openclaw-channel-dmwork 0.3.5 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-channel-dmwork",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "DMWork channel plugin for OpenClaw via WuKongIM WebSocket",
   "main": "index.ts",
   "type": "module",
@@ -49,4 +49,4 @@
     "curve25519-js",
     "md5-typescript"
   ]
-}
+}

package/src/accounts.ts

@@ -15,6 +15,7 @@ export type ResolvedDmworkAccount = {
     botToken?: string;
     apiUrl: string;
     wsUrl?: string;
+    cdnUrl?: string;  // CDN base URL for media files (public-read, no auth)
     pollIntervalMs: number;
     heartbeatIntervalMs: number;
     requireMention?: boolean;
@@ -51,6 +52,7 @@ export function resolveDmworkAccount(params: {
   const botToken = accountConfig.botToken ?? channel.botToken;
   const apiUrl = accountConfig.apiUrl ?? channel.apiUrl ?? DEFAULT_API_URL;
   const wsUrl = accountConfig.wsUrl ?? channel.wsUrl;
+  const cdnUrl = accountConfig.cdnUrl ?? channel.cdnUrl;
   const pollIntervalMs =
     accountConfig.pollIntervalMs ??
     channel.pollIntervalMs ??
@@ -72,6 +74,7 @@ export function resolveDmworkAccount(params: {
       botToken,
       apiUrl,
       wsUrl,
+      cdnUrl,
       pollIntervalMs,
       heartbeatIntervalMs,
       requireMention: accountConfig.requireMention ?? channel.requireMention,

package/src/config-schema.ts

@@ -6,6 +6,7 @@ export interface DmworkAccountConfig {
   botToken?: string;
   apiUrl?: string;
   wsUrl?: string;
+  cdnUrl?: string;  // CDN base URL for media files (e.g. https://cdn.example.com/bucket)
   pollIntervalMs?: number;
   heartbeatIntervalMs?: number;
   requireMention?: boolean;
@@ -20,6 +21,7 @@ export interface DmworkConfig {
   botToken?: string;
   apiUrl?: string;
   wsUrl?: string;
+  cdnUrl?: string;  // CDN base URL for media files (e.g. https://cdn.example.com/bucket)
   pollIntervalMs?: number;
   heartbeatIntervalMs?: number;
   requireMention?: boolean;
@@ -43,6 +45,7 @@ export const DmworkConfigJsonSchema = {
       botToken: { type: "string" },
       apiUrl: { type: "string" },
       wsUrl: { type: "string" },
+      cdnUrl: { type: "string" },
       pollIntervalMs: { type: "number", minimum: 500 },
       heartbeatIntervalMs: { type: "number", minimum: 5000 },
       requireMention: { type: "boolean" },
@@ -59,6 +62,7 @@ export const DmworkConfigJsonSchema = {
             botToken: { type: "string" },
             apiUrl: { type: "string" },
             wsUrl: { type: "string" },
+            cdnUrl: { type: "string" },
             pollIntervalMs: { type: "number", minimum: 500 },
             heartbeatIntervalMs: { type: "number", minimum: 5000 },
             requireMention: { type: "boolean" },

package/src/inbound.ts

@@ -151,23 +151,35 @@ interface ResolvedContent {
   mediaType?: string;
 }
 
-function resolveContent(payload: BotMessage["payload"], apiUrl?: string): ResolvedContent {
+function resolveContent(payload: BotMessage["payload"], apiUrl?: string, log?: ChannelLogSink, cdnUrl?: string): ResolvedContent {
   if (!payload) return { text: "" };
 
   const makeFullUrl = (relUrl?: string) => {
     if (!relUrl) return undefined;
     if (relUrl.startsWith("http")) return relUrl;
-    // Use bot file proxy endpoint which handles auth via Bearer token
-    // and returns 302 redirect to presigned URL (works with both MinIO and COS).
-    // /v1/botfile/*path auto-strips "file/" prefix from the storage path.
+    // Strip common path prefixes to get the raw storage path
+    let storagePath = relUrl;
+    // Remove "file/preview/" or "file/" prefix
+    if (storagePath.startsWith("file/preview/")) {
+      storagePath = storagePath.substring("file/preview/".length);
+    } else if (storagePath.startsWith("file/")) {
+      storagePath = storagePath.substring("file/".length);
+    }
+    if (cdnUrl) {
+      // CDN direct: public-read, no auth needed, LLM can access directly
+      const base = cdnUrl.replace(/\/+$/, "");
+      return `${base}/${storagePath}`;
+    }
+    // Fallback: Nginx public /file/ path (no auth)
     const baseUrl = apiUrl?.replace(/\/+$/, "") ?? "";
-    return `${baseUrl}/v1/botfile/${relUrl}`;
+    return `${baseUrl}/file/${storagePath}`;
   };
 
   switch (payload.type) {
     case MessageType.Text:
       return { text: payload.content ?? "" };
     case MessageType.Image: {
+      log?.debug?.(`dmwork: [resolveContent] Image payload.url=${payload.url}`);
       const imgUrl = makeFullUrl(payload.url);
       const imgMime = guessMime(payload.url, "image/jpeg");
       return { text: `[图片]\n${imgUrl ?? ""}`.trim(), mediaUrl: imgUrl, mediaType: imgMime };
@@ -187,6 +199,7 @@ function resolveContent(payload: BotMessage["payload"], apiUrl?: string): Resolv
       return { text: `[视频]\n${videoUrl ?? ""}`.trim(), mediaUrl: videoUrl, mediaType: videoMime };
     }
     case MessageType.File: {
+      log?.debug?.(`dmwork: [resolveContent] File payload.url=${payload.url}`);
       const fileUrl = makeFullUrl(payload.url);
       const fileMime = guessMime(payload.url, payload.name ? guessMime(payload.name, "application/octet-stream") : "application/octet-stream");
       return { text: `[文件: ${payload.name ?? "未知文件"}]\n${fileUrl ?? ""}`.trim(), mediaUrl: fileUrl, mediaType: fileMime };
@@ -434,7 +447,7 @@ export async function handleInboundMessage(params: {
     ? message.channel_id!
     : spaceId ? `${spaceId}:${message.from_uid}` : message.from_uid;
 
-  const resolved = resolveContent(message.payload, account.config.apiUrl);
+  const resolved = resolveContent(message.payload, account.config.apiUrl, log, account.config.cdnUrl);
   let rawBody = resolved.text;
   let inboundMediaUrl = resolved.mediaUrl;
   // Inline text file content if possible
@@ -447,16 +460,7 @@ export async function handleInboundMessage(params: {
     }
   }
 
-  // Convert authenticated media URLs to base64 data URLs so the Agent can access them
-  if (inboundMediaUrl && !inboundMediaUrl.startsWith("data:")) {
-    const dataUrl = await fetchAsDataUrl(inboundMediaUrl, account.config.botToken ?? "", log);
-    if (dataUrl) {
-      log?.info?.(`dmwork: converted media URL to base64 data URL (${resolved.mediaType})`);
-      inboundMediaUrl = dataUrl;
-    } else {
-      log?.warn?.(`dmwork: failed to convert media URL to base64, keeping original`);
-    }
-  }
+  // Media URLs are passed directly to the Agent (storage is public-read, no auth needed)
 
   if (!rawBody) {
     log?.info?.(
@@ -541,7 +545,7 @@ export async function handleInboundMessage(params: {
       entries.push({
         sender: message.from_uid,
         body: rawBody,
-        mediaDataUrl: inboundMediaUrl?.startsWith("data:") ? inboundMediaUrl : undefined,
+        mediaUrl: inboundMediaUrl,
         timestamp: message.timestamp ? message.timestamp * 1000 : Date.now(),
       });
       const historyLimit = account.config.historyLimit ?? DEFAULT_GROUP_HISTORY_LIMIT;
@@ -580,14 +584,26 @@ export async function handleInboundMessage(params: {
           limit: fetchLimit,
           log,
         });
-        entries = apiMessages
+        const filteredApiMsgs = apiMessages
           .filter((m: any) => m.from_uid !== botUid && (m.content || m.type !== 1))
-          .slice(-historyLimit)
-          .map((m: any) => ({
+          .slice(-historyLimit);
+        entries = filteredApiMsgs.map((m: any) => {
+          const entry: any = {
             sender: m.from_uid,
             body: m.content || resolveApiMessagePlaceholder(m.type, m.name),
-            timestamp: m.timestamp,  // Already in ms from getChannelMessages
-          }));
+            timestamp: m.timestamp,
+          };
+          // For media message types, resolve the URL directly (storage is public-read)
+          const mediaTypes = [MessageType.Image, MessageType.File, MessageType.Voice, MessageType.Video];
+          if (mediaTypes.includes(m.type) && !m.content) {
+            const apiResolved = resolveContent({ type: m.type, url: m.url, name: m.name } as any, account.config.apiUrl, log, account.config.cdnUrl);
+            if (apiResolved.mediaUrl) {
+              entry.mediaUrl = apiResolved.mediaUrl;
+              entry.body = apiResolved.text;
+            }
+          }
+          return entry;
+        });
         log?.info?.(`dmwork: [MENTION] 从API获取到 ${entries.length} 条历史消息`);
       } catch (err) {
         log?.error?.(`dmwork: [MENTION] 从API获取历史失败: ${err}`);
@@ -595,16 +611,16 @@ export async function handleInboundMessage(params: {
     }
 
     // Build history context manually (JSON format)
-    // Collect media data URLs from history entries for attachment to the inbound context
+    // Collect media URLs from history entries for attachment to the inbound context
     historyMediaUrls = entries
-      .map((e: any) => e.mediaDataUrl)
+      .map((e: any) => e.mediaUrl)
       .filter((url: string | undefined): url is string => Boolean(url));
 
     if (entries.length > 0) {
       const messagesJson = JSON.stringify(entries.map((e: any) => ({
         sender: e.sender,
         body: e.body,
-        ...(e.mediaDataUrl ? { hasMedia: true } : {}),
+        ...(e.mediaUrl ? { hasMedia: true } : {}),
       })), null, 2);
       const template = account.config.historyPromptTemplate || DEFAULT_HISTORY_PROMPT_TEMPLATE;
       historyPrefix = template