fix: extension cannot start smoothly (#810)

* fix: extension cannot start smoothly

* fix the unit test failure

* fix: extension cannot download

---------

Co-authored-by: rick <[email protected]>

Author: LinuxSuRen

cmd/server.go

@@ -264,13 +264,12 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
 	storeExtMgr := server.NewStoreExtManager(o.execer)
 	storeExtMgr.WithDownloader(extDownloader)
 	remoteServer := server.NewRemoteServer(loader, remote.NewGRPCloaderFromStore(), secretServer, storeExtMgr, o.configDir, o.grpcMaxRecvMsgSize)
-	kinds, storeKindsErr := remoteServer.GetStoreKinds(ctx, nil)
-	if storeKindsErr != nil {
-		cmd.PrintErrf("failed to get store kinds, error: %v\n", storeKindsErr)
-	} else {
-		if runPluginErr := startPlugins(storeExtMgr, kinds); runPluginErr != nil {
+	if stores, storeErr := remoteServer.GetStores(ctx, nil); storeErr == nil {
+		if runPluginErr := startPlugins(storeExtMgr, stores); runPluginErr != nil {
 			cmd.PrintErrf("error occurred during starting plugins, error: %v\n", runPluginErr)
 		}
+	} else {
+		cmd.PrintErrf("error occurred during getting stores, error: %v\n", storeErr)
 	}
 
 	// create mock server controller
@@ -438,13 +437,14 @@ func postRequestProxy(proxy string) func(w http.ResponseWriter, r *http.Request,
 	}
 }
 
-func startPlugins(storeExtMgr server.ExtManager, kinds *server.StoreKinds) (err error) {
-	const socketPrefix = "unix://"
-
-	for _, kind := range kinds.Data {
-		if kind.Enabled && (strings.HasPrefix(kind.Url, socketPrefix) || strings.Contains(kind.Url, ":")) {
-			err = errors.Join(err, storeExtMgr.Start(kind.Name, kind.Url))
+func startPlugins(storeExtMgr server.ExtManager, stores *server.Stores) (err error) {
+	for _, store := range stores.Data {
+		if store.Disabled || store.Kind == nil {
+			continue
 		}
+
+		kind := store.Kind
+		err = errors.Join(err, storeExtMgr.Start(kind.Name, kind.Url))
 	}
 	return
 }

console/atest-ui/src/App.vue

@@ -6,7 +6,7 @@ import {
     Share,
     ArrowDown,
     Guide,
-    DataAnalysis, Help, Setting
+    Help, Setting
 } from '@element-plus/icons-vue'
 import * as ElementPlusIcons from '@element-plus/icons-vue'
 import { ref, watch, getCurrentInstance} from 'vue'
@@ -152,16 +152,16 @@ API.GetMenus((menus) => {
           <el-icon><Guide /></el-icon>
           <template #title>{{ t('title.mock' )}}</template>
         </el-menu-item>
-        <el-menu-item index="store">
-          <el-icon><location /></el-icon>
-          <template #title>{{ t('title.stores') }}</template>
-        </el-menu-item>
         <span v-for="menu in extensionMenus" :key="menu.index" :index="menu.index">
             <el-menu-item :index="menu.index">
                 <el-icon><component :is="ElementPlusIcons[menu.icon]" /></el-icon>
                 <template #title>{{ menu.name }}</template>
             </el-menu-item>
         </span>
+        <el-menu-item index="store">
+          <el-icon><location /></el-icon>
+          <template #title>{{ t('title.stores') }}</template>
+        </el-menu-item>
       </el-menu>
     </el-aside>
 

pkg/downloader/oci.go

@@ -135,7 +135,7 @@ func (d *defaultOCIDownloader) Download(image, tag, file string) (reader io.Read
 		}
 	}
 
-	err = fmt.Errorf("not found %s", file)
+	err = fmt.Errorf("not found %s from %s", file, api)
 	return
 }
 

pkg/server/remote_server.go

@@ -28,6 +28,7 @@ import (
 	"path/filepath"
 	reflect "reflect"
 	"regexp"
+	"runtime"
 	"slices"
 	"strconv"
 	"strings"
@@ -1247,10 +1248,7 @@ func (s *server) CreateStore(ctx context.Context, in *Store) (reply *Store, err
 	storeFactory := testing.NewStoreFactory(s.configDir)
 	store := ToNormalStore(in)
 
-	if store.Kind.URL == "" {
-		store.Kind.URL = fmt.Sprintf("unix://%s", home.GetExtensionSocketPath(store.Kind.Name))
-	}
-
+	handleStore(&store)
 	if err = storeFactory.CreateStore(store); err == nil && s.storeExtMgr != nil {
 		err = s.storeExtMgr.Start(store.Kind.Name, store.Kind.URL)
 	}
@@ -1260,6 +1258,7 @@ func (s *server) UpdateStore(ctx context.Context, in *Store) (reply *Store, err
 	reply = &Store{}
 	storeFactory := testing.NewStoreFactory(s.configDir)
 	store := ToNormalStore(in)
+	handleStore(&store)
 	if err = storeFactory.UpdateStore(store); err == nil && s.storeExtMgr != nil {
 		// TODO need to restart extension if config was changed
 		err = s.storeExtMgr.Start(store.Kind.Name, store.Kind.URL)
@@ -1276,14 +1275,21 @@ func (s *server) VerifyStore(ctx context.Context, in *SimpleQuery) (reply *Exten
 	reply = &ExtensionStatus{}
 	var loader testing.Writer
 	if loader, err = s.getLoaderByStoreName(in.Name); err == nil && loader != nil {
-		readOnly, verifyErr := loader.Verify()
+		readOnly, version, verifyErr := loader.Verify()
 		reply.Ready = verifyErr == nil
+		reply.Version = version
 		reply.ReadOnly = readOnly
 		reply.Message = util.OKOrErrorMessage(verifyErr)
 	}
 	return
 }
 
+func handleStore(store *testing.Store) {
+	if store.Kind.URL == "" && runtime.GOOS != "windows" {
+		store.Kind.URL = fmt.Sprintf("unix://%s", home.GetExtensionSocketPath(store.Kind.Name))
+	}
+}
+
 // secret related interfaces
 func (s *server) GetSecrets(ctx context.Context, in *Empty) (reply *Secrets, err error) {
 	return s.secretServer.GetSecrets(ctx, in)

pkg/server/server.pb.go

@@ -616,6 +616,7 @@ message StoreKind {
   repeated StoreKindDependency dependencies = 4;
   string link = 5;
   repeated StoreKindParam params = 6;
+  repeated string categories = 7;
 }
 
 message StoreKindDependency {

pkg/server/server.proto

@@ -98,13 +98,21 @@ func (s *storeExtManager) StartPlugin(storeKind testing.StoreKind) {
 }
 
 func (s *storeExtManager) Start(name, socket string) (err error) {
+	if name == "" {
+	}
+
+	serverLogger.Info("start", "extension", name, "socket", socket)
 	if v, ok := s.extStatusMap[name]; ok && v {
 		return
 	}
+
 	platformBasedName := name
 	if s.execer.OS() == "windows" {
 		platformBasedName += ".exe"
+	} else {
+		socket = fmt.Sprintf("unix://%s", home.GetExtensionSocketPath(name))
 	}
+
 	targetDir := home.GetUserBinDir()
 	targetBinaryFile := filepath.Join(targetDir, platformBasedName)
 
@@ -118,13 +126,14 @@ func (s *storeExtManager) Start(name, socket string) (err error) {
 		if err != nil {
 			err = fmt.Errorf("not found extension, try to download it, error: %v", err)
 			go func() {
-				s.ociDownloader.WithKind("store")
-				s.ociDownloader.WithOS(s.execer.OS())
-				reader, dErr := s.ociDownloader.Download(name, "", "")
+				ociDownloader := downloader.NewStoreDownloader()
+				ociDownloader.WithKind("store")
+				ociDownloader.WithOS(s.execer.OS())
+				reader, dErr := ociDownloader.Download(name, "", "")
 				if dErr != nil {
 					serverLogger.Error(dErr, "failed to download extension", "name", name)
 				} else {
-					extFile := s.ociDownloader.GetTargetFile()
+					extFile := ociDownloader.GetTargetFile()
 
 					targetFile := filepath.Base(extFile)
 					if dErr = downloader.WriteTo(reader, targetDir, targetFile); dErr == nil {

pkg/server/store_ext_manager.go

@@ -24,7 +24,7 @@ type Loader interface {
 	GetCount() int
 	Reset()
 
-	Verify() (readOnly bool, err error)
+	Verify() (readOnly bool, version string, err error)
 	PProf(name string) []byte
 
 	Query(query map[string]string) (result DataResult, err error)

pkg/testing/loader.go

@@ -504,7 +504,7 @@ func (l *fileLoader) RenameTestSuite(oldName, newName string) (err error) {
 	return
 }
 
-func (l *fileLoader) Verify() (readOnly bool, err error) {
+func (l *fileLoader) Verify() (readOnly bool, version string, err error) {
 	// always be okay
 	return
 }

pkg/testing/loader_file.go

@@ -56,7 +56,7 @@ func TestFileLoader(t *testing.T) {
 			}
 			tt.verify(t, loader)
 
-			readonly, err := loader.Verify()
+			readonly, _, err := loader.Verify()
 			assert.NoError(t, err)
 			assert.False(t, readonly)
 		})