palz-connector 1.0.2 → 1.0.4

package/openclaw.plugin.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "palz-connector",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Palz IM 接入 OpenClaw",
   "main": "plugin.ts",
   "type": "module",

package/plugin.ts

@@ -7,9 +7,9 @@
 
 import WebSocket from 'ws';
 import { readFileSync } from 'fs';
-import { resolve, dirname, join } from 'path';
+import { resolve, dirname } from 'path';
 import { fileURLToPath } from 'url';
-import { homedir } from 'os';
+
 
 // ============ 类型定义 ============
 
@@ -49,23 +49,12 @@ function getPluginDir(): string {
 }
 
 function readGatewayToken(log?: any): string {
-  try {
-    const openclawPath = join(homedir(), '.openclaw', 'openclaw.json');
-    const openclawConfig = JSON.parse(readFileSync(openclawPath, 'utf-8'));
-    const token = openclawConfig?.gateway?.auth?.token;
-    if (token) {
-      log?.info?.('[Palz] gatewayToken 从 ~/.openclaw/openclaw.json 读取');
-      return token;
-    }
-  } catch {
-    // 文件不存在或解析失败，继续尝试环境变量
-  }
-
-  if (process.env.GATEWAY_TOKEN) {
-    return process.env.GATEWAY_TOKEN;
+  if (process.env.OPENCLAW_GATEWAY_TOKEN) {
+    log?.info?.('[Palz] gatewayToken 从环境变量 OPENCLAW_GATEWAY_TOKEN 读取');
+    return process.env.OPENCLAW_GATEWAY_TOKEN;
   }
 
-  log?.warn?.('[Palz] gatewayToken 未配置（~/.openclaw/openclaw.json 和环境变量 GATEWAY_TOKEN 均未设置）');
+  log?.warn?.('[Palz] gatewayToken 未配置（环境变量 OPENCLAW_GATEWAY_TOKEN 未设置）');
   return '';
 }
 
@@ -153,36 +142,28 @@ function isNewSessionCommand(text: string): boolean {
 
 function getSessionKey(
   senderId: string,
+  conversationId: string,
   forceNew: boolean,
-  sessionTimeout: number,
   log?: any,
 ): { sessionKey: string; isNew: boolean } {
+  const sessionId = `palz:${senderId}:${conversationId}`;
   const now = Date.now();
 
   if (forceNew) {
-    const sessionId = `palz:${senderId}:${now}`;
     userSessions.set(senderId, { lastActivity: now, sessionId });
-    log?.info?.(`[Palz][Session] 用户主动开启新会话: ${senderId}`);
+    log?.info?.(`[Palz][Session] 用户主动开启新会话: ${senderId}, conversation=${conversationId}`);
     return { sessionKey: sessionId, isNew: true };
   }
 
   const existing = userSessions.get(senderId);
-  if (existing) {
-    const elapsed = now - existing.lastActivity;
-    if (elapsed > sessionTimeout) {
-      const sessionId = `palz:${senderId}:${now}`;
-      userSessions.set(senderId, { lastActivity: now, sessionId });
-      log?.info?.(`[Palz][Session] 会话超时(${Math.round(elapsed / 60000)}分钟)，自动开启新会话: ${senderId}`);
-      return { sessionKey: sessionId, isNew: true };
-    }
+  if (existing && existing.sessionId === sessionId) {
     existing.lastActivity = now;
-    return { sessionKey: existing.sessionId, isNew: false };
+    return { sessionKey: sessionId, isNew: false };
   }
 
-  const sessionId = `palz:${senderId}:${now}`;
   userSessions.set(senderId, { lastActivity: now, sessionId });
-  log?.info?.(`[Palz][Session] 新用户首次会话: ${senderId}`);
-  return { sessionKey: sessionId, isNew: false };
+  log?.info?.(`[Palz][Session] 新会话: ${senderId}, conversation=${conversationId}`);
+  return { sessionKey: sessionId, isNew: !existing };
 }
 
 // ============ Gateway SSE 客户端 ============
@@ -198,7 +179,18 @@ async function* streamFromGateway(
   const rt = getRuntime();
   const gatewayUrl = `http://127.0.0.1:${rt.gateway?.port || 18789}/v1/chat/completions`;
 
-  log?.info?.(`[Palz][Gateway] POST ${gatewayUrl}, session=${sessionKey}`);
+  const requestBody = {
+    model: 'main',
+    messages: [{ role: 'user', content: userContent }],
+    stream: true,
+    user: sessionKey,
+  };
+
+  const contentPreview = typeof userContent === 'string'
+    ? userContent.slice(0, 200)
+    : JSON.stringify(userContent).slice(0, 200);
+  log?.info?.(`[Palz][Gateway] POST ${gatewayUrl}, session=${sessionKey}, content=${contentPreview}`);
+  log?.info?.(`[Palz][Gateway] Request body: ${JSON.stringify(requestBody, null, 2)}`);
 
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), GATEWAY_TIMEOUT);
@@ -211,27 +203,28 @@ async function* streamFromGateway(
         'Content-Type': 'application/json',
         ...(gatewayAuth ? { Authorization: `Bearer ${gatewayAuth}` } : {}),
       },
-      body: JSON.stringify({
-        model: 'main',
-        messages: [{ role: 'user', content: userContent }],
-        stream: true,
-        user: sessionKey,
-      }),
+      body: JSON.stringify(requestBody),
       signal: controller.signal,
     });
   } catch (err: any) {
     clearTimeout(timer);
+    log?.error?.(`[Palz][Gateway] 请求异常: ${err.message}`);
     throw err;
   }
 
+  log?.info?.(`[Palz][Gateway] Response status=${response.status}, headers=${JSON.stringify(Object.fromEntries(response.headers.entries()))}`);
+
   if (!response.ok || !response.body) {
     clearTimeout(timer);
-    throw new Error(`Gateway error: ${response.status}`);
+    const errorBody = await response.text().catch(() => '');
+    log?.error?.(`[Palz][Gateway] 请求失败: status=${response.status}, body=${errorBody}`);
+    throw new Error(`Gateway error: ${response.status} ${errorBody}`);
   }
 
   const reader = (response.body as any).getReader();
   const decoder = new TextDecoder();
   let buffer = '';
+  let fullResponse = '';
 
   try {
     while (true) {
@@ -243,16 +236,23 @@ async function* streamFromGateway(
       for (const line of lines) {
         if (!line.startsWith('data: ')) continue;
         const data = line.slice(6).trim();
-        if (data === '[DONE]') return;
+        if (data === '[DONE]') {
+          log?.info?.(`[Palz][Gateway] 流式响应完成, 总长度=${fullResponse.length}, 内容=${fullResponse.slice(0, 500)}`);
+          return;
+        }
         try {
           const chunk = JSON.parse(data);
           const content = chunk.choices?.[0]?.delta?.content;
-          if (content) yield content;
+          if (content) {
+            fullResponse += content;
+            yield content;
+          }
         } catch {
-          // skip malformed JSON chunks
+          log?.warn?.(`[Palz][Gateway] 解析SSE数据失败: ${data.slice(0, 200)}`);
         }
       }
     }
+    log?.info?.(`[Palz][Gateway] 流结束, 总长度=${fullResponse.length}, 内容=${fullResponse.slice(0, 500)}`);
   } finally {
     clearTimeout(timer);
   }
@@ -260,20 +260,54 @@ async function* streamFromGateway(
 
 // ============ IM 消息发送 ============
 
-async function sendToIM(config: any, conversationId: string, content: OpenAIContent, log?: any) {
+const STREAM_THROTTLE_MS = 200;
+
+interface StreamOpts {
+  streamId: string;
+  seq: number;
+  isFinal: boolean;
+  delta: string;
+}
+
+let msgSeq = 0;
+
+function nextMsgId(): string {
+  return `bot_reply_${Date.now()}_${++msgSeq}`;
+}
+
+async function sendToIM(
+  config: any,
+  conversationId: string,
+  content: OpenAIContent,
+  log?: any,
+  stream?: StreamOpts,
+  conversationType: string = 'direct',
+) {
   const botId = config.botId;
   const url = `${config.apiBaseUrl}/bot/send`;
   const contentLength = typeof content === 'string' ? content.length : JSON.stringify(content).length;
-  log?.info?.(`[Palz][Send] POST ${url}, bot_id=${botId}, conversation=${conversationId}, length=${contentLength}`);
+
+  const reqBody: Record<string, unknown> = {
+    bot_id: botId,
+    conversation_id: conversationId,
+    conversation_type: conversationType,
+    msg_id: nextMsgId(),
+    content,
+  };
+
+  if (stream) {
+    reqBody.stream_id = stream.streamId;
+    reqBody.seq = stream.seq;
+    reqBody.is_final = stream.isFinal;
+    reqBody.delta = stream.delta;
+  }
+
+  log?.info?.(`[Palz][Send] POST ${url}, bot_id=${botId}, conversation=${conversationId}, msg_id=${reqBody.msg_id}, length=${contentLength}${stream ? `, stream=${stream.streamId}, seq=${stream.seq}, final=${stream.isFinal}, delta_len=${stream.delta.length}` : ''}`);
 
   const response = await fetch(url, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      bot_id: botId,
-      conversation_id: conversationId,
-      content,
-    }),
+    body: JSON.stringify(reqBody),
   });
 
   const body = await response.json().catch(() => null);
@@ -285,6 +319,55 @@ async function sendToIM(config: any, conversationId: string, content: OpenAICont
   return body;
 }
 
+/**
+ * 流式回复：边从 Gateway 读取边向 IM 发送，带节流控制。
+ * 每个片段同时携带 content（完整累积）和 delta（本次增量），
+ * IM 端可按需选择：用 delta 追加渲染（高效），或用 content 全量替换（可靠）。
+ */
+async function streamReplyToIM(
+  config: any,
+  conversationId: string,
+  gateway: AsyncGenerator<string>,
+  log?: any,
+  conversationType: string = 'direct',
+) {
+  const streamId = `stream_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+  let fullResponse = '';
+  let lastSentLength = 0;
+  let lastSendTime = 0;
+  let seq = 0;
+
+  try {
+    for await (const chunk of gateway) {
+      fullResponse += chunk;
+
+      const now = Date.now();
+      if (now - lastSendTime >= STREAM_THROTTLE_MS) {
+        const delta = fullResponse.slice(lastSentLength);
+        await sendToIM(config, conversationId, fullResponse, log, {
+          streamId, seq: seq++, isFinal: false, delta,
+        }, conversationType);
+        lastSentLength = fullResponse.length;
+        lastSendTime = now;
+      }
+    }
+
+    const finalDelta = fullResponse.slice(lastSentLength);
+    await sendToIM(config, conversationId, fullResponse || '（无响应）', log, {
+      streamId, seq: seq++, isFinal: true, delta: finalDelta,
+    }, conversationType);
+  } catch (err: any) {
+    log?.error?.(`[Palz][Stream] 流式回复异常: ${err.message}`);
+    if (fullResponse) {
+      const errSuffix = `\n\n[错误: ${err.message}]`;
+      await sendToIM(config, conversationId, fullResponse + errSuffix, log, {
+        streamId, seq: seq++, isFinal: true, delta: fullResponse.slice(lastSentLength) + errSuffix,
+      }, conversationType).catch(() => {});
+    }
+    throw err;
+  }
+}
+
 // ============ 核心消息处理 ============
 
 function handleIMMessage(params: {
@@ -306,29 +389,40 @@ function handleIMMessage(params: {
 
   const senderId = msg.sender_id;
   const conversationId = msg.conversation_id;
-  log?.info?.(`[Palz] 收到消息: sender=${senderId}, bot_id=${config.botId}, conv=${conversationId}`);
+  const conversationType = msg.conversation_type || 'direct';
+  const useStream = msg.stream === true;
+  const msgSnapshot = Object.fromEntries(
+    Object.entries(msg).map(([k, v]) => {
+      const s = typeof v === 'string' ? v : JSON.stringify(v);
+      return [k, s.length > 300 ? s.slice(0, 300) + '...' : v];
+    }),
+  );
+  log?.info?.(`[Palz] 收到消息: ${JSON.stringify(msgSnapshot)}, stream=${useStream}`);
 
   withUserLock(senderId, async () => {
-    const sessionTimeout = config.sessionTimeout ?? 1800000;
-
     if (isNewSessionCommand(plainText)) {
-      getSessionKey(senderId, true, sessionTimeout, log);
-      await sendToIM(config, conversationId, '✨ 已开启新会话', log);
+      getSessionKey(senderId, conversationId, true, log);
+      await sendToIM(config, conversationId, '✨ 已开启新会话', log, undefined, conversationType);
       return;
     }
 
-    const { sessionKey } = getSessionKey(senderId, false, sessionTimeout, log);
+    const { sessionKey } = getSessionKey(senderId, conversationId, false, log);
     const gatewayAuth = config.gatewayToken || '';
 
-    let fullResponse = '';
     try {
-      for await (const chunk of streamFromGateway(content, sessionKey, gatewayAuth, log)) {
-        fullResponse += chunk;
+      const gateway = streamFromGateway(content, sessionKey, gatewayAuth, log);
+      if (useStream) {
+        await streamReplyToIM(config, conversationId, gateway, log, conversationType);
+      } else {
+        let fullResponse = '';
+        for await (const chunk of gateway) {
+          fullResponse += chunk;
+        }
+        await sendToIM(config, conversationId, fullResponse || '（无响应）', log, undefined, conversationType);
       }
-      await sendToIM(config, conversationId, fullResponse || '（无响应）', log);
     } catch (err: any) {
       log?.error?.(`[Palz][Gateway] 调用失败: ${err.message}`);
-      await sendToIM(config, conversationId, `抱歉，处理请求时出错: ${err.message}`, log);
+      await sendToIM(config, conversationId, `抱歉，处理请求时出错: ${err.message}`, log, undefined, conversationType);
     }
   });
 }