liangzimixin 0.3.44 → 0.3.46

package/dist/index.cjs

@@ -20055,7 +20055,7 @@ var MessageDedup = class {
 // src/transport/message-pipe.ts
 var import_node_crypto3 = require("crypto");
 var log21 = createLogger("transport/message-pipe");
-var MessagePipe = class {
+var MessagePipe = class _MessagePipe {
   wsClient;
   dedup;
   crypto;
@@ -20097,6 +20097,31 @@ var MessagePipe = class {
   async injectRawFrame(rawData) {
     return this.handleInbound(rawData);
   }
+  /** 文件类消息类型集合 — 这些类型的加密消息保留原始 content（文件元数据） */
+  static FILE_MSG_TYPES = /* @__PURE__ */ new Set(["image", "file", "voice", "video"]);
+  /**
+   * 构建文件类加密消息的 extra — 完整模板格式。
+   * 文件消息不加密 content（需要保留 fileId 等元数据），只在 extra 中携带会话信息。
+   */
+  static buildFileEncryptExtra(iv, keyId) {
+    return JSON.stringify({
+      containSensitive: false,
+      cryptoIv: iv,
+      decryptText: "",
+      decrypted: false,
+      destroyType: 0,
+      encryptMsg: "",
+      expireAt: null,
+      level: 0,
+      newDestroy: 1,
+      phone: "",
+      receiveShowTip: false,
+      receiveTip: "",
+      sessionId: keyId,
+      showTip: false,
+      tip: ""
+    });
+  }
   /**
    * 出站发送 — 通过 HTTP API 发送消息到 IM 服务器。
    * POST {messageServiceBaseUrl}/messages/v1/send
@@ -20105,30 +20130,48 @@ var MessagePipe = class {
    * 加密行为取决于 encryptionMode:
    * - quantum_only:      强制加密，失败直接抛错（不降级明文）
    * - quantum_and_plain:  加密失败降级明文（保持兼容）
+   *
+   * 文件类消息 (image/file/voice/video):
+   * - content 保留原始文件元数据（fileId、fileName、size 等）
+   * - extra 使用完整模板格式，encryptMsg 为空
+   *
+   * 文本类消息 (text/markdown):
+   * - content 加密后置空，密文放入 extra.encryptMsg
    */
   async sendMessage(msg) {
     let content = msg.content;
     let extra = "";
+    const isFileMessage = _MessagePipe.FILE_MSG_TYPES.has(msg.msgType);
     if (!msg.skipEncrypt && this.quantumAccount) {
       if (this.encryptionMode === "quantum_only") {
         const { ciphertext, keyId, iv } = await this.crypto.encrypt(msg.content);
-        extra = JSON.stringify({
-          cryptoIv: iv,
-          encryptMsg: ciphertext,
-          sessionId: keyId
-        });
-        content = JSON.stringify({ content: "" });
-        log21.debug("\u{1F512} \u51FA\u7AD9\u6D88\u606F\u5DF2\u52A0\u5BC6 (quantum_only)", { sessionId: keyId });
-      } else {
-        try {
-          const { ciphertext, keyId, iv } = await this.crypto.encrypt(msg.content);
+        if (isFileMessage) {
+          extra = _MessagePipe.buildFileEncryptExtra(iv, keyId);
+          log21.debug("\u{1F512} \u51FA\u7AD9\u6587\u4EF6\u6D88\u606F\u5DF2\u6807\u8BB0\u52A0\u5BC6 (quantum_only)", { sessionId: keyId, msgType: msg.msgType });
+        } else {
           extra = JSON.stringify({
             cryptoIv: iv,
             encryptMsg: ciphertext,
             sessionId: keyId
           });
           content = JSON.stringify({ content: "" });
-          log21.debug("\u{1F512} \u51FA\u7AD9\u6D88\u606F\u5DF2\u52A0\u5BC6 (quantum_and_plain)", { sessionId: keyId });
+          log21.debug("\u{1F512} \u51FA\u7AD9\u6D88\u606F\u5DF2\u52A0\u5BC6 (quantum_only)", { sessionId: keyId });
+        }
+      } else {
+        try {
+          const { ciphertext, keyId, iv } = await this.crypto.encrypt(msg.content);
+          if (isFileMessage) {
+            extra = _MessagePipe.buildFileEncryptExtra(iv, keyId);
+            log21.debug("\u{1F512} \u51FA\u7AD9\u6587\u4EF6\u6D88\u606F\u5DF2\u6807\u8BB0\u52A0\u5BC6 (quantum_and_plain)", { sessionId: keyId, msgType: msg.msgType });
+          } else {
+            extra = JSON.stringify({
+              cryptoIv: iv,
+              encryptMsg: ciphertext,
+              sessionId: keyId
+            });
+            content = JSON.stringify({ content: "" });
+            log21.debug("\u{1F512} \u51FA\u7AD9\u6D88\u606F\u5DF2\u52A0\u5BC6 (quantum_and_plain)", { sessionId: keyId });
+          }
         } catch (err) {
           log21.error("\u274C \u51FA\u7AD9\u6D88\u606F\u52A0\u5BC6\u5931\u8D25\uFF0C\u5C06\u53D1\u9001\u660E\u6587", {
             error: err.message
@@ -20150,13 +20193,11 @@ var MessagePipe = class {
     }
     const result = await this.callMessageApi("/messages/v1/send", body, "outbound");
     if (!result) return;
-    log21.info("outbound:sent \u2192 IM \u670D\u52A1\u5668", {
+    log21.info("\u{1F4E4} outbound:sent \u2192 IM \u670D\u52A1\u5668", {
       chatId: msg.chatId,
-      receiveId: msg.senderId,
-      msgType: msg.msgType,
       encrypted: Boolean(extra),
-      contentPreview: extra ? "[encrypted]" : msg.content.slice(0, 200),
-      requestId: result.request_id
+      requestId: result.request_id,
+      body
     });
   }
   /**
@@ -20265,8 +20306,27 @@ var MessagePipe = class {
       log21.warn("\u26A0\uFE0F CallbackData \u89E3\u6790\u5931\u8D25", { error: err.message });
       return;
     }
+    log21.info("\u{1F4E9} \u5165\u7AD9\u539F\u59CB\u6570\u636E", {
+      appId: callbackData.appId,
+      msgUid: callbackData.msgUid,
+      eventType: callbackData.eventType,
+      userId: callbackData.userId,
+      toUserId: callbackData.toUserId,
+      groupId: callbackData.groupId,
+      type: callbackData.type,
+      content: callbackData.content,
+      extra: callbackData.extra
+    });
     const extra = callbackData.extra;
-    const isEncrypted = typeof extra === "string" && extra.length > 0;
+    let isEncrypted = false;
+    if (typeof extra === "string" && extra.length > 0) {
+      try {
+        const parsed = JSON.parse(extra);
+        isEncrypted = Boolean(parsed.encryptMsg);
+      } catch {
+        log21.debug("\u2139\uFE0F extra \u4E0D\u662F\u6709\u6548 JSON\uFF0C\u89C6\u4E3A\u660E\u6587", { msgUid: callbackData.msgUid });
+      }
+    }
     let contentObj;
     if (this.encryptionMode === "quantum_only") {
       if (!this.quantumAccount) {
@@ -20457,7 +20517,7 @@ var ConnectionManager = class {
     this.client.on("pong", () => {
       this.pongReceived = true;
       this.clearPongTimeout();
-      log22.info("heartbeat: pong received");
+      log22.debug("heartbeat: pong received");
     });
   }
   /** 启动心跳保活 — 定时发送 WebSocket Ping 帧 */
@@ -20478,7 +20538,7 @@ var ConnectionManager = class {
       }
       this.pongReceived = false;
       this.client.ping();
-      log22.info("heartbeat: ping sent");
+      log22.debug("heartbeat: ping sent");
       this.clearPongTimeout();
       this.pongTimeoutTimer = setTimeout(() => {
         if (!this.pongReceived && this.running) {

package/dist/index.d.cts

@@ -786,6 +786,13 @@ declare class MessagePipe {
      * TODO: 验证通过后移除此方法
      */
     injectRawFrame(rawData: string | Buffer): Promise<void>;
+    /** 文件类消息类型集合 — 这些类型的加密消息保留原始 content（文件元数据） */
+    private static readonly FILE_MSG_TYPES;
+    /**
+     * 构建文件类加密消息的 extra — 完整模板格式。
+     * 文件消息不加密 content（需要保留 fileId 等元数据），只在 extra 中携带会话信息。
+     */
+    private static buildFileEncryptExtra;
     /**
      * 出站发送 — 通过 HTTP API 发送消息到 IM 服务器。
      * POST {messageServiceBaseUrl}/messages/v1/send
@@ -794,6 +801,13 @@ declare class MessagePipe {
      * 加密行为取决于 encryptionMode:
      * - quantum_only:      强制加密，失败直接抛错（不降级明文）
      * - quantum_and_plain:  加密失败降级明文（保持兼容）
+     *
+     * 文件类消息 (image/file/voice/video):
+     * - content 保留原始文件元数据（fileId、fileName、size 等）
+     * - extra 使用完整模板格式，encryptMsg 为空
+     *
+     * 文本类消息 (text/markdown):
+     * - content 加密后置空，密文放入 extra.encryptMsg
      */
     sendMessage(msg: OutboundMessage): Promise<void>;
     /**

package/dist/setup-entry.cjs

@@ -19099,7 +19099,7 @@ var MessageDedup = class {
 // src/transport/message-pipe.ts
 var import_node_crypto3 = require("crypto");
 var log12 = createLogger("transport/message-pipe");
-var MessagePipe = class {
+var MessagePipe = class _MessagePipe {
   wsClient;
   dedup;
   crypto;
@@ -19141,6 +19141,31 @@ var MessagePipe = class {
   async injectRawFrame(rawData) {
     return this.handleInbound(rawData);
   }
+  /** 文件类消息类型集合 — 这些类型的加密消息保留原始 content（文件元数据） */
+  static FILE_MSG_TYPES = /* @__PURE__ */ new Set(["image", "file", "voice", "video"]);
+  /**
+   * 构建文件类加密消息的 extra — 完整模板格式。
+   * 文件消息不加密 content（需要保留 fileId 等元数据），只在 extra 中携带会话信息。
+   */
+  static buildFileEncryptExtra(iv, keyId) {
+    return JSON.stringify({
+      containSensitive: false,
+      cryptoIv: iv,
+      decryptText: "",
+      decrypted: false,
+      destroyType: 0,
+      encryptMsg: "",
+      expireAt: null,
+      level: 0,
+      newDestroy: 1,
+      phone: "",
+      receiveShowTip: false,
+      receiveTip: "",
+      sessionId: keyId,
+      showTip: false,
+      tip: ""
+    });
+  }
   /**
    * 出站发送 — 通过 HTTP API 发送消息到 IM 服务器。
    * POST {messageServiceBaseUrl}/messages/v1/send
@@ -19149,30 +19174,48 @@ var MessagePipe = class {
    * 加密行为取决于 encryptionMode:
    * - quantum_only:      强制加密，失败直接抛错（不降级明文）
    * - quantum_and_plain:  加密失败降级明文（保持兼容）
+   *
+   * 文件类消息 (image/file/voice/video):
+   * - content 保留原始文件元数据（fileId、fileName、size 等）
+   * - extra 使用完整模板格式，encryptMsg 为空
+   *
+   * 文本类消息 (text/markdown):
+   * - content 加密后置空，密文放入 extra.encryptMsg
    */
   async sendMessage(msg) {
     let content = msg.content;
     let extra = "";
+    const isFileMessage = _MessagePipe.FILE_MSG_TYPES.has(msg.msgType);
     if (!msg.skipEncrypt && this.quantumAccount) {
       if (this.encryptionMode === "quantum_only") {
         const { ciphertext, keyId, iv } = await this.crypto.encrypt(msg.content);
-        extra = JSON.stringify({
-          cryptoIv: iv,
-          encryptMsg: ciphertext,
-          sessionId: keyId
-        });
-        content = JSON.stringify({ content: "" });
-        log12.debug("\u{1F512} \u51FA\u7AD9\u6D88\u606F\u5DF2\u52A0\u5BC6 (quantum_only)", { sessionId: keyId });
-      } else {
-        try {
-          const { ciphertext, keyId, iv } = await this.crypto.encrypt(msg.content);
+        if (isFileMessage) {
+          extra = _MessagePipe.buildFileEncryptExtra(iv, keyId);
+          log12.debug("\u{1F512} \u51FA\u7AD9\u6587\u4EF6\u6D88\u606F\u5DF2\u6807\u8BB0\u52A0\u5BC6 (quantum_only)", { sessionId: keyId, msgType: msg.msgType });
+        } else {
           extra = JSON.stringify({
             cryptoIv: iv,
             encryptMsg: ciphertext,
             sessionId: keyId
           });
           content = JSON.stringify({ content: "" });
-          log12.debug("\u{1F512} \u51FA\u7AD9\u6D88\u606F\u5DF2\u52A0\u5BC6 (quantum_and_plain)", { sessionId: keyId });
+          log12.debug("\u{1F512} \u51FA\u7AD9\u6D88\u606F\u5DF2\u52A0\u5BC6 (quantum_only)", { sessionId: keyId });
+        }
+      } else {
+        try {
+          const { ciphertext, keyId, iv } = await this.crypto.encrypt(msg.content);
+          if (isFileMessage) {
+            extra = _MessagePipe.buildFileEncryptExtra(iv, keyId);
+            log12.debug("\u{1F512} \u51FA\u7AD9\u6587\u4EF6\u6D88\u606F\u5DF2\u6807\u8BB0\u52A0\u5BC6 (quantum_and_plain)", { sessionId: keyId, msgType: msg.msgType });
+          } else {
+            extra = JSON.stringify({
+              cryptoIv: iv,
+              encryptMsg: ciphertext,
+              sessionId: keyId
+            });
+            content = JSON.stringify({ content: "" });
+            log12.debug("\u{1F512} \u51FA\u7AD9\u6D88\u606F\u5DF2\u52A0\u5BC6 (quantum_and_plain)", { sessionId: keyId });
+          }
         } catch (err) {
           log12.error("\u274C \u51FA\u7AD9\u6D88\u606F\u52A0\u5BC6\u5931\u8D25\uFF0C\u5C06\u53D1\u9001\u660E\u6587", {
             error: err.message
@@ -19194,13 +19237,11 @@ var MessagePipe = class {
     }
     const result = await this.callMessageApi("/messages/v1/send", body, "outbound");
     if (!result) return;
-    log12.info("outbound:sent \u2192 IM \u670D\u52A1\u5668", {
+    log12.info("\u{1F4E4} outbound:sent \u2192 IM \u670D\u52A1\u5668", {
       chatId: msg.chatId,
-      receiveId: msg.senderId,
-      msgType: msg.msgType,
       encrypted: Boolean(extra),
-      contentPreview: extra ? "[encrypted]" : msg.content.slice(0, 200),
-      requestId: result.request_id
+      requestId: result.request_id,
+      body
     });
   }
   /**
@@ -19309,8 +19350,27 @@ var MessagePipe = class {
       log12.warn("\u26A0\uFE0F CallbackData \u89E3\u6790\u5931\u8D25", { error: err.message });
       return;
     }
+    log12.info("\u{1F4E9} \u5165\u7AD9\u539F\u59CB\u6570\u636E", {
+      appId: callbackData.appId,
+      msgUid: callbackData.msgUid,
+      eventType: callbackData.eventType,
+      userId: callbackData.userId,
+      toUserId: callbackData.toUserId,
+      groupId: callbackData.groupId,
+      type: callbackData.type,
+      content: callbackData.content,
+      extra: callbackData.extra
+    });
     const extra = callbackData.extra;
-    const isEncrypted = typeof extra === "string" && extra.length > 0;
+    let isEncrypted = false;
+    if (typeof extra === "string" && extra.length > 0) {
+      try {
+        const parsed = JSON.parse(extra);
+        isEncrypted = Boolean(parsed.encryptMsg);
+      } catch {
+        log12.debug("\u2139\uFE0F extra \u4E0D\u662F\u6709\u6548 JSON\uFF0C\u89C6\u4E3A\u660E\u6587", { msgUid: callbackData.msgUid });
+      }
+    }
     let contentObj;
     if (this.encryptionMode === "quantum_only") {
       if (!this.quantumAccount) {
@@ -19501,7 +19561,7 @@ var ConnectionManager = class {
     this.client.on("pong", () => {
       this.pongReceived = true;
       this.clearPongTimeout();
-      log13.info("heartbeat: pong received");
+      log13.debug("heartbeat: pong received");
     });
   }
   /** 启动心跳保活 — 定时发送 WebSocket Ping 帧 */
@@ -19522,7 +19582,7 @@ var ConnectionManager = class {
       }
       this.pongReceived = false;
       this.client.ping();
-      log13.info("heartbeat: ping sent");
+      log13.debug("heartbeat: ping sent");
       this.clearPongTimeout();
       this.pongTimeoutTimer = setTimeout(() => {
         if (!this.pongReceived && this.running) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liangzimixin",
-  "version": "0.3.44",
+  "version": "0.3.46",
   "description": "Quantum-encrypted IM channel plugin for OpenClaw",
   "type": "module",
   "main": "dist/index.cjs",