@dcrays/dcgchat 0.2.11 → 0.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat",
-  "version": "0.2.11",
+  "version": "0.2.15",
   "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 并返回回复
  */
@@ -247,6 +366,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 +415,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 +459,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 +468,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 +488,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 = ''

package/src/monitor.ts

@@ -140,7 +140,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         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" || operation_type === "update") { 
-            installSkill({ path: skill_url, code: skill_code }, content);
+            installSkill({ path: skill_url, code: skill_code }, content, { cfg, accountId: account.accountId, runtime });
           } else if (operation_type === "remove" || operation_type === "disable") {
             uninstallSkill({ code: skill_code }, content);
           } else {

package/src/skill.ts

@@ -5,15 +5,24 @@ import unzipper from 'unzipper';
 import { pipeline } from "stream/promises";
 import fs from 'fs';
 import path from 'path';
+import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
 import { logDcgchat } from './log.js';
-import { getWorkspaceDir } from './runtime.js';
+import { getDcgchatRuntime, getWorkspaceDir } from './runtime.js';
 import { getWsConnection } from './connection.js';
+import { resolveAccount } from './channel.js';
+import { getMsgParams } from './tool.js';
 
 type ISkillParams = {
   path: string;
   code: string;
 }
 
+type SkillContext = {
+  cfg: ClawdbotConfig;
+  accountId: string;
+  runtime?: RuntimeEnv;
+}
+
 function sendEvent(msgContent: Record<string, any>) {
   const ws = getWsConnection()
   if (ws?.readyState === WebSocket.OPEN) {
@@ -27,7 +36,77 @@ function sendEvent(msgContent: Record<string, any>) {
   }
 }
 
-export async function installSkill(params: ISkillParams, msgContent: Record<string, any>) {
+async function sendNewSessionCommand(ctx: SkillContext) {
+  try {
+    const core = getDcgchatRuntime();
+    const log = ctx.runtime?.log ?? console.log;
+    const params = getMsgParams();
+    const account = resolveAccount(ctx.cfg, ctx.accountId);
+    const userId = String(params.userId);
+
+    const route = core.channel.routing.resolveAgentRoute({
+      cfg: ctx.cfg,
+      channel: "dcgchat",
+      accountId: account.accountId,
+      peer: { kind: "direct", id: userId },
+    });
+
+    const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(ctx.cfg);
+    const bodyFormatted = core.channel.reply.formatAgentEnvelope({
+      channel: "书灵墨宝",
+      from: userId,
+      timestamp: new Date(),
+      envelope: envelopeOptions,
+      body: "/new",
+    });
+
+    const ctxPayload = core.channel.reply.finalizeInboundContext({
+      Body: bodyFormatted,
+      RawBody: "/new",
+      CommandBody: "/new",
+      From: userId,
+      To: userId,
+      SessionKey: route.sessionKey,
+      AccountId: params.sessionId,
+      ChatType: "direct",
+      SenderName: userId,
+      SenderId: userId,
+      Provider: "dcgchat" as const,
+      Surface: "dcgchat" as const,
+      MessageSid: Date.now().toString(),
+      Timestamp: Date.now(),
+      WasMentioned: true,
+      CommandAuthorized: true,
+      OriginatingChannel: "dcgchat" as const,
+      OriginatingTo: `user:${userId}`,
+    });
+
+    const noopDispatcher = {
+      sendToolResult: () => false,
+      sendBlockReply: () => false,
+      sendFinalReply: () => false,
+      waitForIdle: async () => {},
+      getQueuedCounts: () => ({ tool: 0, block: 0, final: 0 }),
+      markComplete: () => {},
+    };
+
+    await core.channel.reply.withReplyDispatcher({
+      dispatcher: noopDispatcher,
+      run: () =>
+        core.channel.reply.dispatchReplyFromConfig({
+          ctx: ctxPayload,
+          cfg: ctx.cfg,
+          dispatcher: noopDispatcher,
+        }),
+    });
+
+    log(`dcgchat: /new command dispatched silently after skill install`);
+  } catch (err) {
+    logDcgchat.error(`sendNewSessionCommand failed: ${err}`);
+  }
+}
+
+export async function installSkill(params: ISkillParams, msgContent: Record<string, any>, ctx?: SkillContext) {
   const { path: cdnUrl, code } = params;
   const workspacePath = getWorkspaceDir();
   
@@ -67,7 +146,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("/");
         
         // 检测根目录
@@ -122,6 +208,9 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
     });
   });
   sendEvent({ ...msgContent, status: 'ok' })
+  if (ctx) {
+    await sendNewSessionCommand(ctx);
+  }
   } catch (error) {
     // 如果安装失败，清理目录
     if (fs.existsSync(skillDir)) {