palz-connector 1.4.7 → 1.4.9

package/openclaw.plugin.json

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

package/package.json

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

package/palz-connector.config.json

@@ -2,6 +2,8 @@
   "enabled": true,
   "streamUrl": "ws://14.103.148.99:8090/ws/bot",
   "apiBaseUrl": "http://14.103.148.99:8090/api",
+  "clawGatewayUrl": "http://claw-gateway:8080",
+  "activityReportEnabled": false,
   "sessionTimeout": 1800000,
   "groupContextCache": false,
   "showProcess": true

package/palz-connector.dev.config.json

@@ -2,6 +2,8 @@
   "enabled": true,
   "streamUrl": "wss://claw-server.csaiagent.com/ws/bot",
   "apiBaseUrl": "https://claw-server.csaiagent.com/api",
+  "clawGatewayUrl": "http://claw-gateway:8080",
+  "activityReportEnabled": true,
   "sessionTimeout": 1800000,
   "groupContextCache": false,
   "showProcess": true

package/palz-connector.prod.config.json

@@ -2,6 +2,8 @@
   "enabled": true,
   "streamUrl": "wss://claw-server.csagentai.com/ws/bot",
   "apiBaseUrl": "https://claw-server.csagentai.com/api",
+  "clawGatewayUrl": "http://claw-gateway:8080",
+  "activityReportEnabled": true,
   "sessionTimeout": 1800000,
   "groupContextCache": false,
   "showProcess": true

package/palz-connector.staging.config.json

@@ -2,6 +2,8 @@
   "enabled": true,
   "streamUrl": "wss://claw-server.csjkagent.com/ws/bot",
   "apiBaseUrl": "https://claw-server.csjkagent.com/api",
+  "clawGatewayUrl": "https://claw-server.csjkagent.com/api",
+  "activityReportEnabled": true,
   "sessionTimeout": 1800000,
   "groupContextCache": false,
   "showProcess": true

package/src/activity.ts

@@ -0,0 +1,102 @@
+/**
+ * Palz IM 收到消息后的 claw-gateway 活动上报。
+ */
+
+import type { PalzConfig, PalzMessageEvent } from "./types.js";
+
+const ACTIVITY_REPORT_TIMEOUT_MS = 2000;
+const ACTIVITY_REPORT_PATH_PREFIX = "/openclaw-gateway/be/deployments";
+
+const warnedMissingConfig = new Set<string>();
+
+export interface ReportPalzActivityParams {
+  config: PalzConfig;
+  msg: PalzMessageEvent;
+  receivedAt: Date;
+  runtime?: any;
+  accountId?: string;
+}
+
+function formatDateTimeWithOffset(date: Date): string {
+  const pad = (n: number, width = 2) => String(n).padStart(width, "0");
+  const offsetMinutes = -date.getTimezoneOffset();
+  const sign = offsetMinutes >= 0 ? "+" : "-";
+  const absOffset = Math.abs(offsetMinutes);
+  const offsetHours = Math.floor(absOffset / 60);
+  const offsetRestMinutes = absOffset % 60;
+
+  return [
+    `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`,
+    "T",
+    `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`,
+    `${sign}${pad(offsetHours)}:${pad(offsetRestMinutes)}`,
+  ].join("");
+}
+
+function resolveActivityUrl(baseUrl: string, releaseName: string): string {
+  const normalizedBase = baseUrl.replace(/\/+$/, "");
+  return `${normalizedBase}${ACTIVITY_REPORT_PATH_PREFIX}/${encodeURIComponent(releaseName)}/activity`;
+}
+
+export async function reportPalzActivity(params: ReportPalzActivityParams): Promise<void> {
+  const { config, msg, receivedAt, 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"}]`;
+
+  if (config.activityReportEnabled !== true) return;
+
+  const baseUrl = config.clawGatewayUrl?.trim();
+  const releaseName = (process.env.botID || config.botId || "").trim();
+  if (!baseUrl || !releaseName) {
+    const warnKey = `${accountId ?? ""}:${baseUrl ? "hasBaseUrl" : "missingBaseUrl"}:${releaseName ? "hasRelease" : "missingRelease"}`;
+    if (!warnedMissingConfig.has(warnKey)) {
+      warnedMissingConfig.add(warnKey);
+      error(`${tag}: [ACTIVITY_REPORT] enabled but missing ${!baseUrl ? "clawGatewayUrl" : "botID/releaseName"}, skip`);
+    }
+    return;
+  }
+
+  const payload: Record<string, unknown> = {
+    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),
+  };
+
+  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();
+
+  try {
+    const response = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body,
+      signal: controller.signal,
+    });
+    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)}`);
+      return;
+    }
+    log(`${tag}: [ACTIVITY_REPORT] ok status=${response.status} elapsed=${elapsedMs}ms msg_id=${msg.msg_id}`);
+  } catch (err: any) {
+    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}`);
+  } finally {
+    clearTimeout(timeout);
+  }
+}

package/src/bot.ts

@@ -558,6 +558,9 @@ async function _dispatchPalzMessageInner(params: HandlePalzMessageParams): Promi
   if (groupId) {
     untrustedContext.push(`group_id: ${groupId}`);
   }
+  if (msg.group_name) {
+    untrustedContext.push(`group_name: ${msg.group_name}`);
+  }
   if (msg.group_owner_id) {
     untrustedContext.push(`group_owner_id: ${msg.group_owner_id}`);
   }
@@ -584,7 +587,7 @@ async function _dispatchPalzMessageInner(params: HandlePalzMessageParams): Promi
     SessionKey: route.sessionKey,
     AccountId: route.accountId,
     ChatType: chatType,
-    GroupSubject: isGroup ? msg.conversation_id : undefined,
+    GroupSubject: isGroup ? (msg.group_name || msg.conversation_id) : undefined,
     SenderId: msg.sender_id,
     SenderName: senderName,
     UntrustedContext: untrustedContext,

package/src/channel.ts

@@ -44,6 +44,8 @@ export const palzPlugin = {
         enabled: { type: "boolean" },
         streamUrl: { type: "string" },
         apiBaseUrl: { type: "string" },
+        clawGatewayUrl: { type: "string" },
+        activityReportEnabled: { type: "boolean" },
         sessionTimeout: { type: "integer", minimum: 0 },
       },
     },

package/src/config.ts

@@ -3,7 +3,7 @@
  *
  * 配置来源：
  * - botId: 仅从环境变量 botID 读取
- * - streamUrl / apiBaseUrl / sessionTimeout: 从配置文件读取
+ * - streamUrl / apiBaseUrl / clawGatewayUrl / sessionTimeout: 从配置文件读取
  *   - 若环境变量 HELM_ENV 存在且非空，读取 palz-connector.{HELM_ENV}.config.json
  *   - 否则读取默认配置文件 palz-connector.config.json
  */
@@ -71,6 +71,8 @@ export function resolvePalzConfig(_cfg?: any): PalzConfig {
     botId: process.env.botID || "",
     streamUrl: file.streamUrl || "",
     apiBaseUrl: file.apiBaseUrl || "",
+    clawGatewayUrl: file.clawGatewayUrl || "",
+    activityReportEnabled: file.activityReportEnabled === true,
     sessionTimeout: file.sessionTimeout ?? DEFAULT_SESSION_TIMEOUT,
     groupContextCache: file.groupContextCache !== false,
     showProcess: file.showProcess === true,

package/src/monitor.ts

@@ -7,6 +7,7 @@
 
 import WebSocket from "ws";
 import { handlePalzMessage } from "./bot.js";
+import { reportPalzActivity } from "./activity.js";
 import { tracer, extractTraceparentContext, SpanStatusCode } from "./tracing.js";
 import type { PalzConfig, PalzMessageEvent } from "./types.js";
 
@@ -40,6 +41,7 @@ export async function monitorPalzProvider(params: MonitorPalzParams): Promise<vo
     let currentWs: WebSocket | null = null;
     let consecutive4002 = 0;
     const MAX_CONSECUTIVE_4002 = 10;
+    const MAX_RECONNECT_DELAY_MS = 16_000;
 
     const cleanup = () => {
       closed = true;
@@ -72,15 +74,28 @@ export async function monitorPalzProvider(params: MonitorPalzParams): Promise<vo
     }
     abortSignal?.addEventListener("abort", handleAbort, { once: true });
 
-    function scheduleReconnect() {
+    function scheduleReconnect(delay = reconnectDelay, advanceBackoff = true) {
       if (closed) return;
-      log(`palz[${accountId}]: scheduling reconnect in ${reconnectDelay}ms`);
-      reconnectTimer = setTimeout(connect, reconnectDelay);
-      reconnectDelay = Math.min(reconnectDelay * 2, 30_000);
+      if (reconnectTimer) {
+        clearTimeout(reconnectTimer);
+        reconnectTimer = null;
+      }
+      log(`palz[${accountId}]: scheduling reconnect in ${delay}ms`);
+      reconnectTimer = setTimeout(() => {
+        reconnectTimer = null;
+        connect();
+      }, delay);
+      if (advanceBackoff) {
+        reconnectDelay = Math.min(reconnectDelay * 2, MAX_RECONNECT_DELAY_MS);
+      }
     }
 
     function connect() {
       if (closed) return;
+      if (reconnectTimer) {
+        clearTimeout(reconnectTimer);
+        reconnectTimer = null;
+      }
 
       let ws: WebSocket;
       try {
@@ -94,7 +109,55 @@ export async function monitorPalzProvider(params: MonitorPalzParams): Promise<vo
       let connectedAt = 0;
       let pingInterval: ReturnType<typeof setInterval> | null = null;
       let messageCount = 0;
-      let closeFired = false;
+      let ended = false;
+
+      const handleSocketEnd = (code: number, reasonStr: string) => {
+        if (ended) return;
+        ended = true;
+        if (pingInterval) {
+          clearInterval(pingInterval);
+          pingInterval = null;
+        }
+        if (closed) return;
+
+        const wasConnected = connectedAt > 0;
+        const stableMs = wasConnected ? Date.now() - connectedAt : 0;
+
+        // 4002: 被新连接替代，带退避重试
+        if (code === 4002) {
+          consecutive4002++;
+          if (consecutive4002 >= MAX_CONSECUTIVE_4002) {
+            log(
+              `palz[${accountId}]: replaced ${consecutive4002} times (code=4002), giving up`,
+            );
+            cleanup();
+            resolve();
+            return;
+          }
+          const jitter = Math.floor(Math.random() * 2000);
+          const delay = 3000 * consecutive4002 + jitter;
+          log(
+            `palz[${accountId}]: replaced (code=4002, attempt=${consecutive4002}), retry in ${delay}ms`,
+          );
+          scheduleReconnect(delay, false);
+          return;
+        }
+
+        // 4001: bot_id 缺失，不重连
+        if (code === 4001) {
+          error(`palz[${accountId}]: bot_id missing (code=4001), not reconnecting`);
+          cleanup();
+          resolve();
+          return;
+        }
+
+        // 其他断开：指数退避重连
+        if (wasConnected && stableMs > 10_000) reconnectDelay = 1000;
+        log(
+          `palz[${accountId}]: disconnected (code=${code}, reason=${reasonStr}, uptime=${Math.round(stableMs / 1000)}s, msgs=${messageCount}), reconnecting in ${reconnectDelay}ms`,
+        );
+        scheduleReconnect();
+      };
 
       ws.on("open", () => {
         connectedAt = Date.now();
@@ -111,6 +174,7 @@ export async function monitorPalzProvider(params: MonitorPalzParams): Promise<vo
       });
 
       ws.on("message", (data: Buffer) => {
+        const receivedAt = new Date();
         const raw = data.toString();
         try {
           const msg = JSON.parse(raw) as PalzMessageEvent;
@@ -129,7 +193,22 @@ export async function monitorPalzProvider(params: MonitorPalzParams): Promise<vo
 
               log(`palz[${accountId}]: [WS_RECV] #${messageCount} full_message=${raw.slice(0, 1000)} traceId=${span.spanContext().traceId}`);
 
-              handlePalzMessage({ cfg, msg, runtime, accountId }).catch((err: any) => {
+              reportPalzActivity({
+                config,
+                msg,
+                receivedAt,
+                runtime,
+                accountId,
+              }).catch((err: any) => {
+                error(`palz[${accountId}]: [ACTIVITY_REPORT] unhandled error: ${err.message ?? err}`);
+              });
+
+              handlePalzMessage({
+                cfg,
+                msg,
+                runtime,
+                accountId,
+              }).catch((err: any) => {
                 error(`palz[${accountId}]: [WS_RECV] handlePalzMessage unhandled error: ${err.message ?? err}`);
               });
             } catch (e) {
@@ -145,62 +224,12 @@ export async function monitorPalzProvider(params: MonitorPalzParams): Promise<vo
       });
 
       ws.on("close", (code: number, reason: Buffer) => {
-        closeFired = true;
-        if (pingInterval) {
-          clearInterval(pingInterval);
-          pingInterval = null;
-        }
-        if (closed) return;
-
-        const stableMs = Date.now() - connectedAt;
-        const reasonStr = reason?.toString() || "";
-
-        // 4002: 被新连接替代，带退避重试
-        if (code === 4002) {
-          consecutive4002++;
-          if (consecutive4002 >= MAX_CONSECUTIVE_4002) {
-            log(
-              `palz[${accountId}]: replaced ${consecutive4002} times (code=4002), giving up`,
-            );
-            cleanup();
-            resolve();
-            return;
-          }
-          const jitter = Math.floor(Math.random() * 2000);
-          const delay = 3000 * consecutive4002 + jitter;
-          log(
-            `palz[${accountId}]: replaced (code=4002, attempt=${consecutive4002}), retry in ${delay}ms`,
-          );
-          reconnectTimer = setTimeout(connect, delay);
-          return;
-        }
-
-        // 4001: bot_id 缺失，不重连
-        if (code === 4001) {
-          error(`palz[${accountId}]: bot_id missing (code=4001), not reconnecting`);
-          cleanup();
-          resolve();
-          return;
-        }
-
-        // 其他断开：指数退避重连
-        if (stableMs > 10_000) reconnectDelay = 1000;
-        log(
-          `palz[${accountId}]: disconnected (code=${code}, reason=${reasonStr}, uptime=${Math.round(stableMs / 1000)}s, msgs=${messageCount}), reconnecting in ${reconnectDelay}ms`,
-        );
-        scheduleReconnect();
+        handleSocketEnd(code, reason?.toString() || "");
       });
 
       ws.on("error", (err) => {
         error(`palz[${accountId}]: WebSocket error: ${err.message}`);
-        if (!closeFired) {
-          closeFired = true;
-          if (pingInterval) {
-            clearInterval(pingInterval);
-            pingInterval = null;
-          }
-          scheduleReconnect();
-        }
+        handleSocketEnd(1006, err.message);
       });
     }
 

package/src/types.ts

@@ -39,6 +39,8 @@ export interface PalzMessageEvent {
   group_id?: string;
   /** 群主用户 ID，群聊时由 IM 下发 */
   group_owner_id?: string;
+  /** 群聊名称，群聊时由 IM 下发 */
+  group_name?: string;
   /** Lobster ID，标识 agent 身份（IM 通过此字段区分不同 agent） */
   lobster_id?: string;
   /** 群组类型，由 IM 下发 */
@@ -62,6 +64,10 @@ export interface PalzConfig {
   botId?: string;
   streamUrl?: string;
   apiBaseUrl?: string;
+  /** claw-gateway 服务基础地址，例如 https://example.com */
+  clawGatewayUrl?: string;
+  /** 是否向 claw-gateway 上报 IM 消息接收事件，默认 false */
+  activityReportEnabled?: boolean;
   sessionTimeout?: number;
   /** 群聊上下文缓存开关：true=未@消息缓存为上下文（默认），false=所有群聊消息直接发送给AI */
   groupContextCache?: boolean;