@dcrays/dcgchat-test 0.2.12 → 0.2.14

package/package.json

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

package/src/bot.ts

@@ -152,6 +152,125 @@ 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('|')})`;
+
+  // ✅ 文件名字符（增强：支持中文、符号）
+  const FILE_NAME = `[\\w\\u4e00-\\u9fa5：:《》()（）\\-\\s]+?`;
+
+  try {
+    // 1️⃣ `xxx.xxx`
+    const backtickReg = new RegExp(`\`([^\\\`]+?\\.${EXT})\``, 'gi');
+    (text.match(backtickReg) || []).forEach(item => {
+      const name = item.replace(/`/g, '').trim();
+      if (isValidFileName(name)) {
+        result.add(`/mobook/${name}`);
+      }
+    });
+
+    // 2️⃣ /mobook/xxx.xxx
+    const fullPathReg = new RegExp(`/mobook/${FILE_NAME}\\.${EXT}`, 'gi');
+    (text.match(fullPathReg) || []).forEach(p => {
+      result.add(normalizePath(p));
+    });
+
+    // 3️⃣ mobook下的 xxx.xxx
+    const inlineReg = new RegExp(`mobook下的\\s*(${FILE_NAME}\\.${EXT})`, 'gi');
+    (text.match(inlineReg) || []).forEach(item => {
+      const match = item.match(new RegExp(`${FILE_NAME}\\.${EXT}`, 'i'));
+      if (match && isValidFileName(match[0])) {
+        result.add(`/mobook/${match[0].trim()}`);
+      }
+    });
+
+    // 🆕 4️⃣ **xxx.xxx**
+    const boldReg = new RegExp(`\\*\\*(${FILE_NAME}\\.${EXT})\\*\\*`, 'gi');
+    (text.match(boldReg) || []).forEach(item => {
+      const name = item.replace(/\*\*/g, '').trim();
+      if (isValidFileName(name)) {
+        result.add(`/mobook/${name}`);
+      }
+    });
+
+    // 🆕 5️⃣ xxx.xxx (123字节)
+    const looseReg = new RegExp(`(${FILE_NAME}\\.${EXT})\\s*\\(`, 'gi');
+    (text.match(looseReg) || []).forEach(item => {
+      const name = item.replace(/\s*\(.+$/, '').trim();
+      if (isValidFileName(name)) {
+        result.add(`/mobook/${name}`);
+      }
+    });
+
+  } 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 并返回回复
  */
@@ -197,7 +316,7 @@ export async function handleDcgchatMessage(params: {
 
     const route = core.channel.routing.resolveAgentRoute({
       cfg,
-      channel: "dcgchat-test",
+      channel: "dcgchat",
       accountId: account.accountId,
       peer: { kind: "direct", id: userId },
     });
@@ -234,13 +353,13 @@ export async function handleDcgchatMessage(params: {
       ChatType: "direct",
       SenderName: userId,
       SenderId: userId,
-      Provider: "dcgchat-test" as const,
-      Surface: "dcgchat-test" as const,
+      Provider: "dcgchat" as const,
+      Surface: "dcgchat" as const,
       MessageSid: msg.content.message_id,
       Timestamp: Date.now(),
       WasMentioned: true,
       CommandAuthorized: true,
-      OriginatingChannel: "dcgchat-test" as const,
+      OriginatingChannel: "dcgchat" as const,
       OriginatingTo: `user:${userId}`,
       ...mediaPayload,
     });
@@ -369,6 +488,33 @@ 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",

package/src/skill.ts

@@ -67,7 +67,14 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
       }
       
       try {
-        const entryPath = entry.path;
+        const flags = entry.props?.flags ?? 0;
+        const isUtf8 = (flags & 0x800) !== 0;
+        let entryPath: string;
+        if (!isUtf8 && entry.props?.pathBuffer) {
+          entryPath = new TextDecoder('gbk').decode(entry.props.pathBuffer);
+        } else {
+          entryPath = entry.path;
+        }
         const pathParts = entryPath.split("/");
         
         // 检测根目录