node works 2

Author: andrzej-janczak

plugins/runtime-utils.go

@@ -26,16 +26,17 @@ type binary struct {
 type pluginConfig struct {
 	Name        string            `yaml:"name"`
 	Description string            `yaml:"description"`
-	Download    downloadConfig    `yaml:"download"`
+	Downloads   []downloadConfig  `yaml:"downloads"`
+	ArchMapping map[string]string `yaml:"arch_mapping"`
 	Binaries    []binary          `yaml:"binaries"`
 }
 
 // downloadConfig holds the download configuration from the plugin.yaml
 type downloadConfig struct {
-	URLTemplate      string            `yaml:"url_template"`
-	FileNameTemplate string            `yaml:"file_name_template"`
-	Extension        extensionConfig   `yaml:"extension"`
-	ArchMapping      map[string]string `yaml:"arch_mapping"`
+	OS               []string        `yaml:"os"`
+	URLTemplate      string          `yaml:"url_template"`
+	FileNameTemplate string          `yaml:"file_name_template"`
+	Extension        extensionConfig `yaml:"extension"`
 }
 
 // extensionConfig defines the file extension based on OS
@@ -79,74 +80,92 @@ type RuntimeInfo struct {
 // ProcessRuntimes processes a list of runtime configurations and returns a map of runtime information
 func ProcessRuntimes(configs []RuntimeConfig, runtimesDir string) (map[string]*RuntimeInfo, error) {
 	result := make(map[string]*RuntimeInfo)
-	
+
 	for _, config := range configs {
 		runtimeInfo, err := processRuntime(config, runtimesDir)
 		if err != nil {
 			return nil, err
 		}
-		
+
 		result[config.Name] = runtimeInfo
 	}
-	
+
 	return result, nil
 }
 
-
 // ProcessRuntime processes a single runtime configuration and returns detailed runtime info
 func processRuntime(config RuntimeConfig, runtimesDir string) (*RuntimeInfo, error) {
 	plugin, err := loadPlugin(config.Name)
 	if err != nil {
 		return nil, fmt.Errorf("failed to load plugin for runtime %s: %w", config.Name, err)
 	}
-	
-	fileName := plugin.getFileName(config.Version)
-	extension := plugin.getExtension(runtime.GOOS)
+
+	// Find the appropriate OS-specific download configuration
+	var download downloadConfig
+	found := false
+	for _, d := range plugin.Config.Downloads {
+		for _, os := range d.OS {
+			if os == runtime.GOOS {
+				download = d
+				found = true
+				break
+			}
+		}
+		if found {
+			break
+		}
+	}
+
+	if !found {
+		return nil, fmt.Errorf("no download configuration found for OS %s in runtime %s", runtime.GOOS, config.Name)
+	}
+
+	fileName := plugin.getFileName(download, config.Version)
+	extension := plugin.getExtension(download, runtime.GOOS)
 	installDir := plugin.getInstallationDirectoryPath(runtimesDir, config.Version)
-	
+
 	// Create RuntimeInfo with essential information
 	info := &RuntimeInfo{
 		Name:        config.Name,
 		Version:     config.Version,
 		InstallDir:  installDir,
-		DownloadURL: plugin.getDownloadURL(config.Version),
+		DownloadURL: plugin.getDownloadURL(download, config.Version),
 		FileName:    fileName,
 		Extension:   extension,
 		Binaries:    make(map[string]string),
 	}
-	
+
 	// Process binary paths
 	for _, binary := range plugin.Config.Binaries {
 		binaryPath := path.Join(installDir, binary.Path)
-		
+
 		// Add file extension for Windows executables
 		if runtime.GOOS == "windows" && !strings.HasSuffix(binaryPath, ".exe") {
 			binaryPath += ".exe"
 		}
-		
+
 		info.Binaries[binary.Name] = binaryPath
 	}
-	
+
 	return info, nil
 }
 
-
 // LoadPlugin loads a plugin configuration from the specified plugin directory
 func loadPlugin(runtimeName string) (*runtimePlugin, error) {
 	pluginPath := filepath.Join("runtimes", runtimeName, "plugin.yaml")
-	
+
 	// Read from embedded filesystem
 	data, err := pluginsFS.ReadFile(pluginPath)
 	if err != nil {
 		return nil, fmt.Errorf("error reading plugin.yaml: %w", err)
 	}
-	
+
 	var config pluginConfig
 	err = yaml.Unmarshal(data, &config)
 	if err != nil {
 		return nil, fmt.Errorf("error parsing plugin.yaml: %w", err)
 	}
-	
+
 	return &runtimePlugin{
 		Config:     config,
 		ConfigPath: pluginPath,
@@ -156,65 +175,65 @@ func loadPlugin(runtimeName string) (*runtimePlugin, error) {
 // GetMappedArch returns the architecture mapping for the current system
 func (p *runtimePlugin) getMappedArch(goarch string) string {
 	// Check if there's a mapping for this architecture
-	if mappedArch, ok := p.Config.Download.ArchMapping[goarch]; ok {
+	if mappedArch, ok := p.Config.ArchMapping[goarch]; ok {
 		return mappedArch
 	}
 	// Return the original architecture if no mapping exists
 	return goarch
 }
 
 // GetExtension returns the appropriate file extension based on the OS
-func (p *runtimePlugin) getExtension(goos string) string {
+func (p *runtimePlugin) getExtension(download downloadConfig, goos string) string {
 	if goos == "windows" {
-		return p.Config.Download.Extension.Windows
+		return download.Extension.Windows
 	}
-	return p.Config.Download.Extension.Default
+	return download.Extension.Default
 }
 
 // GetFileName generates the filename based on the template in plugin.yaml
-func (p *runtimePlugin) getFileName(version string) string {
+func (p *runtimePlugin) getFileName(download downloadConfig, version string) string {
 	goos := runtime.GOOS
 	goarch := runtime.GOARCH
-	
+
 	// Map Go architecture to runtime-specific architecture
 	mappedArch := p.getMappedArch(goarch)
-	
+
 	// Prepare template data
 	data := templateData{
 		Version: version,
 		OS:      goos,
 		Arch:    mappedArch,
 	}
-	
+
 	// Execute template substitution for filename
-	tmpl, err := template.New("filename").Parse(p.Config.Download.FileNameTemplate)
+	tmpl, err := template.New("filename").Parse(download.FileNameTemplate)
 	if err != nil {
 		return ""
 	}
-	
+
 	var buf bytes.Buffer
 	err = tmpl.Execute(&buf, data)
 	if err != nil {
 		return ""
 	}
-	
+
 	return buf.String()
 }
 
 // GetDownloadURL generates the download URL based on the template in plugin.yaml
-func (p *runtimePlugin) getDownloadURL(version string) string {
+func (p *runtimePlugin) getDownloadURL(download downloadConfig, version string) string {
 	goos := runtime.GOOS
 	goarch := runtime.GOARCH
-	
+
 	// Map Go architecture to runtime-specific architecture
 	mappedArch := p.getMappedArch(goarch)
-	
+
 	// Get the appropriate extension
-	extension := p.getExtension(goos)
-	
+	extension := p.getExtension(download, goos)
+
 	// Get the filename
-	fileName := p.getFileName(version)
-	
+	fileName := p.getFileName(download, version)
+
 	// Prepare template data
 	data := templateData{
 		Version:   version,
@@ -223,24 +242,24 @@ func (p *runtimePlugin) getDownloadURL(version string) string {
 		Arch:      mappedArch,
 		Extension: extension,
 	}
-	
+
 	// Execute template substitution for URL
-	tmpl, err := template.New("url").Parse(p.Config.Download.URLTemplate)
+	tmpl, err := template.New("url").Parse(download.URLTemplate)
 	if err != nil {
 		return ""
 	}
-	
+
 	var buf bytes.Buffer
 	err = tmpl.Execute(&buf, data)
 	if err != nil {
 		return ""
 	}
-	
+
 	return buf.String()
 }
 
 // GetInstallationDirectoryPath returns the installation directory path for the runtime
 func (p *runtimePlugin) getInstallationDirectoryPath(runtimesDir string, version string) string {
-	fileName := p.getFileName(version)
+	fileName := p.getFileName(p.Config.Downloads[0], version)
 	return path.Join(runtimesDir, fileName)
 }

plugins/runtimes/node/plugin.yaml

@@ -1,16 +1,23 @@
 name: node
 description: Node.js JavaScript runtime
-download:
-  url_template: "https://nodejs.org/dist/v{{.Version}}/{{.FileName}}.{{.Extension}}"
-  file_name_template: "node-v{{.Version}}-{{.OS}}-{{.Arch}}"
-  extension:
-    windows: "zip"
-    default: "tar.gz"
-  arch_mapping:
-    "386": "x86"
-    "amd64": "x64"
-    "arm": "armv7l"
-    "arm64": "arm64"
+downloads:
+  - os: ["linux", "darwin"]
+    url_template: "https://nodejs.org/dist/v{{.Version}}/{{.FileName}}.{{.Extension}}"
+    file_name_template: "node-v{{.Version}}-{{.OS}}-{{.Arch}}"
+    extension:
+      windows: "zip"
+      default: "tar.gz"
+  - os: ["windows"]
+    url_template: "https://nodejs.org/dist/v{{.Version}}/{{.FileName}}.{{.Extension}}"
+    file_name_template: "node-v{{.Version}}-{{.OS}}-{{.Arch}}"
+    extension:
+      windows: "zip"
+      default: "tar.gz"
+arch_mapping:
+  "386": "x86"
+  "amd64": "x64"
+  "arm": "armv7l"
+  "arm64": "arm64"
 binaries:
   - name: node
     path: "bin/node"