rol-websocket-channel 1.6.7 → 1.7.0

package/dist/index.js

@@ -249,19 +249,27 @@ const WebSocketChannel = {
         }),
     },
     outbound: {
+        // MQTT 是 topic-based 路由，不依赖 to 做地址解析
+        // 使用 "direct" 模式：AI reply 走 deliver 回调；message 工具走 sendText
         deliveryMode: "direct",
-        sendText: async ({ to, text }) => {
+        sendText: async ({ to, text, sessionKey }) => {
             const conn = ConnectionManager.getGlobalConnection();
             if (!conn || !conn.ws || !conn.ws.connected) {
                 return { ok: false, error: "No MQTT connection" };
             }
+            // 与 deliver 回调保持一致，使用 receiver 格式发布消息
             const message = JSON.stringify({
-                type: "message",
-                to,
-                content: text,
+                type: "receiver",
+                source: "ai",
+                data: { text },
                 timestamp: Date.now(),
             });
-            conn.ws.publish(conn.topic, message);
+            // 将 # 替换为 bot（outbound 不知道 source_type，默认 bot）
+            let targetTopic = conn.topic;
+            if (targetTopic.endsWith("#")) {
+                targetTopic = targetTopic.slice(0, -1) + "bot";
+            }
+            conn.ws.publish(targetTopic, message);
             return { ok: true };
         },
         sendMedia: async ({ to, text, mediaUrl }) => {
@@ -270,16 +278,75 @@ const WebSocketChannel = {
                 return { ok: false, error: "No MQTT connection" };
             }
             const message = JSON.stringify({
-                type: "media",
-                to,
-                content: text,
-                mediaUrl,
+                type: "receiver",
+                source: "ai",
+                data: { text, mediaUrl },
                 timestamp: Date.now(),
             });
-            conn.ws.publish(conn.topic, message);
+            let targetTopic = conn.topic;
+            if (targetTopic.endsWith("#")) {
+                targetTopic = targetTopic.slice(0, -1) + "bot";
+            }
+            conn.ws.publish(targetTopic, message);
             return { ok: true };
         },
     },
+    // ============================================
+    // messaging: 告知框架如何解析 target 地址
+    // MQTT 是 topic-based，任意非空字符串都是合法 target
+    // ============================================
+    messaging: {
+        // 接受任何非空字符串作为合法 target（MQTT 不做地址校验）
+        normalizeTarget: (raw) => {
+            const trimmed = raw?.trim();
+            return trimmed || undefined;
+        },
+        // 告知框架：deliver 目标就是原始字符串本身
+        targetResolver: {
+            looksLikeId: (_raw) => true,
+        },
+    },
+    // ============================================
+    // actions: 处理 message 工具的 send action
+    // 直接发布到 MQTT，完全绕过 target 解析
+    // ============================================
+    actions: {
+        describeMessageTool: () => ({
+            actions: ["send"],
+        }),
+        supportsAction: ({ action }) => action === "send",
+        handleAction: async (ctx) => {
+            const { action, params } = ctx;
+            if (action !== "send") {
+                throw new Error(`Unsupported action: ${action}`);
+            }
+            const text = typeof params.message === "string" ? params.message
+                : typeof params.text === "string" ? params.text
+                    : "";
+            const conn = ConnectionManager.getGlobalConnection();
+            if (!conn || !conn.ws || !conn.ws.connected) {
+                return {
+                    content: [{ type: "text", text: JSON.stringify({ ok: false, error: "No MQTT connection" }) }],
+                    details: {},
+                };
+            }
+            const replyMessage = JSON.stringify({
+                type: "receiver",
+                source: "ai",
+                data: { text },
+                timestamp: Date.now(),
+            });
+            let targetTopic = conn.topic;
+            if (targetTopic.endsWith("#")) {
+                targetTopic = targetTopic.slice(0, -1) + "bot";
+            }
+            conn.ws.publish(targetTopic, replyMessage);
+            return {
+                content: [{ type: "text", text: JSON.stringify({ ok: true }) }],
+                details: {},
+            };
+        },
+    },
     gateway: {
         startAccount: async (ctx) => {
             const { log, account, abortSignal, cfg } = ctx;
@@ -435,11 +502,13 @@ async function handleIncomingMessage(payload, account, cfg, runtime, log, mqttTo
         const resolvedAccountId = targetAgentId ?? route.accountId;
         const resolvedSessionKey = targetSessionId ?? route.sessionKey;
         // 构建消息上下文
+        // To 必须设置为 senderId：框架用它确定 message 工具的回复目标
+        // From 是发送方；To 是「这条对话的对端」（即 bot 应回复给谁）
         const ctxPayload = runtime.channel.reply.finalizeInboundContext({
             Body: normalizedMessage.text,
             BodyForAgent: normalizedMessage.text,
             From: normalizedMessage.senderId,
-            To: undefined,
+            To: normalizedMessage.senderId,
             SessionKey: resolvedSessionKey,
             AccountId: resolvedAccountId,
             ChatType: "direct",
@@ -451,46 +520,60 @@ async function handleIncomingMessage(payload, account, cfg, runtime, log, mqttTo
             Timestamp: Date.now(),
         });
         // 调度回复
-        await runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
-            ctx: ctxPayload,
-            cfg,
-            dispatcherOptions: {
-                deliver: async (payload) => {
-                    const conn = ConnectionManager.getGlobalConnection();
-                    if (!conn || !conn.ws || !conn.ws.connected) {
-                        throw new Error("No MQTT connection available");
-                    }
-                    const replyMessage = {
-                        type: "receiver",
-                        trace_id: traceId,
-                        source: "ai",
-                        meta: {
-                            'agentId': resolvedAccountId,
-                            'sessionKey': resolvedSessionKey
-                        },
-                        data: payload,
-                        timestamp: Date.now(),
-                    };
-                    // 根据 source_type 修改 topic 末尾的 #
-                    let targetTopic = mqttTopic;
-                    const sourceType = innerData?.source_type;
-                    if (targetTopic.endsWith("#")) {
-                        const replacement = sourceType === "device" ? "device" : "bot";
-                        targetTopic = targetTopic.slice(0, -1) + replacement;
-                    }
-                    conn.ws.publish(targetTopic, JSON.stringify(replyMessage));
-                },
-                onError: (err) => {
-                    log?.error(`[rol-websocket-channel] Delivery error: ${err.message}`);
-                },
+        // withReplyDispatcher({ dispatcher, run }) 是底层封装：
+        //   - dispatcher 由 createReplyDispatcherWithTyping 创建（负责 deliver 和分批发送）
+        //   - run 调用 dispatchReplyFromConfig（负责路由和 AI 回复逻辑）
+        //   - markComplete 由框架内部在 run 完成后自动调用，不需要外部传入
+        const { dispatcher, markRunComplete, markDispatchIdle } = runtime.channel.reply.createReplyDispatcherWithTyping({
+            deliver: async (payload) => {
+                const conn = ConnectionManager.getGlobalConnection();
+                if (!conn || !conn.ws || !conn.ws.connected) {
+                    throw new Error("No MQTT connection available");
+                }
+                const replyMessage = {
+                    type: "receiver",
+                    trace_id: traceId,
+                    source: "ai",
+                    meta: {
+                        'agentId': resolvedAccountId,
+                        'sessionKey': resolvedSessionKey
+                    },
+                    data: payload,
+                    timestamp: Date.now(),
+                };
+                // 根据 source_type 修改 topic 末尾的 #
+                let targetTopic = mqttTopic;
+                const sourceType = innerData?.source_type;
+                if (targetTopic.endsWith("#")) {
+                    const replacement = sourceType === "device" ? "device" : "bot";
+                    targetTopic = targetTopic.slice(0, -1) + replacement;
+                }
+                conn.ws.publish(targetTopic, JSON.stringify(replyMessage));
+            },
+            onError: (err) => {
+                log?.error(`[rol-websocket-channel] Delivery error: ${err.message} ${err.stack}`);
             },
         });
+        try {
+            await runtime.channel.reply.withReplyDispatcher({
+                dispatcher,
+                run: () => runtime.channel.reply.dispatchReplyFromConfig({
+                    ctx: ctxPayload,
+                    cfg,
+                    dispatcher,
+                }),
+            });
+        }
+        finally {
+            markRunComplete?.();
+            markDispatchIdle?.();
+        }
     }
     catch (err) {
         log?.error(`[rol-websocket-channel] Failed to process message: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
-const immediateAckMessageTypes = new Set(["openclawUpdate", "pluginSelfUpdate"]);
+const immediateAckMessageTypes = new Set(["pluginSelfUpdate"]);
 export async function handleCustomMessageType(msgType, innerData, traceId, accountId, mqttTopic) {
     const isSkillInstallFlow = msgType === "skillsInstallFromClawHub" || msgType === "skillsUpdateFromClawHub";
     const response = {

package/dist/message-handler.js

@@ -18,7 +18,7 @@ import { uninstallSkill } from './src/admin/methods/skills-extended.js';
 import { toggleSkill } from './src/admin/methods/skills-toggle.js';
 import { listMemoryFiles, getMemoryFile, backupMemory, exportMemoryZip, getMemoryPresignedPost, createMemoryBackupRecord, importMemoryZip, } from './src/admin/methods/memory.js';
 import { getMem9Config, installMem9, reconnectMem9 } from './src/admin/methods/mem9.js';
-import { currentVersion, doctorFix, logs, openclawUpdate, pluginSelfUpdate, restart, stop } from './src/admin/methods/system.js';
+import { currentVersion, doctorFix, logs, pluginSelfUpdate, restart, stop } from './src/admin/methods/system.js';
 export class MessageHandler {
     /**
      * 示例方法：处理 ping 类型的消息
@@ -497,12 +497,7 @@ export class MessageHandler {
             return await logs(data, context);
         });
     }
-    async openclawUpdate(data) {
-        return wrapAdminCall(async () => {
-            const context = getContext();
-            return await openclawUpdate(data, context);
-        });
-    }
+    // OpenClaw core updates are managed outside this plugin.
     async pluginSelfUpdate(data) {
         return wrapAdminCall(async () => {
             const context = getContext();

package/dist/src/admin/lib/openclaw-bin.js

@@ -1,3 +1,21 @@
+import path from 'node:path';
+import os from 'node:os';
+import fs from 'node:fs';
 export function resolveOpenClawBin() {
-    return process.env.OPENCLAW_BIN || 'openclaw';
+    if (process.env.OPENCLAW_BIN) {
+        return process.env.OPENCLAW_BIN;
+    }
+    if (process.platform === 'win32') {
+        const appData = process.env.APPDATA;
+        const candidates = [
+            appData ? path.join(appData, 'npm', 'openclaw.cmd') : null,
+            path.join(os.homedir(), 'AppData', 'Roaming', 'npm', 'openclaw.cmd')
+        ];
+        for (const candidate of candidates) {
+            if (candidate && fs.existsSync(candidate)) {
+                return candidate;
+            }
+        }
+    }
+    return 'openclaw';
 }

package/dist/src/admin/lib/openclaw-bin.test.js

@@ -0,0 +1,37 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { resolveOpenClawBin } from './openclaw-bin.js';
+describe('resolveOpenClawBin', () => {
+    test('uses APPDATA npm shim on Windows when OPENCLAW_BIN is unset', { skip: process.platform !== 'win32' }, async () => {
+        const originalOpenClawBin = process.env.OPENCLAW_BIN;
+        const originalAppData = process.env.APPDATA;
+        const root = await fs.mkdtemp(path.join(os.tmpdir(), 'openclaw-bin-'));
+        try {
+            const appData = path.join(root, 'Roaming');
+            const shim = path.join(appData, 'npm', 'openclaw.cmd');
+            await fs.mkdir(path.dirname(shim), { recursive: true });
+            await fs.writeFile(shim, '@echo off\r\n', 'utf8');
+            delete process.env.OPENCLAW_BIN;
+            process.env.APPDATA = appData;
+            assert.equal(resolveOpenClawBin(), shim);
+        }
+        finally {
+            if (originalOpenClawBin === undefined) {
+                delete process.env.OPENCLAW_BIN;
+            }
+            else {
+                process.env.OPENCLAW_BIN = originalOpenClawBin;
+            }
+            if (originalAppData === undefined) {
+                delete process.env.APPDATA;
+            }
+            else {
+                process.env.APPDATA = originalAppData;
+            }
+            await fs.rm(root, { recursive: true, force: true });
+        }
+    });
+});

package/dist/src/admin/methods/index.js

@@ -11,7 +11,7 @@ import { listSessions } from './sessions.js';
 import { getSession, prepareMessage, attachSkill } from './sessions-extended.js';
 import { installSkillFromClawHub, installSkillFromNpm, listInstalledSkills, searchClawHubSkills, updateSkillFromClawHub } from './skills.js';
 import { getInstalledSkill, uninstallSkill } from './skills-extended.js';
-import { currentVersion, doctorFix, logs, openclawUpdate, ping, pluginSelfUpdate, restart, stop } from './system.js';
+import { currentVersion, doctorFix, logs, ping, pluginSelfUpdate, restart, stop } from './system.js';
 import { getUsageBreakdown, getUsagePageSummary, getUsageSummary, getUsageTimeseries } from './usage.js';
 const methods = new Map([
     // System
@@ -20,7 +20,7 @@ const methods = new Map([
     ['system.stop', stop],
     ['system.doctorFix', doctorFix],
     ['system.logs', logs],
-    ['system.openclawUpdate', openclawUpdate],
+    // OpenClaw core updates are managed outside this plugin.
     ['system.pluginSelfUpdate', pluginSelfUpdate],
     ['system.currentVersion', currentVersion],
     // Agents