fix: multiple embedded plugins

Author: h3zh1

client/plugin/embed.go

@@ -153,13 +153,20 @@ func (plug *EmbedPlugin) GetLevel() MalLevel {
 	return plug.Level
 }
 
+// EmbedURI 构建当前嵌入式插件的规范资源URI
+func (plug *EmbedPlugin) EmbedURI(resourcePath string) string {
+	rootPath := strings.Trim(plug.RootPath, "/")
+	resourcePath = strings.TrimPrefix(resourcePath, "/")
+	return fmt.Sprintf("embed://%s/%s", rootPath, resourcePath)
+}
+
 // registerEmbedResourceFunctions 注册嵌入式资源相关的Lua函数
 func (plug *EmbedPlugin) registerEmbedResourceFunctions() {
 	// 重写script_resource函数 - 返回资源文件路径
 	plug.registerFunction("script_resource", func(filename string) (string, error) {
 		resourcePath := "resources/" + filename
 		if _, exists := plug.GetFileContent(resourcePath); exists {
-			return fmt.Sprintf("embed://%s/%s", plug.Name, resourcePath), nil
+			return plug.EmbedURI(resourcePath), nil
 		}
 
 		// 回退到文件系统
@@ -175,7 +182,7 @@ func (plug *EmbedPlugin) registerEmbedResourceFunctions() {
 				for _, levelPlugin := range globalManager.GetEmbeddedPluginsByLevel(level) {
 					resourcePath := "resources/" + filename
 					if _, fileExists := levelPlugin.GetFileContent(resourcePath); fileExists {
-						return fmt.Sprintf("embed://%s/%s", levelPlugin.Name, resourcePath), nil
+						return levelPlugin.EmbedURI(resourcePath), nil
 					}
 				}
 			}
@@ -192,7 +199,7 @@ func (plug *EmbedPlugin) registerEmbedResourceFunctions() {
 
 		resourcePath := "resources/" + filename
 		if _, exists := plug.GetFileContent(resourcePath); exists {
-			return fmt.Sprintf("embed://%s/%s", plug.Name, resourcePath), nil
+			return plug.EmbedURI(resourcePath), nil
 		}
 
 		resourceFile := filepath.Join(assets.GetMalsDir(), plug.Name, "resources", filename)
@@ -208,7 +215,7 @@ func (plug *EmbedPlugin) registerEmbedResourceFunctions() {
 				for _, levelPlugin := range globalManager.GetEmbeddedPluginsByLevel(level) {
 					resourcePath := "resources/" + filename
 					if _, fileExists := levelPlugin.GetFileContent(resourcePath); fileExists {
-						return fmt.Sprintf("embed://%s/%s", levelPlugin.Name, resourcePath), nil
+						return levelPlugin.EmbedURI(resourcePath), nil
 					}
 				}
 			}
@@ -262,35 +269,11 @@ func (plug *EmbedPlugin) registerEmbedResourceFunctions() {
 	// 新增read_embed_resource函数 - 专门用于读取嵌入式资源，支持embed://路径
 	plug.registerFunction("read_embed_resource", func(resourcePath string) (string, error) {
 		if strings.HasPrefix(resourcePath, "embed://") {
-			// 解析嵌入式资源路径: embed://pluginName/resourcePath
-			parts := strings.TrimPrefix(resourcePath, "embed://")
-			pathParts := strings.SplitN(parts, "/", 2)
-			if len(pathParts) != 2 {
-				return "", fmt.Errorf("invalid embedded resource path: %s", resourcePath)
-			}
-
-			pluginName := pathParts[0]
-			filename := strings.TrimPrefix(pathParts[1], "resources/")
-
-			// 如果是当前插件的资源
-			if pluginName == plug.Name {
-				resourceFilePath := "resources/" + filename
-				if content, exists := plug.GetFileContent(resourceFilePath); exists {
-					return string(content), nil
-				}
-			}
-
-			// 从全局管理器查找其他插件的资源
-			if globalManager := GetGlobalMalManager(); globalManager != nil {
-				if plugin, exists := globalManager.GetEmbedPlugin(pluginName); exists {
-					resourceFilePath := "resources/" + filename
-					if content, fileExists := plugin.GetFileContent(resourceFilePath); fileExists {
-						return string(content), nil
-					}
-				}
+			content, err := intl.ReadEmbedResource(resourcePath)
+			if err != nil {
+				return "", err
 			}
-
-			return "", fmt.Errorf("embedded resource not found: %s", resourcePath)
+			return string(content), nil
 		}
 
 		// 如果不是embed://路径，直接从文件系统读取

helper/intl/intl.go

@@ -78,34 +78,77 @@ func GetResourcePath(levelName, filename string) string {
 	return fmt.Sprintf("embed://%s/resources/%s", levelName, filename)
 }
 
-// ParseEmbedPath 解析embed://路径，返回level和文件路径
-func ParseEmbedPath(embedPath string) (levelName, filePath string, err error) {
+// ParseEmbedPath 解析embed://路径，返回命名空间和文件路径
+func ParseEmbedPath(embedPath string) (namespace, filePath string, err error) {
 	if !strings.HasPrefix(embedPath, "embed://") {
 		return "", "", fmt.Errorf("invalid embed path: %s", embedPath)
 	}
 
-	// 移除embed://前缀
-	path := strings.TrimPrefix(embedPath, "embed://")
-
-	// 分割为level和文件路径
+	path := strings.Trim(strings.TrimPrefix(embedPath, "embed://"), "/")
 	parts := strings.SplitN(path, "/", 2)
 	if len(parts) != 2 {
 		return "", "", fmt.Errorf("invalid embed path format: %s", embedPath)
 	}
 
-	return parts[0], parts[1], nil
+	return strings.TrimSpace(parts[0]), strings.TrimPrefix(parts[1], "/"), nil
+}
+
+func isKnownLevel(namespace string) bool {
+	switch namespace {
+	case "custom", "professional", "community":
+		return true
+	default:
+		return false
+	}
+}
+
+func buildFallbackEmbedCandidates(namespace, filePath string) []string {
+	levels := []string{"custom", "professional", "community"}
+	seen := make(map[string]struct{}, len(levels)+1)
+	candidates := make([]string, 0, len(levels)+1)
+
+	add := func(path string) {
+		path = strings.Trim(path, "/")
+		if path == "" {
+			return
+		}
+		if _, ok := seen[path]; ok {
+			return
+		}
+		seen[path] = struct{}{}
+		candidates = append(candidates, path)
+	}
+
+	for _, level := range levels {
+		add(level + "/" + namespace + "/" + filePath)
+	}
+
+	if isKnownLevel(namespace) {
+		add(namespace + "/" + namespace + "/" + filePath)
+	}
+
+	return candidates
 }
 
 // ReadEmbedResource 根据embed://路径读取嵌入式资源
 func ReadEmbedResource(embedPath string) ([]byte, error) {
-	levelName, filePath, err := ParseEmbedPath(embedPath)
+	namespace, filePath, err := ParseEmbedPath(embedPath)
 	if err != nil {
 		return nil, err
 	}
 
-	// 构建完整路径
-	fullPath := levelName + "/" + filePath
-	return GetFileContent(fullPath)
+	directPath := strings.Trim(strings.TrimPrefix(embedPath, "embed://"), "/")
+	if content, readErr := GetFileContent(directPath); readErr == nil {
+		return content, nil
+	}
+
+	for _, candidate := range buildFallbackEmbedCandidates(namespace, filePath) {
+		if content, readErr := GetFileContent(candidate); readErr == nil {
+			return content, nil
+		}
+	}
+
+	return nil, fmt.Errorf("embedded resource not found: %s", embedPath)
 }
 
 // ListLevels 列出所有可用的级别（community, professional）

helper/intl/intl_embed_path_test.go

@@ -0,0 +1,32 @@
+package intl
+
+import "testing"
+
+func TestReadEmbedResourceCanonicalPath(t *testing.T) {
+	path := "embed://community/community/resources/bof/ipconfig/ipconfig.x64.o"
+	content, err := ReadEmbedResource(path)
+	if err != nil {
+		t.Fatalf("canonical path should be readable: %v", err)
+	}
+	if len(content) == 0 {
+		t.Fatal("canonical path returned empty content")
+	}
+}
+
+func TestReadEmbedResourceLegacyPathFallback(t *testing.T) {
+	path := "embed://community/resources/bof/ipconfig/ipconfig.x64.o"
+	content, err := ReadEmbedResource(path)
+	if err != nil {
+		t.Fatalf("legacy path should fallback correctly: %v", err)
+	}
+	if len(content) == 0 {
+		t.Fatal("legacy fallback returned empty content")
+	}
+}
+
+func TestReadEmbedResourceInvalidPath(t *testing.T) {
+	_, err := ReadEmbedResource("embed://invalid")
+	if err == nil {
+		t.Fatal("expected parse error for invalid embed path")
+	}
+}