openclaw-xiaoyou 1.0.0 → 1.0.1

package/README.md

@@ -85,32 +85,6 @@ openclaw channels add --channel xiaoyou
 | `heartbeatIntervalMs` | number | 否 | 30000 | 心跳间隔（ms） |
 | `heartbeatTimeoutMs` | number | 否 | 10000 | 心跳超时（ms） |
 
-### 多账号
-
-同时连接多个企业服务：
-
-```json
-{
-  "channels": {
-    "xiaoyou": {
-      "enabled": true,
-      "wsUrl": "wss://default.corp.com/ws",
-      "authToken": "default-token",
-      "accounts": {
-        "sales": {
-          "wsUrl": "wss://sales.corp.com/ws",
-          "authToken": "sales-token"
-        },
-        "support": {
-          "wsUrl": "wss://support.corp.com/ws",
-          "authToken": "support-token"
-        }
-      }
-    }
-  }
-}
-```
-
 ## CLI 命令
 
 ```bash

package/docs/communication-flow.md

@@ -410,49 +410,9 @@ xiaoyou 插件采用 **Bridge 模式**：由插件主动向企业服务发起 We
 └─────────────────────────────────────────────────────────────────┘
 ```
 
-## 7. 多账号场景
-
-xiaoyou 支持同时连接多个企业服务（如销售系统 + 客服系统）：
-
-```
-                    ┌──────────────────────┐
-                    │  OpenClaw Gateway    │
-                    │                      │
-                    │  ┌────────────────┐  │
-                    │  │ xiaoyou 插件   │  │
-                    │  │                │  │
-  ┌──────────┐     │  │  ┌──────────┐  │  │
-  │ 销售 IM  │◀════╪══╪══│ client   │  │  │
-  │ 服务     │     │  │  │ "sales"  │  │  │
-  └──────────┘     │  │  └──────────┘  │  │
-                    │  │                │  │
-  ┌──────────┐     │  │  ┌──────────┐  │  │
-  │ 客服 IM  │◀════╪══╪══│ client   │  │  │
-  │ 服务     │     │  │  │"support" │  │  │
-  └──────────┘     │  │  └──────────┘  │  │
-                    │  │                │  │
-                    │  └────────────────┘  │
-                    └──────────────────────┘
-
-配置：
-{
-  "channels": {
-    "xiaoyou": {
-      "accounts": {
-        "sales":   { "wsUrl": "wss://sales.corp.com/ws",   "authToken": "..." },
-        "support": { "wsUrl": "wss://support.corp.com/ws", "authToken": "..." }
-      }
-    }
-  }
-}
-```
-
-每个 account 独立维护一个 EnterpriseClient 实例，独立的连接、认证、心跳和重连。
-
-
-## 8. 异常处理与容错
+## 7. 异常处理与容错
 
-### 8.1 异常场景处理矩阵
+### 7.1 异常场景处理矩阵
 
 ```
 ┌──────────────────────┬─────────────────────────┬──────────────────────────┐
@@ -473,7 +433,7 @@ xiaoyou 支持同时连接多个企业服务（如销售系统 + 客服系统）
 └──────────────────────┴─────────────────────────┴──────────────────────────┘
 ```
 
-### 8.2 重连时序
+### 7.2 重连时序
 
 ```
   时间轴 ──────────────────────────────────────────────────────▶
@@ -490,7 +450,7 @@ xiaoyou 支持同时连接多个企业服务（如销售系统 + 客服系统）
                                             ═══════════════▶
 ```
 
-## 9. 企业服务端实现要点
+## 8. 企业服务端实现要点
 
 企业侧需要实现一个 WebSocket Server，处理以下职责：
 
@@ -523,7 +483,7 @@ xiaoyou 支持同时连接多个企业服务（如销售系统 + 客服系统）
 └─────────────────────────────────────────────────────────┘
 ```
 
-### 9.2 企业服务端伪代码示例
+### 8.2 企业服务端伪代码示例
 
 ```python
 # Python 示例 (FastAPI + websockets)
@@ -586,9 +546,9 @@ async def on_user_message(ws, user_msg):
     })
 ```
 
-## 10. 部署拓扑
+## 9. 部署拓扑
 
-### 10.1 最简部署（单机）
+### 9.1 最简部署（单机）
 
 ```
 ┌─────────────────────────────────────────────┐
@@ -604,7 +564,7 @@ async def on_user_message(ws, user_msg):
 └─────────────────────────────────────────────┘
 ```
 
-### 10.2 生产部署（分离）
+### 9.2 生产部署（分离）
 
 ```
 ┌──────────────────┐         ┌──────────────────┐
@@ -622,7 +582,7 @@ async def on_user_message(ws, user_msg):
 - xiaoyou 的重连机制可以应对单节点故障
 ```
 
-## 11. 快速对照表
+## 10. 快速对照表
 
 | 你想知道... | 看这里 |
 |------------|--------|
@@ -633,7 +593,6 @@ async def on_user_message(ws, user_msg):
 | Agent 回复怎么送回用户？ | §4.1 步骤 ⑨⑩⑪ |
 | WebSocket 帧格式是什么？ | §5 协议帧参考 |
 | 插件内部怎么组织的？ | §6 插件内部模块交互 |
-| 怎么连多个企业服务？ | §7 多账号场景 |
-| 出了问题怎么处理？ | §8 异常处理与容错 |
-| 企业侧要实现什么？ | §9 企业服务端实现要点 |
-| 怎么部署？ | §10 部署拓扑 |
+| 出了问题怎么处理？ | §7 异常处理与容错 |
+| 企业侧要实现什么？ | §8 企业服务端实现要点 |
+| 怎么部署？ | §9 部署拓扑 |

package/index.ts

@@ -35,7 +35,7 @@ const plugin = {
           .description("Show enterprise WebSocket connection status")
           .action(async () => {
             const status = await xiayouPlugin.status.describe({
-              account: { accountId: "default" },
+              account: {},
             });
             console.log(JSON.stringify(status, null, 2));
           });
@@ -51,7 +51,6 @@ const plugin = {
               return;
             }
             const result = await xiayouPlugin.outbound.send({
-              account: { accountId: "default" },
               to: opts.to,
               payload: { kind: "text", text: opts.text },
             });

package/openclaw.plugin.json

@@ -55,18 +55,6 @@
           "type": "number",
           "default": 10000,
           "description": "心跳超时时间（毫秒），超时则断开重连"
-        },
-        "accounts": {
-          "type": "object",
-          "description": "多账号配置，key 为 accountId，值为上述字段的覆盖",
-          "additionalProperties": {
-            "type": "object",
-            "properties": {
-              "wsUrl": { "type": "string" },
-              "authToken": { "type": "string", "sensitive": true },
-              "allowFrom": { "type": "array", "items": { "type": "string" } }
-            }
-          }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-xiaoyou",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "description": "Xiaoyou channel plugin for OpenClaw — connects enterprise services via persistent outbound WebSocket",
   "openclaw": {

package/src/channel.test.ts

@@ -15,8 +15,8 @@ const fullCfg = {
 };
 
 describe("config adapter", () => {
-  it("resolves account with all fields", () => {
-    const acct = xiayouPlugin.config.resolveAccount(fullCfg, undefined);
+  it("resolves config with all fields", () => {
+    const acct = xiayouPlugin.config.resolveAccount(fullCfg);
     expect(acct.wsUrl).toBe("wss://im.corp.example.com/ws");
     expect(acct.authToken).toBe("test-token-123");
     expect(acct.allowFrom).toEqual(["user-1", "user-2"]);
@@ -27,7 +27,7 @@ describe("config adapter", () => {
 
   it("applies defaults for optional fields", () => {
     const cfg = { channels: { xiaoyou: { wsUrl: "ws://localhost:9090", authToken: "t" } } };
-    const acct = xiayouPlugin.config.resolveAccount(cfg, undefined);
+    const acct = xiayouPlugin.config.resolveAccount(cfg);
     expect(acct.reconnectIntervalMs).toBe(3000);
     expect(acct.maxReconnectAttempts).toBe(0);
     expect(acct.heartbeatIntervalMs).toBe(30000);
@@ -35,106 +35,27 @@ describe("config adapter", () => {
   });
 
   it("throws when wsUrl missing", () => {
-    expect(() => xiayouPlugin.config.resolveAccount({ channels: { xiaoyou: {} } }, undefined))
+    expect(() => xiayouPlugin.config.resolveAccount({ channels: { xiaoyou: {} } }))
       .toThrow("wsUrl is required");
   });
 
   it("throws when section missing", () => {
-    expect(() => xiayouPlugin.config.resolveAccount({ channels: {} }, undefined))
+    expect(() => xiayouPlugin.config.resolveAccount({ channels: {} }))
       .toThrow("config section not found");
   });
-
-  it("resolves multi-account override", () => {
-    const cfg = {
-      channels: {
-        xiaoyou: {
-          wsUrl: "ws://default/ws",
-          authToken: "default-token",
-          accounts: {
-            sales: { wsUrl: "ws://sales/ws", authToken: "sales-token" },
-          },
-        },
-      },
-    };
-    const acct = xiayouPlugin.config.resolveAccount(cfg, "sales");
-    expect(acct.wsUrl).toBe("ws://sales/ws");
-    expect(acct.authToken).toBe("sales-token");
-  });
-
-  it("falls back to default when accountId not in accounts", () => {
-    const cfg = {
-      channels: {
-        xiaoyou: {
-          wsUrl: "ws://default/ws",
-          authToken: "default-token",
-          accounts: { sales: { wsUrl: "ws://sales/ws" } },
-        },
-      },
-    };
-    const acct = xiayouPlugin.config.resolveAccount(cfg, "unknown");
-    expect(acct.wsUrl).toBe("ws://default/ws");
-  });
 });
 
 describe("inspectAccount", () => {
   it("reports configured", () => {
-    const r = xiayouPlugin.config.inspectAccount(fullCfg, undefined);
+    const r = xiayouPlugin.config.inspectAccount(fullCfg);
     expect(r.enabled).toBe(true);
     expect(r.configured).toBe(true);
     expect(r.tokenStatus).toBe("available");
   });
 
   it("reports not configured", () => {
-    const r = xiayouPlugin.config.inspectAccount({ channels: {} }, undefined);
+    const r = xiayouPlugin.config.inspectAccount({ channels: {} });
     expect(r.enabled).toBe(false);
     expect(r.configured).toBe(false);
   });
 });
-
-describe("listAccounts", () => {
-  it("returns default when no accounts section", () => {
-    expect(xiayouPlugin.config.listAccounts(fullCfg)).toEqual(["default"]);
-  });
-
-  it("returns account keys", () => {
-    const cfg = {
-      channels: {
-        xiaoyou: {
-          wsUrl: "ws://x",
-          accounts: { a: {}, b: {} },
-        },
-      },
-    };
-    expect(xiayouPlugin.config.listAccounts(cfg)).toEqual(["a", "b"]);
-  });
-
-  it("returns empty when not configured", () => {
-    expect(xiayouPlugin.config.listAccounts({ channels: {} })).toEqual([]);
-  });
-});
-
-describe("capabilities", () => {
-  it("declares correct feature set", () => {
-    const c = xiayouPlugin.capabilities;
-    expect(c.media).toBe(true);
-    expect(c.reply).toBe(true);
-    expect(c.edit).toBe(false);
-    expect(c.polls).toBe(false);
-    expect(c.reactions).toBe(false);
-  });
-});
-
-describe("status adapter", () => {
-  it("reports issues when not connected", async () => {
-    const s = await xiayouPlugin.status.describe({
-      account: { accountId: "default", wsUrl: "ws://x", authToken: "t" },
-    });
-    expect(s.summary).toBe("error");
-    expect(s.issues.some((i: any) => i.message.includes("not connected"))).toBe(true);
-  });
-
-  it("reports wsUrl missing", async () => {
-    const s = await xiayouPlugin.status.describe({ account: { accountId: "default" } });
-    expect(s.issues.some((i: any) => i.message.includes("wsUrl"))).toBe(true);
-  });
-});

package/src/channel.ts

@@ -12,8 +12,7 @@ import { createEnterpriseClient, type EnterpriseClient } from "./enterprise-clie
 
 // ─── 运行时状态 ──────────────────────────────────────
 
-/** 每个 account 一个 EnterpriseClient */
-const clients = new Map<string, EnterpriseClient>();
+let _client: EnterpriseClient | null = null;
 
 /** OpenClaw runtime API 引用，由 index.ts register() 注入 */
 let _runtime: any = null;
@@ -22,31 +21,24 @@ export function getRuntime() { return _runtime; }
 
 // ─── Config Adapter ──────────────────────────────────
 
-function resolveAccount(cfg: any, accountId?: string | null): ResolvedAccount {
+function resolveAccount(cfg: any): ResolvedAccount {
   const section = cfg.channels?.["xiaoyou"];
   if (!section) throw new Error("xiaoyou: channel config section not found");
-
-  // 多账号支持：accounts.<id> 覆盖顶层默认值
-  const acct = accountId && section.accounts?.[accountId]
-    ? { ...section, ...section.accounts[accountId] }
-    : section;
-
-  if (!acct.wsUrl) throw new Error("xiaoyou: wsUrl is required");
+  if (!section.wsUrl) throw new Error("xiaoyou: wsUrl is required");
 
   return {
-    accountId: accountId ?? acct.defaultAccount ?? null,
-    wsUrl: acct.wsUrl,
-    authToken: acct.authToken ?? "",
-    allowFrom: acct.allowFrom ?? [],
-    dmPolicy: acct.dmSecurity,
-    reconnectIntervalMs: acct.reconnectIntervalMs ?? 3000,
-    maxReconnectAttempts: acct.maxReconnectAttempts ?? 0,
-    heartbeatIntervalMs: acct.heartbeatIntervalMs ?? 30000,
-    heartbeatTimeoutMs: acct.heartbeatTimeoutMs ?? 10000,
+    wsUrl: section.wsUrl,
+    authToken: section.authToken ?? "",
+    allowFrom: section.allowFrom ?? [],
+    dmPolicy: section.dmSecurity,
+    reconnectIntervalMs: section.reconnectIntervalMs ?? 3000,
+    maxReconnectAttempts: section.maxReconnectAttempts ?? 0,
+    heartbeatIntervalMs: section.heartbeatIntervalMs ?? 30000,
+    heartbeatTimeoutMs: section.heartbeatTimeoutMs ?? 10000,
   };
 }
 
-function inspectAccount(cfg: any, _accountId?: string | null) {
+function inspectAccount(cfg: any) {
   const section = cfg.channels?.["xiaoyou"];
   return {
     enabled: Boolean(section?.wsUrl),
@@ -55,13 +47,6 @@ function inspectAccount(cfg: any, _accountId?: string | null) {
   };
 }
 
-function listAccounts(cfg: any): string[] {
-  const section = cfg.channels?.["xiaoyou"];
-  if (!section?.wsUrl) return [];
-  if (section.accounts) return Object.keys(section.accounts);
-  return ["default"];
-}
-
 // ─── Channel Plugin ──────────────────────────────────
 
 export const xiayouPlugin = {
@@ -94,7 +79,6 @@ export const xiayouPlugin = {
   config: {
     resolveAccount,
     inspectAccount,
-    listAccounts,
   },
 
   // ── DM 安全策略 ────────────────────────────────────
@@ -116,13 +100,10 @@ export const xiayouPlugin = {
       const resolved: ResolvedAccount =
         typeof account.wsUrl === "string"
           ? account
-          : resolveAccount(config, account.accountId);
-
-      const clientKey = resolved.accountId ?? "default";
+          : resolveAccount(config);
 
       // 断开已有连接
-      const existing = clients.get(clientKey);
-      if (existing) existing.disconnect();
+      if (_client) _client.disconnect();
 
       const client = createEnterpriseClient({
         account: resolved,
@@ -135,7 +116,6 @@ export const xiayouPlugin = {
           }
           await runtime.inbound.dispatch({
             channelId: "xiaoyou",
-            accountId: resolved.accountId ?? "default",
             senderId: msg.senderId,
             senderName: msg.senderName ?? msg.senderId,
             conversationId: msg.conversationId,
@@ -152,25 +132,21 @@ export const xiayouPlugin = {
       });
 
       client.connect();
-      clients.set(clientKey, client);
-      logger.info(`[xiaoyou] gateway started (account=${clientKey})`);
+      _client = client;
+      logger.info("[xiaoyou] gateway started");
       return client;
     },
 
     stop: async (client: EnterpriseClient) => {
       client.disconnect();
-      for (const [key, c] of clients.entries()) {
-        if (c === client) { clients.delete(key); break; }
-      }
+      if (_client === client) _client = null;
     },
   },
 
   // ── Outbound 出站 ──────────────────────────────────
   outbound: {
-    send: async ({ account, to, payload }: any) => {
-      const clientKey = account.accountId ?? "default";
-      const client = clients.get(clientKey);
-      if (!client || !client.isConnected()) {
+    send: async ({ to, payload }: any) => {
+      if (!_client || !_client.isConnected()) {
         return { ok: false, error: "xiaoyou: not connected" };
       }
 
@@ -183,11 +159,11 @@ export const xiayouPlugin = {
       };
 
       if (payload.kind === "text") {
-        client.sendReply({ ...baseReply, text: payload.text });
+        _client.sendReply({ ...baseReply, text: payload.text });
         return { ok: true };
       }
       if (payload.kind === "image" || payload.kind === "file") {
-        client.sendReply({
+        _client.sendReply({
           ...baseReply,
           text: payload.caption ?? "",
           mediaUrls: [payload.url ?? payload.filePath],
@@ -201,13 +177,11 @@ export const xiayouPlugin = {
   // ── Status 状态检查 ────────────────────────────────
   status: {
     describe: async ({ account }: any) => {
-      const clientKey = account.accountId ?? "default";
-      const client = clients.get(clientKey);
       const issues: Array<{ severity: string; message: string }> = [];
 
-      if (!account.wsUrl) issues.push({ severity: "error", message: "wsUrl not configured" });
-      if (!account.authToken) issues.push({ severity: "warning", message: "authToken not set" });
-      if (!client || !client.isConnected()) issues.push({ severity: "error", message: "WebSocket not connected" });
+      if (!account?.wsUrl) issues.push({ severity: "error", message: "wsUrl not configured" });
+      if (!account?.authToken) issues.push({ severity: "warning", message: "authToken not set" });
+      if (!_client || !_client.isConnected()) issues.push({ severity: "error", message: "WebSocket not connected" });
 
       return {
         summary: issues.length === 0 ? "connected" : "error",

package/src/enterprise-client.ts

@@ -78,7 +78,7 @@ export function createEnterpriseClient(opts: EnterpriseClientOptions): Enterpris
     ws.send(JSON.stringify({
       type: "auth",
       token: account.authToken,
-      clientId: `openclaw-xiaoyou-${account.accountId ?? "default"}`,
+      clientId: "openclaw-xiaoyou",
       clientVersion: "1.0.0",
     }));
     logger.info("[xiaoyou] auth sent, waiting for auth_result...");

package/src/types.ts

@@ -7,7 +7,6 @@
 // ─── 解析后的账号配置 ────────────────────────────────────
 
 export type ResolvedAccount = {
-  accountId: string | null;
   /** 企业 WebSocket 服务地址，如 wss://im.corp.example.com/ws */
   wsUrl: string;
   /** 连接企业服务的认证 token */