@openclaw-channel/socket-chat 1.0.4 → 1.0.6

package/README.md

@@ -30,6 +30,15 @@ openclaw plugins install /path/to/socket-chat
 
 ---
 
+## 更新
+
+```bash
+# 从 npm 更新
+openclaw plugins  update socket-chat
+```
+
+---
+
 ## 通过 CLI 添加账号
 
 apiKey 从微秘书平台[个人中心](https://wechat.aibotk.com/user/info)获取

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw-channel/socket-chat",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "OpenClaw Socket Chat channel plugin — MQTT-based IM bridge",
   "type": "module",
   "publishConfig": {

package/src/channel.ts

@@ -242,7 +242,7 @@ export const socketChatPlugin: ChannelPlugin<ResolvedSocketChatAccount> = {
     normalizeTarget: normalizeSocketChatTarget,
     targetResolver: {
       looksLikeId: looksLikeSocketChatTargetId,
-      hint: "<contactId|group:groupId|group:groupId@wxid_mention1,wxid_mention2>",
+      hint: "<contactId|group:groupId|group:groupId|userId1,userId2>",
     },
   },
 
@@ -383,10 +383,10 @@ export const socketChatPlugin: ChannelPlugin<ResolvedSocketChatAccount> = {
   // -------------------------------------------------------------------------
   agentPrompt: {
     messageToolHints: () => [
-      "- socket-chat: to send to a group, use target format `group:<groupId>`. " +
-        "To @mention users in a group: `group:<groupId>@<userId1>,<userId2>`.",
+      "- socket-chat: to send to a group, use target format `group:<groupId>` (groupId may contain @, e.g. `group:17581395450@chatroom`). " +
+        "To @mention users in a group: `group:<groupId>|<userId1>,<userId2>`.",
       "- socket-chat: to send an image, provide a public HTTP URL as the media parameter.",
-      "- socket-chat: direct messages use the sender's contactId (e.g. `wxid_xxx`) as the target.",
+      "- socket-chat: direct messages use the sender's contactId as the target.",
     ],
   },
 };

package/src/outbound.test.ts

@@ -18,20 +18,20 @@ describe("parseSocketChatTarget", () => {
   });
 
   it("parses a group target without mentions", () => {
-    const result = parseSocketChatTarget("group:roomid_xxx");
-    expect(result).toEqual({ isGroup: true, groupId: "roomid_xxx" });
+    const result = parseSocketChatTarget("group:17581395450@chatroom");
+    expect(result).toEqual({ isGroup: true, groupId: "17581395450@chatroom" });
   });
 
   it("parses a group target with single mention", () => {
-    const result = parseSocketChatTarget("group:roomid_xxx@wxid_a");
-    expect(result).toEqual({ isGroup: true, groupId: "roomid_xxx", mentionIds: ["wxid_a"] });
+    const result = parseSocketChatTarget("group:17581395450@chatroom|wxid_a");
+    expect(result).toEqual({ isGroup: true, groupId: "17581395450@chatroom", mentionIds: ["wxid_a"] });
   });
 
   it("parses a group target with multiple mentions", () => {
-    const result = parseSocketChatTarget("group:roomid_xxx@wxid_a,wxid_b,wxid_c");
+    const result = parseSocketChatTarget("group:17581395450@chatroom|wxid_a,wxid_b,wxid_c");
     expect(result).toEqual({
       isGroup: true,
-      groupId: "roomid_xxx",
+      groupId: "17581395450@chatroom",
       mentionIds: ["wxid_a", "wxid_b", "wxid_c"],
     });
   });
@@ -42,7 +42,7 @@ describe("parseSocketChatTarget", () => {
   });
 
   it("filters empty mention ids", () => {
-    const result = parseSocketChatTarget("group:roomid@wxid_a,,wxid_b");
+    const result = parseSocketChatTarget("group:17581395450@chatroom|wxid_a,,wxid_b");
     expect(result.isGroup).toBe(true);
     if (result.isGroup) {
       expect(result.mentionIds).toEqual(["wxid_a", "wxid_b"]);
@@ -57,7 +57,8 @@ describe("parseSocketChatTarget", () => {
 describe("normalizeSocketChatTarget", () => {
   it("returns the target unchanged for native IDs", () => {
     expect(normalizeSocketChatTarget("wxid_abc")).toBe("wxid_abc");
-    expect(normalizeSocketChatTarget("group:roomid_xxx")).toBe("group:roomid_xxx");
+    expect(normalizeSocketChatTarget("group:17581395450@chatroom")).toBe("group:17581395450@chatroom");
+    expect(normalizeSocketChatTarget("group:17581395450@chatroom|wxid_a")).toBe("group:17581395450@chatroom|wxid_a");
   });
 
   it("strips socket-chat: prefix (case-insensitive)", () => {
@@ -81,25 +82,23 @@ describe("normalizeSocketChatTarget", () => {
 // ---------------------------------------------------------------------------
 
 describe("looksLikeSocketChatTargetId", () => {
-  it("recognizes wxid_ prefix", () => {
+  it("accepts any non-empty id", () => {
     expect(looksLikeSocketChatTargetId("wxid_abc123")).toBe(true);
-  });
-
-  it("recognizes roomid_ prefix", () => {
     expect(looksLikeSocketChatTargetId("roomid_xyz")).toBe(true);
-  });
-
-  it("recognizes group: prefix", () => {
     expect(looksLikeSocketChatTargetId("group:roomid_xxx")).toBe(true);
+    expect(looksLikeSocketChatTargetId("alice")).toBe(true);
+    expect(looksLikeSocketChatTargetId("user@example.com")).toBe(true);
   });
 
-  it("rejects arbitrary strings", () => {
-    expect(looksLikeSocketChatTargetId("alice")).toBe(false);
-    expect(looksLikeSocketChatTargetId("user@example.com")).toBe(false);
+  it("rejects empty string", () => {
     expect(looksLikeSocketChatTargetId("")).toBe(false);
   });
 
-  it("trims leading whitespace before checking", () => {
+  it("rejects whitespace-only string", () => {
+    expect(looksLikeSocketChatTargetId("   ")).toBe(false);
+  });
+
+  it("trims before checking", () => {
     expect(looksLikeSocketChatTargetId("  wxid_abc")).toBe(true);
   });
 });
@@ -118,24 +117,24 @@ describe("buildTextPayload", () => {
   });
 
   it("builds a group text payload", () => {
-    const payload = buildTextPayload("group:roomid_xxx", "hi group");
+    const payload = buildTextPayload("group:17581395450@chatroom", "hi group");
     expect(payload.isGroup).toBe(true);
-    expect(payload.groupId).toBe("roomid_xxx");
+    expect(payload.groupId).toBe("17581395450@chatroom");
     expect(payload.messages).toEqual([{ type: 1, content: "hi group" }]);
   });
 
   it("extracts mentions from group target string", () => {
-    const payload = buildTextPayload("group:roomid_xxx@wxid_a,wxid_b", "hi");
+    const payload = buildTextPayload("group:17581395450@chatroom|wxid_a,wxid_b", "hi");
     expect(payload.mentionIds).toEqual(["wxid_a", "wxid_b"]);
   });
 
   it("allows explicit override of mentionIds", () => {
-    const payload = buildTextPayload("group:roomid_xxx", "hi", { mentionIds: ["wxid_override"] });
+    const payload = buildTextPayload("group:17581395450@chatroom", "hi", { mentionIds: ["wxid_override"] });
     expect(payload.mentionIds).toEqual(["wxid_override"]);
   });
 
   it("sets mentionIds to undefined when empty", () => {
-    const payload = buildTextPayload("group:roomid_xxx", "hi", { mentionIds: [] });
+    const payload = buildTextPayload("group:17581395450@chatroom", "hi", { mentionIds: [] });
     expect(payload.mentionIds).toBeUndefined();
   });
 });
@@ -169,8 +168,8 @@ describe("buildMediaPayload", () => {
   });
 
   it("builds group media payload", () => {
-    const payload = buildMediaPayload("group:roomid_xxx", "https://img.example.com/photo.jpg");
+    const payload = buildMediaPayload("group:17581395450@chatroom", "https://img.example.com/photo.jpg");
     expect(payload.isGroup).toBe(true);
-    expect(payload.groupId).toBe("roomid_xxx");
+    expect(payload.groupId).toBe("17581395450@chatroom");
   });
 });

package/src/outbound.ts

@@ -9,19 +9,19 @@ import type { SocketChatMqttConfig, SocketChatOutboundPayload } from "./types.js
  *
  * 格式约定：
  *   - 私聊：contactId，例如 "wxid_abc123"
- *   - 群聊：以 "group:" 前缀，例如 "group:roomid_xxx"
- *   - 群聊带 @：以 "group:roomid_xxx@wxid_a,wxid_b"（@ 后面逗号分隔 mentionIds）
+ *   - 群聊：以 "group:" 前缀，例如 "group:17581395450@chatroom"
+ *   - 群聊带 mention：用 "|" 分隔 groupId 与 mentionIds，例如 "group:17581395450@chatroom|wxid_a,wxid_b"
  */
 export function parseSocketChatTarget(to: string): Omit<SocketChatOutboundPayload, "messages"> {
   const trimmed = to.trim();
 
   if (trimmed.startsWith("group:")) {
     const withoutPrefix = trimmed.slice("group:".length);
-    const atIdx = withoutPrefix.indexOf("@");
-    if (atIdx !== -1) {
-      const groupId = withoutPrefix.slice(0, atIdx);
+    const pipeIdx = withoutPrefix.indexOf("|");
+    if (pipeIdx !== -1) {
+      const groupId = withoutPrefix.slice(0, pipeIdx);
       const mentionIds = withoutPrefix
-        .slice(atIdx + 1)
+        .slice(pipeIdx + 1)
         .split(",")
         .map((s) => s.trim())
         .filter(Boolean);
@@ -46,10 +46,10 @@ export function normalizeSocketChatTarget(raw: string): string | undefined {
 
 /**
  * 判断字符串是否像一个 socket-chat 原生 ID
- * wxid_xxx / roomid_xxx 格式，或带 group: 前缀
+ * socket-chat 的 chatId 格式不固定，任何非空字符串均视为原生 ID
  */
 export function looksLikeSocketChatTargetId(s: string): boolean {
-  return /^(wxid_|roomid_|group:)/.test(s.trim());
+  return s.trim().length > 0;
 }
 
 /**