koishi-plugin-chatluna-toolbox 0.0.1 → 0.0.4

package/lib/index.js

@@ -22,6 +22,7 @@ var index_exports = {};
 __export(index_exports, {
   Config: () => ConfigSchema,
   ConfigSchema: () => ConfigSchema,
+  DEFAULT_GROUP_INFO_ITEMS: () => DEFAULT_GROUP_INFO_ITEMS,
   DEFAULT_MEMBER_INFO_ITEMS: () => DEFAULT_MEMBER_INFO_ITEMS,
   NativeToolsSchema: () => NativeToolsSchema,
   RAW_INTERCEPTOR_TAG: () => RAW_INTERCEPTOR_TAG,
@@ -132,6 +133,13 @@ var DEFAULT_MEMBER_INFO_ITEMS = [
   "joinTime",
   "lastSentTime"
 ];
+var DEFAULT_GROUP_INFO_ITEMS = [
+  "groupName",
+  "groupId",
+  "memberCount",
+  "ownerList",
+  "adminList"
+];
 var RAW_INTERCEPTOR_TAG = "__chatlunaToolboxRawInterceptor";
 
 // src/schema/variables.ts
@@ -172,9 +180,16 @@ var VariablesSchema = import_koishi3.Schema.object({
   }).description("\u673A\u5668\u4EBA\u4FE1\u606F\u53D8\u91CF").collapse(),
   groupInfo: import_koishi3.Schema.object({
     variableName: import_koishi3.Schema.string().default("groupInfo").description("\u53D8\u91CF\u540D\u79F0"),
-    includeMemberCount: import_koishi3.Schema.boolean().default(true).description("\u662F\u5426\u5305\u542B\u6210\u5458\u6570\u91CF"),
-    includeCreateTime: import_koishi3.Schema.boolean().default(true).description("\u662F\u5426\u5305\u542B\u521B\u5EFA\u65F6\u95F4"),
-    includeOwnersAndAdmins: import_koishi3.Schema.boolean().default(true).description("\u662F\u5426\u5C55\u793A\u7FA4\u4E3B\u4E0E\u7BA1\u7406\u5458\u540D\u5355")
+    items: import_koishi3.Schema.array(
+      import_koishi3.Schema.union([
+        import_koishi3.Schema.const("groupName").description("\u7FA4\u540D\u79F0"),
+        import_koishi3.Schema.const("groupId").description("\u7FA4\u53F7"),
+        import_koishi3.Schema.const("memberCount").description("\u6210\u5458\u6570\u91CF"),
+        import_koishi3.Schema.const("createTime").description("\u521B\u5EFA\u65F6\u95F4\uFF08\u4EC5\u90E8\u5206\u5B9E\u73B0\u652F\u6301\uFF09"),
+        import_koishi3.Schema.const("ownerList").description("\u7FA4\u4E3B\u540D\u5355"),
+        import_koishi3.Schema.const("adminList").description("\u7BA1\u7406\u5458\u540D\u5355")
+      ])
+    ).role("checkbox").default([...DEFAULT_GROUP_INFO_ITEMS]).description("\u663E\u793A\u7684\u7FA4\u4FE1\u606F\u9879")
   }).description("\u7FA4\u4FE1\u606F\u53D8\u91CF").collapse(),
   random: import_koishi3.Schema.object({
     variableName: import_koishi3.Schema.string().default("random").description("\u53D8\u91CF\u540D\u79F0"),
@@ -182,13 +197,14 @@ var VariablesSchema = import_koishi3.Schema.object({
     max: import_koishi3.Schema.number().default(100).description("\u9ED8\u8BA4\u968F\u673A\u6570\u4E0A\u9650")
   }).description("\u968F\u673A\u6570\u53D8\u91CF").collapse()
 }).default({
-  userInfo: { variableName: "userInfo", items: [...DEFAULT_MEMBER_INFO_ITEMS] },
+  userInfo: {
+    variableName: "userInfo",
+    items: [...DEFAULT_MEMBER_INFO_ITEMS]
+  },
   botInfo: { variableName: "botInfo", items: [...DEFAULT_MEMBER_INFO_ITEMS] },
   groupInfo: {
     variableName: "groupInfo",
-    includeMemberCount: true,
-    includeCreateTime: true,
-    includeOwnersAndAdmins: true
+    items: [...DEFAULT_GROUP_INFO_ITEMS]
   },
   random: { variableName: "random", min: 0, max: 100 }
 }).description("\u5176\u4ED6\u53D8\u91CF");
@@ -591,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;
@@ -642,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;
@@ -669,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;
@@ -751,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;
@@ -790,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);
@@ -805,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,
@@ -822,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) => {
@@ -831,6 +899,7 @@ function registerXmlTools(deps) {
           }
         }
       }
+      return handled;
     }
   });
   return {
@@ -1082,16 +1151,24 @@ async function fetchOwnersAndAdmins(session, log) {
       const list = await bot.getGuildMemberList(guildId);
       members = list?.data || null;
     }
-    if (!members || !Array.isArray(members) || members.length === 0) return null;
+    if (!members || !Array.isArray(members) || members.length === 0)
+      return null;
     const owners = [];
     const admins = [];
     for (const member of members) {
       const roleRaw = member.role || member.roleName || member.permission || member.identity || (Array.isArray(member.roles) ? member.roles[0] : "") || "";
       const role = String(roleRaw || "").toLowerCase();
-      const userId = String(member.user_id || member.userId || member.id || member.qq || member.uid || "");
-      const candidates = [member.card, member.remark, member.displayName, member.nick, member.nickname, member.name].map(
-        (item) => item ? String(item).trim() : ""
+      const userId = String(
+        member.user_id || member.userId || member.id || member.qq || member.uid || ""
       );
+      const candidates = [
+        member.card,
+        member.remark,
+        member.displayName,
+        member.nick,
+        member.nickname,
+        member.name
+      ].map((item) => item ? String(item).trim() : "");
       const name2 = candidates.find((item) => item) || userId;
       const label = userId ? `${name2}(${userId})` : name2;
       if (role === "owner" || role === "master" || role === "leader") {
@@ -1106,26 +1183,56 @@ async function fetchOwnersAndAdmins(session, log) {
     return null;
   }
 }
-function formatGroupInfo(group, options) {
-  const { includeMemberCount, includeCreateTime } = options;
-  const id = group.group_id ?? group.groupId ?? group.id ?? "\u672A\u77E5\u7FA4\u53F7";
-  const name2 = group.group_name ?? group.groupName ?? group.name ?? "\u672A\u547D\u540D\u7FA4";
+function formatDateOnly2(value) {
+  if (value == null || value === "") return "";
+  const timestamp = Number(value);
+  if (!Number.isFinite(timestamp)) return "";
+  const date = new Date(timestamp < 1e11 ? timestamp * 1e3 : timestamp);
+  if (Number.isNaN(date.valueOf())) return "";
+  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
+}
+function renderGroupInfo(group, items, roles) {
+  const values = [];
+  const id = String(group.group_id ?? group.groupId ?? group.id ?? "").trim();
+  const name2 = String(
+    group.group_name ?? group.groupName ?? group.name ?? ""
+  ).trim();
   const memberCount = group.member_count ?? group.memberCount ?? group.max_member_count;
-  let createTime = "";
-  if (includeCreateTime) {
-    const raw = group.create_time ?? group.createTime;
-    if (raw) {
-      const timestamp = Number(raw);
-      if (Number.isFinite(timestamp)) {
-        const date = new Date(timestamp < 1e11 ? timestamp * 1e3 : timestamp);
-        if (!Number.isNaN(date.valueOf())) {
-          createTime = `\uFF0C\u521B\u5EFA\u65F6\u95F4\uFF1A${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
-        }
+  const createTime = formatDateOnly2(group.create_time ?? group.createTime);
+  for (const item of items) {
+    switch (item) {
+      case "groupName":
+        if (name2) values.push(`\u7FA4\u540D\uFF1A${name2}`);
+        break;
+      case "groupId":
+        if (id) values.push(`\u7FA4\u53F7\uFF1A${id}`);
+        break;
+      case "memberCount":
+        if (memberCount != null) values.push(`\u6210\u5458\u6570\u91CF\uFF1A${memberCount}`);
+        break;
+      case "createTime":
+        if (createTime) values.push(`\u521B\u5EFA\u65F6\u95F4\uFF1A${createTime}`);
+        break;
+      case "ownerList": {
+        if (!roles) break;
+        values.push(
+          `\u7FA4\u4E3B\uFF1A${roles.owners.length ? roles.owners.join("\u3001") : "\u65E0"}`
+        );
+        break;
+      }
+      case "adminList": {
+        if (!roles) break;
+        values.push(
+          `\u7BA1\u7406\u5458\uFF1A${roles.admins.length ? roles.admins.join("\u3001") : "\u65E0"}`
+        );
+        break;
       }
+      default:
+        break;
     }
   }
-  const members = includeMemberCount ? `\uFF0C\u4EBA\u6570: ${memberCount ?? "\u672A\u77E5"}` : "";
-  return `\u7FA4\u53F7\uFF1A${id}\uFF0C\u7FA4\u540D\u79F0\uFF1A${name2}${members}${createTime}`;
+  if (values.length === 0) return id || name2 || "\u672A\u80FD\u83B7\u53D6\u5F53\u524D\u7FA4\u4FE1\u606F\u3002";
+  return values.join("\n");
 }
 function createGroupInfoProvider(deps) {
   const { config, log } = deps;
@@ -1134,29 +1241,13 @@ function createGroupInfoProvider(deps) {
     if (!session) return "\u6682\u65E0\u7FA4\u4FE1\u606F\u3002";
     if (!session.guildId) return "";
     if (session.platform !== "onebot") return "\u5F53\u524D\u5E73\u53F0\u6682\u4E0D\u652F\u6301\u67E5\u8BE2\u7FA4\u4FE1\u606F\u3002";
-    const groupInfoCfg = config.groupInfo || {
-      includeMemberCount: true,
-      includeCreateTime: true,
-      includeOwnersAndAdmins: true
-    };
+    const items = Array.isArray(config.groupInfo?.items) && config.groupInfo.items.length ? config.groupInfo.items : DEFAULT_GROUP_INFO_ITEMS;
     try {
       const groupInfo = await fetchGroupInfo(session);
       if (!groupInfo) return "\u672A\u80FD\u83B7\u53D6\u5F53\u524D\u7FA4\u4FE1\u606F\u3002";
-      const baseText = formatGroupInfo(groupInfo, {
-        includeMemberCount: groupInfoCfg.includeMemberCount !== false,
-        includeCreateTime: groupInfoCfg.includeCreateTime !== false
-      });
-      if (groupInfoCfg.includeOwnersAndAdmins) {
-        const roles = await fetchOwnersAndAdmins(session, log);
-        if (roles) {
-          const ownersText = roles.owners.length ? roles.owners.join("\u3001") : "\u65E0";
-          const adminsText = roles.admins.length ? roles.admins.join("\u3001") : "\u65E0";
-          return `${baseText}
-\u7FA4\u4E3B\uFF1A${ownersText}
-\u7BA1\u7406\u5458\uFF1A${adminsText}`;
-        }
-      }
-      return baseText;
+      const needRoles = items.includes("ownerList") || items.includes("adminList");
+      const roles = needRoles ? await fetchOwnersAndAdmins(session, log) : null;
+      return renderGroupInfo(groupInfo, items, roles);
     } catch (error) {
       log?.("debug", "\u7FA4\u4FE1\u606F\u53D8\u91CF\u89E3\u6790\u5931\u8D25", error);
       return "\u83B7\u53D6\u7FA4\u4FE1\u606F\u5931\u8D25\u3002";
@@ -1194,7 +1285,7 @@ function normalizeTimestamp2(raw) {
   if (!Number.isFinite(numeric)) return null;
   return numeric < 1e11 ? numeric * 1e3 : numeric;
 }
-function formatDateOnly2(value) {
+function formatDateOnly3(value) {
   if (!value) return "";
   const date = new Date(value);
   if (Number.isNaN(date.valueOf())) return "";
@@ -1328,7 +1419,7 @@ function renderUserInfo(session, member, items) {
         break;
       }
       case "joinTime": {
-        const joinTime = formatDateOnly2(
+        const joinTime = formatDateOnly3(
           normalizeTimestamp2(
             pickFirst2(
               member?.join_time,
@@ -1447,6 +1538,7 @@ function apply(ctx, config) {
 0 && (module.exports = {
   Config,
   ConfigSchema,
+  DEFAULT_GROUP_INFO_ITEMS,
   DEFAULT_MEMBER_INFO_ITEMS,
   NativeToolsSchema,
   RAW_INTERCEPTOR_TAG,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-toolbox",
   "description": "为 ChatLuna 提供更多原生工具、XML 工具与变量。",
-  "version": "0.0.1",
+  "version": "0.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [