@dcrays/dcgchat-test 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",
@@ -20,9 +20,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
+    "ali-oss": "file:src/libs/ali-oss-6.23.0.tgz",
     "axios": "file:src/libs/axios-1.13.6.tgz",
     "ws": "file:src/libs/ws-8.19.0.tgz",
-    "mime-types": "file:src/libs/mime-types-3.0.2.tgz",
+    "md5": "file:src/libs/md5-2.3.0.tgz",
     "unzipper": "file:src/libs/unzipper-0.12.3.tgz"
   },
   "openclaw": {

package/src/api.ts

@@ -10,7 +10,7 @@ export const getStsToken = async (name: string, botToken: string) => {
     "/user/getStsToken",
     {
       sourceFileName: name,
-      isPrivate: 0,
+      isPrivate: 1,
     },
     { botToken },
   );
@@ -21,6 +21,29 @@ export const getStsToken = async (name: string, botToken: string) => {
 
   return response.data;
 };
+export const generateSignUrl = async (file_url: string, botToken: string) => {
+  try {
+    // 确保 userToken 已缓存（如果未缓存会自动获取并缓存）
+    await getUserToken(botToken);
+  
+    const response = await post<any>(
+      "/user/generateSignUrl",
+      {
+        loudPlatform: 0,
+        fileName: file_url
+      },
+      { botToken },
+    );
+    if (response.code === 0 && response.data) {
+      // @ts-ignore
+      return response.data?.filePath
+    }
+    return ''
+    
+  } catch (error) {
+    return ''
+  }
+};
 
 /**
  * 通过 botToken 查询 userToken

package/src/bot.ts

@@ -6,9 +6,8 @@ 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(), '../');
+import { generateSignUrl } from "./api.js";
+import { ossUpload } from "./oss.js";
 
 type MediaInfo = {
   path: string;
@@ -16,27 +15,49 @@ type MediaInfo = {
   placeholder: string;
 };
 
-async function resolveMediaFromUrls(
-  files: { url: string, name: string }[],
-  log?: (msg: string) => void,
-): Promise<MediaInfo[]> {
+const mediaMaxBytes = 300 * 1024 * 1024;
+async function resolveMediaFromUrls(files: { name: string, url: string }[], botToken: string, log: (message: string) => void): Promise<MediaInfo[]> {
+  const core = getDcgchatRuntime();
   const out: MediaInfo[] = [];
+  log(`dcgchat media: starting resolve for ${files.length} file(s): ${JSON.stringify(files)}`);
+
   for (let i = 0; i < files.length; i++) {
-    const url = path.join(targetPath, files[i]?.url);
+    const file = files[i];
     try {
-      const response = await fetch(url);
-      const contentType = response.headers.get("content-type") || "";
+      const data = await generateSignUrl(file.url, botToken);
+      log(`dcgchat media: [${i + 1}/${files.length}] generateSignUrl: ${data}`);
+      const response = await fetch(data);
+      if (!response.ok) {
+        log?.(`dcgchat media: [${i + 1}/${files.length}] fetch failed with HTTP ${response.status}, skipping`);
+        continue;
+      }
+      const buffer = Buffer.from(await response.arrayBuffer());
+
+      let contentType = response.headers.get("content-type") || "";
+      if (!contentType) {
+        contentType = await core.media.detectMime({ buffer }) || "";
+      }
+      const fileName = file.name || path.basename(new URL(file.url).pathname) || "file";
+      const saved = await core.channel.media.saveMediaBuffer(
+        buffer,
+        contentType,
+        "inbound",
+        // maxByte: mediaMaxBytes,
+        fileName,
+      );
       const isImage = contentType.startsWith("image/");
       out.push({
-        path: url,
-        // @ts-ignore
-        contentType: saved.contentType,
+        path: saved.path,
+        contentType: saved.contentType || "",
         placeholder: isImage ? "<media:image>" : "<media:file>",
       });
+
     } catch (err) {
-      log?.(`dcgchat media: [${i + 1}/${files.length}] FAILED to process ${url}: ${String(err)}`);
+      log(`dcgchat media: [${i + 1}/${files.length}] FAILED to process ${file.url}: ${String(err)}`);
     }
   }
+  log(`dcgchat media: resolve complete, ${out.length}/${files.length} file(s) succeeded`);
+
   return out;
 }
 
@@ -115,15 +136,7 @@ export async function handleDcgchatMessage(params: {
     const files = msg.content.files ?? [];
     let mediaPayload: Record<string, unknown> = {};
     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>",
-        }
-      });
+      const mediaList = await resolveMediaFromUrls(files, msg.content.bot_token, log)
       mediaPayload = buildMediaPayload(mediaList);
       log(`dcgchat[${accountId}]: media resolved ${mediaList.length}/${files.length} file(s), payload=${JSON.stringify(mediaList)}`);
     }
@@ -174,36 +187,10 @@ export async function handleDcgchatMessage(params: {
         responsePrefixContextProvider: prefixContext.responsePrefixContextProvider,
         humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, route.agentId),
         onReplyStart: async () => {},
-        deliver: async (payload) => {
-          // log(`dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`);
-          // const t = payload.text?.trim().replaceAll(
-          //       "/root/.openclaw/workspace/moBooksAgentGenerate",
-          //       "/upload"
-          //     );
-          // if (t) {
-          //   log(`dcgchat[${accountId}][deliver]: sending chunk to user ${msg._userId}, text="${t.slice(0, 50)}..."`);
-          //   params.onChunk({
-          //     messageType: "openclaw_bot_chat",
-          //     _userId: msg._userId,
-          //     source: "client",
-          //     content: {
-          //       bot_token: msg.content.bot_token,
-          //       domain_id: msg.content.domain_id,
-          //       app_id: msg.content.app_id,
-          //       bot_id: msg.content.bot_id,
-          //       agent_id: msg.content.agent_id,
-          //       session_id: msg.content.session_id,
-          //       message_id: msg.content.message_id,
-          //       response: t,
-          //       state: 'chunk',
-          //     },
-          //   });
-          //   log(`dcgchat[${accountId}][deliver]: chunk sent successfully`);
-          // } else {
-          //   log(`dcgchat[${accountId}][deliver]: skipping empty chunk`);
-          // }
+        deliver: async (payload: { text: string | any[]; }) => {
+          log(`dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`);
         },
-        onError: (err, info) => {
+        onError: (err: any, info: { kind: any; }) => {
           error(`dcgchat[${accountId}] ${info.kind} reply failed: ${String(err)}`);
         },
         onIdle: () => {},
@@ -218,14 +205,25 @@ export async function handleDcgchatMessage(params: {
       replyOptions: {
         ...replyOptions,
         onModelSelected: prefixContext.onModelSelected,
-        onPartialReply: (payload: ReplyPayload) => {
+        onPartialReply: async (payload: ReplyPayload) => {
          log(`dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`);
-          const t = payload.text?.trim().replaceAll(
-                "/root/.openclaw/workspace/moBooksAgentGenerate",
-                "/upload"
-              );
-          if (t) {
-            log(`dcgchat[${accountId}][deliver]: sending chunk to user ${msg._userId}, text="${t.slice(0, 50)}..."`);
+         const mediaList =
+              payload.mediaUrls && payload.mediaUrls.length > 0
+                ? payload.mediaUrls
+                : payload.mediaUrl
+                  ? [payload.mediaUrl]
+                  : [];
+          if (mediaList.length > 0) {
+            const files = []
+            for (let i = 0; i < mediaList.length; i++) {
+              const file = mediaList[i]
+              const fileName = file.split(/[\\/]/).pop() || ''
+              const url = await ossUpload(file, msg.content.bot_token)
+              files.push({
+                url: url,
+                name: fileName,
+              })
+            }
             params.onChunk({
               messageType: "openclaw_bot_chat",
               _userId: msg._userId,
@@ -238,12 +236,35 @@ export async function handleDcgchatMessage(params: {
                 agent_id: msg.content.agent_id,
                 session_id: msg.content.session_id,
                 message_id: msg.content.message_id,
-                response: t.replace(textChunk, ''),
+                response: '',
+                files: files,
                 state: 'chunk',
               },
             });
-            textChunk = t
+          }
+          if (payload.text) {
+            log(`dcgchat[${accountId}][deliver]: sending chunk to user ${msg._userId}, text="${payload.text.slice(0, 50)}..."`);
+            params.onChunk({
+              messageType: "openclaw_bot_chat",
+              _userId: msg._userId,
+              source: "client",
+              content: {
+                bot_token: msg.content.bot_token,
+                domain_id: msg.content.domain_id,
+                app_id: msg.content.app_id,
+                bot_id: msg.content.bot_id,
+                agent_id: msg.content.agent_id,
+                session_id: msg.content.session_id,
+                message_id: msg.content.message_id,
+                response: payload.text.replace(textChunk, ''),
+                state: 'chunk',
+              },
+            });
+            textChunk = payload.text
             log(`dcgchat[${accountId}][deliver]: chunk sent successfully`);
+          } else if (payload.mediaUrl && payload.mediaUrls) {
+            
+
           } else {
             log(`dcgchat[${accountId}][deliver]: skipping empty chunk`);
           }

package/src/channel.ts

@@ -1,50 +1,10 @@
-import { copyFile, mkdir, rename, unlink } from "node:fs/promises";
-import { basename, dirname, isAbsolute, relative, resolve } from "node:path";
-import os from "node:os";
 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 { 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;
@@ -145,6 +105,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     sendText: async (ctx) => {
       const ws = getWsConnection()
       const params = getMsgParams();
+      const log = ctx.runtime?.log ?? console.log;
        if (ws?.readyState === WebSocket.OPEN) {
         const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
         const content = {
@@ -157,18 +118,15 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
             app_id: params.appId,
             bot_id: params.botId,
             agent_id: params.agentId,
-            response: ctx.text.replaceAll(
-              "/root/.openclaw/workspace/moBooksAgentGenerate",
-              "/upload"
-            ),
+            response: ctx.text,
             session_id: params.sessionId,
             message_id: params.messageId || Date.now().toString(),
           },
         };
         ws.send(JSON.stringify(content));
-        logDcgchat.info(`dcgchat[${ctx.accountId}]: sendText to ${params.userId}, ${JSON.stringify(content)}`);
+        log(`dcgchat[${ctx.accountId}]: sendText to ${params.userId}, ${JSON.stringify(content)}`);
       } else {
-        logDcgchat.warn(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
+        log(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
       }
       return {
         channel: "dcgchat-test",
@@ -179,13 +137,12 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     sendMedia: async (ctx) => {
       const ws = getWsConnection()
       const params = getMsgParams();
-
-       if (ws?.readyState === WebSocket.OPEN) {
+      const log = ctx.runtime?.log ?? console.log;
+      if (ws?.readyState === WebSocket.OPEN) {
+        const fileName = ctx.mediaUrl?.split(/[\\/]/).pop() || ''
         const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
-
-        // try {
-          const url = await ensureMediaInUploadDir(ctx.mediaUrl ?? '');
-          const fileName = url?.split(/[\\/]/).pop() || ''
+        try {
+          const url = ctx.mediaUrl ? await ossUpload(ctx.mediaUrl, botToken) : '';
           const content = {
             messageType: "openclaw_bot_chat",
             _userId: params.userId,
@@ -196,37 +153,42 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
               app_id: params.appId,
               bot_id: params.botId,
               agent_id: params.agentId,
-              response: ctx.text.replaceAll(
-                "/root/.openclaw/workspace/moBooksAgentGenerate",
-                "/upload"
-              ),
+              response: ctx.text,
               files: [{
                 url: url,
                 name: fileName,
               }],
               session_id: params.sessionId,
-              message_id: params.messageId || Date.now().toString(),
+              message_id: params.messageId ||Date.now().toString(),
+            },
+          };
+          ws.send(JSON.stringify(content));
+          log(`dcgchat[${ctx.accountId}]: sendMedia alioss to ${params.userId}, ${JSON.stringify(content)}`);
+        } catch (error) {
+         const content = {
+            messageType: "openclaw_bot_chat",
+            _userId: params.userId,
+            source: "client",
+            content: {
+              bot_token: botToken,
+              domain_id: params.domainId,
+              app_id: params.appId,
+              bot_id: params.botId,
+              agent_id: params.agentId,
+              response: ctx.text,
+              files: [{
+                url: ctx.mediaUrl,
+                name: fileName,
+              }],
+              session_id: params.sessionId ||  Date.now().toString(),
+              message_id: params.messageId ||Date.now().toString(),
             },
           };
           ws.send(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)}`);
-        // }
+          log(`dcgchat[${ctx.accountId}]: error sendMedia to ${params.userId}, ${JSON.stringify(content)}`);
+        }
       } else {
-        logDcgchat.warn(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
+        log(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
       }
       return {
         channel: "dcgchat-test",

package/src/monitor.ts

@@ -112,13 +112,14 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       if (parsed.messageType == "openclaw_bot_chat") {
         const msg = parsed as unknown as InboundMessage;
         setMsgStatus('running');
+        log(`dcgchat[${account.accountId}]: openclaw_bot_chat received, ${JSON.stringify(msg)}`);
         setMsgParams({
           userId: msg._userId,
           token: msg.content.bot_token,
           sessionId: msg.content.session_id,
           messageId: msg.content.message_id,
-          domainId: msg.content.domain_id,
-          appId: msg.content.app_id,
+          domainId: account.domainId ||  1000,
+          appId: account.appId || '100',
           botId: msg.content.bot_id,
           agentId: msg.content.agent_id,
         });
@@ -138,7 +139,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         const { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id } = parsed.content ? parsed.content : {} as Record<string, any>;
         const content = { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id };
         if (event_type === "skill") {
-          if (operation_type === "install" || operation_type === "enable") {
+          if (operation_type === "install" || operation_type === "enable" || operation_type === "update") { 
             installSkill({ path: skill_url, code: skill_code }, content);
           } else if (operation_type === "remove" || operation_type === "disable") {
             uninstallSkill({ code: skill_code }, content);

package/src/oss.ts

@@ -61,9 +61,9 @@ export const ossUpload = async (file: File | string | Buffer, botToken: string)
   if (objectResult?.res?.status !== 200) {
     throw new Error("OSS 上传失败");
   }
-  console.log(objectResult.url);
+  console.log(11111, JSON.stringify(objectResult));
   // const url = `${data.protocol || 'http'}://${data.bucket}.${data.endPoint}/${data.uploadDir}${data.ossFileKey}`
-  return objectResult.url;
+  return objectResult.name || objectResult.url;
   } catch (error) {
     console.error("OSS 上传失败:", error);
     throw error;

package/src/request.ts

@@ -2,6 +2,7 @@ import axios from "axios";
 import md5 from "md5";
 import type { IResponse } from "./types.js";
 import { getUserTokenCache } from "./userInfo.js";
+import { getMsgParams } from "./tool.js";
 
 export const apiUrlMap = {
   production: "https://api-gateway.shuwenda.com",
@@ -178,17 +179,23 @@ export function post<T = Record<string, unknown>, R = unknown>(
     botToken?: string;
   },
 ): Promise<IResponse<R>> {
+  const params = getMsgParams() || {}
   const config: any = {
     method: "POST",
     url,
-    data,
-    headers: buildHeaders(data as Record<string, unknown>, url, options?.userToken),
+    data: {
+      ...data,
+      _appId: params.appId
+    },
+    headers: buildHeaders({
+      ...data,
+      _appId: params.appId
+    } as Record<string, unknown>, url, options?.userToken),
   };
 
   // 将 botToken 附加到配置中，供请求拦截器使用
   if (options?.botToken) {
     config.__botToken = options.botToken;
   }
-
   return axiosInstance.request(config);
 }

package/src/tool.ts

@@ -1,7 +1,6 @@
 
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { getWsConnection } from "./connection.js";
-import { logDcgchat } from "./log.js";
 
 let msgParams = {} as {
   userId: number;
@@ -29,32 +28,35 @@ export function setMsgStatus(status: 'running' | 'finished' | '') {
 export function getMsgStatus() {
   return msgStatus;
 }
-
+let runId = '';
+let toolName = '';
 export function monitoringToolMessage(api: OpenClawPluginApi) {
-  api.on("after_tool_call", (event, payload) => {
+  api.on("after_tool_call", (event) => {
     const ws = getWsConnection()
     const params = getMsgParams();
     const status = getMsgStatus();
     // 
     if (ws?.readyState === WebSocket.OPEN && status === 'running') {
-      ws.send(JSON.stringify({
-        messageType: "openclaw_bot_chat",
-        _userId: params?.userId,
-        source: "client",
-        content: {
-          bot_token: params?.token,
-          response: 'all_finished',
-          session_id:params?.sessionId,
-          message_id: params?.messageId || Date.now().toString()
-        },
-      }));
+      const log = api.runtime?.log ?? api.log;
+      // @ts-ignore
+      if (!runId || runId !== event.runId || !toolName || toolName !== event.toolName) {
+        ws.send(JSON.stringify({
+          messageType: "openclaw_bot_chat",
+          _userId: params?.userId,
+          source: "client",
+          content: {
+            bot_token: params?.token,
+            response: 'all_finished',
+            session_id:params?.sessionId,
+            message_id: params?.messageId || Date.now().toString()
+          },
+        }));
+      }
       const text = JSON.stringify({
         type: 'tool_call',
+        specialIdentification: 'dcgchat_tool_call_special_identification',
         ...event
-      }).replaceAll(
-        "/root/.openclaw/workspace/moBooksAgentGenerate",
-        "/upload"
-      );
+      });
       ws.send(JSON.stringify({
         messageType: "openclaw_bot_chat",
         _userId: params?.userId,
@@ -65,23 +67,29 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
           app_id: params?.appId,
           bot_id: params?.botId,
           agent_id: params?.agentId,
-          response: text,
-          session_id:params?.sessionId,
-          message_id: params?.messageId || Date.now().toString()
-        },
-      }));
-      ws.send(JSON.stringify({
-        messageType: "openclaw_bot_chat",
-        _userId: params?.userId,
-        source: "client",
-        content: {
-          bot_token: params?.token,
-          response: 'all_finished',
+          thinking_content: text,
+          response: '',
           session_id:params?.sessionId,
           message_id: params?.messageId || Date.now().toString()
         },
       }));
-      logDcgchat.info(`dcgchat: tool message to ${params?.sessionId}, ${JSON.stringify(event)}`);
+      // @ts-ignore
+      if (!runId || runId !== event.runId || !toolName || toolName !== event.toolName) {
+        ws.send(JSON.stringify({
+          messageType: "openclaw_bot_chat",
+          _userId: params?.userId,
+          source: "client",
+          content: {
+            bot_token: params?.token,
+            response: 'all_finished',
+            session_id:params?.sessionId,
+            message_id: params?.messageId || Date.now().toString()
+          },
+        }));
+      }
+      runId = event.runId;
+      toolName = event.toolName;
+      log?.(`dcgchat[${params?.sessionId}]:11111111 tool message to ${params?.sessionId}, ${JSON.stringify(event)}`);
     }
   });
 }

package/src/types.ts

@@ -79,6 +79,7 @@ export type OutboundReply = {
     app_id?: string;
     bot_id?: string;
     agent_id?: string;
+    files?: {url: string, name: string}[];
   };
 };