@nextclaw/channel-runtime 0.1.24 → 0.1.26

package/dist/index.d.ts

@@ -175,6 +175,7 @@ declare class QQChannel extends BaseChannel<Config["channels"]["qq"]> {
     private bot;
     private processedIds;
     private processedSet;
+    private senderNameCache;
     private reconnectTimer;
     private connectTask;
     private reconnectAttempt;
@@ -184,13 +185,18 @@ declare class QQChannel extends BaseChannel<Config["channels"]["qq"]> {
     start(): Promise<void>;
     stop(): Promise<void>;
     send(msg: OutboundMessage): Promise<void>;
+    private sendByMessageType;
     private handleIncoming;
     private resolveSenderName;
     private decorateSpeakerPrefix;
     private sanitizeSpeakerToken;
+    private extractDeclaredName;
     private isDuplicate;
     private sendWithTokenRetry;
     private isTokenExpiredError;
+    private isDisallowedUrlParamError;
+    private toQqSafeText;
+    private extractBlockedUrlToken;
     private tryConnect;
     private connect;
     private createBot;

package/dist/index.js

@@ -893,10 +893,10 @@ function chunkDiscordText(text, opts = {}) {
       preserveWhitespace: wasInsideFence
     });
     for (let segmentIndex = 0; segmentIndex < segments.length; segmentIndex += 1) {
-      const segment2 = segments[segmentIndex];
+      const segment = segments[segmentIndex];
       const isContinuation = segmentIndex > 0;
       const delimiter = isContinuation ? "" : current.length > 0 ? "\n" : "";
-      const addition = `${delimiter}${segment2}`;
+      const addition = `${delimiter}${segment}`;
       const nextLength = current.length + addition.length;
       const nextLineCount = currentLines + (isContinuation ? 0 : 1);
       const exceedsChars = nextLength > charLimit;
@@ -910,7 +910,7 @@ function chunkDiscordText(text, opts = {}) {
           currentLines += 1;
         }
       } else {
-        current = segment2;
+        current = segment;
         currentLines = 1;
       }
     }
@@ -2414,14 +2414,14 @@ function sleep3(ms) {
 import {
   Bot,
   ReceiverMode,
-  SessionEvents,
-  segment
+  SessionEvents
 } from "qq-official-bot";
 var QQChannel = class extends BaseChannel {
   name = "qq";
   bot = null;
   processedIds = [];
   processedSet = /* @__PURE__ */ new Set();
+  senderNameCache = /* @__PURE__ */ new Map();
   reconnectTimer = null;
   connectTask = null;
   reconnectAttempt = 0;
@@ -2458,7 +2458,20 @@ var QQChannel = class extends BaseChannel {
     const metadataMessageId = msg.metadata?.message_id ?? null;
     const sourceId = msg.replyTo ?? metadataMessageId ?? void 0;
     const source = sourceId ? { id: sourceId } : void 0;
-    const payload = this.config.markdownSupport ? segment.markdown(msg.content ?? "") : msg.content ?? "";
+    const rawContent = msg.content ?? "";
+    const payload = rawContent;
+    try {
+      await this.sendByMessageType({ messageType, qqMeta, msg, payload, source });
+    } catch (error) {
+      if (!this.isDisallowedUrlParamError(error)) {
+        throw error;
+      }
+      const safeText = this.toQqSafeText(rawContent, error);
+      await this.sendByMessageType({ messageType, qqMeta, msg, payload: safeText, source });
+    }
+  }
+  async sendByMessageType(params) {
+    const { messageType, qqMeta, msg, payload, source } = params;
     if (messageType === "group") {
       const groupId = qqMeta.groupId ?? msg.chatId;
       await this.sendWithTokenRetry(() => this.bot?.sendGroupMessage(groupId, payload, source));
@@ -2492,7 +2505,15 @@ var QQChannel = class extends BaseChannel {
     }
     const content = event.raw_message?.trim() ?? "";
     const normalizedContent = content || "[empty message]";
-    const senderName = this.resolveSenderName(rawEvent);
+    const eventSenderName = this.resolveSenderName(rawEvent);
+    if (eventSenderName) {
+      this.senderNameCache.set(senderId, eventSenderName);
+    }
+    const declaredName = this.extractDeclaredName(normalizedContent);
+    if (declaredName) {
+      this.senderNameCache.set(senderId, declaredName);
+    }
+    const senderName = declaredName ?? eventSenderName ?? this.senderNameCache.get(senderId) ?? null;
     let chatId = senderId;
     let messageType = "private";
     const qqMeta = {};
@@ -2524,6 +2545,9 @@ var QQChannel = class extends BaseChannel {
       }
     } else {
       qqMeta.userId = senderId;
+      if (senderName) {
+        qqMeta.userName = senderName;
+      }
     }
     qqMeta.messageType = messageType;
     const safeContent = this.decorateSpeakerPrefix({
@@ -2554,7 +2578,8 @@ var QQChannel = class extends BaseChannel {
       rawEvent.sender?.card,
       rawEvent.sender?.nickname,
       rawEvent.sender?.nick,
-      rawEvent.sender?.username
+      rawEvent.sender?.username,
+      rawEvent.sender?.user_name
     ];
     for (const value of candidates) {
       if (typeof value !== "string") {
@@ -2568,9 +2593,6 @@ var QQChannel = class extends BaseChannel {
     return null;
   }
   decorateSpeakerPrefix(params) {
-    if (params.messageType !== "group" && params.messageType !== "guild") {
-      return params.content;
-    }
     const userId = this.sanitizeSpeakerToken(params.senderId);
     if (!userId) {
       return params.content;
@@ -2585,6 +2607,25 @@ var QQChannel = class extends BaseChannel {
   sanitizeSpeakerToken(value) {
     return value.replace(/[\r\n;\]]/g, " ").trim();
   }
+  extractDeclaredName(content) {
+    const trimmed = content.trim();
+    const patterns = [
+      /^我的昵称是\s*([^\s，。！？!?,]{1,24})$/u,
+      /^我叫\s*([^\s，。！？!?,]{1,24})$/u,
+      /^叫我\s*([^\s，。！？!?,]{1,24})$/u
+    ];
+    for (const pattern of patterns) {
+      const match = trimmed.match(pattern);
+      if (!match) {
+        continue;
+      }
+      const candidate = this.sanitizeSpeakerToken(match[1] ?? "");
+      if (candidate) {
+        return candidate;
+      }
+    }
+    return null;
+  }
   isDuplicate(messageId) {
     if (this.processedSet.has(messageId)) {
       return true;
@@ -2614,6 +2655,27 @@ var QQChannel = class extends BaseChannel {
     const message = error instanceof Error ? error.message : String(error);
     return message.includes("code(11244)") || message.toLowerCase().includes("token not exist or expire");
   }
+  isDisallowedUrlParamError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return message.includes("code(40034028)") || message.includes("\u8BF7\u6C42\u53C2\u6570\u4E0D\u5141\u8BB8\u5305\u542Burl");
+  }
+  toQqSafeText(content, error) {
+    let safe = content.replace(/\[([^\]]+)\]\(([^)]+)\)/g, "$1").replace(/https?:\/\/\S+/gi, "[link]").replace(/www\.\S+/gi, "[link]").replace(/\b[a-z0-9._/-]+\.md\b/gi, "[file]");
+    const blocked = this.extractBlockedUrlToken(error);
+    if (blocked) {
+      safe = safe.replaceAll(blocked, "[link]");
+    }
+    return safe;
+  }
+  extractBlockedUrlToken(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const match = message.match(/包含url\s+([^\s]+)/);
+    if (!match) {
+      return null;
+    }
+    const token = match[1].trim();
+    return token.length > 0 ? token : null;
+  }
   tryConnect(trigger) {
     if (!this.running || this.bot || this.connectTask) {
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/channel-runtime",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "private": false,
   "description": "Runtime implementations for NextClaw builtin channel plugins.",
   "type": "module",
@@ -15,7 +15,7 @@
   ],
   "dependencies": {
     "@larksuiteoapi/node-sdk": "^1.58.0",
-    "@nextclaw/core": "^0.6.41",
+    "@nextclaw/core": "^0.6.43",
     "@slack/socket-mode": "^1.3.3",
     "@slack/web-api": "^7.6.0",
     "dingtalk-stream": "^2.1.4",