@dcrays/dcgchat 0.2.10 → 0.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",

package/src/bot.ts

@@ -1,16 +1,16 @@
+import fs from "node:fs";
 import path from "node:path";
-import os from "node:os";
 import type { ClawdbotConfig, ReplyPayload, 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 { getDcgchatRuntime, getWorkspaceDir } from "./runtime.js";
+import { resolveAccount, sendDcgchatMedia } from "./channel.js";
 import { setMsgStatus } from "./tool.js";
 import { generateSignUrl } from "./api.js";
-import { ossUpload } from "./oss.js";
 
 type MediaInfo = {
   path: string;
+  fileName: string;
   contentType: string;
   placeholder: string;
 };
@@ -53,6 +53,7 @@ async function resolveMediaFromUrls(files: { name: string, url: string }[], botT
       const isImage = contentType.startsWith("image/");
       out.push({
         path: saved.path,
+        fileName,
         contentType: saved.contentType || "",
         placeholder: isImage ? "<media:image>" : "<media:file>",
       });
@@ -68,26 +69,89 @@ async function resolveMediaFromUrls(files: { name: string, url: string }[], botT
 
 function buildMediaPayload(mediaList: MediaInfo[]): {
   MediaPath?: string;
+  MediaFileName?: string;
   MediaType?: string;
   MediaUrl?: string;
+  MediaFileNames?: string[];
   MediaPaths?: string[];
   MediaUrls?: string[];
   MediaTypes?: string[];
 } {
   if (mediaList.length === 0) return {};
   const first = mediaList[0];
+  const mediaFileNames = mediaList.map((m) => m.fileName).filter(Boolean);
   const mediaPaths = mediaList.map((m) => m.path);
   const mediaTypes = mediaList.map((m) => m.contentType).filter(Boolean);
   return {
     MediaPath: first?.path,
+    MediaFileName: first?.fileName,
     MediaType: first?.contentType,
     MediaUrl: first?.path,
+    MediaFileNames: mediaFileNames.length > 0 ? mediaFileNames : undefined,
     MediaPaths: mediaPaths.length > 0 ? mediaPaths : undefined,
     MediaUrls: mediaPaths.length > 0 ? mediaPaths : undefined,
     MediaTypes: mediaTypes.length > 0 ? mediaTypes : undefined,
   };
 }
 
+function resolveReplyMediaList(payload: ReplyPayload): string[] {
+  if (payload.mediaUrls?.length) return payload.mediaUrls.filter(Boolean);
+  return payload.mediaUrl ? [payload.mediaUrl] : [];
+}
+
+function createFileExtractor() {
+  const globalSet = new Set()
+
+  function getNewFiles(text: string) {
+    if (!text) return []
+
+    const currentSet = new Set()
+    const lines = text.split(/\n+/)
+
+    for (const line of lines) {
+      const cleanLine = line.trim()
+      if (!cleanLine) continue
+
+      const matches = cleanLine.matchAll(/`([^`]+)`/g)
+      for (const m of matches) {
+        handlePath(m[1])
+      }
+
+      const rawMatches = cleanLine.match(/\/[^\s)）]+/g) || []
+      for (const p of rawMatches) {
+        handlePath(p)
+      }
+    }
+
+    function handlePath(p: string) {
+      const filePath = p.trim()
+      if (filePath.includes('\n')) return
+      if (isValidFile(filePath)) {
+        currentSet.add(filePath)
+      }
+    }
+
+    const newFiles = []
+    for (const file of currentSet) {
+      if (!globalSet.has(file)) {
+        globalSet.add(file)
+        newFiles.push(file)
+      }
+    }
+
+    return newFiles
+  }
+
+  function isValidFile(p: string) {
+    return (
+      /\/(upload|mobook)\//i.test(p) &&
+      /\.[a-zA-Z0-9]+$/.test(p)
+    )
+  }
+
+  return { getNewFiles }
+}
+
 /**
  * 处理一条用户消息，调用 Agent 并返回回复
  */
@@ -101,6 +165,8 @@ export async function handleDcgchatMessage(params: {
   const { cfg, msg, accountId, runtime } = params;
   const log = runtime?.log ?? console.log;
   const error = runtime?.error ?? console.error;
+  //  完整的文本
+  let completeText = ''
 
   const account = resolveAccount(cfg, accountId);
   const userId = msg._userId.toString();
@@ -191,7 +257,7 @@ export async function handleDcgchatMessage(params: {
         responsePrefixContextProvider: prefixContext.responsePrefixContextProvider,
         humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, route.agentId),
         onReplyStart: async () => {},
-        deliver: async (payload: { text: string | any[]; }) => {
+        deliver: async (payload: ReplyPayload) => {
           log(`dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`);
         },
         onError: (err: any, info: { kind: any; }) => {
@@ -222,64 +288,45 @@ export async function handleDcgchatMessage(params: {
           onModelSelected: prefixContext.onModelSelected,
           onPartialReply: async (payload: ReplyPayload) => {
             log(`dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`);
-            const mediaList =
-              payload.mediaUrls && payload.mediaUrls.length > 0
-                ? payload.mediaUrls
-                : payload.mediaUrl
-                  ? [payload.mediaUrl]
-                  : [];
+            if (payload.text) {
+              completeText = payload.text
+            }
+            const mediaList = resolveReplyMediaList(payload);
             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,
-                })
+                await sendDcgchatMedia({
+                  cfg,
+                  accountId,
+                  log,
+                  mediaUrl: mediaList[i],
+                  text: "",
+                });
               }
-              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: '',
-                  files: files,
-                  state: 'chunk',
-                },
-              });
+              log(`dcgchat[${accountId}][deliver]: sent ${mediaList.length} media file(s) through channel adapter`);
             }
             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',
-                },
-              });
+              const nextTextChunk = payload.text.replace(textChunk, '');
+              if (nextTextChunk.trim()) {
+                log(`dcgchat[${accountId}][deliver]: sending chunk to user ${msg._userId}, text="${nextTextChunk.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: nextTextChunk,
+                    state: 'chunk',
+                  },
+                });
+                log(`dcgchat[${accountId}][deliver]: chunk sent successfully`);
+              }
               textChunk = payload.text
-              log(`dcgchat[${accountId}][deliver]: chunk sent successfully`);
-            } else if (payload.mediaUrl && payload.mediaUrls) {
-
-
             } else {
               log(`dcgchat[${accountId}][deliver]: skipping empty chunk`);
             }
@@ -304,6 +351,29 @@ export async function handleDcgchatMessage(params: {
         state: 'final',
       },
     });
+    const extractor = createFileExtractor()
+    const completeFiles = extractor.getNewFiles(completeText)
+    if (completeFiles.length > 0) {
+      for (let i = 0; i < completeFiles.length; i++) {
+        let url = completeFiles[i] as string
+        if (!path.isAbsolute(url)) {
+          url = path.join(getWorkspaceDir(), url)
+        }
+        if (!fs.existsSync(url)) {
+          log(`dcgchat[${accountId}]:  completeFiles file not found, skipping: ${url}`);
+          continue;
+        }
+        await sendDcgchatMedia({
+          cfg,
+          accountId,
+          log,
+          mediaUrl: url,
+          text: "",
+        });
+      }
+      log(`dcgchat[${accountId}][deliver]: sent ${completeFiles.length} media file(s) through channel adapter`);
+    }
+
     setMsgStatus('finished');
     textChunk = ''
     log(`dcgchat[${accountId}]: final state sent`);

package/src/channel.ts

@@ -5,6 +5,93 @@ import { getWsConnection } from "./connection.js";
 import { ossUpload } from "./oss.js";
 import { getMsgParams } from "./tool.js";
 
+type DcgchatMediaSendContext = {
+  cfg: OpenClawConfig;
+  accountId?: string | null;
+  log?: (message: string) => void;
+  mediaUrl?: string;
+  text?: string;
+};
+
+export async function sendDcgchatMedia(ctx: DcgchatMediaSendContext): Promise<void> {
+  const ws = getWsConnection();
+  const params = getMsgParams();
+  const log = ctx.log ?? console.log;
+
+  if (ws?.readyState !== WebSocket.OPEN) {
+    log(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound media skipped -> ${ws?.readyState}: ${ctx.mediaUrl ?? ""}`);
+    return;
+  }
+
+  const fileName = ctx.mediaUrl?.split(/[\\/]/).pop() || "";
+  const { botToken } = resolveAccount(ctx.cfg, ctx.accountId);
+
+  try {
+    const url = ctx.mediaUrl ? await ossUpload(ctx.mediaUrl, botToken) : "";
+    console.log("🚀 ~ sendDcgchatMedia ~ ctx.mediaUrl:", ctx.mediaUrl)
+    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,
+          name: fileName,
+        }],
+        session_id: params.sessionId,
+        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: Date.now().toString(),
+      },
+    };
+    ws.send(JSON.stringify(content));
+    log(`dcgchat[${ctx.accountId}]: error sendMedia to ${params.userId}, ${JSON.stringify(content)}`);
+  } finally {
+    ws.send(JSON.stringify({
+      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,
+        ssession_id: params.sessionId,
+        message_id: Date.now().toString(),
+        response: "",
+        state: "final",
+      },
+    }));
+  }
+}
+
 
 export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null): ResolvedDcgchatAccount {
   const id = accountId ?? DEFAULT_ACCOUNT_ID;
@@ -100,7 +187,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     sendText: async (ctx) => {
       const ws = getWsConnection()
       const params = getMsgParams();
-      const log = ctx.runtime?.log ?? console.log;
+      const log = console.log;
        if (ws?.readyState === WebSocket.OPEN) {
         const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
         const content = {
@@ -146,77 +233,8 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       };
     },
     sendMedia: async (ctx) => {
-      const ws = getWsConnection()
       const params = getMsgParams();
-      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 = ctx.mediaUrl ? await ossUpload(ctx.mediaUrl, botToken) : '';
-          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: url,
-                name: fileName,
-              }],
-              session_id: params.sessionId,
-              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: Date.now().toString(),
-            },
-          };
-          ws.send(JSON.stringify(content));
-          ws.send(JSON.stringify({
-            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,
-              ssession_id: params.sessionId,
-              message_id: Date.now().toString(),
-              response: '',
-              state: 'final',
-            },
-          }));
-          log(`dcgchat[${ctx.accountId}]: error sendMedia to ${params.userId}, ${JSON.stringify(content)}`);
-        }
-      } else {
-        log(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
-      }
+      await sendDcgchatMedia(ctx);
       return {
         channel: "dcgchat",
         messageId: `dcg-${Date.now()}`,