koishi-plugin-adapter-onebot-multi 2.0.0 → 2.0.1

package/lib/index.js

@@ -2184,6 +2184,14 @@ function apply(ctx, _config) {
   const managedBotIds = /* @__PURE__ */ new Set();
   const botForks = /* @__PURE__ */ new Map();
   const getRuntimeConfig = /* @__PURE__ */ __name(() => configStore.getRuntime(), "getRuntimeConfig");
+  const createPendingSelfId = /* @__PURE__ */ __name(() => {
+    let candidate = `pending_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
+    const exists = /* @__PURE__ */ __name((id) => configStore.getBots().some((bot) => bot.selfId === id), "exists");
+    while (exists(candidate)) {
+      candidate = `pending_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
+    }
+    return candidate;
+  }, "createPendingSelfId");
   const isReverseTemplateBot = /* @__PURE__ */ __name((bot) => {
     return (bot.protocol || "ws-reverse") === "ws-reverse" && String(bot.selfId || "").startsWith("pending_");
   }, "isReverseTemplateBot");
@@ -2194,6 +2202,31 @@ function apply(ctx, _config) {
       return (bot.path || "/onebot") === path2;
     });
   }, "findReverseTemplate");
+  const findReverseSeedBot = /* @__PURE__ */ __name((path2) => {
+    const bots = configStore.getBots().filter((bot) => {
+      if (bot.enabled === false) return false;
+      return (bot.protocol || "ws-reverse") === "ws-reverse" && (bot.path || "/onebot") === path2;
+    });
+    return bots.find(isReverseTemplateBot) || bots[0];
+  }, "findReverseSeedBot");
+  const ensureReverseTemplateRecord = /* @__PURE__ */ __name((path2) => {
+    const normalizedPath = path2 || "/onebot";
+    if (findReverseTemplate(normalizedPath)) return;
+    const seedBot = findReverseSeedBot(normalizedPath);
+    if (!seedBot) return;
+    configStore.setBots([
+      ...configStore.getBots(),
+      {
+        selfId: createPendingSelfId(),
+        token: seedBot.token,
+        protocol: "ws-reverse",
+        path: normalizedPath,
+        name: "服务器",
+        enabled: true
+      }
+    ]);
+    logger.info(`已为 path=${normalizedPath} 自动补齐 ws 服务器模板记录`);
+  }, "ensureReverseTemplateRecord");
   const getGlobalConfig = /* @__PURE__ */ __name(() => {
     const runtime = getRuntimeConfig();
     return {
@@ -2306,16 +2339,20 @@ function apply(ctx, _config) {
       return ctx.bots.find((bot) => bot.selfId === normalizedSelfId && bot.platform === "onebot");
     }
     const template = findReverseTemplate(normalizedPath);
-    if (!template) {
-      logger.warn(`未找到 path=${normalizedPath} 的 ws-reverse 模板，拒绝动态创建 Bot ${normalizedSelfId}`);
+    const seedBot = template || findReverseSeedBot(normalizedPath);
+    if (!seedBot) {
+      logger.warn(`未找到 path=${normalizedPath} 的 ws-reverse 配置，拒绝动态创建 Bot ${normalizedSelfId}`);
       return;
     }
+    if (!template) {
+      ensureReverseTemplateRecord(normalizedPath);
+    }
     const dynamicBot = {
       selfId: normalizedSelfId,
-      token: template.token,
+      token: seedBot.token,
       protocol: "ws-reverse",
       path: normalizedPath,
-      name: template.name && template.name !== "服务器" ? template.name : void 0,
+      name: seedBot.name && seedBot.name !== "服务器" ? seedBot.name : void 0,
       enabled: true
     };
     configStore.setBots([...configStore.getBots(), dynamicBot]);
@@ -2347,6 +2384,13 @@ function apply(ctx, _config) {
     startBot(target);
   }, "restartBot");
   const syncBots = /* @__PURE__ */ __name(async () => {
+    const currentBots = configStore.getBots();
+    const reversePaths = new Set(
+      currentBots.filter((bot) => (bot.protocol || "ws-reverse") === "ws-reverse").map((bot) => bot.path || "/onebot")
+    );
+    for (const path2 of reversePaths) {
+      ensureReverseTemplateRecord(path2);
+    }
     const bots = configStore.getBots();
     const enabledIds = new Set(bots.filter((b) => b.enabled !== false).map((b) => b.selfId));
     for (const selfId of Array.from(managedBotIds)) {
@@ -2362,14 +2406,6 @@ function apply(ctx, _config) {
     }
   }, "syncBots");
   const upsertBot = /* @__PURE__ */ __name((nextBot, oldSelfId) => {
-    const createPendingSelfId = /* @__PURE__ */ __name(() => {
-      let candidate = `pending_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
-      const exists = /* @__PURE__ */ __name((id) => configStore.getBots().some((bot) => bot.selfId === id), "exists");
-      while (exists(candidate)) {
-        candidate = `pending_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
-      }
-      return candidate;
-    }, "createPendingSelfId");
     const inputSelfId = String(nextBot.selfId || "").trim();
     const nextSelfId = inputSelfId || oldSelfId || createPendingSelfId();
     const all = configStore.getBots();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-adapter-onebot-multi",
   "description": "奶龙bot定制版onebot适配器，支持自动负载均衡与黑白名单，控制台侧边栏管理",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [