@zhin.js/console 1.0.59 → 2.0.2

package/lib/index.js

@@ -6,6 +6,7 @@ import * as path2 from 'path';
 import path2__default from 'path';
 import * as crypto from 'crypto';
 import WebSocket from 'ws';
+import { getCronManager, generateCronJobId } from '@zhin.js/agent';
 import { transform } from 'esbuild';
 
 // src/index.ts
@@ -388,12 +389,13 @@ function initBotHub(root3) {
   root3.on("notice.receive", handlerNotice);
   const adapterNames = root3.adapters ? [...root3.adapters] : [];
   const inject2 = root3.inject;
+  const adapterListeners = [];
   if (inject2 && typeof inject2 === "function" && adapterNames.length > 0) {
     for (const name of adapterNames) {
       try {
         const ad = inject2(name);
         if (ad && typeof ad.on === "function") {
-          ad.on("message.receive", (msg) => {
+          const handler = (msg) => {
             const payload = {
               type: "bot:message",
               data: {
@@ -407,16 +409,25 @@ function initBotHub(root3) {
               }
             };
             broadcast(payload);
-          });
+          };
+          ad.on("message.receive", handler);
+          adapterListeners.push({ adapter: ad, handler });
         }
       } catch {
       }
     }
   }
+  return () => {
+    root3.off?.("request.receive", handlerReq);
+    root3.off?.("notice.receive", handlerNotice);
+    for (const { adapter, handler } of adapterListeners) {
+      adapter.off?.("message.receive", handler);
+    }
+    hubInited = false;
+  };
 }
-
-// src/websocket.ts
-var { root, logger } = usePlugin();
+var plugin = usePlugin();
+var { root, logger } = plugin;
 function collectBotsList() {
   const bots = [];
   for (const name of root.adapters) {
@@ -503,7 +514,10 @@ function getConfigFilePath() {
 }
 function setupWebSocket(webServer) {
   setBotHubWss(webServer.ws);
-  initBotHub(root);
+  const disposeBotHub = initBotHub(root);
+  if (disposeBotHub) {
+    plugin.onDispose(disposeBotHub);
+  }
   webServer.ws.on("connection", (ws) => {
     ws.send(JSON.stringify({
       type: "sync",
@@ -1406,6 +1420,132 @@ async function handleWebSocketMessage(ws, message, webServer) {
       }
       break;
     }
+    // ================================================================
+    // 系统管理
+    // ================================================================
+    case "system:restart": {
+      try {
+        logger.info("[console] \u6536\u5230\u91CD\u542F\u8BF7\u6C42\uFF0C\u51C6\u5907\u91CD\u542F\u8FDB\u7A0B...");
+        ws.send(JSON.stringify({ requestId, data: { success: true, message: "\u6B63\u5728\u91CD\u542F..." } }));
+        broadcastToAll(webServer, { type: "system:restarting" });
+        setTimeout(() => {
+          process.exit(51);
+        }, 500);
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    // ================================================================
+    // 定时任务管理
+    // ================================================================
+    case "cron:list": {
+      try {
+        const m = getCronManager();
+        if (!m) {
+          ws.send(JSON.stringify({ requestId, error: "\u5B9A\u65F6\u4EFB\u52A1\u670D\u52A1\u4E0D\u53EF\u7528\uFF08Agent \u672A\u521D\u59CB\u5316\uFF09" }));
+          break;
+        }
+        const memory = m.cronFeature.getStatus().map((s) => ({
+          type: "memory",
+          expression: s.expression,
+          running: s.running,
+          nextExecution: s.nextExecution?.toISOString() ?? null,
+          plugin: s.plugin
+        }));
+        const persistent = m.engine ? (await m.engine.listJobs()).map((j) => ({
+          type: "persistent",
+          ...j
+        })) : [];
+        ws.send(JSON.stringify({ requestId, data: { memory, persistent } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    case "cron:add": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "\u6301\u4E45\u5316\u5B9A\u65F6\u4EFB\u52A1\u5F15\u64CE\u4E0D\u53EF\u7528" }));
+          break;
+        }
+        const { cronExpression, prompt, label, context: cronContext } = message;
+        if (!cronExpression || !prompt) {
+          ws.send(JSON.stringify({ requestId, error: "\u7F3A\u5C11 cronExpression \u6216 prompt" }));
+          break;
+        }
+        const record = await m.engine.addJob({
+          id: generateCronJobId(),
+          cronExpression,
+          prompt,
+          label: label || void 0,
+          enabled: true,
+          context: cronContext || void 0
+        });
+        ws.send(JSON.stringify({ requestId, data: record }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    case "cron:remove": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "\u6301\u4E45\u5316\u5B9A\u65F6\u4EFB\u52A1\u5F15\u64CE\u4E0D\u53EF\u7528" }));
+          break;
+        }
+        const { id } = message;
+        if (!id) {
+          ws.send(JSON.stringify({ requestId, error: "\u7F3A\u5C11\u4EFB\u52A1 id" }));
+          break;
+        }
+        const ok = await m.engine.removeJob(id);
+        ws.send(JSON.stringify({ requestId, data: { success: ok } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    case "cron:pause": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "\u6301\u4E45\u5316\u5B9A\u65F6\u4EFB\u52A1\u5F15\u64CE\u4E0D\u53EF\u7528" }));
+          break;
+        }
+        const { id } = message;
+        if (!id) {
+          ws.send(JSON.stringify({ requestId, error: "\u7F3A\u5C11\u4EFB\u52A1 id" }));
+          break;
+        }
+        const ok = await m.engine.pauseJob(id);
+        ws.send(JSON.stringify({ requestId, data: { success: ok } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    case "cron:resume": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "\u6301\u4E45\u5316\u5B9A\u65F6\u4EFB\u52A1\u5F15\u64CE\u4E0D\u53EF\u7528" }));
+          break;
+        }
+        const { id } = message;
+        if (!id) {
+          ws.send(JSON.stringify({ requestId, error: "\u7F3A\u5C11\u4EFB\u52A1 id" }));
+          break;
+        }
+        const ok = await m.engine.resumeJob(id);
+        ws.send(JSON.stringify({ requestId, data: { success: ok } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
     default:
       ws.send(JSON.stringify({ requestId, error: `Unknown message type: ${type}` }));
   }

package/lib/websocket.js

@@ -2,6 +2,7 @@ import fs2 from 'fs';
 import path2 from 'path';
 import WebSocket from 'ws';
 import { usePlugin, Adapter } from '@zhin.js/core';
+import { getCronManager, generateCronJobId } from '@zhin.js/agent';
 
 // src/websocket.ts
 
@@ -261,12 +262,13 @@ function initBotHub(root2) {
   root2.on("notice.receive", handlerNotice);
   const adapterNames = root2.adapters ? [...root2.adapters] : [];
   const inject = root2.inject;
+  const adapterListeners = [];
   if (inject && typeof inject === "function" && adapterNames.length > 0) {
     for (const name of adapterNames) {
       try {
         const ad = inject(name);
         if (ad && typeof ad.on === "function") {
-          ad.on("message.receive", (msg) => {
+          const handler = (msg) => {
             const payload = {
               type: "bot:message",
               data: {
@@ -280,16 +282,25 @@ function initBotHub(root2) {
               }
             };
             broadcast(payload);
-          });
+          };
+          ad.on("message.receive", handler);
+          adapterListeners.push({ adapter: ad, handler });
         }
       } catch {
       }
     }
   }
+  return () => {
+    root2.off?.("request.receive", handlerReq);
+    root2.off?.("notice.receive", handlerNotice);
+    for (const { adapter, handler } of adapterListeners) {
+      adapter.off?.("message.receive", handler);
+    }
+    hubInited = false;
+  };
 }
-
-// src/websocket.ts
-var { root, logger } = usePlugin();
+var plugin = usePlugin();
+var { root, logger } = plugin;
 function collectBotsList() {
   const bots = [];
   for (const name of root.adapters) {
@@ -376,7 +387,10 @@ function getConfigFilePath() {
 }
 function setupWebSocket(webServer) {
   setBotHubWss(webServer.ws);
-  initBotHub(root);
+  const disposeBotHub = initBotHub(root);
+  if (disposeBotHub) {
+    plugin.onDispose(disposeBotHub);
+  }
   webServer.ws.on("connection", (ws) => {
     ws.send(JSON.stringify({
       type: "sync",
@@ -1279,6 +1293,132 @@ async function handleWebSocketMessage(ws, message, webServer) {
       }
       break;
     }
+    // ================================================================
+    // 系统管理
+    // ================================================================
+    case "system:restart": {
+      try {
+        logger.info("[console] \u6536\u5230\u91CD\u542F\u8BF7\u6C42\uFF0C\u51C6\u5907\u91CD\u542F\u8FDB\u7A0B...");
+        ws.send(JSON.stringify({ requestId, data: { success: true, message: "\u6B63\u5728\u91CD\u542F..." } }));
+        broadcastToAll(webServer, { type: "system:restarting" });
+        setTimeout(() => {
+          process.exit(51);
+        }, 500);
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    // ================================================================
+    // 定时任务管理
+    // ================================================================
+    case "cron:list": {
+      try {
+        const m = getCronManager();
+        if (!m) {
+          ws.send(JSON.stringify({ requestId, error: "\u5B9A\u65F6\u4EFB\u52A1\u670D\u52A1\u4E0D\u53EF\u7528\uFF08Agent \u672A\u521D\u59CB\u5316\uFF09" }));
+          break;
+        }
+        const memory = m.cronFeature.getStatus().map((s) => ({
+          type: "memory",
+          expression: s.expression,
+          running: s.running,
+          nextExecution: s.nextExecution?.toISOString() ?? null,
+          plugin: s.plugin
+        }));
+        const persistent = m.engine ? (await m.engine.listJobs()).map((j) => ({
+          type: "persistent",
+          ...j
+        })) : [];
+        ws.send(JSON.stringify({ requestId, data: { memory, persistent } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    case "cron:add": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "\u6301\u4E45\u5316\u5B9A\u65F6\u4EFB\u52A1\u5F15\u64CE\u4E0D\u53EF\u7528" }));
+          break;
+        }
+        const { cronExpression, prompt, label, context: cronContext } = message;
+        if (!cronExpression || !prompt) {
+          ws.send(JSON.stringify({ requestId, error: "\u7F3A\u5C11 cronExpression \u6216 prompt" }));
+          break;
+        }
+        const record = await m.engine.addJob({
+          id: generateCronJobId(),
+          cronExpression,
+          prompt,
+          label: label || void 0,
+          enabled: true,
+          context: cronContext || void 0
+        });
+        ws.send(JSON.stringify({ requestId, data: record }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    case "cron:remove": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "\u6301\u4E45\u5316\u5B9A\u65F6\u4EFB\u52A1\u5F15\u64CE\u4E0D\u53EF\u7528" }));
+          break;
+        }
+        const { id } = message;
+        if (!id) {
+          ws.send(JSON.stringify({ requestId, error: "\u7F3A\u5C11\u4EFB\u52A1 id" }));
+          break;
+        }
+        const ok = await m.engine.removeJob(id);
+        ws.send(JSON.stringify({ requestId, data: { success: ok } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    case "cron:pause": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "\u6301\u4E45\u5316\u5B9A\u65F6\u4EFB\u52A1\u5F15\u64CE\u4E0D\u53EF\u7528" }));
+          break;
+        }
+        const { id } = message;
+        if (!id) {
+          ws.send(JSON.stringify({ requestId, error: "\u7F3A\u5C11\u4EFB\u52A1 id" }));
+          break;
+        }
+        const ok = await m.engine.pauseJob(id);
+        ws.send(JSON.stringify({ requestId, data: { success: ok } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
+    case "cron:resume": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "\u6301\u4E45\u5316\u5B9A\u65F6\u4EFB\u52A1\u5F15\u64CE\u4E0D\u53EF\u7528" }));
+          break;
+        }
+        const { id } = message;
+        if (!id) {
+          ws.send(JSON.stringify({ requestId, error: "\u7F3A\u5C11\u4EFB\u52A1 id" }));
+          break;
+        }
+        const ok = await m.engine.resumeJob(id);
+        ws.send(JSON.stringify({ requestId, data: { success: ok } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: error.message }));
+      }
+      break;
+    }
     default:
       ws.send(JSON.stringify({ requestId, error: `Unknown message type: ${type}` }));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/console",
-  "version": "1.0.59",
+  "version": "2.0.2",
   "description": "Web console service for Zhin.js with real-time monitoring",
   "type": "module",
   "main": "./lib/index.js",
@@ -65,14 +65,15 @@
     "rolldown": "^1.0.0-rc.9",
     "vite": "8.0.0",
     "yaml": "^2.8.2",
-    "zhin.js": "1.0.57"
+    "zhin.js": "1.0.60"
   },
   "peerDependencies": {
     "@types/ws": "^8.18.1",
-    "@zhin.js/client": "^1.0.14",
-    "@zhin.js/core": "^1.0.57",
-    "@zhin.js/http": "^1.0.52",
-    "zhin.js": "1.0.57"
+    "@zhin.js/core": "^1.1.2",
+    "@zhin.js/http": "^1.0.55",
+    "@zhin.js/client": "^1.0.15",
+    "@zhin.js/agent": "^0.1.2",
+    "zhin.js": "1.0.60"
   },
   "files": [
     "src",

package/src/bot-hub.ts

@@ -188,9 +188,10 @@ export async function sendCatchUpToClient(ws: WebSocket) {
 
 export function initBotHub(root: {
   on: (ev: string, fn: (...a: any[]) => void) => void;
+  off?: (ev: string, fn: (...a: any[]) => void) => void;
   adapters?: Iterable<string>;
   inject?: (key: string) => unknown;
-}) {
+}): (() => void) | undefined {
   if (hubInited) return;
   hubInited = true;
 
@@ -211,12 +212,13 @@ export function initBotHub(root: {
   // 收消息推送：向控制台广播机器人收到的消息，供「收消息展示」使用
   const adapterNames = root.adapters ? [...(root.adapters as Iterable<string>)] : [];
   const inject = root.inject;
+  const adapterListeners: Array<{ adapter: any; handler: (...a: any[]) => void }> = [];
   if (inject && typeof inject === "function" && adapterNames.length > 0) {
     for (const name of adapterNames) {
       try {
-        const ad = inject(name) as { on?: (ev: string, fn: (...a: any[]) => void) => void } | null;
+        const ad = inject(name) as { on?: (ev: string, fn: (...a: any[]) => void) => void; off?: (ev: string, fn: (...a: any[]) => void) => void } | null;
         if (ad && typeof ad.on === "function") {
-          ad.on("message.receive", (msg: any) => {
+          const handler = (msg: any) => {
             const payload = {
               type: "bot:message",
               data: {
@@ -230,11 +232,23 @@ export function initBotHub(root: {
               },
             };
             broadcast(payload);
-          });
+          };
+          ad.on("message.receive", handler);
+          adapterListeners.push({ adapter: ad, handler });
         }
       } catch {
         // 忽略单个适配器注册失败
       }
     }
   }
+
+  // 返回清理函数
+  return () => {
+    root.off?.("request.receive", handlerReq);
+    root.off?.("notice.receive", handlerNotice);
+    for (const { adapter, handler } of adapterListeners) {
+      adapter.off?.("message.receive", handler);
+    }
+    hubInited = false;
+  };
 }

package/src/websocket.ts

@@ -20,8 +20,11 @@ import {
   getRequestRowById,
 } from "./bot-persistence.js";
 import { removePendingRequest } from "./bot-hub.js";
+import { getCronManager, generateCronJobId } from "@zhin.js/agent";
+import type { CronJobRecord } from "@zhin.js/agent";
 
-const { root, logger } = usePlugin();
+const plugin = usePlugin();
+const { root, logger } = plugin;
 
 function collectBotsList(): Array<{
   name: string;
@@ -143,7 +146,15 @@ function getConfigFilePath(): string {
 
 export function setupWebSocket(webServer: WebServer) {
   setBotHubWss(webServer.ws);
-  initBotHub(root as { on: (ev: string, fn: (...a: unknown[]) => void) => void });
+  const disposeBotHub = initBotHub(root as {
+    on: (ev: string, fn: (...a: unknown[]) => void) => void;
+    off?: (ev: string, fn: (...a: unknown[]) => void) => void;
+    adapters?: Iterable<string>;
+    inject?: (key: string) => unknown;
+  });
+  if (disposeBotHub) {
+    plugin.onDispose(disposeBotHub);
+  }
 
   webServer.ws.on("connection", (ws: WebSocket) => {
     ws.send(JSON.stringify({
@@ -1081,6 +1092,144 @@ async function handleWebSocketMessage(
       break;
     }
 
+    // ================================================================
+    // 系统管理
+    // ================================================================
+
+    case "system:restart": {
+      try {
+        logger.info("[console] 收到重启请求，准备重启进程...");
+        ws.send(JSON.stringify({ requestId, data: { success: true, message: "正在重启..." } }));
+        // 广播给所有客户端
+        broadcastToAll(webServer, { type: "system:restarting" });
+        // 延迟 500ms 让 WebSocket 消息发出，然后用 exit code 51 触发 CLI 守护进程重启
+        setTimeout(() => {
+          process.exit(51);
+        }, 500);
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: (error as Error).message }));
+      }
+      break;
+    }
+
+    // ================================================================
+    // 定时任务管理
+    // ================================================================
+
+    case "cron:list": {
+      try {
+        const m = getCronManager();
+        if (!m) {
+          ws.send(JSON.stringify({ requestId, error: "定时任务服务不可用（Agent 未初始化）" }));
+          break;
+        }
+        const memory = m.cronFeature.getStatus().map((s) => ({
+          type: "memory" as const,
+          expression: s.expression,
+          running: s.running,
+          nextExecution: s.nextExecution?.toISOString() ?? null,
+          plugin: s.plugin,
+        }));
+        const persistent = m.engine
+          ? (await m.engine.listJobs()).map((j) => ({
+              type: "persistent" as const,
+              ...j,
+            }))
+          : [];
+        ws.send(JSON.stringify({ requestId, data: { memory, persistent } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: (error as Error).message }));
+      }
+      break;
+    }
+
+    case "cron:add": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "持久化定时任务引擎不可用" }));
+          break;
+        }
+        const { cronExpression, prompt, label, context: cronContext } = message as any;
+        if (!cronExpression || !prompt) {
+          ws.send(JSON.stringify({ requestId, error: "缺少 cronExpression 或 prompt" }));
+          break;
+        }
+        const record = await m.engine.addJob({
+          id: generateCronJobId(),
+          cronExpression,
+          prompt,
+          label: label || undefined,
+          enabled: true,
+          context: cronContext || undefined,
+        });
+        ws.send(JSON.stringify({ requestId, data: record }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: (error as Error).message }));
+      }
+      break;
+    }
+
+    case "cron:remove": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "持久化定时任务引擎不可用" }));
+          break;
+        }
+        const { id } = message as any;
+        if (!id) {
+          ws.send(JSON.stringify({ requestId, error: "缺少任务 id" }));
+          break;
+        }
+        const ok = await m.engine.removeJob(id);
+        ws.send(JSON.stringify({ requestId, data: { success: ok } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: (error as Error).message }));
+      }
+      break;
+    }
+
+    case "cron:pause": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "持久化定时任务引擎不可用" }));
+          break;
+        }
+        const { id } = message as any;
+        if (!id) {
+          ws.send(JSON.stringify({ requestId, error: "缺少任务 id" }));
+          break;
+        }
+        const ok = await m.engine.pauseJob(id);
+        ws.send(JSON.stringify({ requestId, data: { success: ok } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: (error as Error).message }));
+      }
+      break;
+    }
+
+    case "cron:resume": {
+      try {
+        const m = getCronManager();
+        if (!m?.engine) {
+          ws.send(JSON.stringify({ requestId, error: "持久化定时任务引擎不可用" }));
+          break;
+        }
+        const { id } = message as any;
+        if (!id) {
+          ws.send(JSON.stringify({ requestId, error: "缺少任务 id" }));
+          break;
+        }
+        const ok = await m.engine.resumeJob(id);
+        ws.send(JSON.stringify({ requestId, data: { success: ok } }));
+      } catch (error) {
+        ws.send(JSON.stringify({ requestId, error: (error as Error).message }));
+      }
+      break;
+    }
+
     default:
       ws.send(JSON.stringify({ requestId, error: `Unknown message type: ${type}` }));
   }