palz-connector 1.6.9 → 1.7.1

package/openclaw.plugin.json

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

package/package.json

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

package/palz-connector.config.json

@@ -1,12 +1,12 @@
 {
   "enabled": true,
-  "streamUrl": "ws://14.103.148.99:8090/ws/bot",
-  "apiBaseUrl": "http://14.103.148.99:8090/api",
+  "streamUrl": "ws://claw-server:8787/ws/bot",
+  "apiBaseUrl": "http://claw-server:8787/api",
   "clawGatewayUrl": "http://claw-gateway:8080",
-  "activityReportEnabled": false,
+  "activityReportEnabled": true,
   "sessionTimeout": 1800000,
   "groupContextCache": false,
   "showProcess": true,
-  "kbEngineUrl": "http://127.0.0.1:8070",
+  "kbEngineUrl": "http://uniclaw-kb-engine:8070",
   "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

@@ -72,11 +72,10 @@ export const palzPlugin = {
     gateway: {
         startAccount: async (ctx) => {
             const log = typeof ctx.runtime?.log === "function" ? ctx.runtime.log : console.log;
-            const logInfo = typeof ctx.log?.info === "function" ? ctx.log.info.bind(ctx.log) : log;
             const error = typeof ctx.runtime?.error === "function" ? ctx.runtime.error : console.error;
-            logInfo("palz-gateway: [startAccount] 输入: accountId=" + JSON.stringify(ctx.accountId));
+            log("palz-gateway: [startAccount] 输入: accountId=" + JSON.stringify(ctx.accountId));
             if (ctx.accountId !== PALZ_MANAGER_ACCOUNT_ID) {
-                logInfo("palz-gateway: [startAccount] non-manager account " + JSON.stringify(ctx.accountId) + ", returning abort-pending promise");
+                log("palz-gateway: [startAccount] non-manager account " + JSON.stringify(ctx.accountId) + ", returning abort-pending promise");
                 return new Promise((resolve) => {
                     if (ctx.abortSignal?.aborted) {
                         resolve();
@@ -88,15 +87,17 @@ export const palzPlugin = {
             const baseConfig = resolvePalzConfig(ctx.cfg);
             if (!baseConfig.streamUrl || !baseConfig.apiBaseUrl) {
                 const errMsg = "Palz manager not configured (missing streamUrl/apiBaseUrl)";
-                logInfo("palz-gateway: [startAccount] 失败: " + errMsg);
+                log("palz-gateway: [startAccount] 失败: " + errMsg);
                 throw new Error(errMsg);
             }
-            logInfo("palz-gateway: [startAccount] 启动 manager, streamUrl=" + baseConfig.streamUrl);
+            log("palz-gateway: [startAccount] 启动 manager, streamUrl=" + baseConfig.streamUrl);
             const manager = new ConnectionManager({
                 cfg: ctx.cfg,
                 baseConfig,
                 runtime: ctx.runtime,
-                log: logInfo,
+                // 用 runtime.log（写文件），而非仅 stdout 的 ctx.log.info，
+                // 使连接生命周期日志（reconcile/add/remove/shutdown）落入 palz-*.log。
+                log,
                 error,
             });
             const scanner = startUserDirScanner({
@@ -105,7 +106,7 @@ export const palzPlugin = {
                         error("palz-gateway: reconcile error: " + String(err));
                     });
                 },
-                log: logInfo,
+                log,
                 error,
             });
             // Stop service: disconnect all WS connections and prevent scanner-triggered reconnects.
@@ -115,7 +116,7 @@ export const palzPlugin = {
                 if (stopped)
                     return;
                 stopped = true;
-                logInfo("palz-gateway: [doStop] stopping service, shutting down scanner + manager");
+                log("palz-gateway: [doStop] stopping service, shutting down scanner + manager");
                 scanner.stop();
                 manager.shutdown();
             };
@@ -133,13 +134,15 @@ export const palzPlugin = {
                     },
                     cfg: ctx.cfg,
                     runtime: ctx.runtime,
-                    log: logInfo,
+                    // 用 runtime.log（写入 palz-*.log 文件），而非 ctx.log.info（仅 stdout），
+                    // 使 control-server 的回调日志与消息链路日志落到同一文件，便于排查。
+                    log,
                     error,
                 });
             }
             return new Promise((resolve) => {
                 const onAbort = () => {
-                    logInfo("palz-gateway: [startAccount] abort received, shutting down manager");
+                    log("palz-gateway: [startAccount] abort received, shutting down manager");
                     controlServer?.close();
                     doStop();
                     resolve();

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} 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) {