@dcrays/dcgchat-test 0.2.13 → 0.2.15

package/package.json

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

package/src/bot.ts

@@ -188,50 +188,59 @@ const EXT_LIST = [
 
 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 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 fullPathMatches = text.match(
-      new RegExp(`/mobook/[\\w\\u4e00-\\u9fa5.-]+?\\.${EXT}`, 'gi')
-    ) || [];
-
-    fullPathMatches.forEach(p => {
+    // 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 mobookInlineMatches = text.match(
-      new RegExp(`mobook下的\\s*([\\w\\u4e00-\\u9fa5.-]+?\\.${EXT})`, 'gi')
-    ) || [];
+    // 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}`);
+      }
+    });
 
-    mobookInlineMatches.forEach(item => {
-      const match = item.match(
-        new RegExp(`([\\w\\u4e00-\\u9fa5.-]+?\\.${EXT})`, 'i')
-      );
-      if (match && isValidFileName(match[1])) {
-        result.add(`/mobook/${match[1]}`);
+    // 🆕 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);
   }
 
@@ -307,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 },
     });
@@ -344,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,
     });

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-test",
+      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-test" as const,
+      Surface: "dcgchat-test" as const,
+      MessageSid: Date.now().toString(),
+      Timestamp: Date.now(),
+      WasMentioned: true,
+      CommandAuthorized: true,
+      OriginatingChannel: "dcgchat-test" 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)) {