liangzimixin 0.3.33 → 0.3.36

package/dist/index.cjs

@@ -18067,6 +18067,23 @@ function inferFileNameFromUrl(url2) {
 
 // src/channel/outbound.ts
 var log4 = createLogger("channel/outbound");
+var messageEncryptionStatus = /* @__PURE__ */ new Map();
+var activeChatMessage = /* @__PURE__ */ new Map();
+function setInboundEncryptionStatus(chatId, messageId, isEncrypted) {
+  messageEncryptionStatus.set(messageId, isEncrypted);
+  activeChatMessage.set(chatId, messageId);
+}
+function clearInboundEncryptionStatus(chatId, messageId) {
+  messageEncryptionStatus.delete(messageId);
+  if (activeChatMessage.get(chatId) === messageId) {
+    activeChatMessage.delete(chatId);
+  }
+}
+function getOutboundEncryptionStatus(chatId) {
+  const messageId = activeChatMessage.get(chatId);
+  if (!messageId) return void 0;
+  return messageEncryptionStatus.get(messageId);
+}
 var messagePipeGetter = null;
 function setMessagePipeGetter(getter) {
   messagePipeGetter = getter;
@@ -18099,11 +18116,13 @@ var quantumImOutbound = {
     }
     const messagePipe = messagePipeGetter();
     const chatId = parseChannelAddress(to);
+    const isEncrypted = getOutboundEncryptionStatus(chatId);
     await messagePipe.sendMessage({
       chatId,
       senderId: chatId,
       msgType: "markdown",
-      content: JSON.stringify({ content: text })
+      content: JSON.stringify({ content: text }),
+      skipEncrypt: isEncrypted === false
     });
     return { channel: CHANNEL_ID, messageId: "", chatId };
   },
@@ -18118,6 +18137,7 @@ var quantumImOutbound = {
     const sdkRuntime = sdkRuntimeGetter();
     const chatId = parseChannelAddress(to);
     const fileCfg = pluginConfigGetter().file;
+    const isEncrypted = getOutboundEncryptionStatus(chatId);
     const result = await resolveAndUploadMedia({
       mediaUrl: mediaUrl ?? void 0,
       tokenManager: tokenManagerGetter(),
@@ -18129,7 +18149,8 @@ var quantumImOutbound = {
       chatId,
       maxFileSizeMb: fileCfg.maxFileSizeMb,
       chunkSizeMb: fileCfg.chunkSizeMb,
-      timeoutMs: fileCfg.fetchTimeoutMs
+      timeoutMs: fileCfg.fetchTimeoutMs,
+      skipEncrypt: isEncrypted === false
     });
     if (result.warning) {
       log4.warn("sendMedia:degraded", { chatId, warning: result.warning });
@@ -18533,6 +18554,7 @@ var InboundPipeline = class {
         });
         return;
       }
+      setInboundEncryptionStatus(msg.chatId, msg.messageId, msg.isEncrypted ?? false);
       if (detectAbort(context.text)) {
         log12.info("\u26D4 \u68C0\u6D4B\u5230\u4E2D\u6B62\u6307\u4EE4", {
           messageId: msg.messageId,
@@ -18600,6 +18622,7 @@ var InboundPipeline = class {
         \u56DE\u590D\u6570: counts?.final ?? 0,
         \u8017\u65F6ms: durationMs
       });
+      clearInboundEncryptionStatus(msg.chatId, msg.messageId);
     } catch (err) {
       const durationMs = Date.now() - startMs;
       log12.error("\u274C \u6D88\u606F\u5904\u7406\u5931\u8D25", {
@@ -18610,6 +18633,7 @@ var InboundPipeline = class {
         stack: err.stack,
         durationMs
       });
+      clearInboundEncryptionStatus(msg.chatId, msg.messageId);
     }
   }
 };
@@ -18905,7 +18929,11 @@ var quantumImPlugin = {
     })
   },
   messaging: {
-    normalizeTarget: (raw) => raw ?? void 0
+    normalizeTarget: (raw) => {
+      if (!raw) return void 0;
+      const normalized = parseChannelAddress(raw).trim();
+      return normalized || void 0;
+    }
   },
   outbound: quantumImOutbound,
   setup: {
@@ -19841,6 +19869,9 @@ var WSClient = class extends import_node_events.EventEmitter {
       ws.on("message", (data) => {
         this.emit("message", data);
       });
+      ws.on("pong", () => {
+        this.emit("pong");
+      });
       ws.on("close", (code, reason) => {
         log19.info("ws:closed", { code, reason: reason.toString() });
         this.emit("close", code, reason.toString());
@@ -19863,6 +19894,12 @@ var WSClient = class extends import_node_events.EventEmitter {
     }
     this.ws.send(data);
   }
+  /** 发送 WebSocket 协议级 Ping 帧 */
+  ping() {
+    if (this.ws && this.ws.readyState === wrapper_default.OPEN) {
+      this.ws.ping();
+    }
+  }
   /** 关闭连接 */
   close(code, reason) {
     if (this.ws) {
@@ -20219,6 +20256,8 @@ var ConnectionManager = class {
   appId = "";
   /** 是否正在重连中 (防止并发重连) */
   reconnecting = false;
+  /** 是否收到了最近一次 pong 响应 */
+  pongReceived = true;
   constructor(client, options) {
     this.client = client;
     this.options = {
@@ -20252,6 +20291,15 @@ var ConnectionManager = class {
         ...this.appId ? { "X-App-ID": this.appId } : {}
       }
     });
+    this.registerEvents();
+    this.startHeartbeat();
+    log22.info("ConnectionManager started \u2713", { url: url2 });
+  }
+  /** 注册 close / error / pong 事件 */
+  registerEvents() {
+    this.client.removeAllListeners("close");
+    this.client.removeAllListeners("error");
+    this.client.removeAllListeners("pong");
     this.client.on("close", () => {
       if (this.running) {
         log22.warn("ws:disconnected, scheduling reconnect");
@@ -20261,17 +20309,29 @@ var ConnectionManager = class {
     this.client.on("error", (err) => {
       log22.error("ws:connection-error", { error: err.message });
     });
-    this.startHeartbeat();
-    log22.info("ConnectionManager started \u2713", { url: url2 });
+    this.client.on("pong", () => {
+      this.pongReceived = true;
+    });
   }
-  /** 启动心跳保活 — 定时检查连接状态 */
+  /** 启动心跳保活 — 定时发送 WebSocket Ping 帧 */
   startHeartbeat() {
     this.stopHeartbeat();
+    this.pongReceived = true;
     this.heartbeatTimer = setInterval(() => {
       if (this.client.readyState !== wrapper_default.OPEN) {
         log22.warn("heartbeat: connection not open, scheduling reconnect");
         this.scheduleReconnect();
+        return;
+      }
+      if (!this.pongReceived) {
+        log22.warn("heartbeat: pong timeout, connection dead");
+        this.client.close(4e3, "pong timeout");
+        this.scheduleReconnect();
+        return;
       }
+      this.pongReceived = false;
+      this.client.ping();
+      log22.debug?.("heartbeat: ping sent");
     }, this.options.heartbeatIntervalMs);
   }
   /** 停止心跳定时器 */
@@ -20313,6 +20373,7 @@ var ConnectionManager = class {
           }
         });
         this.reconnectAttempts = 0;
+        this.registerEvents();
         this.startHeartbeat();
         log22.info("ws:reconnected", { attempt: this.reconnectAttempts, url: this.url });
         return;

package/dist/index.d.cts

@@ -684,6 +684,8 @@ declare class WSClient extends EventEmitter {
     connect(options: WSClientOptions): Promise<void>;
     /** 发送数据到服务器 — 前置检查连接状态 */
     send(data: string | Buffer): void;
+    /** 发送 WebSocket 协议级 Ping 帧 */
+    ping(): void;
     /** 关闭连接 */
     close(code?: number, reason?: string): void;
     /** 当前连接状态 (0=CONNECTING, 1=OPEN, 2=CLOSING, 3=CLOSED) */
@@ -865,6 +867,8 @@ declare class ConnectionManager {
     private appId;
     /** 是否正在重连中 (防止并发重连) */
     private reconnecting;
+    /** 是否收到了最近一次 pong 响应 */
+    private pongReceived;
     constructor(client: WSClient, options?: ConnectionManagerOptions);
     /**
      * 启动连接 — 连接 WS + 开始心跳 + 注册重连逻辑
@@ -873,7 +877,9 @@ declare class ConnectionManager {
      * @param appId - 应用 ID (用于 X-App-ID 头)
      */
     start(url: string, tokenFn: () => Promise<string>, appId?: string): Promise<void>;
-    /** 启动心跳保活 — 定时检查连接状态 */
+    /** 注册 close / error / pong 事件 */
+    private registerEvents;
+    /** 启动心跳保活 — 定时发送 WebSocket Ping 帧 */
     private startHeartbeat;
     /** 停止心跳定时器 */
     private stopHeartbeat;

package/dist/setup-entry.cjs

@@ -4162,6 +4162,23 @@ function inferFileNameFromUrl(url2) {
 
 // src/channel/outbound.ts
 var log4 = createLogger("channel/outbound");
+var messageEncryptionStatus = /* @__PURE__ */ new Map();
+var activeChatMessage = /* @__PURE__ */ new Map();
+function setInboundEncryptionStatus(chatId, messageId, isEncrypted) {
+  messageEncryptionStatus.set(messageId, isEncrypted);
+  activeChatMessage.set(chatId, messageId);
+}
+function clearInboundEncryptionStatus(chatId, messageId) {
+  messageEncryptionStatus.delete(messageId);
+  if (activeChatMessage.get(chatId) === messageId) {
+    activeChatMessage.delete(chatId);
+  }
+}
+function getOutboundEncryptionStatus(chatId) {
+  const messageId = activeChatMessage.get(chatId);
+  if (!messageId) return void 0;
+  return messageEncryptionStatus.get(messageId);
+}
 var messagePipeGetter = null;
 function setMessagePipeGetter(getter) {
   messagePipeGetter = getter;
@@ -4194,11 +4211,13 @@ var quantumImOutbound = {
     }
     const messagePipe = messagePipeGetter();
     const chatId = parseChannelAddress(to);
+    const isEncrypted = getOutboundEncryptionStatus(chatId);
     await messagePipe.sendMessage({
       chatId,
       senderId: chatId,
       msgType: "markdown",
-      content: JSON.stringify({ content: text })
+      content: JSON.stringify({ content: text }),
+      skipEncrypt: isEncrypted === false
     });
     return { channel: CHANNEL_ID, messageId: "", chatId };
   },
@@ -4213,6 +4232,7 @@ var quantumImOutbound = {
     const sdkRuntime = sdkRuntimeGetter();
     const chatId = parseChannelAddress(to);
     const fileCfg = pluginConfigGetter().file;
+    const isEncrypted = getOutboundEncryptionStatus(chatId);
     const result = await resolveAndUploadMedia({
       mediaUrl: mediaUrl ?? void 0,
       tokenManager: tokenManagerGetter(),
@@ -4224,7 +4244,8 @@ var quantumImOutbound = {
       chatId,
       maxFileSizeMb: fileCfg.maxFileSizeMb,
       chunkSizeMb: fileCfg.chunkSizeMb,
-      timeoutMs: fileCfg.fetchTimeoutMs
+      timeoutMs: fileCfg.fetchTimeoutMs,
+      skipEncrypt: isEncrypted === false
     });
     if (result.warning) {
       log4.warn("sendMedia:degraded", { chatId, warning: result.warning });
@@ -18907,6 +18928,9 @@ var WSClient = class extends import_node_events.EventEmitter {
       ws.on("message", (data) => {
         this.emit("message", data);
       });
+      ws.on("pong", () => {
+        this.emit("pong");
+      });
       ws.on("close", (code, reason) => {
         log10.info("ws:closed", { code, reason: reason.toString() });
         this.emit("close", code, reason.toString());
@@ -18929,6 +18953,12 @@ var WSClient = class extends import_node_events.EventEmitter {
     }
     this.ws.send(data);
   }
+  /** 发送 WebSocket 协议级 Ping 帧 */
+  ping() {
+    if (this.ws && this.ws.readyState === wrapper_default.OPEN) {
+      this.ws.ping();
+    }
+  }
   /** 关闭连接 */
   close(code, reason) {
     if (this.ws) {
@@ -19285,6 +19315,8 @@ var ConnectionManager = class {
   appId = "";
   /** 是否正在重连中 (防止并发重连) */
   reconnecting = false;
+  /** 是否收到了最近一次 pong 响应 */
+  pongReceived = true;
   constructor(client, options) {
     this.client = client;
     this.options = {
@@ -19318,6 +19350,15 @@ var ConnectionManager = class {
         ...this.appId ? { "X-App-ID": this.appId } : {}
       }
     });
+    this.registerEvents();
+    this.startHeartbeat();
+    log13.info("ConnectionManager started \u2713", { url: url2 });
+  }
+  /** 注册 close / error / pong 事件 */
+  registerEvents() {
+    this.client.removeAllListeners("close");
+    this.client.removeAllListeners("error");
+    this.client.removeAllListeners("pong");
     this.client.on("close", () => {
       if (this.running) {
         log13.warn("ws:disconnected, scheduling reconnect");
@@ -19327,17 +19368,29 @@ var ConnectionManager = class {
     this.client.on("error", (err) => {
       log13.error("ws:connection-error", { error: err.message });
     });
-    this.startHeartbeat();
-    log13.info("ConnectionManager started \u2713", { url: url2 });
+    this.client.on("pong", () => {
+      this.pongReceived = true;
+    });
   }
-  /** 启动心跳保活 — 定时检查连接状态 */
+  /** 启动心跳保活 — 定时发送 WebSocket Ping 帧 */
   startHeartbeat() {
     this.stopHeartbeat();
+    this.pongReceived = true;
     this.heartbeatTimer = setInterval(() => {
       if (this.client.readyState !== wrapper_default.OPEN) {
         log13.warn("heartbeat: connection not open, scheduling reconnect");
         this.scheduleReconnect();
+        return;
       }
+      if (!this.pongReceived) {
+        log13.warn("heartbeat: pong timeout, connection dead");
+        this.client.close(4e3, "pong timeout");
+        this.scheduleReconnect();
+        return;
+      }
+      this.pongReceived = false;
+      this.client.ping();
+      log13.debug?.("heartbeat: ping sent");
     }, this.options.heartbeatIntervalMs);
   }
   /** 停止心跳定时器 */
@@ -19379,6 +19432,7 @@ var ConnectionManager = class {
           }
         });
         this.reconnectAttempts = 0;
+        this.registerEvents();
         this.startHeartbeat();
         log13.info("ws:reconnected", { attempt: this.reconnectAttempts, url: this.url });
         return;
@@ -20326,6 +20380,7 @@ var InboundPipeline = class {
         });
         return;
       }
+      setInboundEncryptionStatus(msg.chatId, msg.messageId, msg.isEncrypted ?? false);
       if (detectAbort(context.text)) {
         log24.info("\u26D4 \u68C0\u6D4B\u5230\u4E2D\u6B62\u6307\u4EE4", {
           messageId: msg.messageId,
@@ -20393,6 +20448,7 @@ var InboundPipeline = class {
         \u56DE\u590D\u6570: counts?.final ?? 0,
         \u8017\u65F6ms: durationMs
       });
+      clearInboundEncryptionStatus(msg.chatId, msg.messageId);
     } catch (err) {
       const durationMs = Date.now() - startMs;
       log24.error("\u274C \u6D88\u606F\u5904\u7406\u5931\u8D25", {
@@ -20403,6 +20459,7 @@ var InboundPipeline = class {
         stack: err.stack,
         durationMs
       });
+      clearInboundEncryptionStatus(msg.chatId, msg.messageId);
     }
   }
 };
@@ -20637,7 +20694,11 @@ var quantumImPlugin = {
     })
   },
   messaging: {
-    normalizeTarget: (raw) => raw ?? void 0
+    normalizeTarget: (raw) => {
+      if (!raw) return void 0;
+      const normalized = parseChannelAddress(raw).trim();
+      return normalized || void 0;
+    }
   },
   outbound: quantumImOutbound,
   setup: {

package/package.json

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