liangzimixin 0.3.69 → 0.3.71

package/dist/index.cjs

@@ -18488,12 +18488,25 @@ async function resolveAndUploadMedia(params) {
         timeoutMs
       });
     } catch (err) {
-      log5.warn("media:upload failed, \u964D\u7EA7\u5904\u7406", { error: err.message });
+      const errMsg = err.message;
+      log5.warn("media:upload failed, \u964D\u7EA7\u5904\u7406", { error: errMsg });
+      try {
+        const tipText = "\u26A0\uFE0F \u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002";
+        await messagePipe.sendMessage({
+          chatId,
+          senderId: chatId,
+          msgType: "text",
+          content: JSON.stringify({ content: tipText }),
+          skipEncrypt: true
+        });
+      } catch (tipErr) {
+        log5.warn("media:upload-failed tip send error", { error: tipErr.message });
+      }
       return {
         channel: CHANNEL_ID,
         messageId: "",
         chatId,
-        warning: `\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25: ${err.message}`
+        warning: `\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25: ${errMsg}`
       };
     }
     const msgType = fileType;
@@ -18519,7 +18532,7 @@ async function resolveAndUploadMedia(params) {
       content: JSON.stringify(contentPayload),
       skipEncrypt: params.skipEncrypt,
       encryptionMeta
-      // 文件加密的 keyId/iv → sendMessage 用于构建 extra
+      // 文件加密的 keyId/iv → sendMessage 用于构建 extraContent
     });
     log5.info("media:sent", {
       chatId,
@@ -18759,6 +18772,10 @@ var quantumImOutbound = {
   /** 发送文本消息 — 通过 messagePipe 发送 */
   sendText: async ({ cfg, to, text, accountId }) => {
     log7.info("sendText called", { to, textLength: text.length });
+    if (!text?.trim()) {
+      log7.warn("outbound:sendText skipped \u2014 empty text", { to });
+      return { channel: CHANNEL_ID, messageId: "", chatId: to };
+    }
     if (!messagePipeGetter) {
       log7.error("outbound:sendText failed, messagePipe not initialized");
       return { channel: CHANNEL_ID, messageId: "", chatId: to };
@@ -19121,19 +19138,27 @@ function createQuantumImDeliverFn(deps) {
     const hasMedia = mediaUrls.length > 0;
     if (!hasText && !hasMedia) return;
     if (hasText) {
-      await messagePipe.sendMessage({
-        chatId,
-        senderId,
-        msgType: resolveTextMsgType(payload.text),
-        content: JSON.stringify({ content: payload.text }),
-        replyToMessageId,
-        skipEncrypt: shouldSkipEncrypt
-      });
-      log14.info("\u{1F4E4} AI \u6587\u672C\u56DE\u590D\u5DF2\u53D1\u9001", {
-        chatId,
-        \u957F\u5EA6: payload.text.length,
-        \u56DE\u590D\u9884\u89C8: payload.text.slice(0, 200)
-      });
+      try {
+        await messagePipe.sendMessage({
+          chatId,
+          senderId,
+          msgType: resolveTextMsgType(payload.text),
+          content: JSON.stringify({ content: payload.text }),
+          replyToMessageId,
+          skipEncrypt: shouldSkipEncrypt
+        });
+        log14.info("\u{1F4E4} AI \u6587\u672C\u56DE\u590D\u5DF2\u53D1\u9001", {
+          chatId,
+          \u957F\u5EA6: payload.text.length,
+          \u56DE\u590D\u9884\u89C8: payload.text.slice(0, 200)
+        });
+      } catch (err) {
+        log14.error("\u{1F4E4} AI \u6587\u672C\u56DE\u590D\u53D1\u9001\u5931\u8D25", {
+          chatId,
+          error: err.message
+        });
+        if (!hasMedia) throw err;
+      }
     }
     if (hasMedia) {
       for (const mediaUrl of mediaUrls) {
@@ -19425,6 +19450,21 @@ var InboundPipeline = class {
         stack: err.stack,
         durationMs
       });
+      try {
+        const errorTip = "\u26A0\uFE0F \u6D88\u606F\u5904\u7406\u9047\u5230\u95EE\u9898\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002\u5982\u95EE\u9898\u6301\u7EED\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u3002";
+        await this.deps.messagePipe.sendMessage({
+          chatId: msg.chatId,
+          senderId: msg.senderId,
+          msgType: resolveTextMsgType(errorTip),
+          content: JSON.stringify({ content: errorTip }),
+          skipEncrypt: true
+          // 系统提示消息不加密，避免加密失败导致的死循环
+        });
+      } catch (tipErr) {
+        log15.warn("\u26A0\uFE0F \u9519\u8BEF\u63D0\u793A\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF08\u907F\u514D\u6B7B\u5FAA\u73AF\uFF0C\u4E0D\u518D\u91CD\u8BD5\uFF09", {
+          error: tipErr.message
+        });
+      }
       clearInboundEncryptionStatus(msg.chatId, msg.messageId);
     } finally {
       semaphore.release();
@@ -20918,7 +20958,7 @@ var CallbackDataSchema = external_exports.object({
   msgUid: external_exports.string(),
   type: external_exports.string(),
   content: external_exports.record(external_exports.string(), external_exports.unknown()),
-  extra: external_exports.string().optional()
+  extraContent: external_exports.string().optional()
 });
 var MessagePipe = class _MessagePipe {
   wsClient;
@@ -21035,8 +21075,8 @@ var MessagePipe = class _MessagePipe {
   /** 文件类消息类型集合 — 这些类型的加密消息保留原始 content（文件元数据） */
   static FILE_MSG_TYPES = /* @__PURE__ */ new Set(["image", "file", "voice", "video"]);
   /**
-   * 构建文件类加密消息的 extra — 完整模板格式。
-   * 文件消息不加密 content（需要保留 fileId 等元数据），只在 extra 中携带会话信息。
+   * 构建文件类加密消息的 extraContent — 完整模板格式。
+   * 文件消息不加密 content（需要保留 fileId 等元数据），只在 extraContent 中携带会话信息。
    */
   static buildFileEncryptExtra(iv, keyId) {
     return JSON.stringify({
@@ -21068,27 +21108,27 @@ var MessagePipe = class _MessagePipe {
    *
    * 文件类消息 (image/file/voice/video):
    * - content 保留原始文件元数据（fileId、fileName、size 等）
-   * - extra 使用完整模板格式，encryptMsg 为空
+   * - extraContent 使用完整模板格式，encryptMsg 为空
    *
    * 文本类消息 (text/markdown):
-   * - content 加密后置空，密文放入 extra.encryptMsg
+   * - content 加密后置空，密文放入 extraContent.encryptMsg
    */
   async sendMessage(msg) {
     let content = msg.content;
-    let extra = "";
+    let extraContent = "";
     const isFileMessage = _MessagePipe.FILE_MSG_TYPES.has(msg.msgType);
     if (!msg.skipEncrypt && this.quantumAccount) {
       if (this.encryptionMode === "quantum_only") {
         if (isFileMessage && msg.encryptionMeta) {
-          extra = _MessagePipe.buildFileEncryptExtra(msg.encryptionMeta.iv, msg.encryptionMeta.keyId);
+          extraContent = _MessagePipe.buildFileEncryptExtra(msg.encryptionMeta.iv, msg.encryptionMeta.keyId);
           log25.debug("\u{1F512} \u51FA\u7AD9\u6587\u4EF6\u6D88\u606F\u5DF2\u6807\u8BB0\u52A0\u5BC6 (quantum_only)", { sessionId: msg.encryptionMeta.keyId, msgType: msg.msgType });
         } else if (isFileMessage) {
           const { keyId, iv } = await this.crypto.encrypt(msg.content);
-          extra = _MessagePipe.buildFileEncryptExtra(iv, keyId);
+          extraContent = _MessagePipe.buildFileEncryptExtra(iv, keyId);
           log25.debug("\u{1F512} \u51FA\u7AD9\u6587\u4EF6\u6D88\u606F\u5DF2\u6807\u8BB0\u52A0\u5BC6 (quantum_only, fallback)", { sessionId: keyId, msgType: msg.msgType });
         } else {
           const { ciphertext, keyId, iv } = await this.crypto.encrypt(msg.content);
-          extra = JSON.stringify({
+          extraContent = JSON.stringify({
             cryptoIv: iv,
             encryptMsg: ciphertext,
             sessionId: keyId
@@ -21099,15 +21139,15 @@ var MessagePipe = class _MessagePipe {
       } else {
         try {
           if (isFileMessage && msg.encryptionMeta) {
-            extra = _MessagePipe.buildFileEncryptExtra(msg.encryptionMeta.iv, msg.encryptionMeta.keyId);
+            extraContent = _MessagePipe.buildFileEncryptExtra(msg.encryptionMeta.iv, msg.encryptionMeta.keyId);
             log25.debug("\u{1F512} \u51FA\u7AD9\u6587\u4EF6\u6D88\u606F\u5DF2\u6807\u8BB0\u52A0\u5BC6 (quantum_and_plain)", { sessionId: msg.encryptionMeta.keyId, msgType: msg.msgType });
           } else if (isFileMessage) {
             const { keyId, iv } = await this.crypto.encrypt(msg.content);
-            extra = _MessagePipe.buildFileEncryptExtra(iv, keyId);
+            extraContent = _MessagePipe.buildFileEncryptExtra(iv, keyId);
             log25.debug("\u{1F512} \u51FA\u7AD9\u6587\u4EF6\u6D88\u606F\u5DF2\u6807\u8BB0\u52A0\u5BC6 (quantum_and_plain, fallback)", { sessionId: keyId, msgType: msg.msgType });
           } else {
             const { ciphertext, keyId, iv } = await this.crypto.encrypt(msg.content);
-            extra = JSON.stringify({
+            extraContent = JSON.stringify({
               cryptoIv: iv,
               encryptMsg: ciphertext,
               sessionId: keyId
@@ -21136,17 +21176,19 @@ var MessagePipe = class _MessagePipe {
       msg_type: msg.msgType,
       content
     };
-    if (extra) {
-      body.extra = extra;
+    if (extraContent) {
+      body.extraContent = extraContent;
     }
     if (msg.replyToMessageId) {
       body.reply_msg_id = msg.replyToMessageId;
     }
     const result = await this.callMessageApi("/messages/v1/send", body, "outbound");
-    if (!result) return;
+    if (!result) {
+      throw new Error(`\u6D88\u606F\u53D1\u9001\u5931\u8D25: POST ${this.messageServiceBaseUrl}/messages/v1/send \u672A\u8FD4\u56DE\u6709\u6548\u54CD\u5E94`);
+    }
     log25.info("\u{1F4E4} outbound:sent \u2192 IM \u670D\u52A1\u5668", {
       chatId: msg.chatId,
-      encrypted: Boolean(extra),
+      encrypted: Boolean(extraContent),
       requestId: result.request_id,
       body
     });
@@ -21167,7 +21209,10 @@ var MessagePipe = class _MessagePipe {
       conversation_type: ""
     };
     const result = await this.callMessageApi("/messages/v1/recall", body, "recall");
-    if (!result) return;
+    if (!result) {
+      log25.warn("recall:failed \u2014 callMessageApi returned null");
+      return;
+    }
     log25.info("recall:sent", {
       messageId: params.messageId,
       requestId: result.request_id
@@ -21182,6 +21227,43 @@ var MessagePipe = class _MessagePipe {
    * @param body - 请求体
    * @param logTag - 日志标签前缀 (如 'outbound' / 'recall')
    */
+  /** 单次 HTTP 请求封装 — callMessageApi 内部使用 */
+  async _callMessageApiOnce(url2, body, logTag) {
+    const apiStartMs = Date.now();
+    const token = await this.tokenFn();
+    const resp = await fetch(url2, {
+      method: "POST",
+      headers: {
+        "Authorization": `Bearer ${token}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(body)
+    });
+    if (!resp.ok) {
+      log25.error(`${logTag}:http-error`, {
+        status: resp.status,
+        statusText: resp.statusText,
+        url: url2
+      });
+      return { code: -1, msg: `HTTP ${resp.status}`, _retryable: resp.status >= 500 };
+    }
+    const result = await resp.json();
+    if (result.code !== 0 && result.code !== 200) {
+      log25.error(`${logTag}:api-error`, {
+        code: result.code,
+        msg: result.msg,
+        requestId: result.request_id
+      });
+      return null;
+    }
+    metrics.increment("outbound.success");
+    metrics.recordLatency("outbound.latency", Date.now() - apiStartMs);
+    return result;
+  }
+  /**
+   * 消息服务 API 公共调用方法 — 含 1 次重试 (仅限 5xx / 网络错误)。
+   * 失败返回 null（不抛异常），错误通过 log 记录。
+   */
   async callMessageApi(path3, body, logTag) {
     const url2 = `${this.messageServiceBaseUrl}${path3}`;
     const rateLimitResult = await this.rateLimiter.acquire();
@@ -21194,44 +21276,42 @@ var MessagePipe = class _MessagePipe {
       return null;
     }
     try {
-      const apiStartMs = Date.now();
-      const token = await this.tokenFn();
-      const resp = await fetch(url2, {
-        method: "POST",
-        headers: {
-          "Authorization": `Bearer ${token}`,
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(body)
-      });
-      if (!resp.ok) {
-        log25.error(`${logTag}:http-error`, {
-          status: resp.status,
-          statusText: resp.statusText,
-          url: url2
-        });
+      const result = await this._callMessageApiOnce(url2, body, logTag);
+      if (result && "_retryable" in result) {
+        if (result._retryable) {
+          log25.warn(`${logTag}:retrying after 5xx`, { url: url2 });
+          await new Promise((r) => setTimeout(r, 1e3));
+          try {
+            const retryResult = await this._callMessageApiOnce(url2, body, `${logTag}:retry`);
+            if (retryResult && !("_retryable" in retryResult)) {
+              return retryResult;
+            }
+          } catch (retryErr) {
+            log25.error(`${logTag}:retry-failed`, { error: retryErr.message });
+          }
+        }
         metrics.increment("outbound.failed");
         return null;
       }
-      const result = await resp.json();
-      if (result.code !== 0 && result.code !== 200) {
-        log25.error(`${logTag}:api-error`, {
-          code: result.code,
-          msg: result.msg,
-          requestId: result.request_id
+      return result;
+    } catch (err) {
+      log25.warn(`${logTag}:network-error, retrying`, { url: url2, error: err.message });
+      await new Promise((r) => setTimeout(r, 1e3));
+      try {
+        const retryResult = await this._callMessageApiOnce(url2, body, `${logTag}:retry`);
+        if (retryResult && !("_retryable" in retryResult)) {
+          return retryResult;
+        }
+        metrics.increment("outbound.failed");
+        return null;
+      } catch (retryErr) {
+        metrics.increment("outbound.failed");
+        log25.error(`${logTag}:retry-network-error`, {
+          url: url2,
+          error: retryErr.message
         });
         return null;
       }
-      metrics.increment("outbound.success");
-      metrics.recordLatency("outbound.latency", Date.now() - apiStartMs);
-      return result;
-    } catch (err) {
-      metrics.increment("outbound.failed");
-      log25.error(`${logTag}:network-error`, {
-        url: url2,
-        error: err.message
-      });
-      return null;
     }
   }
   /**
@@ -21298,16 +21378,16 @@ var MessagePipe = class _MessagePipe {
       groupId: callbackData.groupId,
       type: callbackData.type,
       content: callbackData.content,
-      extra: callbackData.extra
+      extraContent: callbackData.extraContent
     });
-    const extra = callbackData.extra;
+    const extraContent = callbackData.extraContent;
     let isEncrypted = false;
-    if (typeof extra === "string" && extra.length > 0) {
+    if (typeof extraContent === "string" && extraContent.length > 0) {
       try {
-        const parsed = JSON.parse(extra);
+        const parsed = JSON.parse(extraContent);
         isEncrypted = Boolean(parsed.encryptMsg);
       } catch {
-        log25.debug("\u2139\uFE0F extra \u4E0D\u662F\u6709\u6548 JSON\uFF0C\u89C6\u4E3A\u660E\u6587", { msgUid: callbackData.msgUid });
+        log25.debug("\u2139\uFE0F extraContent \u4E0D\u662F\u6709\u6548 JSON\uFF0C\u89C6\u4E3A\u660E\u6587", { msgUid: callbackData.msgUid });
       }
     }
     let contentObj;
@@ -21340,6 +21420,10 @@ var MessagePipe = class _MessagePipe {
           msgUid: callbackData.msgUid,
           error: err.message
         });
+        await this.sendHintMessage(
+          callbackData,
+          "\u26A0\uFE0F \u6D88\u606F\u89E3\u5BC6\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u53D1\u9001\u3002\u5982\u95EE\u9898\u6301\u7EED\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u3002"
+        );
         return;
       }
     } else {
@@ -21361,6 +21445,10 @@ var MessagePipe = class _MessagePipe {
             msgUid: callbackData.msgUid,
             error: err.message
           });
+          await this.sendHintMessage(
+            callbackData,
+            "\u26A0\uFE0F \u6D88\u606F\u89E3\u5BC6\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u53D1\u9001\u3002\u5982\u95EE\u9898\u6301\u7EED\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u3002"
+          );
           return;
         }
       } else {
@@ -21414,15 +21502,15 @@ var MessagePipe = class _MessagePipe {
     }
   }
   /**
-   * 解密 extra 中的加密内容。
+   * 解密 extraContent 中的加密内容。
    * @throws 解密失败时抛出异常
    */
   async decryptExtra(callbackData) {
-    const extraData = JSON.parse(callbackData.extra);
+    const extraData = JSON.parse(callbackData.extraContent);
     const encryptMsg = extraData.encryptMsg ?? "";
     const sessionId = extraData.sessionId ?? "";
     if (!encryptMsg) {
-      log25.warn("\u26A0\uFE0F extra \u4E2D encryptMsg \u4E3A\u7A7A\uFF0C\u4F7F\u7528\u539F\u59CB content", { msgUid: callbackData.msgUid });
+      log25.warn("\u26A0\uFE0F extraContent \u4E2D encryptMsg \u4E3A\u7A7A\uFF0C\u4F7F\u7528\u539F\u59CB content", { msgUid: callbackData.msgUid });
       return callbackData.content;
     }
     const cryptoIv = extraData.cryptoIv ?? "";

package/dist/index.d.cts

@@ -214,7 +214,7 @@ interface OutboundMessage {
     replyToMessageId?: string;
     /** 跳过出站加密 — 用于"思考中"等无需加密的系统提示消息 */
     skipEncrypt?: boolean;
-    /** 文件加密元数据 — 文件已在上传前加密时传入，sendMessage 直接使用此 keyId/iv 构建 extra */
+    /** 文件加密元数据 — 文件已在上传前加密时传入，sendMessage 直接使用此 keyId/iv 构建 extraContent */
     encryptionMeta?: {
         keyId: string;
         iv: string;
@@ -925,8 +925,8 @@ declare class MessagePipe {
     /** 文件类消息类型集合 — 这些类型的加密消息保留原始 content（文件元数据） */
     private static readonly FILE_MSG_TYPES;
     /**
-     * 构建文件类加密消息的 extra — 完整模板格式。
-     * 文件消息不加密 content（需要保留 fileId 等元数据），只在 extra 中携带会话信息。
+     * 构建文件类加密消息的 extraContent — 完整模板格式。
+     * 文件消息不加密 content（需要保留 fileId 等元数据），只在 extraContent 中携带会话信息。
      */
     private static buildFileEncryptExtra;
     /**
@@ -940,10 +940,10 @@ declare class MessagePipe {
      *
      * 文件类消息 (image/file/voice/video):
      * - content 保留原始文件元数据（fileId、fileName、size 等）
-     * - extra 使用完整模板格式，encryptMsg 为空
+     * - extraContent 使用完整模板格式，encryptMsg 为空
      *
      * 文本类消息 (text/markdown):
-     * - content 加密后置空，密文放入 extra.encryptMsg
+     * - content 加密后置空，密文放入 extraContent.encryptMsg
      */
     sendMessage(msg: OutboundMessage): Promise<void>;
     /**
@@ -966,6 +966,12 @@ declare class MessagePipe {
      * @param body - 请求体
      * @param logTag - 日志标签前缀 (如 'outbound' / 'recall')
      */
+    /** 单次 HTTP 请求封装 — callMessageApi 内部使用 */
+    private _callMessageApiOnce;
+    /**
+     * 消息服务 API 公共调用方法 — 含 1 次重试 (仅限 5xx / 网络错误)。
+     * 失败返回 null（不抛异常），错误通过 log 记录。
+     */
     private callMessageApi;
     /**
      * 入站处理流水线 (7 步):
@@ -984,7 +990,7 @@ declare class MessagePipe {
      */
     private sendHintMessage;
     /**
-     * 解密 extra 中的加密内容。
+     * 解密 extraContent 中的加密内容。
      * @throws 解密失败时抛出异常
      */
     private decryptExtra;