@dcrays/dcgchat-test 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "type": "module",
   "description": "OpenClaw channel plugin for DCG Chat (WebSocket)",
   "main": "index.ts",
@@ -20,10 +20,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "ali-oss": "file:src/libs/ali-oss-6.23.0.tgz",
     "ws": "file:src/libs/ws-8.19.0.tgz",
-    "axios": "file:src/libs/axios-1.13.6.tgz",
-    "md5": "file:src/libs/md5-2.3.0.tgz",
+    "mime-types": "file:src/libs/mime-types-3.0.2.tgz",
     "unzipper": "file:src/libs/unzipper-0.12.3.tgz"
   },
   "devDependencies": {

package/src/bot.ts

@@ -1,10 +1,14 @@
 import path from "node:path";
+import os from "node:os";
 import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
 import { createReplyPrefixContext } from "openclaw/plugin-sdk";
 import type { InboundMessage, OutboundReply } from "./types.js";
 import { getDcgchatRuntime } from "./runtime.js";
 import { resolveAccount } from "./channel.js";
 import { setMsgStatus } from "./tool.js";
+import mime from "mime-types"
+
+const targetPath = path.join(os.homedir(), '.openclaw');
 
 type MediaInfo = {
   path: string;
@@ -13,63 +17,26 @@ type MediaInfo = {
 };
 
 async function resolveMediaFromUrls(
-  fileUrls: string[],
-  maxBytes: number,
+  files: { url: string, name: string }[],
   log?: (msg: string) => void,
 ): Promise<MediaInfo[]> {
-  const core = getDcgchatRuntime();
   const out: MediaInfo[] = [];
-
-  log?.(`dcgchat media: starting resolve for ${fileUrls.length} file(s): ${JSON.stringify(fileUrls)}`);
-
-  for (let i = 0; i < fileUrls.length; i++) {
-    const url = fileUrls[i];
-    log?.(`dcgchat media: [${i + 1}/${fileUrls.length}] fetching ${url}`);
+  for (let i = 0; i < files.length; i++) {
+    const url = path.join(targetPath, files[i]?.url);
     try {
       const response = await fetch(url);
-      log?.(`dcgchat media: [${i + 1}/${fileUrls.length}] fetch response status=${response.status}, content-type=${response.headers.get("content-type")}, content-length=${response.headers.get("content-length")}`);
-      if (!response.ok) {
-        log?.(`dcgchat media: [${i + 1}/${fileUrls.length}] fetch failed with HTTP ${response.status}, skipping`);
-        continue;
-      }
-      const buffer = Buffer.from(await response.arrayBuffer());
-      log?.(`dcgchat media: [${i + 1}/${fileUrls.length}] downloaded buffer size=${buffer.length} bytes`);
-
-      let contentType = response.headers.get("content-type") || "";
-      if (!contentType) {
-        log?.(`dcgchat media: [${i + 1}/${fileUrls.length}] no content-type header, detecting mime...`);
-        // @ts-ignore
-        contentType = await core.media.detectMime({ buffer });
-      }
-      log?.(`dcgchat media: [${i + 1}/${fileUrls.length}] resolved contentType=${contentType}`);
-
-      const fileName = path.basename(new URL(url).pathname) || "file";
-      log?.(`dcgchat media: [${i + 1}/${fileUrls.length}] fileName=${fileName}, saving to disk (maxBytes=${maxBytes})...`);
-
-      const saved = await core.channel.media.saveMediaBuffer(
-        buffer,
-        contentType,
-        "inbound",
-        maxBytes,
-        fileName,
-      );
-
+      const contentType = response.headers.get("content-type") || "";
       const isImage = contentType.startsWith("image/");
       out.push({
-        path: saved.path,
+        path: url,
         // @ts-ignore
         contentType: saved.contentType,
         placeholder: isImage ? "<media:image>" : "<media:file>",
       });
-
-      log?.(`dcgchat media: [${i + 1}/${fileUrls.length}] saved to ${saved.path} (contentType=${saved.contentType}, isImage=${isImage})`);
     } catch (err) {
-      log?.(`dcgchat media: [${i + 1}/${fileUrls.length}] FAILED to process ${url}: ${String(err)}`);
+      log?.(`dcgchat media: [${i + 1}/${files.length}] FAILED to process ${url}: ${String(err)}`);
     }
   }
-
-  log?.(`dcgchat media: resolve complete, ${out.length}/${fileUrls.length} file(s) succeeded`);
-
   return out;
 }
 
@@ -141,15 +108,20 @@ export async function handleDcgchatMessage(params: {
     });
 
     // 处理用户上传的文件
-    const fileUrls = msg.content.file_urls ?? [];
-    log(`dcgchat[${accountId}]: incoming message from user=${userId}, text="${text?.slice(0, 80)}", file_urls count=${fileUrls.length}`);
+    const files = msg.content.files ?? [];
     let mediaPayload: Record<string, unknown> = {};
-    if (fileUrls.length > 0) {
-      log(`dcgchat[${accountId}]: processing ${fileUrls.length} file(s): ${JSON.stringify(fileUrls)}`);
-      const mediaMaxBytes = 30 * 1024 * 1024;
-      const mediaList = await resolveMediaFromUrls(fileUrls, mediaMaxBytes, log);
+    if (files.length > 0) {
+      const mediaList =  files?.map(item => {
+        const contentType = mime.lookup(item.name) || "application/octet-stream";
+        const isImage = contentType.startsWith("image/");
+        return {
+          path:  path.join(targetPath, item?.url),
+          contentType: contentType,
+          placeholder: isImage ? "<media:image>" : "<media:file>",
+        }
+      });
       mediaPayload = buildMediaPayload(mediaList);
-      log(`dcgchat[${accountId}]: media resolved ${mediaList.length}/${fileUrls.length} file(s), payload=${JSON.stringify(mediaPayload)}`);
+      log(`dcgchat[${accountId}]: media resolved ${mediaList.length}/${files.length} file(s), payload=${JSON.stringify(mediaList)}`);
     }
 
     const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);

package/src/channel.ts

@@ -1,11 +1,56 @@
+import { copyFile, mkdir, rename, unlink } from "node:fs/promises";
+import { basename, dirname, isAbsolute, relative, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import type { ChannelPlugin, OpenClawConfig } from "openclaw/plugin-sdk";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk";
 import type { ResolvedDcgchatAccount, DcgchatConfig } from "./types.js";
 import { logDcgchat } from "./log.js";
 import { getWsConnection } from "./connection.js";
-import { ossUpload } from "./oss.js";
+// import { ossUpload } from "./oss.js";
 import { getMsgParams } from "./tool.js";
 
+const uploadRoot = resolve('/', "upload");
+
+function isPathInside(parentPath: string, targetPath: string): boolean {
+  const relativePath = relative(parentPath, targetPath);
+  return relativePath === "" || (!relativePath.startsWith("..") && !isAbsolute(relativePath));
+}
+
+async function ensureMediaInUploadDir(url: string): Promise<string> {
+  if (!url || /^([a-z][a-z\d+\-.]*):\/\//i.test(url) || !isAbsolute(url)) {
+    return url;
+  }
+
+  const sourcePath = resolve(url);
+  if (isPathInside(uploadRoot, sourcePath)) {
+    return sourcePath;
+  }
+
+  const fileName = basename(sourcePath);
+  if (!fileName) {
+    return sourcePath;
+  }
+
+  const targetPath = resolve(uploadRoot, fileName);
+  if (targetPath === sourcePath) {
+    return targetPath;
+  }
+
+  await mkdir(uploadRoot, { recursive: true });
+
+  try {
+    await rename(sourcePath, targetPath);
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code !== "EXDEV") {
+      throw error;
+    }
+    await copyFile(sourcePath, targetPath);
+    await unlink(sourcePath);
+  }
+
+  return targetPath;
+}
+
 export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null): ResolvedDcgchatAccount {
   const id = accountId ?? DEFAULT_ACCOUNT_ID;
   const raw = (cfg.channels?.["dcgchat"] as DcgchatConfig | undefined) ?? {};
@@ -98,14 +143,13 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     // textChunkLimit: 25,
     textChunkLimit: 4000,
     sendText: async (ctx) => {
-      const target = ctx.to || "(implicit)";
       const ws = getWsConnection()
       const params = getMsgParams();
        if (ws?.readyState === WebSocket.OPEN) {
         const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
         const content = {
           messageType: "openclaw_bot_chat",
-          _userId: target,
+          _userId: params.userId,
           source: "client",
           content: {
             bot_token: botToken,
@@ -115,60 +159,65 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
           },
         };
         ws.send(JSON.stringify(content));
-        logDcgchat.info(`dcgchat[${ctx.accountId}]: sendText to ${target}, ${JSON.stringify(content)}`);
+        logDcgchat.info(`dcgchat[${ctx.accountId}]: sendText to ${params.userId}, ${JSON.stringify(content)}`);
       } else {
         logDcgchat.warn(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
       }
       return {
         channel: "dcgchat",
         messageId: `dcg-${Date.now()}`,
-        chatId: target,
+        chatId: params.userId.toString(),
       };
     },
     sendMedia: async (ctx) => {
-      const target = ctx.to || "(implicit)";
       const ws = getWsConnection()
       const params = getMsgParams();
+
        if (ws?.readyState === WebSocket.OPEN) {
         const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
-        try {
-          const url = ctx.mediaUrl ? await ossUpload(ctx.mediaUrl, botToken) : '';
-          const fileName = ctx.mediaUrl?.split(/[\\/]/).pop() || ''
+
+        // try {
+          const url = ctx.mediaUrl;
+          const fileName = url?.split(/[\\/]/).pop() || ''
           const content = {
             messageType: "openclaw_bot_chat",
-            _userId: target,
+            _userId: params.userId,
             source: "client",
             content: {
               bot_token: botToken,
-              response: ctx.text + '\n' +  `[${fileName}](${url})`,
+              response: ctx.text,
+              files: [{
+                url: url,
+                name: fileName,
+              }],
               session_id: params.sessionId,
-              message_id: params.messageId ||Date.now().toString(),
-            },
-          };
-          ws.send(JSON.stringify(content));
-          logDcgchat.info(`dcgchat[${ctx.accountId}]: sendMedia to ${target}, ${JSON.stringify(content)}`);
-        } catch (error) {
-         const content = {
-            messageType: "openclaw_bot_chat",
-            _userId: target,
-            source: "client",
-            content: {
-              bot_token: botToken,
-              response: ctx.text + '\n' +  ctx.mediaUrl,
-              session_id: params.sessionId ||  Date.now().toString(),
-              message_id: params.messageId ||Date.now().toString(),
+              message_id: params.messageId || Date.now().toString(),
             },
           };
           ws.send(JSON.stringify(content));
-          logDcgchat.info(`dcgchat[${ctx.accountId}]: sendMedia to ${target}, ${JSON.stringify(content)}`);
-        }
+          logDcgchat.info(`dcgchat[${ctx.accountId}]:  agent sendMedia to ${params.userId}, ${JSON.stringify(content)}`);
+        // } catch (error) {
+        //  const content = {
+        //     messageType: "openclaw_bot_chat",
+        //     _userId: target,
+        //     source: "client",
+        //     content: {
+        //       bot_token: botToken,
+        //       response: ctx.text + '\n' +  ctx.mediaUrl,
+        //       session_id: params.sessionId ||  Date.now().toString(),
+        //       message_id: params.messageId ||Date.now().toString(),
+        //     },
+        //   };
+        //   ws.send(JSON.stringify(content));
+        //   logDcgchat.info(`dcgchat[${ctx.accountId}]: sendMedia to ${target}, ${JSON.stringify(content)}`);
+        // }
       } else {
         logDcgchat.warn(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
       }
       return {
         channel: "dcgchat",
         messageId: `dcg-${Date.now()}`,
-        chatId: target,
+        chatId: params.userId.toString(),
       };  
     },
   },

package/src/types.ts

@@ -42,7 +42,10 @@ export type InboundMessage = {
     session_id: string;
     message_id: string;
     text: string;
-    file_urls?: string[];
+    files?: {
+      url: string;
+      name: string;
+    }[];
   };
 };