palz-connector 1.6.2 → 1.6.3

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "palz-connector",
   "name": "Palz Connector Channel",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "Palz IM 接入 OpenClaw",
   "channels": [
     "palz-connector"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "palz-connector",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "type": "module",
   "main": "index.js",
   "description": "Palz IM 接入 OpenClaw — 模块化架构，基于 OpenClaw Runtime 消息管道",

package/palz-connector.config.json

@@ -6,5 +6,6 @@
   "activityReportEnabled": false,
   "sessionTimeout": 1800000,
   "groupContextCache": false,
-  "showProcess": true
+  "showProcess": true,
+  "controlPort": 8008
 }

package/palz-connector.dev.config.json

@@ -6,5 +6,6 @@
   "activityReportEnabled": true,
   "sessionTimeout": 1800000,
   "groupContextCache": false,
-  "showProcess": true
+  "showProcess": true,
+  "controlPort": 8008
 }

package/palz-connector.prod.config.json

@@ -6,5 +6,6 @@
   "activityReportEnabled": true,
   "sessionTimeout": 1800000,
   "groupContextCache": false,
-  "showProcess": true
+  "showProcess": true,
+  "controlPort": 8008
 }

package/palz-connector.staging.config.json

@@ -7,4 +7,5 @@
   "sessionTimeout": 1800000,
   "groupContextCache": false,
   "showProcess": true
+  "controlPort": 8008
 }

package/src/activity.js

@@ -1,9 +1,10 @@
 /**
- * Palz IM 收到消息后的 claw-gateway 活动上报。
+ * Palz IM WebSocket 连接成功后的 claw-gateway 活动上报。
  */
 const ACTIVITY_REPORT_TIMEOUT_MS = 2000;
 const ACTIVITY_REPORT_PATH_PREFIX = "/openclaw-gateway/be/deployments";
 const warnedMissingConfig = new Set();
+const SERVICE_NAME = process.env.OPENCLAW_WORKSPACE_POOL_SERVICE_NAME ?? "";
 function formatDateTimeWithOffset(date) {
     const pad = (n, width = 2) => String(n).padStart(width, "0");
     const offsetMinutes = -date.getTimezoneOffset();
@@ -23,7 +24,7 @@ function resolveActivityUrl(baseUrl, releaseName) {
     return `${normalizedBase}${ACTIVITY_REPORT_PATH_PREFIX}/${encodeURIComponent(releaseName)}/activity`;
 }
 export async function reportPalzActivity(params) {
-    const { config, msg, receivedAt, runtime, accountId } = params;
+    const { config, connectedAt, runtime, accountId } = params;
     const log = typeof runtime?.log === "function" ? runtime.log : console.log;
     const error = typeof runtime?.error === "function" ? runtime.error : console.error;
     const tag = `palz[${accountId ?? config.botId ?? "default"}]`;
@@ -41,22 +42,17 @@ export async function reportPalzActivity(params) {
     }
     const payload = {
         source: "palz-connector",
-        eventType: "im_message_received",
-        messageId: msg.msg_id,
-        conversationId: msg.conversation_id,
-        conversationType: msg.conversation_type || "direct",
-        userId: msg.owner_id ?? "",
-        senderId: msg.sender_id,
-        receivedAt: formatDateTimeWithOffset(receivedAt),
+        eventType: "ws_connected",
+        releaseName,
+        serviceName: SERVICE_NAME,
+        connectedAt: formatDateTimeWithOffset(connectedAt),
     };
-    if (msg.traceparent) {
-        payload.traceId = msg.traceparent;
-    }
     const url = resolveActivityUrl(baseUrl, releaseName);
     const body = JSON.stringify(payload);
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), ACTIVITY_REPORT_TIMEOUT_MS);
     const startMs = Date.now();
+    log(`${tag}: [ACTIVITY_REPORT] reporting eventType=ws_connected url=${url} body=${body}`);
     try {
         const response = await fetch(url, {
             method: "POST",
@@ -67,15 +63,15 @@ export async function reportPalzActivity(params) {
         const elapsedMs = Date.now() - startMs;
         const responseText = await response.text().catch(() => "");
         if (!response.ok) {
-            error(`${tag}: [ACTIVITY_REPORT] failed status=${response.status} elapsed=${elapsedMs}ms msg_id=${msg.msg_id} response=${responseText.slice(0, 300)}`);
+            error(`${tag}: [ACTIVITY_REPORT] failed status=${response.status} elapsed=${elapsedMs}ms response=${responseText.slice(0, 300)}`);
             return;
         }
-        log(`${tag}: [ACTIVITY_REPORT] ok status=${response.status} elapsed=${elapsedMs}ms msg_id=${msg.msg_id}`);
+        log(`${tag}: [ACTIVITY_REPORT] ok status=${response.status} elapsed=${elapsedMs}ms eventType=ws_connected`);
     }
     catch (err) {
         const elapsedMs = Date.now() - startMs;
         const reason = err?.name === "AbortError" ? `timeout ${ACTIVITY_REPORT_TIMEOUT_MS}ms` : (err?.message ?? String(err));
-        error(`${tag}: [ACTIVITY_REPORT] error elapsed=${elapsedMs}ms msg_id=${msg.msg_id} reason=${reason}`);
+        error(`${tag}: [ACTIVITY_REPORT] error elapsed=${elapsedMs}ms reason=${reason}`);
     }
     finally {
         clearTimeout(timeout);

package/src/channel.js

@@ -9,6 +9,7 @@ import { palzOutbound } from "./outbound.js";
 import { normalizePalzTarget, looksLikePalzId } from "./targets.js";
 import { ConnectionManager } from "./connection-manager.js";
 import { startUserDirScanner } from "./workspace-scanner.js";
+import { startControlServer } from "./control-server.js";
 export const palzPlugin = {
     id: "palz-connector",
     meta: {
@@ -39,6 +40,7 @@ export const palzPlugin = {
                 clawGatewayUrl: { type: "string" },
                 activityReportEnabled: { type: "boolean" },
                 sessionTimeout: { type: "integer", minimum: 0 },
+                controlPort: { type: "integer", minimum: 0 },
             },
         },
     },
@@ -106,11 +108,37 @@ export const palzPlugin = {
                 log: logInfo,
                 error,
             });
+            // 停止服务：断开所有 WS 且不再重连。幂等，可被 HTTP 控制接口或框架层 abort 多次调用。
+            let stopped = false;
+            const doStop = () => {
+                if (stopped)
+                    return;
+                stopped = true;
+                logInfo("palz-gateway: [doStop] stopping service, shutting down scanner + manager");
+                scanner.stop();
+                manager.shutdown();
+            };
+            // 可选启动 HTTP 控制服务（仅当配置了 controlPort）。停止服务时保留该 HTTP 服务，
+            // 仅在框架层 abort 时才关闭。
+            let controlServer = null;
+            const controlPort = baseConfig.controlPort;
+            if (typeof controlPort === "number" && controlPort > 0) {
+                controlServer = startControlServer({
+                    port: controlPort,
+                    onStop: doStop,
+                    getStatus: () => {
+                        const activeUsers = manager.getActiveUsers();
+                        return { stopped, activeConnections: activeUsers.length, activeUsers };
+                    },
+                    log: logInfo,
+                    error,
+                });
+            }
             return new Promise((resolve) => {
                 const onAbort = () => {
                     logInfo("palz-gateway: [startAccount] abort received, shutting down manager");
-                    scanner.stop();
-                    manager.shutdown();
+                    controlServer?.close();
+                    doStop();
                     resolve();
                 };
                 if (ctx.abortSignal?.aborted) {

package/src/config.js

@@ -67,6 +67,7 @@ export function resolvePalzConfig(_cfg, botId) {
         sessionTimeout: file.sessionTimeout ?? DEFAULT_SESSION_TIMEOUT,
         groupContextCache: file.groupContextCache !== false,
         showProcess: file.showProcess === true,
+        controlPort: file.controlPort,
     };
     if (!_configLoggedOnce) {
         _configLoggedOnce = true;

package/src/control-server.js

@@ -0,0 +1,81 @@
+/**
+ * Palz Connector HTTP 控制服务
+ *
+ * 提供一个独立的 HTTP 端口，供外部主动控制插件：
+ *   - POST /admin/stop   断开所有 WS 连接且不再重连（停止服务），幂等
+ *   - GET  /admin/health 查询当前状态（是否已停止 / 活跃连接数）
+ *
+ * 与 WS 连接 / 消息处理 / reconcile 完全隔离：只持有 onStop / getStatus 回调，
+ * 不碰任何业务数据；只有配置了端口才启动；启动错误只记日志不影响插件主流程。
+ *
+ * 统一响应结构：{ code, err_message, data }，code=0 表示成功，非 0 为错误码。
+ * HTTP status 一律 200，业务结果由 code 表达。
+ */
+import http from "node:http";
+function sendJson(res, body) {
+    const payload = JSON.stringify(body);
+    res.writeHead(200, { "Content-Type": "application/json" });
+    res.end(payload);
+}
+export function startControlServer(opts) {
+    const log = opts.log ?? console.log;
+    const error = opts.error ?? console.error;
+    const server = http.createServer((req, res) => {
+        const method = (req.method || "GET").toUpperCase();
+        // 去掉查询串，只取 path
+        const path = (req.url || "/").split("?")[0].replace(/\/+$/, "") || "/";
+        try {
+            if (path === "/admin/stop") {
+                if (method !== "POST") {
+                    sendJson(res, { code: 405, err_message: "method not allowed", data: {} });
+                    return;
+                }
+                const before = opts.getStatus();
+                opts.onStop();
+                const after = opts.getStatus();
+                log(`control-server: [stop] requested, activeBefore=${before.activeConnections} stopped=${after.stopped}`);
+                sendJson(res, {
+                    code: 0,
+                    err_message: "",
+                    data: { stopped: after.stopped, stoppedConnections: before.activeConnections },
+                });
+                return;
+            }
+            if (path === "/admin/health") {
+                if (method !== "GET") {
+                    sendJson(res, { code: 405, err_message: "method not allowed", data: {} });
+                    return;
+                }
+                const status = opts.getStatus();
+                sendJson(res, { code: 0, err_message: "", data: { ...status } });
+                return;
+            }
+            sendJson(res, { code: 404, err_message: "not found", data: {} });
+        }
+        catch (err) {
+            error(`control-server: request handling error: ${err?.message ?? err}`);
+            try {
+                sendJson(res, { code: 500, err_message: String(err?.message ?? err), data: {} });
+            }
+            catch { }
+        }
+    });
+    // 端口占用等错误只记日志，不让插件崩溃。
+    server.on("error", (err) => {
+        error(`control-server: server error on port ${opts.port}: ${err?.message ?? err}`);
+    });
+    server.listen(opts.port, () => {
+        log(`control-server: listening on port ${opts.port}`);
+    });
+    return {
+        close() {
+            try {
+                server.close();
+                log(`control-server: closed (port ${opts.port})`);
+            }
+            catch (err) {
+                error(`control-server: close error: ${err?.message ?? err}`);
+            }
+        },
+    };
+}

package/src/monitor.js

@@ -167,6 +167,14 @@ export async function monitorPalzProvider(params) {
                 lastPongAt = connectedAt;
                 consecutive4002 = 0;
                 log(`palz[${accountId}]: WebSocket connected, bot_id=${config.botId}`);
+                reportPalzActivity({
+                    config,
+                    connectedAt: new Date(connectedAt),
+                    runtime,
+                    accountId,
+                }).catch((err) => {
+                    error(`palz[${accountId}]: [ACTIVITY_REPORT] unhandled error: ${err.message ?? err}`);
+                });
                 pingInterval = setInterval(() => {
                     if (ws.readyState === WebSocket.OPEN) {
                         const timeSinceLastPong = Date.now() - lastPongAt;
@@ -195,7 +203,6 @@ export async function monitorPalzProvider(params) {
                 }
             });
             ws.on("message", (data) => {
-                const receivedAt = new Date();
                 const raw = data.toString();
                 try {
                     const msg = JSON.parse(raw);
@@ -209,15 +216,6 @@ export async function monitorPalzProvider(params) {
                         try {
                             span.setAttribute("raw_message", raw);
                             log(`palz[${accountId}]: [WS_RECV] #${messageCount} full_message=${raw.slice(0, 1000)} traceId=${span.spanContext().traceId}`);
-                            reportPalzActivity({
-                                config,
-                                msg,
-                                receivedAt,
-                                runtime,
-                                accountId,
-                            }).catch((err) => {
-                                error(`palz[${accountId}]: [ACTIVITY_REPORT] unhandled error: ${err.message ?? err}`);
-                            });
                             // agent_id：从消息中取，缺失/空时默认为 {userId}-main
                             let messageAgentId = typeof msg.agent_id === "string" ? msg.agent_id.trim() : "";
                             if (!messageAgentId) {