koishi-plugin-chatluna-toolbox 0.0.12 → 0.0.13

package/lib/index.js

@@ -201,6 +201,10 @@ var require_lib = __commonJS({
         writable: true
       });
     }
+    function createMessageFingerprint(message, response) {
+      const type = String(message.type ?? message.role ?? "").trim().toLowerCase();
+      return `${type}:${response}`;
+    }
     function restoreDispatcher(key, dispatcher) {
       if (dispatcher.messages.push === dispatcher.patchedPush) {
         dispatcher.messages.push = dispatcher.originalPush;
@@ -212,17 +216,22 @@ var require_lib = __commonJS({
       let dispatcher = getDispatcher(messages, key);
       if (!dispatcher) {
         const listeners = /* @__PURE__ */ new Set();
-        const processedMessages = /* @__PURE__ */ new WeakSet();
+        const processedMessages = /* @__PURE__ */ new WeakMap();
         const originalPush = messages.push;
         const patchedPush = function patchedPush2(...items) {
           const result = originalPush.apply(this, items);
           for (const item of items) {
             if (!item || typeof item !== "object") continue;
-            if (processedMessages.has(item)) continue;
-            processedMessages.add(item);
             const message = item;
             const response = extractAssistantText(message);
             if (!response) continue;
+            const fingerprint = createMessageFingerprint(
+              item,
+              response
+            );
+            const previousFingerprint = processedMessages.get(item);
+            if (previousFingerprint === fingerprint) continue;
+            processedMessages.set(item, fingerprint);
             for (const listener2 of Array.from(listeners)) {
               try {
                 listener2(message);
@@ -706,7 +715,15 @@ var path = __toESM(require("path"));
 function createLogger(ctx, config) {
   const logger = ctx.logger("chatluna-toolbox");
   return (level, message, meta) => {
-    if (level === "debug" && !config.debugLogging) return;
+    if (level === "debug") {
+      if (!config.debugLogging) return;
+      if (meta === void 0) {
+        logger.info(message);
+        return;
+      }
+      logger.info(message, meta);
+      return;
+    }
     if (meta === void 0) {
       logger[level](message);
       return;
@@ -1980,6 +1997,9 @@ function createGroupInfoProvider(deps) {
 }
 
 // src/features/variables/providers/group-shut-list.ts
+var GROUP_SHUT_LIST_TIMEOUT_MS = 200;
+var GROUP_SHUT_LIST_TIMEOUT_ERROR = "\u8BF7\u6C42\u7FA4\u7981\u8A00\u5217\u8868\u8D85\u65F6\u3002";
+var GROUP_SHUT_LIST_CACHE_TTL_MS = 15e3;
 function normalizeTimestamp2(raw) {
   if (raw === null || raw === void 0 || raw === "" || Number(raw) === 0)
     return null;
@@ -2001,13 +2021,6 @@ function pickFirst2(...values) {
   }
   return "";
 }
-function extractList(result) {
-  if (Array.isArray(result)) return result;
-  if (result && typeof result === "object" && Array.isArray(result.data)) {
-    return result.data;
-  }
-  return [];
-}
 function normalizeShutItem(item) {
   const userId = pickFirst2(
     item.uin,
@@ -2035,32 +2048,227 @@ function normalizeShutItem(item) {
     shutUpTimeText
   };
 }
-async function fetchGroupShutList(session, config) {
+function previewText(text, max = 180) {
+  const raw = String(text ?? "").trim();
+  if (!raw) return "";
+  return raw.length > max ? `${raw.slice(0, max)}...` : raw;
+}
+function getDataKind(data) {
+  if (Array.isArray(data)) return "array";
+  if (data === null) return "null";
+  if (data === void 0) return "undefined";
+  return typeof data;
+}
+function debug(log, message, meta) {
+  log?.("debug", message, meta);
+}
+function debugErrorMessage(error) {
+  if (error instanceof Error) return previewText(error.message);
+  return previewText(error);
+}
+function withTiming(promise) {
+  const startedAt = Date.now();
+  return promise.then((value) => ({
+    value,
+    elapsedMs: Date.now() - startedAt
+  }));
+}
+function withTimeout(promise, timeoutMs) {
+  return new Promise((resolve2, reject) => {
+    const timer = setTimeout(() => {
+      reject(new Error(GROUP_SHUT_LIST_TIMEOUT_ERROR));
+    }, timeoutMs);
+    promise.then((value) => {
+      clearTimeout(timer);
+      resolve2(value);
+    }).catch((error) => {
+      clearTimeout(timer);
+      reject(error);
+    });
+  });
+}
+function isOneBotEnvelope(result) {
+  return !!result && typeof result === "object" && !Array.isArray(result);
+}
+function isTimeoutError(error) {
+  return error instanceof Error && error.message === GROUP_SHUT_LIST_TIMEOUT_ERROR;
+}
+function normalizeErrorMessage(error) {
+  if (!(error instanceof Error)) return "";
+  return error.message.toLowerCase();
+}
+function shouldFallbackByError(error) {
+  if (isTimeoutError(error)) return false;
+  const message = normalizeErrorMessage(error);
+  if (!message) return false;
+  return message.includes("string required") || message.includes("number required") || message.includes("invalid") || message.includes("type") || message.includes("\u53C2\u6570");
+}
+function shouldFallbackByEnvelope(envelope) {
+  const message = `${envelope.message || ""} ${envelope.wording || ""}`.toLowerCase().trim();
+  if (!message) return false;
+  return message.includes("string") || message.includes("number") || message.includes("type") || message.includes("\u53C2\u6570");
+}
+function debugEnvelopeMeta(result) {
+  if (!isOneBotEnvelope(result)) {
+    return {
+      resultKind: Array.isArray(result) ? "array" : typeof result
+    };
+  }
+  return {
+    resultKind: "envelope",
+    status: previewText(result.status),
+    retcode: typeof result.retcode === "number" ? result.retcode : void 0,
+    dataKind: getDataKind(result.data),
+    dataLength: Array.isArray(result.data) ? result.data.length : void 0,
+    errorMessage: previewText(result.message || result.wording)
+  };
+}
+function parseShutListResult(result) {
+  if (Array.isArray(result)) {
+    return { list: result, shouldFallback: false };
+  }
+  if (!isOneBotEnvelope(result)) {
+    return { list: [], shouldFallback: false };
+  }
+  const status = String(result.status || "").toLowerCase();
+  const hasRetcode = typeof result.retcode === "number";
+  const failedByRetcode = hasRetcode && result.retcode !== 0;
+  const failedByStatus = !!status && status !== "ok";
+  if (failedByRetcode || failedByStatus) {
+    if (shouldFallbackByEnvelope(result)) {
+      return { list: [], shouldFallback: true };
+    }
+    const errorText = String(result.message || result.wording || "\u63A5\u53E3\u8C03\u7528\u5931\u8D25\u3002");
+    throw new Error(errorText);
+  }
+  if (Array.isArray(result.data)) {
+    return {
+      list: result.data,
+      shouldFallback: false
+    };
+  }
+  if (result.data == null) {
+    return { list: [], shouldFallback: false };
+  }
+  return { list: [], shouldFallback: false };
+}
+async function callGroupShutList(internal, groupId, log, preferredProtocol) {
+  debug(log, "groupShutList: request start", {
+    stage: "request.start",
+    preferredProtocol,
+    groupId,
+    groupIdType: typeof groupId
+  });
+  const { value: result, elapsedMs } = await withTiming(
+    withTimeout(
+      callOneBotAPI(
+        internal,
+        "get_group_shut_list",
+        { group_id: groupId },
+        ["getGroupShutList"]
+      ),
+      GROUP_SHUT_LIST_TIMEOUT_MS
+    )
+  );
+  debug(log, "groupShutList: request resolved", {
+    stage: "request.resolved",
+    preferredProtocol,
+    groupId,
+    groupIdType: typeof groupId,
+    elapsedMs,
+    ...debugEnvelopeMeta(result)
+  });
+  const parsed = parseShutListResult(result);
+  debug(log, "groupShutList: response parsed", {
+    stage: "response.parsed",
+    preferredProtocol,
+    groupId,
+    groupIdType: typeof groupId,
+    elapsedMs,
+    shouldFallback: parsed.shouldFallback,
+    dataLength: parsed.list.length
+  });
+  return parsed;
+}
+async function fetchGroupShutList(session, config, log) {
   const { error, internal } = ensureOneBotSession(session);
   if (error || !internal)
     throw new Error(error || "\u7F3A\u5C11 OneBot internal \u63A5\u53E3\u3002");
   const preferredProtocol = resolveOneBotProtocol(config);
   const preferredGroupId = preferredProtocol === "llbot" ? String(session.guildId) : Number(session.guildId);
   const fallbackGroupId = preferredProtocol === "llbot" ? Number(session.guildId) : String(session.guildId);
+  const canFallback = preferredGroupId !== fallbackGroupId;
+  debug(log, "groupShutList: fetch start", {
+    stage: "fetch.start",
+    preferredProtocol,
+    canFallback,
+    groupId: preferredGroupId,
+    groupIdType: typeof preferredGroupId
+  });
   try {
-    const result = await callOneBotAPI(
+    const primary = await callGroupShutList(
       internal,
-      "get_group_shut_list",
-      { group_id: preferredGroupId },
-      ["getGroupShutList"]
+      preferredGroupId,
+      log,
+      preferredProtocol
     );
-    return extractList(result);
+    if (!canFallback || !primary.shouldFallback) return primary.list;
+    debug(log, "groupShutList: trigger fallback by envelope", {
+      stage: "fallback.envelope",
+      preferredProtocol,
+      canFallback,
+      groupId: fallbackGroupId,
+      groupIdType: typeof fallbackGroupId,
+      shouldFallback: primary.shouldFallback
+    });
+    const fallback = await callGroupShutList(
+      internal,
+      fallbackGroupId,
+      log,
+      preferredProtocol
+    );
+    return fallback.list;
   } catch (error2) {
-    if (preferredGroupId === fallbackGroupId) throw error2;
-    const result = await callOneBotAPI(
+    const fallbackByError = shouldFallbackByError(error2);
+    debug(log, "groupShutList: request failed", {
+      stage: "request.error",
+      preferredProtocol,
+      canFallback,
+      errorMessage: debugErrorMessage(error2),
+      shouldFallback: fallbackByError
+    });
+    if (!canFallback || !fallbackByError) throw error2;
+    debug(log, "groupShutList: trigger fallback by error", {
+      stage: "fallback.error",
+      preferredProtocol,
+      groupId: fallbackGroupId,
+      groupIdType: typeof fallbackGroupId,
+      errorMessage: debugErrorMessage(error2)
+    });
+    const fallback = await callGroupShutList(
       internal,
-      "get_group_shut_list",
-      { group_id: fallbackGroupId },
-      ["getGroupShutList"]
+      fallbackGroupId,
+      log,
+      preferredProtocol
     );
-    return extractList(result);
+    return fallback.list;
   }
 }
+function readCache(cache, guildId, now) {
+  const entry = cache.get(guildId);
+  if (!entry) return null;
+  if (entry.expiresAt <= now) {
+    cache.delete(guildId);
+    return null;
+  }
+  return entry.value;
+}
+function writeCache(cache, guildId, value, now) {
+  cache.set(guildId, {
+    value,
+    expiresAt: now + GROUP_SHUT_LIST_CACHE_TTL_MS
+  });
+}
 function renderShutList(items) {
   if (items.length === 0) return "\u5F53\u524D\u7FA4\u6682\u65E0\u7981\u8A00\u6210\u5458\u3002";
   return items.map(
@@ -2069,18 +2277,47 @@ function renderShutList(items) {
 }
 function createGroupShutListProvider(deps) {
   const { config, log } = deps;
+  const cache = /* @__PURE__ */ new Map();
   return async (_args, _variables, configurable) => {
     const session = configurable?.session;
     if (!session) return "\u6682\u65E0\u7FA4\u7981\u8A00\u5217\u8868\u3002";
     if (!session.guildId) return "";
     if (session.platform !== "onebot")
       return "\u5F53\u524D\u5E73\u53F0\u6682\u4E0D\u652F\u6301\u67E5\u8BE2\u7FA4\u7981\u8A00\u5217\u8868\u3002";
+    const guildId = String(session.guildId);
+    const cached = readCache(cache, guildId, Date.now());
+    if (cached !== null) {
+      debug(log, "groupShutList: cache hit", {
+        stage: "cache.hit",
+        groupId: guildId,
+        groupIdType: typeof guildId
+      });
+      return cached;
+    }
+    debug(log, "groupShutList: cache miss", {
+      stage: "cache.miss",
+      groupId: guildId,
+      groupIdType: typeof guildId
+    });
     try {
-      const list = await fetchGroupShutList(session, config);
+      const list = await fetchGroupShutList(session, config, log);
       const normalized = list.map(normalizeShutItem).filter(Boolean);
-      return renderShutList(normalized);
+      const result = renderShutList(normalized);
+      writeCache(cache, guildId, result, Date.now());
+      debug(log, "groupShutList: provider success", {
+        stage: "provider.success",
+        groupId: guildId,
+        dataLength: list.length
+      });
+      return result;
     } catch (error) {
+      debug(log, "groupShutList: provider failed", {
+        stage: "provider.error",
+        groupId: guildId,
+        errorMessage: debugErrorMessage(error)
+      });
       log?.("debug", "\u7FA4\u7981\u8A00\u5217\u8868\u53D8\u91CF\u89E3\u6790\u5931\u8D25", error);
+      if (isTimeoutError(error)) return "\u5F53\u524D\u7FA4\u6682\u65E0\u7981\u8A00\u6210\u5458\u3002";
       return "\u83B7\u53D6\u7FA4\u7981\u8A00\u5217\u8868\u5931\u8D25\u3002";
     }
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-toolbox",
   "description": "为 ChatLuna 提供更多原生工具、XML 工具与变量，仅支持 onebot 平台。",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [