openclaw-channel-dmwork 0.3.0 → 0.3.2

package/package.json

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

package/src/inbound.ts

@@ -138,22 +138,36 @@ function resolveContent(payload: BotMessage["payload"], apiUrl?: string): Resolv
   const makeFullUrl = (relUrl?: string) => {
     if (!relUrl) return undefined;
     if (relUrl.startsWith("http")) return relUrl;
-    return `${apiUrl?.replace(/\/+$/, "")}/v1/bot/file/${relUrl}`;
+    // Build public file URL: strip /api suffix from apiUrl, strip "preview/" from path
+    // e.g. "file/preview/chat/xxx/img.jpg" → "https://host/file/chat/xxx/img.jpg"
+    const baseUrl = apiUrl?.replace(/\/+$/, "").replace(/\/api$/i, "") ?? "";
+    const cleanPath = relUrl.replace(/^file\/preview\//, "file/");
+    return `${baseUrl}/${cleanPath}`;
   };
 
   switch (payload.type) {
     case MessageType.Text:
       return { text: payload.content ?? "" };
-    case MessageType.Image:
-      return { text: "[图片]", mediaUrl: makeFullUrl(payload.url), mediaType: "image" };
-    case MessageType.GIF:
-      return { text: "[GIF]", mediaUrl: makeFullUrl(payload.url), mediaType: "image" };
-    case MessageType.Voice:
-      return { text: "[语音消息]", mediaUrl: makeFullUrl(payload.url), mediaType: "audio" };
-    case MessageType.Video:
-      return { text: "[视频]", mediaUrl: makeFullUrl(payload.url), mediaType: "video" };
-    case MessageType.File:
-      return { text: `[文件: ${payload.name ?? "未知文件"}]`, mediaUrl: makeFullUrl(payload.url), mediaType: "file" };
+    case MessageType.Image: {
+      const imgUrl = makeFullUrl(payload.url);
+      return { text: `[图片]\n${imgUrl ?? ""}`.trim(), mediaUrl: imgUrl, mediaType: "image" };
+    }
+    case MessageType.GIF: {
+      const gifUrl = makeFullUrl(payload.url);
+      return { text: `[GIF]\n${gifUrl ?? ""}`.trim(), mediaUrl: gifUrl, mediaType: "image" };
+    }
+    case MessageType.Voice: {
+      const voiceUrl = makeFullUrl(payload.url);
+      return { text: `[语音消息]\n${voiceUrl ?? ""}`.trim(), mediaUrl: voiceUrl, mediaType: "audio" };
+    }
+    case MessageType.Video: {
+      const videoUrl = makeFullUrl(payload.url);
+      return { text: `[视频]\n${videoUrl ?? ""}`.trim(), mediaUrl: videoUrl, mediaType: "video" };
+    }
+    case MessageType.File: {
+      const fileUrl = makeFullUrl(payload.url);
+      return { text: `[文件: ${payload.name ?? "未知文件"}]\n${fileUrl ?? ""}`.trim(), mediaUrl: fileUrl, mediaType: "file" };
+    }
     case MessageType.Location: {
       const lat = payload.latitude ?? payload.lat;
       const lng = payload.longitude ?? payload.lng ?? payload.lon;
@@ -181,6 +195,25 @@ const TEXT_FILE_EXTENSIONS = new Set([
   "log", "py", "js", "ts", "go", "java",
 ]);
 
+/** Fetch an authenticated URL and return a base64 data URL */
+async function fetchAsDataUrl(
+  url: string,
+  botToken: string,
+): Promise<string | null> {
+  try {
+    const resp = await fetch(url, {
+      headers: { Authorization: `Bearer ${botToken}` },
+      signal: AbortSignal.timeout(30_000),
+    });
+    if (!resp.ok) return null;
+    const contentType = resp.headers.get("content-type") || "application/octet-stream";
+    const buffer = Buffer.from(await resp.arrayBuffer());
+    return `data:${contentType};base64,${buffer.toString("base64")}`;
+  } catch {
+    return null;
+  }
+}
+
 async function resolveFileContent(
   url: string,
   botToken: string,
@@ -385,6 +418,17 @@ 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 ?? "");
+    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`);
+    }
+  }
+
   if (!rawBody) {
     log?.info?.(
       `dmwork: inbound dropped session=${sessionId} reason=empty-content`,