Add Nginx service orchestration

Author: vikrezdev

cmd/install.go

@@ -27,17 +27,27 @@ var installCmd = &cobra.Command{
 			if err != nil {
 				return err
 			}
-			return installPHP(m.Runtime.PHP)
+			if err := installPHP(m.Runtime.PHP); err != nil {
+				return err
+			}
+			if m.Server != nil && m.Server.Engine == "nginx" {
+				return installNginx("1.30")
+			}
+			return nil
 		}
 
 		runtime, version, err := parseRuntimeSpec(args[0])
 		if err != nil {
 			return err
 		}
-		if runtime != "php" {
-			return fmt.Errorf("install currently supports PHP only")
+		switch runtime {
+		case "php":
+			return installPHP(version)
+		case "nginx":
+			return installNginx(version)
+		default:
+			return fmt.Errorf("install currently supports php and nginx")
 		}
-		return installPHP(version)
 	},
 }
 
@@ -53,6 +63,18 @@ func installPHP(version string) error {
 	return packs.InstallPHP(exact, info, installForce)
 }
 
+func installNginx(version string) error {
+	reg, err := registry.Load()
+	if err != nil {
+		return err
+	}
+	exact, info, err := reg.ResolveNginx(version)
+	if err != nil {
+		return err
+	}
+	return packs.InstallNginx(exact, info, installForce)
+}
+
 func parseRuntimeSpec(spec string) (string, string, error) {
 	parts := strings.Split(spec, "@")
 	if len(parts) != 2 || parts[0] == "" || parts[1] == "" {

cmd/list.go

@@ -21,19 +21,24 @@ var listCmd = &cobra.Command{
 		}
 
 		if listAvailable {
-			if runtime != "php" {
-				return fmt.Errorf("available registry listing currently supports php only")
-			}
 			reg, err := registry.Load()
 			if err != nil {
 				return err
 			}
-			versions := reg.AvailablePHP()
+			var versions []string
+			switch runtime {
+			case "php":
+				versions = reg.AvailablePHP()
+			case "nginx":
+				versions = reg.AvailableNginx()
+			default:
+				return fmt.Errorf("available registry listing currently supports php and nginx")
+			}
 			if len(versions) == 0 {
-				fmt.Println("No PHP versions available in registry.")
+				fmt.Printf("No %s versions available in registry.\n", runtime)
 				return nil
 			}
-			fmt.Println("Available PHP runtimes:")
+			fmt.Printf("Available %s runtimes:\n", runtime)
 			for _, version := range versions {
 				fmt.Printf("  %s\n", version)
 			}

internal/packs/services.go

@@ -0,0 +1,76 @@
+package packs
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/Vikrez22/phpvm/internal/downloader"
+	"github.com/Vikrez22/phpvm/internal/paths"
+	"github.com/Vikrez22/phpvm/registry"
+)
+
+func InstallNginx(version string, info *registry.BuildInfo, force bool) error {
+	destDir := paths.ServiceDir("nginx", version)
+	if _, err := os.Stat(destDir); err == nil {
+		if !force {
+			return fmt.Errorf("Nginx %s is already installed. Use --force to reinstall.", version)
+		}
+		if err := os.RemoveAll(destDir); err != nil {
+			return fmt.Errorf("cannot remove existing Nginx %s: %w", version, err)
+		}
+	}
+
+	fmt.Printf("Installing Nginx %s...\n", version)
+	zipPath, err := downloader.Download(info.URL, downloader.TempDownloadDir(), filepath.Base(info.URL))
+	if err != nil {
+		return err
+	}
+
+	fmt.Print("Verifying checksum... ")
+	if err := downloader.VerifySHA256(zipPath, info.SHA256); err != nil {
+		_ = os.Remove(zipPath)
+		return err
+	}
+	fmt.Println("ok")
+
+	stagingDir := filepath.Join(os.TempDir(), "phpvm", "staging", "nginx-"+version)
+	_ = os.RemoveAll(stagingDir)
+	if err := extractZip(zipPath, stagingDir); err != nil {
+		return fmt.Errorf("extraction failed: %w", err)
+	}
+
+	topLevel, err := findSingleDir(stagingDir)
+	if err != nil {
+		topLevel = stagingDir
+	}
+
+	if err := os.MkdirAll(filepath.Dir(destDir), 0755); err != nil {
+		return err
+	}
+	if err := os.Rename(topLevel, destDir); err != nil {
+		return fmt.Errorf("cannot install Nginx: %w", err)
+	}
+	_ = os.RemoveAll(stagingDir)
+	_ = os.Remove(zipPath)
+
+	fmt.Printf("Nginx %s installed\n", version)
+	return nil
+}
+
+func findSingleDir(parent string) (string, error) {
+	entries, err := os.ReadDir(parent)
+	if err != nil {
+		return "", err
+	}
+	var dirs []string
+	for _, entry := range entries {
+		if entry.IsDir() {
+			dirs = append(dirs, filepath.Join(parent, entry.Name()))
+		}
+	}
+	if len(dirs) != 1 {
+		return "", fmt.Errorf("expected one top-level directory, found %d", len(dirs))
+	}
+	return dirs[0], nil
+}

internal/state/state.go

@@ -87,21 +87,28 @@ func (s *ProjectState) AllocatePort(service string, preferred int) (int, error)
 	if existing, ok := s.AllocatedPorts[service]; ok {
 		return existing, nil
 	}
-	port, err := findFreePort(preferred)
+	reserved := map[int]bool{}
+	for _, port := range s.AllocatedPorts {
+		reserved[port] = true
+	}
+	port, err := findFreePort(preferred, reserved)
 	if err != nil {
 		return 0, err
 	}
 	s.AllocatedPorts[service] = port
 	return port, nil
 }
 
-func findFreePort(preferred int) (int, error) {
-	if preferred > 0 {
+func findFreePort(preferred int, reserved map[int]bool) (int, error) {
+	if preferred > 0 && !reserved[preferred] {
 		if isPortFree(preferred) {
 			return preferred, nil
 		}
 	}
 	for port := 8080; port < 9000; port++ {
+		if reserved[port] {
+			continue
+		}
 		if isPortFree(port) {
 			return port, nil
 		}

internal/state/state_test.go

@@ -44,3 +44,18 @@ func TestHashProjectStable(t *testing.T) {
 		t.Fatalf("hashes differ: %q vs %q", a, b)
 	}
 }
+
+func TestAllocatePortDoesNotReuseReservedPort(t *testing.T) {
+	s := New(t.TempDir())
+	first, err := s.AllocatePort("web", 0)
+	if err != nil {
+		t.Fatalf("AllocatePort web returned error: %v", err)
+	}
+	second, err := s.AllocatePort("php-cgi", 0)
+	if err != nil {
+		t.Fatalf("AllocatePort php-cgi returned error: %v", err)
+	}
+	if first == second {
+		t.Fatalf("ports reused: %d", first)
+	}
+}