adp-openclaw 0.0.46 → 0.0.48

package/index.ts

@@ -7,6 +7,8 @@ import {
   ADP_UPLOAD_TOOL_SCHEMA,
   parseAdpUploadToolParams,
   uploadFilesToAdpEndpoint,
+  uploadResultEmitter,
+  UPLOAD_RESULT_EVENT,
   type AdpUploadToolResult,
   type UploadedFileInfo,
 } from "./src/adp-upload-tool.js";
@@ -184,6 +186,12 @@ const plugin = {
           api.logger.info?.(`[${ADP_UPLOAD_TOOL_NAME}] file.downloadUrl: ${file.downloadUrl}`);
           api.logger.info?.(`[${ADP_UPLOAD_TOOL_NAME}] file.uri: ${file.uri}`);
         }
+        
+        // 发射上传结果事件，让 monitor.ts 能够直接获取完整的下载链接
+        uploadResultEmitter.emit(UPLOAD_RESULT_EVENT, {
+          toolCallId,
+          result: successResult,
+        });
 
         // Build content with resource links and download URLs
         const content: Array<{ type: string; uri?: string; name?: string; mimeType?: string; text?: string; downloadUrl?: string }> = [];
@@ -200,15 +208,20 @@ const plugin = {
         }
 
         // Add a text summary with download URLs for AI to include in response
+        // 注意：URL 包含签名参数，必须完整保留，不能截断或修改
         const urlSummary = (successResult.files || [])
-          .map((f: UploadedFileInfo) => `- [${f.name}](${f.downloadUrl || f.uri})`)
+          .map((f: UploadedFileInfo) => {
+            const url = f.downloadUrl || f.uri;
+            // 把完整 URL 作为代码块，防止 AI 截断或修改
+            return `- **${f.name}**: \`${url}\``;
+          })
           .join("\n");
         
         api.logger.info?.(`[${ADP_UPLOAD_TOOL_NAME}] urlSummary: ${urlSummary}`);
         
         content.push({
           type: "text",
-          text: `Files uploaded successfully:\n${urlSummary}\n\n⚠️ Note: Please include these download links in your response to the user and remind them that the links are valid for 24 hours.`,
+          text: `Files uploaded successfully:\n${urlSummary}\n\n⚠️ IMPORTANT: The URLs above contain authentication signatures. You MUST copy the ENTIRE URL exactly as shown (including all query parameters after the "?"). Do NOT truncate or modify the URLs in any way. The links are valid for 24 hours.`,
         });
 
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adp-openclaw",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "description": "ADP-OpenClaw demo channel plugin (Go WebSocket backend)",
   "type": "module",
   "dependencies": {

package/src/adp-upload-tool.ts

@@ -12,8 +12,17 @@
 import { constants } from "node:fs";
 import { access, readFile, stat } from "node:fs/promises";
 import { basename, extname } from "node:path";
+import { EventEmitter } from "node:events";
 import type { AdpOpenclawChannelConfig } from "./channel.js";
 
+// ==================== 上传结果事件 ====================
+
+/** 上传结果事件发射器，用于通知其他模块上传完成 */
+export const uploadResultEmitter = new EventEmitter();
+
+/** 上传结果事件名称 */
+export const UPLOAD_RESULT_EVENT = "adp-upload-result";
+
 // ==================== 类型定义 ====================
 
 /** 存储凭证请求参数 */

package/src/channel.ts

@@ -7,6 +7,7 @@ import {
   DEFAULT_ACCOUNT_ID,
 } from "openclaw/plugin-sdk";
 import { adpOpenclawOnboardingAdapter } from "./onboarding.js";
+import { getActiveWebSocket } from "./runtime.js";
 
 // Default WebSocket URL for ADP OpenClaw
 const DEFAULT_WS_URL = "wss://wss.lke.cloud.tencent.com/bot/gateway/conn";
@@ -218,6 +219,42 @@ export const adpOpenclawPlugin: ChannelPlugin<ResolvedAdpOpenclawAccount> = {
       });
     },
   },
-  // Note: outbound.send is not available in WebSocket-only architecture
-  // All message sending is done through the WebSocket connection in monitor.ts
+  // Outbound message support for the "message" tool
+  outbound: {
+    send: async ({ text, to, log }) => {
+      const ws = getActiveWebSocket();
+      if (!ws) {
+        log?.error?.("[adp-openclaw] No active WebSocket connection for outbound message");
+        return { ok: false, error: "No active WebSocket connection" };
+      }
+      
+      // Parse target: expected format is "adp-openclaw:{userId}" or "adp-openclaw:bot"
+      // The "to" parameter comes from the message tool with format like "adp-openclaw:user123"
+      const targetParts = to.split(":");
+      const targetUserId = targetParts.length > 1 ? targetParts.slice(1).join(":") : to;
+      
+      log?.info?.(`[adp-openclaw] Sending outbound message to ${targetUserId}: ${text.slice(0, 50)}...`);
+      
+      try {
+        // Generate unique request ID
+        const requestId = `outbound-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+        
+        const outMsg = {
+          type: "outbound",
+          requestId,
+          payload: {
+            to: targetUserId,
+            text: text,
+          },
+          timestamp: Date.now(),
+        };
+        
+        ws.send(JSON.stringify(outMsg));
+        return { ok: true };
+      } catch (err) {
+        log?.error?.(`[adp-openclaw] Failed to send outbound message: ${err}`);
+        return { ok: false, error: String(err) };
+      }
+    },
+  },
 };

package/src/monitor.ts

@@ -2,7 +2,7 @@
 // Supports: API Token auth, conversation tracking for multi-turn dialogues
 
 import type { PluginLogger, ClawdbotConfig } from "openclaw/plugin-sdk";
-import { getAdpOpenclawRuntime } from "./runtime.js";
+import { getAdpOpenclawRuntime, setActiveWebSocket } from "./runtime.js";
 import {
   getChatHistory,
   listSessions,
@@ -14,6 +14,8 @@ import {
   ADP_UPLOAD_TOOL_NAME,
   ADP_UPLOAD_TOOL_SCHEMA,
   executeAdpUploadTool,
+  uploadResultEmitter,
+  UPLOAD_RESULT_EVENT,
   type AdpUploadToolResult,
 } from "./adp-upload-tool.js";
 import {
@@ -174,6 +176,9 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
 
     ws.on("open", () => {
       log?.info(`[adp-openclaw] WebSocket connected, authenticating...`);
+      
+      // Save active WebSocket for outbound messaging
+      setActiveWebSocket(ws);
 
       // Send authentication message with signature (includes timestamp for anti-replay)
       const nonce = generateNonce();
@@ -328,20 +333,58 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
               let lastPartialText = ""; // Track last sent text for delta calculation
               let finalSent = false; // Track if outbound_end has been sent
               const displayName = inMsg.user?.username || inMsg.from;
+              
+              // 收集上传结果，在发送最终回复时追加完整的下载链接
+              let pendingUploadResults: AdpUploadToolResult[] = [];
+              
+              // 监听上传结果事件
+              const uploadResultHandler = (event: { toolCallId: string; result: AdpUploadToolResult }) => {
+                log?.info(`[adp-openclaw] Received upload result event for toolCallId=${event.toolCallId}`);
+                if (event.result.ok && event.result.files && event.result.files.length > 0) {
+                  pendingUploadResults.push(event.result);
+                  // 打印完整的下载链接
+                  for (const file of event.result.files) {
+                    log?.info(`[adp-openclaw] Upload result - file.downloadUrl: ${file.downloadUrl}`);
+                  }
+                }
+              };
+              uploadResultEmitter.on(UPLOAD_RESULT_EVENT, uploadResultHandler);
 
               // Helper function to send outbound_end message
               const sendOutboundEnd = (text: string) => {
                 if (finalSent) return; // Prevent duplicate sends
                 finalSent = true;
                 
+                // 移除事件监听
+                uploadResultEmitter.off(UPLOAD_RESULT_EVENT, uploadResultHandler);
+                
+                // 如果有上传结果，追加完整的下载链接到回复中
+                let finalText = text;
+                if (pendingUploadResults.length > 0) {
+                  const uploadLinks: string[] = [];
+                  for (const result of pendingUploadResults) {
+                    for (const file of (result.files || [])) {
+                      if (file.downloadUrl) {
+                        // 使用完整的下载链接，包括签名参数
+                        uploadLinks.push(`📎 [${file.name}](${file.downloadUrl})`);
+                        log?.info(`[adp-openclaw] Appending download link: ${file.downloadUrl.substring(0, 100)}...`);
+                      }
+                    }
+                  }
+                  if (uploadLinks.length > 0) {
+                    finalText = `${text}\n\n**文件下载链接（24小时有效）：**\n${uploadLinks.join("\n")}`;
+                    log?.info(`[adp-openclaw] Added ${uploadLinks.length} download links to final response`);
+                  }
+                }
+                
                 if (chunkIndex > 0) {
-                  log?.info(`[adp-openclaw] Sending outbound_end to ${displayName}: ${text.slice(0, 50)}... (chunks=${chunkIndex})`);
+                  log?.info(`[adp-openclaw] Sending outbound_end to ${displayName}: ${finalText.slice(0, 50)}... (chunks=${chunkIndex})`);
                   const endMsg: WSMessage = {
                     type: MsgType.OutboundEnd,
                     requestId: generateRequestId(),
                     payload: {
                       to: inMsg.from,
-                      text: text,
+                      text: finalText,
                       conversationId: inMsg.conversationId,
                       recordId: inMsg.recordId, // Pass recordId back to server
                       streamId: streamId,
@@ -353,13 +396,13 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
                   ws.send(JSON.stringify(endMsg));
                 } else {
                   // No streaming chunks were sent, send as regular outbound message
-                  log?.info(`[adp-openclaw] Sending outbound to ${displayName}: ${text.slice(0, 50)}...`);
+                  log?.info(`[adp-openclaw] Sending outbound to ${displayName}: ${finalText.slice(0, 50)}...`);
                   const outMsg: WSMessage = {
                     type: MsgType.Outbound,
                     requestId: generateRequestId(),
                     payload: {
                       to: inMsg.from,
-                      text: text,
+                      text: finalText,
                       conversationId: inMsg.conversationId,
                       recordId: inMsg.recordId, // Pass recordId back to server
                       user: inMsg.user,
@@ -494,6 +537,7 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
                     // SDK may call deliver without kind when streaming ends
                     if (kind === "final" || kind === undefined) {
                       log?.info(`[adp-openclaw] deliver triggering sendOutboundEnd (kind=${kind})`);
+                      log?.info(`[adp-openclaw] Final text content: ${text}`);
                       sendOutboundEnd(text || lastPartialText);
                     }
                   },
@@ -650,6 +694,8 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
     ws.on("close", (code, reason) => {
       if (pingInterval) clearInterval(pingInterval);
       abortSignal?.removeEventListener("abort", abortHandler);
+      // Clear active WebSocket when connection closes
+      setActiveWebSocket(null);
       log?.info(`[adp-openclaw] WebSocket closed: ${code} ${reason.toString()}`);
       resolve();
     });

package/src/runtime.ts

@@ -1,5 +1,6 @@
 // Runtime singleton for adp-openclaw plugin
 import type { PluginRuntime } from "openclaw/plugin-sdk";
+import type { WebSocket } from "ws";
 
 let adpOpenclawRuntime: PluginRuntime | null = null;
 
@@ -16,6 +17,17 @@ export type PluginConfig = {
 
 let pluginConfig: PluginConfig = {};
 
+// Active WebSocket connection for outbound messaging
+let activeWebSocket: WebSocket | null = null;
+
+export function setActiveWebSocket(ws: WebSocket | null): void {
+  activeWebSocket = ws;
+}
+
+export function getActiveWebSocket(): WebSocket | null {
+  return activeWebSocket;
+}
+
 export function setAdpOpenclawRuntime(runtime: PluginRuntime): void {
   adpOpenclawRuntime = runtime;
 }