chore: update code

Author: bytemain

internal/base/interfaces.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"path/filepath"
 
-	"github.com/version-fox/vfox/internal/logger"
 	"github.com/version-fox/vfox/internal/util"
 )
 
@@ -101,43 +100,8 @@ type AvailableHookResultItem struct {
 	Addition []*Info `json:"addition"`
 }
 
-type AvailableHookResult = []*AvailableHookResultItem
-
-func CreatePackages(sdkName string, hookResult []*AvailableHookResultItem) []*Package {
-	var result []*Package
-	for _, item := range hookResult {
-		mainSdk := &Info{
-			Name:    sdkName,
-			Version: item.Version,
-			Note:    item.Note,
-		}
-
-		var additionalArr []*Info
-
-		for i, addition := range item.Addition {
-			if addition.Name == "" {
-				logger.Errorf("[Available] additional file %d no name provided", i+1)
-			}
-
-			additionalArr = append(additionalArr, &Info{
-				Name:    addition.Name,
-				Version: addition.Version,
-				Path:    addition.Path,
-				Note:    addition.Note,
-			})
-		}
-
-		result = append(result, &Package{
-			Main:      mainSdk,
-			Additions: additionalArr,
-		})
-	}
-
-	return result
-}
-
 type PreInstallHookCtx struct {
-	Version Version `json:"version"`
+	Version string `json:"version"`
 }
 
 type PreInstallHookResultAdditionItem struct {
@@ -288,7 +252,7 @@ func (p *Package) Clone() *Package {
 }
 
 type Plugin interface {
-	Available(ctx *AvailableHookCtx) (*AvailableHookResult, error)
+	Available(ctx *AvailableHookCtx) ([]*AvailableHookResultItem, error)
 
 	PreInstall(ctx *PreInstallHookCtx) (*PreInstallHookResult, error)
 	PostInstall(ctx *PostInstallHookCtx) error

internal/plugin/luai/plugin.go

@@ -27,7 +27,7 @@ func (l *LuaPlugin) Close() {
 	l.vm.Close()
 }
 
-func (l *LuaPlugin) Available(ctx *base.AvailableHookCtx) (*base.AvailableHookResult, error) {
+func (l *LuaPlugin) Available(ctx *base.AvailableHookCtx) ([]*base.AvailableHookResultItem, error) {
 	L := l.vm.Instance
 	ctxTable, err := Marshal(L, ctx)
 	if err != nil {
@@ -41,13 +41,13 @@ func (l *LuaPlugin) Available(ctx *base.AvailableHookCtx) (*base.AvailableHookRe
 		return nil, errors.New("no result provided")
 	}
 
-	hookResult := base.AvailableHookResult{}
+	hookResult := []*base.AvailableHookResultItem{}
 	err = Unmarshal(table, &hookResult)
 	if err != nil {
 		return nil, errors.New("failed to unmarshal the return value: " + err.Error())
 	}
 
-	return &hookResult, nil
+	return hookResult, nil
 }
 func (l *LuaPlugin) PreInstall(ctx *base.PreInstallHookCtx) (*base.PreInstallHookResult, error) {
 	L := l.vm.Instance

internal/plugin/luai/vm.go

@@ -88,13 +88,6 @@ func (vm *LuaVM) CallFunction(pluginObj *lua.LTable, funcName string, _args ...l
 	return vm.ReturnedValue(), nil
 }
 
-func (vm *LuaVM) GetTableString(table *lua.LTable, key string) string {
-	if value := table.RawGetString(key); value.Type() != lua.LTNil {
-		return value.String()
-	}
-	return ""
-}
-
 func (vm *LuaVM) Close() {
 	vm.Instance.Close()
 }

internal/plugin/plugin.go

@@ -100,15 +100,44 @@ func (l *PluginWrapper) invokeAvailable(args []string) ([]*base.Package, error)
 	ctx := base.AvailableHookCtx{
 		Args: args,
 	}
-	result, err := l.impl.Available(&ctx)
+	hookResult, err := l.impl.Available(&ctx)
 	if err != nil {
 		return nil, err
 	}
-	if result == nil {
+	if hookResult == nil {
 		return []*base.Package{}, nil
 	}
 
-	return base.CreatePackages(l.Name, *result), nil
+	var result []*base.Package
+	for _, item := range hookResult {
+		mainSdk := &base.Info{
+			Name:    l.Name,
+			Version: item.Version,
+			Note:    item.Note,
+		}
+
+		var additionalArr []*base.Info
+
+		for i, addition := range item.Addition {
+			if addition.Name == "" {
+				logger.Errorf("[Available] additional file %d no name provided", i+1)
+			}
+
+			additionalArr = append(additionalArr, &base.Info{
+				Name:    addition.Name,
+				Version: addition.Version,
+				Path:    addition.Path,
+				Note:    addition.Note,
+			})
+		}
+
+		result = append(result, &base.Package{
+			Main:      mainSdk,
+			Additions: additionalArr,
+		})
+	}
+
+	return result, nil
 }
 
 func (l *PluginWrapper) Available(args []string) ([]*base.Package, error) {
@@ -158,7 +187,7 @@ func (l *PluginWrapper) Available(args []string) ([]*base.Package, error) {
 
 func (l *PluginWrapper) PreInstall(version base.Version) (*base.Package, error) {
 	ctx := base.PreInstallHookCtx{
-		Version: version,
+		Version: string(version),
 	}
 
 	result, err := l.impl.PreInstall(&ctx)