@zhin.js/console 1.0.39 → 1.0.41

package/lib/websocket.js

@@ -1,36 +1,41 @@
+import fs from 'fs';
+import path from 'path';
 import WebSocket from 'ws';
 import { usePlugin } from '@zhin.js/core';
 
 // src/websocket.ts
 var { root, logger } = usePlugin();
+var ENV_WHITELIST = [".env", ".env.development", ".env.production"];
+function resolveConfigKey(pluginName) {
+  const schemaService = root.inject("schema");
+  return schemaService?.resolveConfigKey(pluginName) ?? pluginName;
+}
+function getPluginKeys() {
+  const schemaService = root.inject("schema");
+  if (!schemaService) return [];
+  const keys = /* @__PURE__ */ new Set();
+  for (const [, configKey] of schemaService.getPluginKeyMap()) {
+    keys.add(configKey);
+  }
+  return Array.from(keys);
+}
+function getConfigFilePath() {
+  return path.resolve(process.cwd(), "zhin.config.yml");
+}
 function setupWebSocket(webServer) {
   webServer.ws.on("connection", (ws) => {
-    ws.send(
-      JSON.stringify({
-        type: "sync",
-        data: {
-          key: "entries",
-          value: Object.values(webServer.entries)
-        }
-      })
-    );
-    ws.send(
-      JSON.stringify({
-        type: "init-data",
-        timestamp: Date.now()
-      })
-    );
+    ws.send(JSON.stringify({
+      type: "sync",
+      data: { key: "entries", value: Object.values(webServer.entries) }
+    }));
+    ws.send(JSON.stringify({ type: "init-data", timestamp: Date.now() }));
     ws.on("message", async (data) => {
       try {
         const message = JSON.parse(data.toString());
         await handleWebSocketMessage(ws, message, webServer);
       } catch (error) {
         console.error("WebSocket \u6D88\u606F\u5904\u7406\u9519\u8BEF:", error);
-        ws.send(
-          JSON.stringify({
-            error: "Invalid message format"
-          })
-        );
+        ws.send(JSON.stringify({ error: "Invalid message format" }));
       }
     });
     ws.on("close", () => {
@@ -47,19 +52,50 @@ async function handleWebSocketMessage(ws, message, webServer) {
       ws.send(JSON.stringify({ type: "pong", requestId }));
       break;
     case "entries:get":
-      ws.send(
-        JSON.stringify({
-          requestId,
-          data: Object.values(webServer.entries)
-        })
-      );
+      ws.send(JSON.stringify({ requestId, data: Object.values(webServer.entries) }));
+      break;
+    // ================================================================
+    // 配置文件原始 YAML 读写（用于配置管理页面）
+    // ================================================================
+    case "config:get-yaml":
+      try {
+        const filePath = getConfigFilePath();
+        const yaml = fs.existsSync(filePath) ? fs.readFileSync(filePath, "utf-8") : "";
+        ws.send(JSON.stringify({ requestId, data: { yaml, pluginKeys: getPluginKeys() } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to read config: ${error.message}` }));
+      }
       break;
+    case "config:save-yaml":
+      try {
+        const { yaml } = message;
+        if (typeof yaml !== "string") {
+          ws.send(JSON.stringify({ requestId, error: "yaml field is required" }));
+          break;
+        }
+        const filePath = getConfigFilePath();
+        fs.writeFileSync(filePath, yaml, "utf-8");
+        const configService = root.inject("config");
+        const loader = configService.configs.get("zhin.config.yml");
+        if (loader) loader.load();
+        ws.send(JSON.stringify({ requestId, data: { success: true, message: "\u914D\u7F6E\u5DF2\u4FDD\u5B58\uFF0C\u9700\u91CD\u542F\u751F\u6548" } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to save config: ${error.message}` }));
+      }
+      break;
+    // ================================================================
+    // 插件配置（供 PluginConfigForm 使用）
+    // ================================================================
     case "config:get":
       try {
         const configService = root.inject("config");
-        const appConfig = configService.get("zhin.config.yml");
-        const config = pluginName ? appConfig[pluginName] || {} : appConfig;
-        ws.send(JSON.stringify({ requestId, data: config }));
+        const rawConfig = configService.getRaw("zhin.config.yml");
+        if (!pluginName) {
+          ws.send(JSON.stringify({ requestId, data: rawConfig }));
+        } else {
+          const configKey = resolveConfigKey(pluginName);
+          ws.send(JSON.stringify({ requestId, data: rawConfig[configKey] || {} }));
+        }
       } catch (error) {
         ws.send(JSON.stringify({ requestId, error: `Failed to get config: ${error.message}` }));
       }
@@ -67,8 +103,17 @@ async function handleWebSocketMessage(ws, message, webServer) {
     case "config:get-all":
       try {
         const configService = root.inject("config");
-        const appConfig = configService.get("zhin.config.yml");
-        ws.send(JSON.stringify({ requestId, data: appConfig }));
+        const rawConfig = configService.getRaw("zhin.config.yml");
+        const allConfigs = { ...rawConfig };
+        const schemaService = root.inject("schema");
+        if (schemaService) {
+          for (const [pName, configKey] of schemaService.getPluginKeyMap()) {
+            if (pName !== configKey) {
+              allConfigs[pName] = rawConfig[configKey] || {};
+            }
+          }
+        }
+        ws.send(JSON.stringify({ requestId, data: allConfigs }));
       } catch (error) {
         ws.send(JSON.stringify({ requestId, error: `Failed to get all configs: ${error.message}` }));
       }
@@ -80,28 +125,45 @@ async function handleWebSocketMessage(ws, message, webServer) {
           ws.send(JSON.stringify({ requestId, error: "Plugin name is required" }));
           break;
         }
+        const configKey = resolveConfigKey(pluginName);
         const configService = root.inject("config");
-        const appConfig = configService.get("zhin.config.yml");
-        appConfig[pluginName] = data;
-        configService.set("zhin.config.yml", appConfig);
-        ws.send(JSON.stringify({ requestId, success: true }));
-        broadcastToAll(webServer, {
-          type: "config:updated",
-          data: { pluginName, config: data }
-        });
+        const loader = configService.configs.get("zhin.config.yml");
+        if (!loader) {
+          ws.send(JSON.stringify({ requestId, error: "Config file not loaded" }));
+          break;
+        }
+        loader.patchKey(configKey, data);
+        broadcastToAll(webServer, { type: "config:updated", data: { pluginName, config: data } });
+        const schemaService = root.inject("schema");
+        const reloadable = schemaService?.isReloadable?.(pluginName) ?? false;
+        if (reloadable) {
+          const target = findPluginByConfigKey(root, pluginName);
+          if (target) {
+            try {
+              await target.reload();
+              ws.send(JSON.stringify({ requestId, data: { success: true, reloaded: true } }));
+            } catch (reloadErr) {
+              logger.warn(`\u91CD\u8F7D\u63D2\u4EF6 ${pluginName} \u5931\u8D25: ${reloadErr.message}`);
+              ws.send(JSON.stringify({ requestId, data: { success: true, reloaded: false, message: "\u914D\u7F6E\u5DF2\u4FDD\u5B58\uFF0C\u4F46\u91CD\u8F7D\u5931\u8D25" } }));
+            }
+          } else {
+            ws.send(JSON.stringify({ requestId, data: { success: true, reloaded: false, message: "\u914D\u7F6E\u5DF2\u4FDD\u5B58" } }));
+          }
+        } else {
+          ws.send(JSON.stringify({ requestId, data: { success: true, reloaded: false, message: "\u914D\u7F6E\u5DF2\u4FDD\u5B58\uFF0C\u9700\u91CD\u542F\u8FDB\u7A0B\u624D\u80FD\u751F\u6548" } }));
+        }
       } catch (error) {
         ws.send(JSON.stringify({ requestId, error: `Failed to set config: ${error.message}` }));
       }
       break;
+    // ================================================================
+    // Schema（供 PluginConfigForm 使用）
+    // ================================================================
     case "schema:get":
       try {
         const schemaService = root.inject("schema");
         const schema = pluginName && schemaService ? schemaService.get(pluginName) : null;
-        if (schema) {
-          ws.send(JSON.stringify({ requestId, data: schema.toJSON() }));
-        } else {
-          ws.send(JSON.stringify({ requestId, data: null }));
-        }
+        ws.send(JSON.stringify({ requestId, data: schema ? schema.toJSON() : null }));
       } catch (error) {
         ws.send(JSON.stringify({ requestId, error: `Failed to get schema: ${error.message}` }));
       }
@@ -111,8 +173,15 @@ async function handleWebSocketMessage(ws, message, webServer) {
         const schemaService = root.inject("schema");
         const schemas = {};
         if (schemaService) {
-          for (const [name, schema] of schemaService.items.entries()) {
-            schemas[name] = schema.toJSON();
+          for (const record of schemaService.items) {
+            if (record.key && record.schema) {
+              schemas[record.key] = record.schema.toJSON();
+            }
+          }
+          for (const [pName, configKey] of schemaService.getPluginKeyMap()) {
+            if (pName !== configKey && schemas[configKey]) {
+              schemas[pName] = schemas[configKey];
+            }
           }
         }
         ws.send(JSON.stringify({ requestId, data: schemas }));
@@ -120,14 +189,66 @@ async function handleWebSocketMessage(ws, message, webServer) {
         ws.send(JSON.stringify({ requestId, error: `Failed to get all schemas: ${error.message}` }));
       }
       break;
+    // ================================================================
+    // 环境变量文件管理
+    // ================================================================
+    case "env:list":
+      try {
+        const cwd = process.cwd();
+        const files = ENV_WHITELIST.map((name) => ({
+          name,
+          exists: fs.existsSync(path.resolve(cwd, name))
+        }));
+        ws.send(JSON.stringify({ requestId, data: { files } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to list env files: ${error.message}` }));
+      }
+      break;
+    case "env:get":
+      try {
+        const { filename } = message;
+        if (!filename || !ENV_WHITELIST.includes(filename)) {
+          ws.send(JSON.stringify({ requestId, error: `Invalid env file: ${filename}` }));
+          break;
+        }
+        const envPath = path.resolve(process.cwd(), filename);
+        const content = fs.existsSync(envPath) ? fs.readFileSync(envPath, "utf-8") : "";
+        ws.send(JSON.stringify({ requestId, data: { content } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to read env file: ${error.message}` }));
+      }
+      break;
+    case "env:save":
+      try {
+        const { filename, content } = message;
+        if (!filename || !ENV_WHITELIST.includes(filename)) {
+          ws.send(JSON.stringify({ requestId, error: `Invalid env file: ${filename}` }));
+          break;
+        }
+        if (typeof content !== "string") {
+          ws.send(JSON.stringify({ requestId, error: "content field is required" }));
+          break;
+        }
+        const envPath = path.resolve(process.cwd(), filename);
+        fs.writeFileSync(envPath, content, "utf-8");
+        ws.send(JSON.stringify({ requestId, data: { success: true, message: "\u73AF\u5883\u53D8\u91CF\u5DF2\u4FDD\u5B58\uFF0C\u9700\u91CD\u542F\u751F\u6548" } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: `Failed to save env file: ${error.message}` }));
+      }
+      break;
     default:
-      ws.send(
-        JSON.stringify({
-          requestId,
-          error: `Unknown message type: ${type}`
-        })
-      );
+      ws.send(JSON.stringify({ requestId, error: `Unknown message type: ${type}` }));
+  }
+}
+function findPluginByConfigKey(rootPlugin, configKey) {
+  for (const child of rootPlugin.children) {
+    if (child.name === configKey || child.name.endsWith(`-${configKey}`) || child.name.includes(configKey)) {
+      return child;
+    }
+    const found = findPluginByConfigKey(child, configKey);
+    if (found) return found;
   }
+  return null;
 }
 function broadcastToAll(webServer, message) {
   for (const ws of webServer.ws.clients || []) {
@@ -137,10 +258,7 @@ function broadcastToAll(webServer, message) {
   }
 }
 function notifyDataUpdate(webServer) {
-  broadcastToAll(webServer, {
-    type: "data-update",
-    timestamp: Date.now()
-  });
+  broadcastToAll(webServer, { type: "data-update", timestamp: Date.now() });
 }
 
 export { broadcastToAll, notifyDataUpdate, setupWebSocket };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/console",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "Web console service for Zhin.js with real-time monitoring",
   "type": "module",
   "main": "./lib/index.js",
@@ -67,14 +67,15 @@
     "tailwindcss": "latest",
     "tsup": "^8.5.1",
     "vite": "^7.0.6",
-    "zhin.js": "1.0.42"
+    "yaml": "^2.8.2",
+    "zhin.js": "1.0.43"
   },
   "peerDependencies": {
     "@types/ws": "^8.18.1",
-    "@zhin.js/client": "^1.0.10",
-    "@zhin.js/http": "^1.0.36",
-    "zhin.js": "1.0.42",
-    "@zhin.js/core": "^1.0.42"
+    "@zhin.js/client": "^1.0.11",
+    "@zhin.js/core": "^1.0.43",
+    "zhin.js": "1.0.43",
+    "@zhin.js/http": "^1.0.37"
   },
   "files": [
     "lib",