rol-websocket-channel 1.0.1 → 1.0.5

package/index.ts

@@ -10,7 +10,7 @@
 import type { ReplyPayload } from "openclaw/auto-reply/types";
 import type { ChannelPlugin, OpenClawConfig } from "openclaw/plugin-sdk";
 import { messageHandler } from "./message-handler.js";
-import { MqttClient } from "./src/mqtt/mqtt-client.js";
+import { GlobalMqttClient } from "./src/mqtt/mqtt-client.js";
 import * as ConnectionManager from "./src/mqtt/connection-manager.js";
 
 // ============================================
@@ -78,7 +78,7 @@ const WebSocketChannel: ChannelPlugin<WebSocketChannelAccount> = {
         },
         allowFrom: {
           type: "array",
-          items: { type: "string" }
+          items: { type: "string" },
         },
         pairing: {
           type: "object",
@@ -88,16 +88,16 @@ const WebSocketChannel: ChannelPlugin<WebSocketChannelAccount> = {
             pairedAt: { type: "string" },
             pairingKeyLast4: { type: "string" },
             userId: { type: "string" },
-            rawValue: { type: "string" }
-          }
+            rawValue: { type: "string" },
+          },
         },
         apiCoreBot: {
           type: "object",
           additionalProperties: false,
           properties: {
             baseUrl: { type: "string" },
-            authToken: { type: "string" }
-          }
+            authToken: { type: "string" },
+          },
         },
         config: {
           type: "object",
@@ -117,15 +117,33 @@ const WebSocketChannel: ChannelPlugin<WebSocketChannelAccount> = {
     },
     uiHints: {
       enabled: { label: "Enabled", description: "Enable MQTT Channel" },
-      dmPolicy: { label: "DM Policy", description: "Pairing/allowlist/open policy for direct messages" },
-      allowFrom: { label: "Allow From", description: "Allowed sender IDs when using allowlist or pairing mode" },
-      pairing: { label: "Pairing", description: "Pairing status and resolved identity info" },
-      apiCoreBot: { label: "API Core Bot", description: "Backend API endpoint and auth token used by the plugin" },
-      config: { label: "Configuration", description: "MQTT connection configuration" },
-      "config.enabled": { label: "Enabled", description: "Enable this configuration" },
+      dmPolicy: {
+        label: "DM Policy",
+        description: "Pairing/allowlist/open policy for direct messages",
+      },
+      allowFrom: {
+        label: "Allow From",
+        description: "Allowed sender IDs when using allowlist or pairing mode",
+      },
+      pairing: {
+        label: "Pairing",
+        description: "Pairing status and resolved identity info",
+      },
+      apiCoreBot: {
+        label: "API Core Bot",
+        description: "Backend API endpoint and auth token used by the plugin",
+      },
+      config: {
+        label: "Configuration",
+        description: "MQTT connection configuration",
+      },
+      "config.enabled": {
+        label: "Enabled",
+        description: "Enable this configuration",
+      },
       "config.mqttUrl": {
         label: "MQTT Broker URL",
-        placeholder: "ws://192.168.1.23:8083/mqtt",
+        placeholder: "ws://192.168.1.152:8083/mqtt",
         help: "MQTT broker WebSocket URL",
       },
       "config.mqttTopic": {
@@ -133,7 +151,10 @@ const WebSocketChannel: ChannelPlugin<WebSocketChannelAccount> = {
         placeholder: "announcement/tester",
         help: "MQTT topic to subscribe/publish",
       },
-      "config.groupPolicy": { label: "Group Policy", description: "Message policy for group chats" },
+      "config.groupPolicy": {
+        label: "Group Policy",
+        description: "Message policy for group chats",
+      },
     },
   },
 
@@ -156,11 +177,13 @@ const WebSocketChannel: ChannelPlugin<WebSocketChannelAccount> = {
 
       return {
         accountId: "default",
-        mqttUrl: config.mqttUrl || "ws://192.168.1.23:8083/mqtt",
+        mqttUrl: config.mqttUrl || "ws://192.168.1.152:8083/mqtt",
         mqttTopic: config.mqttTopic || "announcement/tester",
         enabled: config.enabled !== false,
         dmPolicy: channelCfg.dmPolicy || config.groupPolicy || "open",
-        allowFrom: Array.isArray(channelCfg.allowFrom) ? channelCfg.allowFrom : [],
+        allowFrom: Array.isArray(channelCfg.allowFrom)
+          ? channelCfg.allowFrom
+          : [],
         groupPolicy: config.groupPolicy || "open",
       };
     },
@@ -208,27 +231,36 @@ const WebSocketChannel: ChannelPlugin<WebSocketChannelAccount> = {
   outbound: {
     deliveryMode: "direct",
 
-    sendText: async ({ to, text, accountId }) => {
-      const conn = ConnectionManager.getConnection(accountId ?? "default");
+    sendText: async ({ to, text }) => {
+      const conn = ConnectionManager.getGlobalConnection();
       if (!conn || !conn.ws || !conn.ws.connected) {
         return { ok: false, error: "No MQTT connection" };
       }
 
-      const mqttTopic = conn.mqttTopic || "announcement/tester";
-      const message = JSON.stringify({ type: "message", to, content: text, timestamp: Date.now() });
-      conn.ws.publish(mqttTopic, message);
+      const message = JSON.stringify({
+        type: "message",
+        to,
+        content: text,
+        timestamp: Date.now(),
+      });
+      conn.ws.publish(conn.topic, message);
       return { ok: true };
     },
 
-    sendMedia: async ({ to, text, mediaUrl, accountId }) => {
-      const conn = ConnectionManager.getConnection(accountId ?? "default");
+    sendMedia: async ({ to, text, mediaUrl }) => {
+      const conn = ConnectionManager.getGlobalConnection();
       if (!conn || !conn.ws || !conn.ws.connected) {
         return { ok: false, error: "No MQTT connection" };
       }
 
-      const mqttTopic = conn.mqttTopic || "announcement/tester";
-      const message = JSON.stringify({ type: "media", to, content: text, mediaUrl, timestamp: Date.now() });
-      conn.ws.publish(mqttTopic, message);
+      const message = JSON.stringify({
+        type: "media",
+        to,
+        content: text,
+        mediaUrl,
+        timestamp: Date.now(),
+      });
+      conn.ws.publish(conn.topic, message);
       return { ok: true };
     },
   },
@@ -239,22 +271,30 @@ const WebSocketChannel: ChannelPlugin<WebSocketChannelAccount> = {
       const runtime = pluginRuntime;
 
       console.log(`[MQTT] startAccount(${account.accountId}): starting...`);
-      log?.info(`[rol-websocket-channel] Starting MQTT Channel for ${account.accountId}`);
+      log?.info(
+        `[rol-websocket-channel] Starting MQTT Channel for ${account.accountId}`,
+      );
 
       // 检查是否已有活跃连接，防止重复启动
-      if (ConnectionManager.isConnected(account.accountId)) {
-        console.log(`[MQTT] startAccount(${account.accountId}): already connected, skipping`);
+      if (ConnectionManager.isGlobalConnected()) {
+        console.log(
+          `[MQTT] startAccount(${account.accountId}): already connected, skipping`,
+        );
         return;
       }
 
       if (!runtime?.channel?.reply?.withReplyDispatcher) {
-        console.error(`[MQTT] startAccount(${account.accountId}): Runtime API not available`);
+        console.error(
+          `[MQTT] startAccount(${account.accountId}): Runtime API not available`,
+        );
         throw new Error("Runtime API not available");
       }
 
-      const mqttUrl = account.mqttUrl || "ws://192.168.1.23:8083/mqtt";
+      const mqttUrl = account.mqttUrl || "ws://192.168.1.152:8083/mqtt";
       const mqttTopic = account.mqttTopic || "announcement/tester";
-      console.log(`[MQTT] startAccount(${account.accountId}): url=${mqttUrl}, topic=${mqttTopic}`);
+      console.log(
+        `[MQTT] startAccount(${account.accountId}): url=${mqttUrl}, topic=${mqttTopic}`,
+      );
 
       ctx.setStatus({
         accountId: account.accountId,
@@ -266,50 +306,69 @@ const WebSocketChannel: ChannelPlugin<WebSocketChannelAccount> = {
       });
 
       // 创建 MQTT 客户端
-      console.log(`[MQTT] startAccount(${account.accountId}): creating MqttClient...`);
-      const client = new MqttClient({
-        config: {
-          accountId: account.accountId,
-          mqttUrl,
-          mqttTopic,
-          groupPolicy: account.groupPolicy,
-        },
+      console.log(
+        `[MQTT] startAccount(${account.accountId}): creating GlobalMqttClient...`,
+      );
+      const client = new GlobalMqttClient({
+        mqttUrl,
+        mqttTopic,
         abortSignal,
         onConnect: () => {
-          console.log(`[MQTT] startAccount(${account.accountId}): onConnect - setting status to connected`);
+          console.log(
+            `[MQTT] startAccount(${account.accountId}): onConnect - setting status to connected`,
+          );
           ctx.setStatus({
             accountId: account.accountId,
             connected: true,
           });
         },
         onDisconnect: () => {
-          console.log(`[MQTT] startAccount(${account.accountId}): onDisconnect - setting status to disconnected`);
+          console.log(
+            `[MQTT] startAccount(${account.accountId}): onDisconnect - setting status to disconnected`,
+          );
           ctx.setStatus({
             accountId: account.accountId,
             connected: false,
           });
         },
         onError: (err) => {
-          console.error(`[MQTT] startAccount(${account.accountId}): onError - ${err.message}`);
+          console.error(
+            `[MQTT] startAccount(${account.accountId}): onError - ${err.message}`,
+          );
           log?.error(`[rol-websocket-channel] MQTT error: ${err.message}`);
         },
         onMessage: async (topic: string, payload: Buffer) => {
-          console.log(`[MQTT] startAccount(${account.accountId}): onMessage received`);
-          await handleIncomingMessage(payload, account, cfg, runtime, log, mqttTopic);
+          console.log(
+            `[MQTT] startAccount(${account.accountId}): onMessage received`,
+          );
+          await handleIncomingMessage(
+            payload,
+            account,
+            cfg,
+            runtime,
+            log,
+            mqttTopic,
+          );
         },
       });
 
       // 启动连接
-      console.log(`[MQTT] startAccount(${account.accountId}): calling client.connect()...`);
+      console.log(
+        `[MQTT] startAccount(${account.accountId}): calling GlobalMqttClient.connect()...`,
+      );
       await client.connect();
-      console.log(`[MQTT] startAccount(${account.accountId}): client.connect() returned`);
+      console.log(
+        `[MQTT] startAccount(${account.accountId}): GlobalMqttClient.connect() returned`,
+      );
     },
 
     stopAccount: async (ctx) => {
       const { log, account } = ctx;
       console.log(`[MQTT] stopAccount(${account.accountId}): stopping...`);
-      log?.info(`[rol-websocket-channel] Stopping MQTT Channel for ${account.accountId}`);
-      ConnectionManager.closeConnection(account.accountId);
+      log?.info(
+        `[rol-websocket-channel] Stopping MQTT Channel for ${account.accountId}`,
+      );
+      ConnectionManager.closeGlobalConnection();
       console.log(`[MQTT] stopAccount(${account.accountId}): stopped`);
     },
   },
@@ -349,7 +408,13 @@ async function handleIncomingMessage(
 
     // 处理非标准消息类型
     if (msgType !== "sender") {
-      await handleCustomMessageType(msgType, innerData, traceId, account.accountId, mqttTopic);
+      await handleCustomMessageType(
+        msgType,
+        innerData,
+        traceId,
+        account.accountId,
+        mqttTopic,
+      );
       return;
     }
 
@@ -375,7 +440,14 @@ async function handleIncomingMessage(
       metadata: { mqttTopic, traceId },
     };
 
-    log?.info(`[rol-websocket-channel] 📨 Received: "${normalizedMessage.text}" from ${normalizedMessage.senderId}`);
+    const targetAgentId: string | null = innerData.agentId ?? innerData.agent_id ?? null;
+    const targetSessionId: string | null = innerData.sessionId ?? innerData.session_id ?? null;
+
+    log?.info(
+      `[rol-websocket-channel] 📨 Received: "${normalizedMessage.text}" from ${normalizedMessage.senderId}` +
+      (targetAgentId ? ` → agent:${targetAgentId}` : "") +
+      (targetSessionId ? ` → session:${targetSessionId}` : "")
+    );
 
     // 解析路由
     const route = runtime.channel.routing.resolveAgentRoute({
@@ -385,14 +457,18 @@ async function handleIncomingMessage(
       peer: { kind: "direct", id: normalizedMessage.senderId },
     });
 
+    // 用户传参覆盖自动路由结果
+    const resolvedAccountId = targetAgentId ?? route.accountId;
+    const resolvedSessionKey = targetSessionId ?? route.sessionKey;
+
     // 构建消息上下文
     const ctxPayload = runtime.channel.reply.finalizeInboundContext({
       Body: normalizedMessage.text,
       BodyForAgent: normalizedMessage.text,
       From: normalizedMessage.senderId,
       To: undefined,
-      SessionKey: route.sessionKey,
-      AccountId: route.accountId,
+      SessionKey: resolvedSessionKey,
+      AccountId: resolvedAccountId,
       ChatType: "direct",
       SenderName: normalizedMessage.senderName,
       SenderId: normalizedMessage.senderId,
@@ -408,7 +484,7 @@ async function handleIncomingMessage(
       cfg,
       dispatcherOptions: {
         deliver: async (payload: ReplyPayload) => {
-          const conn = ConnectionManager.getConnection(account.accountId);
+          const conn = ConnectionManager.getGlobalConnection();
           if (!conn || !conn.ws || !conn.ws.connected) {
             throw new Error("No MQTT connection available");
           }
@@ -429,7 +505,9 @@ async function handleIncomingMessage(
       },
     });
   } catch (err) {
-    log?.error(`[rol-websocket-channel] Failed to process message: ${err instanceof Error ? err.message : String(err)}`);
+    log?.error(
+      `[rol-websocket-channel] Failed to process message: ${err instanceof Error ? err.message : String(err)}`,
+    );
   }
 }
 
@@ -451,16 +529,20 @@ async function handleCustomMessageType(
   if (typeof handlerMethod === "function") {
     try {
       const methodResult = await handlerMethod.call(messageHandler, innerData);
-      
+
       // 兼容两种返回格式：
       // 1. { ok, result, error } 格式（新的 admin 方法）
       // 2. 直接返回数据格式（原有的 ping、echo、status 方法）
-      if (typeof methodResult === 'object' && methodResult !== null && 'ok' in methodResult) {
+      if (
+        typeof methodResult === "object" &&
+        methodResult !== null &&
+        "ok" in methodResult
+      ) {
         // 新格式：{ ok, result, error }
         response.success = methodResult.ok;
         response.data = methodResult.result;
         if (!methodResult.ok) {
-          response.error = methodResult.error?.message || 'Unknown error';
+          response.error = methodResult.error?.message || "Unknown error";
         }
       } else {
         // 旧格式：直接返回数据
@@ -476,7 +558,7 @@ async function handleCustomMessageType(
     response.error = `Unknown message type: ${msgType}`;
   }
 
-  const conn = ConnectionManager.getConnection(accountId);
+  const conn = ConnectionManager.getGlobalConnection();
   if (conn && conn.ws && conn.ws.connected) {
     conn.ws.publish(mqttTopic, JSON.stringify(response));
   }
@@ -496,13 +578,13 @@ export default function register(api: any) {
   isPluginRegistered = true;
 
   pluginRuntime = api.runtime;
-  
+
   // 初始化共享 context
   initializeContext();
-  
+
   // 注册 Channel
   api.registerChannel({ plugin: WebSocketChannel });
-  
+
   // 注册 CLI（保留供外部调用）
   registerAdminBridgeCli(api);
 }
@@ -511,66 +593,106 @@ export default function register(api: any) {
 // 7. CLI 注册（保留供外部调用）
 // ============================================
 function registerAdminBridgeCli(api: any) {
-  api.registerCli(({ program }: { program: any }) => {
-    const root = program
-      .command('admin-bridge')
-      .description('OpenClaw admin bridge utilities')
-      .addHelpText('after', () => '\nCommands return JSON to stdout for Python or shell orchestration.\n');
-
-    // 这里可以添加 CLI 命令，但现在先保持简单
-    // 如果需要完整的 CLI，可以从 openclaw-ts/index.ts 复制过来
-    
-    root
-      .command('ping')
-      .description('Test admin bridge connection')
-      .action(async () => {
-        try {
-          const { ping } = await import('./src/admin/methods/system.js');
-          const { getContext } = await import('./src/shared/context.js');
-          const result = await ping(undefined, getContext());
-          process.stdout.write(JSON.stringify({ ok: true, result }, null, 2) + '\n');
-        } catch (error) {
-          process.exitCode = 1;
-          process.stderr.write(JSON.stringify({
-            ok: false,
-            error: { message: error instanceof Error ? error.message : String(error) }
-          }, null, 2) + '\n');
-        }
-      });
-
-    root
-      .command('pair <key>')
-      .description('Pair rol-websocket-channel and write OpenClaw configuration')
-      .option('--endpoint <url>', 'Pair exchange endpoint')
-      .option('--auth <token>', 'Authorization header value for pair exchange')
-      .action(async (key: string, options: { endpoint?: string; auth?: string }) => {
-        try {
-          const { pairWithKey } = await import('./src/admin/methods/pairing.js');
-          const result = await pairWithKey(
-            {
-              key,
-              endpoint: options.endpoint,
-              auth: options.auth
-            },
-            getContext()
-          );
-          process.stdout.write(JSON.stringify({ ok: true, result }, null, 2) + '\n');
-        } catch (error) {
-          process.exitCode = 1;
-          process.stderr.write(JSON.stringify({
-            ok: false,
-            error: {
-              message: error instanceof Error ? error.message : String(error),
-              code: (error as any)?.data?.code
+  api.registerCli(
+    ({ program }: { program: any }) => {
+      const root = program
+        .command("admin-bridge")
+        .description("OpenClaw admin bridge utilities")
+        .addHelpText(
+          "after",
+          () =>
+            "\nCommands return JSON to stdout for Python or shell orchestration.\n",
+        );
+
+      // 这里可以添加 CLI 命令，但现在先保持简单
+      // 如果需要完整的 CLI，可以从 openclaw-ts/index.ts 复制过来
+
+      root
+        .command("ping")
+        .description("Test admin bridge connection")
+        .action(async () => {
+          try {
+            const { ping } = await import("./src/admin/methods/system.js");
+            const { getContext } = await import("./src/shared/context.js");
+            const result = await ping(undefined, getContext());
+            process.stdout.write(
+              JSON.stringify({ ok: true, result }, null, 2) + "\n",
+            );
+          } catch (error) {
+            process.exitCode = 1;
+            process.stderr.write(
+              JSON.stringify(
+                {
+                  ok: false,
+                  error: {
+                    message:
+                      error instanceof Error ? error.message : String(error),
+                  },
+                },
+                null,
+                2,
+              ) + "\n",
+            );
+          }
+        });
+
+      root
+        .command("pair <key>")
+        .description(
+          "Pair rol-websocket-channel and write OpenClaw configuration",
+        )
+        .option("--endpoint <url>", "Pair exchange endpoint")
+        .option(
+          "--auth <token>",
+          "Authorization header value for pair exchange",
+        )
+        .action(
+          async (
+            key: string,
+            options: { endpoint?: string; auth?: string },
+          ) => {
+            try {
+              const { pairWithKey } =
+                await import("./src/admin/methods/pairing.js");
+              const result = await pairWithKey(
+                {
+                  key,
+                  endpoint: options.endpoint,
+                  auth: options.auth,
+                },
+                getContext(),
+              );
+              process.stdout.write(
+                JSON.stringify({ ok: true, result }, null, 2) + "\n",
+              );
+            } catch (error) {
+              process.exitCode = 1;
+              process.stderr.write(
+                JSON.stringify(
+                  {
+                    ok: false,
+                    error: {
+                      message:
+                        error instanceof Error ? error.message : String(error),
+                      code: (error as any)?.data?.code,
+                    },
+                  },
+                  null,
+                  2,
+                ) + "\n",
+              );
             }
-          }, null, 2) + '\n');
-        }
-      });
-  }, {
-    descriptors: [{
-      name: 'admin-bridge',
-      description: 'OpenClaw admin bridge commands',
-      hasSubcommands: true
-    }]
-  });
+          },
+        );
+    },
+    {
+      descriptors: [
+        {
+          name: "admin-bridge",
+          description: "OpenClaw admin bridge commands",
+          hasSubcommands: true,
+        },
+      ],
+    },
+  );
 }

package/openclaw.plugin.json

@@ -193,8 +193,8 @@
     },
     "channels.rol-websocket-channel.config.mqttUrl": {
       "label": "MQTT Broker URL",
-      "placeholder": "ws://192.168.1.23:8083/mqtt",
-      "help": "MQTT broker WebSocket URL (e.g., ws://192.168.1.23:8083/mqtt)"
+      "placeholder": "ws://192.168.1.152:8083/mqtt",
+      "help": "MQTT broker WebSocket URL (e.g., ws://192.168.1.152:8083/mqtt)"
     },
     "channels.rol-websocket-channel.config.mqttTopic": {
       "label": "MQTT Topic",

package/package.json

@@ -1,13 +1,10 @@
 {
   "name": "rol-websocket-channel",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "Unified OpenClaw plugin: MQTT Channel + Admin Bridge for remote management",
   "license": "MIT",
   "author": "nixgnehc",
   "type": "module",
-  "bin": {
-    "rol": "./bin/rol.js"
-  },
   "keywords": [
     "openclaw",
     "mqtt",
@@ -18,13 +15,15 @@
   ],
   "scripts": {
     "build": "tsc",
-    "dev": "tsx watch index.ts"
+    "dev": "tsx watch index.ts",
+    "test": "node --import tsx/esm --test src/mqtt/mqtt.test.ts"
   },
   "dependencies": {
     "mqtt": "^5.0.3"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
+    "tsx": "^4.21.0",
     "typescript": "^5.0.0"
   },
   "openclaw": {

package/src/admin/methods/pairing.ts

@@ -101,10 +101,8 @@ async function exchangePairKey(
   existingMqttUrl?: string | null
 ): Promise<PairingPayload> {
   const endpoint = pickString(endpointOverride)
-    ?? pickString(process.env.ROL_PAIR_ENDPOINT)
     ?? DEFAULT_PAIR_ENDPOINT;
-  const auth = pickString(authOverride)
-    ?? pickString(process.env.ROL_PAIR_AUTH);
+  const auth = pickString(authOverride);
 
   const headers: Record<string, string> = {
     'Content-Type': 'application/json'
@@ -156,7 +154,6 @@ function normalizePairingPayload(
 
   const mqttUrl = pickString(channelValue.mqttUrl)
     ?? pickString(root.mqttUrl)
-    ?? pickString(process.env.ROL_PAIR_MQTT_URL)
     ?? existingMqttUrl
     ?? null;
   if (!mqttUrl) {