Merge pull request #43 from middleDuckAi/middleDuck/installer-41-extras-hub

Add bundled and legacy sources to installer extras flow

Author: Dmi3yy

internal/domain/extras.go

@@ -18,16 +18,37 @@ const (
 )
 
 type ExtrasPackage struct {
+	ID                 string   `json:"id,omitempty"`
 	Name               string   `json:"name"`
 	Version            string   `json:"version"`
 	Versions           []string `json:"versions,omitempty"`
 	Description        string   `json:"description"`
 	DefaultInstallMode string   `json:"defaultInstallMode"`
 	DefaultBranch      string   `json:"defaultBranch,omitempty"`
+	Source             string   `json:"source,omitempty"`
+	Section            string   `json:"section,omitempty"`
+	Kind               string   `json:"kind,omitempty"`
+	InstallMode        string   `json:"installMode,omitempty"`
+	Preselected        bool     `json:"preselected,omitempty"`
+	Path               string   `json:"path,omitempty"`
+	Properties         string   `json:"properties,omitempty"`
+	Events             string   `json:"events,omitempty"`
+	GUID               string   `json:"guid,omitempty"`
+	Category           string   `json:"category,omitempty"`
+	LegacyNames        string   `json:"legacyNames,omitempty"`
+	Disabled           bool     `json:"disabled,omitempty"`
+	ShareParams        int      `json:"shareParams,omitempty"`
+	Icon               string   `json:"icon,omitempty"`
+	DownloadURL        string   `json:"downloadUrl,omitempty"`
+	Dependencies       string   `json:"dependencies,omitempty"`
+	Deprecated         bool     `json:"deprecated,omitempty"`
+	Method             string   `json:"method,omitempty"`
 }
 
 type ExtrasSelection struct {
+	ID      string
 	Name    string
+	Source  string
 	Version string
 }
 
@@ -45,6 +66,7 @@ type ExtrasItemDetail struct {
 type ExtrasState struct {
 	Active       bool
 	Stage        ExtrasStage
+	ProjectPath  string
 	Packages     []ExtrasPackage
 	Selections   []ExtrasSelection
 	Results      []ExtrasItemResult

internal/engine/install/engine.go

@@ -991,9 +991,43 @@ func (e *Engine) Run(ctx context.Context, ch chan<- domain.Event, actions <-chan
 		}
 
 		e.maybeRunExtras(ctx, emit, actions, workDir)
+		e.cleanupExtrasRuntimeArtifacts(emit, workDir)
 	}()
 }
 
+func (e *Engine) cleanupExtrasRuntimeArtifacts(emit func(domain.Event) bool, workDir string) {
+	cacheDir := filepath.Join(absDir(workDir), extrasRuntimeCacheDir)
+	if _, err := os.Stat(cacheDir); err != nil {
+		return
+	}
+	if err := os.RemoveAll(cacheDir); err != nil {
+		if emit != nil {
+			_ = emit(domain.Event{
+				Type:     domain.EventWarning,
+				StepID:   extrasStepID,
+				Source:   "extras",
+				Severity: domain.SeverityWarn,
+				Payload: domain.LogPayload{
+					Message: "Failed to remove installer extras runtime cache.",
+					Fields:  map[string]string{"error": err.Error()},
+				},
+			})
+		}
+		return
+	}
+	if emit != nil {
+		_ = emit(domain.Event{
+			Type:     domain.EventLog,
+			StepID:   extrasStepID,
+			Source:   "extras",
+			Severity: domain.SeverityInfo,
+			Payload: domain.LogPayload{
+				Message: "Removed installer extras runtime cache.",
+			},
+		})
+	}
+}
+
 type phpNewOptions struct {
 	DBType     string
 	DBHost     string
@@ -1796,9 +1830,9 @@ func dbDriverQuestionOptions(status domain.SystemStatus) []domain.QuestionOption
 	// If we don't have system status yet, don't block the user.
 	if len(status.Items) == 0 {
 		return []domain.QuestionOption{
+			{ID: "sqlite", Label: "SQLite", Enabled: true},
 			{ID: "mysql", Label: "MySQL or MariaDB", Enabled: true},
 			{ID: "pgsql", Label: "PostgreSQL", Enabled: true},
-			{ID: "sqlite", Label: "SQLite", Enabled: true},
 			{ID: "sqlsrv", Label: "SQL Server", Enabled: true},
 		}
 	}
@@ -1807,9 +1841,9 @@ func dbDriverQuestionOptions(status domain.SystemStatus) []domain.QuestionOption
 	pdoOK := ok && pdoLevel == domain.StatusOK
 
 	return []domain.QuestionOption{
+		dbDriverOption(status, pdoOK, "sqlite", "SQLite", "pdo_sqlite"),
 		dbDriverOption(status, pdoOK, "mysql", "MySQL or MariaDB", "pdo_mysql"),
 		dbDriverOption(status, pdoOK, "pgsql", "PostgreSQL", "pdo_pgsql"),
-		dbDriverOption(status, pdoOK, "sqlite", "SQLite", "pdo_sqlite"),
 		dbDriverOption(status, pdoOK, "sqlsrv", "SQL Server", "pdo_sqlsrv"),
 	}
 }
@@ -1858,6 +1892,15 @@ try {
     if ($name !== ":memory:" && !str_starts_with($name, "file:") && !preg_match('/^(\/|[A-Za-z]:[\\\\\\/])/', $name)) {
       $name = "core/database/" . basename(str_replace("\\", "/", $name));
     }
+    if ($name !== ":memory:" && !str_starts_with($name, "file:")) {
+      $dir = dirname($name);
+      if ($dir !== "" && $dir !== "." && !is_dir($dir)) {
+        @mkdir($dir, 0755, true);
+      }
+      if (!file_exists($name)) {
+        @touch($name);
+      }
+    }
     new \PDO("sqlite:".$name, null, null, $timeout);
     echo json_encode(["ok"=>true]); exit(0);
   }

internal/engine/install/extras.go

@@ -61,6 +61,20 @@ func sanitizeExtrasPackages(pkgs []domain.ExtrasPackage) []domain.ExtrasPackage
 		p.Description = strings.TrimSpace(p.Description)
 		p.DefaultInstallMode = strings.TrimSpace(p.DefaultInstallMode)
 		p.DefaultBranch = strings.TrimSpace(p.DefaultBranch)
+		p.Source = strings.TrimSpace(p.Source)
+		p.Section = strings.TrimSpace(p.Section)
+		p.Kind = strings.TrimSpace(p.Kind)
+		p.InstallMode = strings.TrimSpace(p.InstallMode)
+		p.Path = strings.TrimSpace(p.Path)
+		p.Properties = strings.TrimSpace(p.Properties)
+		p.Events = strings.TrimSpace(p.Events)
+		p.GUID = strings.TrimSpace(p.GUID)
+		p.Category = strings.TrimSpace(p.Category)
+		p.LegacyNames = strings.TrimSpace(p.LegacyNames)
+		p.Icon = strings.TrimSpace(p.Icon)
+		p.DownloadURL = strings.TrimSpace(p.DownloadURL)
+		p.Dependencies = strings.TrimSpace(p.Dependencies)
+		p.Method = strings.TrimSpace(p.Method)
 		if len(p.Versions) > 0 {
 			seen := map[string]struct{}{}
 			clean := make([]string, 0, len(p.Versions))
@@ -77,6 +91,18 @@ func sanitizeExtrasPackages(pkgs []domain.ExtrasPackage) []domain.ExtrasPackage
 			}
 			p.Versions = clean
 		}
+		if p.Source == "" {
+			p.Source = "managed"
+		}
+		if p.Section == "" {
+			p.Section = "Managed extras"
+		}
+		if p.InstallMode == "" {
+			p.InstallMode = "managed-artisan"
+		}
+		if p.ID == "" {
+			p.ID = p.Source + ":" + p.Name
+		}
 		out = append(out, p)
 	}
 	return out