@dcrays/dcgchat-test 0.2.11 → 0.2.13

package/package.json

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

package/src/bot.ts

@@ -152,6 +152,116 @@ function createFileExtractor() {
   return { getNewFiles }
 }
 
+/**
+ * 从文本中提取 /mobook 目录下的文件
+ * @param {string} text
+ * @returns {string[]}
+ */
+const EXT_LIST = [
+  // 文档类
+  'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf', 'txt', 'rtf', 'odt',
+
+  // 数据/开发
+  'json', 'xml', 'csv', 'yaml', 'yml',
+
+  // 前端/文本
+  'html', 'htm', 'md', 'markdown', 'css', 'js', 'ts',
+
+  // 图片
+  'png', 'jpg', 'jpeg', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff',
+
+  // 音频
+  'mp3', 'wav', 'ogg', 'aac', 'flac', 'm4a',
+
+  // 视频
+  'mp4', 'avi', 'mov', 'wmv', 'flv', 'mkv', 'webm',
+
+  // 压缩包
+  'zip', 'rar', '7z', 'tar', 'gz', 'bz2', 'xz',
+
+  // 可执行/程序
+  'exe', 'dmg', 'pkg', 'apk', 'ipa',
+
+  // 其他常见
+  'log', 'dat', 'bin'
+];
+
+function extractMobookFiles(text = '') {
+  if (typeof text !== 'string' || !text.trim()) return [];
+  
+  const result = new Set();
+  
+  // ✅ 支持的文件类型（可扩展）
+  const EXT = `(${EXT_LIST.join('|')})`
+  
+  try {
+    // 1️⃣ 提取 `xxx.xxx`（反引号包裹）
+    const backtickMatches = text.match(
+      new RegExp(`\`([^\\\`]+?\\.${EXT})\``, 'gi')
+    ) || [];
+
+    backtickMatches.forEach(item => {
+      const name = item.replace(/`/g, '').trim();
+      if (isValidFileName(name)) {
+        result.add(`/mobook/${name}`);
+      }
+    });
+
+    // 2️⃣ 提取 "/mobook/xxx.xxx"（完整路径）
+    const fullPathMatches = text.match(
+      new RegExp(`/mobook/[\\w\\u4e00-\\u9fa5.-]+?\\.${EXT}`, 'gi')
+    ) || [];
+
+    fullPathMatches.forEach(p => {
+      result.add(normalizePath(p));
+    });
+
+    // 3️⃣ 提取 “mobook下的 xxx.xxx”
+    const mobookInlineMatches = text.match(
+      new RegExp(`mobook下的\\s*([\\w\\u4e00-\\u9fa5.-]+?\\.${EXT})`, 'gi')
+    ) || [];
+
+    mobookInlineMatches.forEach(item => {
+      const match = item.match(
+        new RegExp(`([\\w\\u4e00-\\u9fa5.-]+?\\.${EXT})`, 'i')
+      );
+      if (match && isValidFileName(match[1])) {
+        result.add(`/mobook/${match[1]}`);
+      }
+    });
+
+  } catch (e) {
+    // 容错：解析异常不影响主流程
+    console.warn('extractMobookFiles error:', e);
+  }
+
+  return [...result];
+}
+
+/**
+ * 校验文件名是否合法（避免脏数据）
+ */
+function isValidFileName(name: string) {
+  if (!name) return false;
+
+  // 过滤异常字符
+  if (/[\/\\<>:"|?*]/.test(name)) return false;
+
+  // 长度限制（防止异常长字符串）
+  if (name.length > 200) return false;
+
+  return true;
+}
+
+/**
+ * 规范路径（去重用）
+ */
+function normalizePath(path: string) {
+  return path
+    .replace(/\/+/g, '/')   // 多斜杠 → 单斜杠
+    .replace(/\/$/, '');    // 去掉结尾 /
+}
+
 /**
  * 处理一条用户消息，调用 Agent 并返回回复
  */
@@ -247,6 +357,8 @@ export async function handleDcgchatMessage(params: {
 
     log(`dcgchat[${accountId}]: ctxPayload=${JSON.stringify(ctxPayload)}`);
 
+    const sentMediaKeys = new Set<string>()
+    const getMediaKey = (url: string) => url.split(/[\\/]/).slice(-2).join('/')
     let textChunk = ''
 
     const prefixContext = createReplyPrefixContext({ cfg, agentId: route.agentId });
@@ -294,11 +406,15 @@ export async function handleDcgchatMessage(params: {
             const mediaList = resolveReplyMediaList(payload);
             if (mediaList.length > 0) {
               for (let i = 0; i < mediaList.length; i++) {
+                const mediaUrl = mediaList[i];
+                const key = getMediaKey(mediaUrl);
+                if (sentMediaKeys.has(key)) continue;
+                sentMediaKeys.add(key);
                 await sendDcgchatMedia({
                   cfg,
                   accountId,
                   log,
-                  mediaUrl: mediaList[i],
+                  mediaUrl,
                   text: "",
                 });
               }
@@ -334,23 +450,7 @@ export async function handleDcgchatMessage(params: {
         },
       });
     }
-    log(`dcgchat[${accountId}]: dispatch complete, sending final state`);
-    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: '',
-        state: 'final',
-      },
-    });
+
     const extractor = createFileExtractor()
     const completeFiles = extractor.getNewFiles(completeText)
     if (completeFiles.length > 0) {
@@ -359,10 +459,16 @@ export async function handleDcgchatMessage(params: {
         if (!path.isAbsolute(url)) {
           url = path.join(getWorkspaceDir(), url)
         }
+        const key = getMediaKey(url);
+        if (sentMediaKeys.has(key)) {
+          log(`dcgchat[${accountId}]: completeFiles already sent, skipping: ${url}`);
+          continue;
+        }
         if (!fs.existsSync(url)) {
-          log(`dcgchat[${accountId}]:  completeFiles file not found, skipping: ${url}`);
+          log(`dcgchat[${accountId}]: completeFiles file not found, skipping: ${url}`);
           continue;
         }
+        sentMediaKeys.add(key);
         await sendDcgchatMedia({
           cfg,
           accountId,
@@ -373,6 +479,50 @@ export async function handleDcgchatMessage(params: {
       }
       log(`dcgchat[${accountId}][deliver]: sent ${completeFiles.length} media file(s) through channel adapter`);
     }
+    const mobookFiles = extractMobookFiles(completeText)
+    if (mobookFiles.length > 0) {
+      for (let i = 0; i < mobookFiles.length; i++) {
+        let url = mobookFiles[i] as string
+        const key = getMediaKey(url);
+        if (sentMediaKeys.has(key)) {
+          log(`dcgchat[${accountId}]: mobookFiles already sent, skipping: ${url}`);
+          continue;
+        }
+        if (!fs.existsSync(url)) {
+          url = path.join(getWorkspaceDir(), url)
+          if (!fs.existsSync(url)) {
+            log(`dcgchat[${accountId}]: mobookFiles file not found, skipping: ${url}`);
+            continue;
+          }
+        }
+        sentMediaKeys.add(key);
+        await sendDcgchatMedia({
+          cfg,
+          accountId,
+          log,
+          mediaUrl: url,
+          text: "",
+        });
+      }
+      log(`dcgchat[${accountId}][deliver]: sent ${mobookFiles.length} media file(s) through channel adapter`);
+    }
+    log(`dcgchat[${accountId}]: dispatch complete, sending final state`);
+    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: '',
+        state: 'final',
+      },
+    });
 
     setMsgStatus('finished');
     textChunk = ''