koishi-plugin-chatluna-toolbox 0.0.2 → 0.0.5

package/lib/index.js

@@ -607,9 +607,12 @@ function createXmlInterceptor(deps) {
   let currentGuildId = null;
   let lastSession = null;
   const pendingSessions = [];
+  let responseSeq = 0;
+  const processedResponses = /* @__PURE__ */ new Set();
   let monitorHandle = null;
   let fastRetryHandle = null;
   let startupHandle = null;
+  const responseRetryHandles = /* @__PURE__ */ new Map();
   let activeService = null;
   let activeLogger = null;
   let originalDebug = null;
@@ -658,6 +661,45 @@ function createXmlInterceptor(deps) {
     }
     return resolved.key ? sessionMap.get(resolved.key) || resolved.session : resolved.session;
   };
+  const markProcessed = (responseId) => {
+    processedResponses.add(responseId);
+    if (processedResponses.size > 100) {
+      const first = processedResponses.values().next().value;
+      if (first) processedResponses.delete(first);
+    }
+  };
+  const runResponse = (responseId, response, session) => {
+    const handled = onResponse(response, session);
+    if (handled) {
+      markProcessed(responseId);
+      const retryHandle = responseRetryHandles.get(responseId);
+      if (retryHandle) {
+        retryHandle();
+        responseRetryHandles.delete(responseId);
+      }
+    }
+    return handled;
+  };
+  const retryResponse = (responseId, response) => {
+    if (responseRetryHandles.has(responseId) || processedResponses.has(responseId))
+      return;
+    const handle = ctx.setTimeout(() => {
+      responseRetryHandles.delete(responseId);
+      if (processedResponses.has(responseId)) return;
+      const session = resolveSession();
+      if (!session) {
+        if (config.debugLogging) {
+          log?.("warn", "\u62E6\u622A\u5230\u539F\u59CB\u8F93\u51FA\u4F46\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF0CXML \u5DE5\u5177\u4E0D\u4F1A\u6267\u884C", {
+            length: response.length
+          });
+        }
+        runResponse(responseId, response, null);
+        return;
+      }
+      runResponse(responseId, response, session);
+    }, 200);
+    responseRetryHandles.set(responseId, handle);
+  };
   const attach = () => {
     const characterService = ctx.chatluna_character;
     if (!characterService) return false;
@@ -685,17 +727,20 @@ function createXmlInterceptor(deps) {
       const wrapped = (...args) => {
         raw(...args);
         const message = args[0];
-        if (typeof message !== "string" || !message.startsWith("model response: "))
-          return;
-        const response = message.substring("model response: ".length);
+        if (typeof message !== "string") return;
+        const prefix = ["model response: ", "model response:\n"].find(
+          (item) => message.startsWith(item)
+        );
+        if (!prefix) return;
+        const response = message.substring(prefix.length);
         if (!response) return;
+        const responseId = `${Date.now()}:${responseSeq++}`;
         const session = resolveSession();
-        if (!session && config.debugLogging) {
-          log?.("warn", "\u62E6\u622A\u5230\u539F\u59CB\u8F93\u51FA\u4F46\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF0CXML \u5DE5\u5177\u4E0D\u4F1A\u6267\u884C", {
-            length: response.length
-          });
+        if (!session) {
+          retryResponse(responseId, response);
+          return;
         }
-        onResponse(response, session);
+        runResponse(responseId, response, session);
       };
       wrapped[RAW_INTERCEPTOR_TAG] = true;
       loggerService.debug = wrapped;
@@ -767,6 +812,9 @@ function createXmlInterceptor(deps) {
       }
       stopFastRetry();
       stopMonitor();
+      for (const handle of responseRetryHandles.values()) handle();
+      responseRetryHandles.clear();
+      processedResponses.clear();
       restore();
       sessionMap.clear();
       pendingSessions.length = 0;
@@ -806,10 +854,12 @@ function registerXmlTools(deps) {
     log,
     onResponse: (response, session) => {
       const actions = parseXmlActions(response);
+      let handled = false;
       if (config.enablePokeXmlTool && actions.pokeUserIds.length > 0) {
         if (!session) {
           log?.("warn", "\u68C0\u6D4B\u5230\u6233\u4E00\u6233\u6807\u8BB0\u4F46\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587");
         } else {
+          handled = true;
           for (const userId of actions.pokeUserIds) {
             void sendPoke({ session, userId, protocol, log }).catch((error) => {
               log?.("warn", "XML \u89E6\u53D1 poke \u5931\u8D25", error);
@@ -821,6 +871,7 @@ function registerXmlTools(deps) {
         if (!session) {
           log?.("warn", "\u68C0\u6D4B\u5230\u8868\u60C5\u6807\u8BB0\u4F46\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587");
         } else {
+          handled = true;
           for (const item of actions.emojis) {
             void sendMsgEmoji({
               session,
@@ -838,6 +889,7 @@ function registerXmlTools(deps) {
         if (!session) {
           log?.("warn", "\u68C0\u6D4B\u5230\u64A4\u56DE\u6807\u8BB0\u4F46\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587");
         } else {
+          handled = true;
           for (const messageId of actions.deleteMessageIds) {
             void sendDeleteMessage({ session, messageId, log }).catch(
               (error) => {
@@ -847,6 +899,7 @@ function registerXmlTools(deps) {
           }
         }
       }
+      return handled;
     }
   });
   return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-toolbox",
   "description": "为 ChatLuna 提供更多原生工具、XML 工具与变量。",
-  "version": "0.0.2",
+  "version": "0.0.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -18,11 +18,6 @@
     "plugin",
     "chatluna"
   ],
-  "koishi": {
-    "description": {
-      "zh": "ChatLuna 工具箱插件"
-    }
-  },
   "peerDependencies": {
     "koishi": "^4.18.7",
     "koishi-plugin-chatluna": "*",