@dcrays/dcgchat-test 0.3.26 → 0.3.28

package/package.json

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

package/src/bot.ts

@@ -1,11 +1,20 @@
 import path from 'node:path'
+import fs from 'node:fs'
+import os from 'node:os'
 import type { ReplyPayload } from 'openclaw/plugin-sdk'
 import { createReplyPrefixContext } from 'openclaw/plugin-sdk'
 import type { InboundMessage } from './types.js'
-import { clearSentMediaKeys, getDcgchatRuntime, getOpenClawConfig, getSessionKey, setMsgStatus } from './utils/global.js'
+import {
+  clearSentMediaKeys,
+  getDcgchatRuntime,
+  getOpenClawConfig,
+  getSessionKey,
+  getWorkspaceDir,
+  setMsgStatus
+} from './utils/global.js'
 import { resolveAccount, sendDcgchatMedia } from './channel.js'
 import { generateSignUrl } from './request/api.js'
-import { extractMobookFiles, getFilePathByFile } from './utils/searchFile.js'
+import { extractMobookFiles } from './utils/searchFile.js'
 import { sendChunk, sendFinal, sendText as sendTextMsg, sendError, wsSendRaw, sendText } from './transport.js'
 import { dcgLogger } from './utils/log.js'
 import { channelInfo, systemCommand, interruptCommand, ENV, ignoreToolCommand } from './utils/constant.js'
@@ -403,7 +412,18 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         sessionStreamSuppressed.delete(effectiveSessionKey)
       } else {
         for (const file of extractMobookFiles(completeText)) {
-          const resolved = getFilePathByFile(file)
+          const candidates: string[] = [file]
+          candidates.push(path.join(getWorkspaceDir(), file))
+          candidates.push(path.join(getWorkspaceDir(), file.replace(/^\//, '')))
+          const underMobook = file.replace(/^\/mobook\//i, '').replace(/^mobook[\\/]/i, '')
+          if (underMobook) {
+            if (process.platform === 'win32') {
+              candidates.push(path.join('C:\\', 'mobook', underMobook))
+            } else if (process.platform === 'darwin') {
+              candidates.push(path.join(os.homedir(), 'mobook', underMobook))
+            }
+          }
+          const resolved = candidates.find((p) => fs.existsSync(p))
           if (!resolved) continue
           try {
             await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl: resolved, text: '' })

package/src/channel.ts

@@ -36,6 +36,7 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
 
   try {
     const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat-test"]?.botToken ?? ''
+    console.log('🚀 ~ sendDcgchatMedia ~ botToken:', botToken)
     const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',

package/src/request/api.ts

@@ -40,7 +40,7 @@ export const queryUserTokenByBotToken = async (botToken: string): Promise<string
   const response = await post<{ botToken: string }, { token: string }>('/organization/queryUserTokenByBotToken', { botToken })
 
   if (!response || !response.data || !response.data.token) {
-    dcgLogger('获取绑定的用户信息失败', 'error')
+    dcgLogger('获取绑定的用户信息失败: ' + JSON.stringify(response), 'error')
     return ''
   }
 

package/src/utils/searchFile.ts

@@ -1,10 +1,10 @@
-import { getWorkspaceDir } from './global.js'
 import { dcgLogger } from './log.js'
-import fs from 'node:fs'
-import os from 'node:os'
-import path from 'node:path'
 
-/** 参与提取的常见文件扩展名 */
+/**
+ * 从文本中提取 /mobook 目录下的文件
+ * @param {string} text
+ * @returns {string[]}
+ */
 const EXT_LIST = [
   // 文档类
   'doc',
@@ -88,47 +88,11 @@ const EXT_LIST = [
  */
 const EXT_SORTED_FOR_REGEX = [...EXT_LIST].sort((a, b) => b.length - a.length)
 
-/** 正则交替串（长扩展名优先） */
-const EXT_ALT = `(${EXT_SORTED_FOR_REGEX.join('|')})`
-/** 文件名片段：中文、常见符号、非贪婪 */
-const FILE_NAME_CLASS = `[\\w\\u4e00-\\u9fa5：:《》()（）\\-\\s]+?`
-
-/** 预编译，避免 extractMobookFiles 每次调用重复构建正则 */
-const RX_EXTRACT = {
-  backtick: new RegExp(`\`([^\\\`]+?\\.${EXT_ALT})\``, 'gi'),
-  fullPath: new RegExp(`/mobook/${FILE_NAME_CLASS}\\.${EXT_ALT}`, 'gi'),
-  winMobook: new RegExp(`(?:[a-zA-Z]:)?[/\\\\]mobook[/\\\\]${FILE_NAME_CLASS}\\.${EXT_ALT}`, 'gi'),
-  inline: new RegExp(`mobook下的\\s*(${FILE_NAME_CLASS}\\.${EXT_ALT})`, 'gi'),
-  bold: new RegExp(`\\*\\*(${FILE_NAME_CLASS}\\.${EXT_ALT})\\*\\*`, 'gi'),
-  loose: new RegExp(`(${FILE_NAME_CLASS}\\.${EXT_ALT})\\s*\\(`, 'gi'),
-  /** Markdown 列表：`- 文件名.ext` — 用 matchAll 取捕获组 1，避免 FILE_NAME 含 `-`/空格 时误把「- 」并入文件名 */
-  markdownList: new RegExp(`[-*•]\\s+(${FILE_NAME_CLASS}\\.${EXT_ALT})`, 'gi'),
-  inlineFile: new RegExp(`${FILE_NAME_CLASS}\\.${EXT_ALT}`, 'i')
-}
-
 /** 去除控制符、零宽字符等常见脏值 */
 function stripMobookNoise(s: string) {
   return s.replace(/[\u0000-\u001F\u007F\u200B-\u200D\u200E\u200F\uFEFF]/g, '')
 }
 
-/**
- * 从路径或 mobook 引用中取出「提到的文件名」：去掉盘符、/mobook、\\mobook\\ 等前缀后取 basename
- */
-function toMobookReferencedBasename(p: string): string {
-  let s = stripMobookNoise(p).trim()
-  if (!s) return ''
-  s = s.replace(/^(?:[a-zA-Z]:)?[/\\]+mobook[/\\]/i, '')
-  s = s.replace(/^\/mobook\//i, '')
-  s = s.replace(/\\/g, '/')
-  const parts = s.split('/').filter(Boolean)
-  return parts.length ? parts[parts.length - 1]! : s
-}
-
-function addMobookMentionedFile(result: Set<string>, raw: string) {
-  const base = toMobookReferencedBasename(raw)
-  if (base && isValidFileName(base)) result.add(base)
-}
-
 /**
  * 从文本中扫描 `.../mobook/...` 或 `...\mobook\...` 片段，按最长后缀匹配合法扩展名（兜底）
  */
@@ -164,7 +128,7 @@ function collectMobookPathsAfterNeedle(text: string, lower: string, needle: stri
     const base = raw.slice(0, -(matchedExt.length + 1))
     const fileName = `${base}.${matchedExt}`
     if (isValidFileName(fileName)) {
-      addMobookMentionedFile(result, fileName)
+      result.add(normalizePath(`/mobook/${fileName}`))
     }
     from = start + 1
   }
@@ -176,38 +140,62 @@ function collectMobookPathsByScan(text: string, result: Set<string>): void {
   collectMobookPathsAfterNeedle(text, lower, '\\mobook\\', result)
 }
 
-/**
- * 从文本中提取提到的 mobook 相关文件名（仅 basename，不含目录）
- * @param text 原始文本
- * @returns 去重后的文件名列表，例如 `['报告.pdf', 'data.xlsx']`
- */
 export function extractMobookFiles(text = '') {
   if (typeof text !== 'string' || !text.trim()) return []
   // 全角冒号（中文输入常见）→ 半角，便于匹配 c：\mobook\
   text = text.replace(/\uFF1A/g, ':')
   const result = new Set<string>()
+  // ✅ 扩展名（必须长扩展名优先，见 EXT_SORTED_FOR_REGEX）
+  const EXT = `(${EXT_SORTED_FOR_REGEX.join('|')})`
+  // ✅ 文件名字符（增强：支持中文、符号）
+  const FILE_NAME = `[\\w\\u4e00-\\u9fa5：:《》()（）\\-\\s]+?`
   try {
-    ;(text.match(RX_EXTRACT.backtick) || []).forEach((item) => {
-      addMobookMentionedFile(result, item.replace(/`/g, '').trim())
+    // 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}`)
+      }
     })
-    ;(text.match(RX_EXTRACT.fullPath) || []).forEach((p) => addMobookMentionedFile(result, p))
-    ;(text.match(RX_EXTRACT.winMobook) || []).forEach((full) => {
+    // 2️⃣ /mobook/xxx.xxx
+    const fullPathReg = new RegExp(`/mobook/${FILE_NAME}\\.${EXT}`, 'gi')
+    ;(text.match(fullPathReg) || []).forEach((p) => {
+      result.add(normalizePath(p))
+    })
+    // 2️⃣b Windows 实际保存路径：C:\mobook\xxx、c:/mobook/xxx、\mobook\xxx（模型常写反斜杠，原先无法识别）
+    const winMobookReg = new RegExp(`(?:[a-zA-Z]:)?[/\\\\]mobook[/\\\\]${FILE_NAME}\\.${EXT}`, 'gi')
+    ;(text.match(winMobookReg) || []).forEach((full) => {
       const name = full.replace(/^(?:[a-zA-Z]:)?[/\\\\]mobook[/\\\\]/i, '').trim()
-      addMobookMentionedFile(result, name)
+      if (isValidFileName(name)) {
+        result.add(normalizePath(`/mobook/${name}`))
+      }
     })
-    ;(text.match(RX_EXTRACT.inline) || []).forEach((item) => {
-      const match = item.match(RX_EXTRACT.inlineFile)
-      if (match?.[0]) addMobookMentionedFile(result, match[0].trim())
+    // 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()}`)
+      }
     })
-    ;(text.match(RX_EXTRACT.bold) || []).forEach((item) => {
-      addMobookMentionedFile(result, item.replace(/\*\*/g, '').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}`)
+      }
     })
-    ;(text.match(RX_EXTRACT.loose) || []).forEach((item) => {
-      addMobookMentionedFile(result, item.replace(/\s*\(.+$/, '').trim())
+    // 🆕 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}`)
+      }
     })
-    for (const m of text.matchAll(RX_EXTRACT.markdownList)) {
-      if (m[1]) addMobookMentionedFile(result, m[1].trim())
-    }
+    // 6️⃣ 兜底：绝对路径等 `.../mobook/<文件名>.<扩展名>` + 最长后缀匹配 + 去脏字符
     collectMobookPathsByScan(text, result)
   } catch (e) {
     dcgLogger(`extractMobookFiles error:${e}`)
@@ -230,84 +218,11 @@ function isValidFileName(name: string) {
   return true
 }
 
-/** mobook 下按文件名递归查找：仅在直线路径均失败时调用；有深度/目录数上限，找到即停 */
-const MOBOOK_FIND_MAX_DEPTH = 10
-const MOBOOK_FIND_MAX_DIRS = 2000
-
-function findMobookFileByBasename(mobookRoot: string, basename: string): string | undefined {
-  if (!basename || basename === '.' || basename === '..') return undefined
-  if (!fs.existsSync(mobookRoot)) return undefined
-  const caseInsensitive = process.platform === 'win32' || process.platform === 'darwin'
-  const want = caseInsensitive ? basename.toLowerCase() : basename
-
-  const stack: Array<{ dir: string; depth: number }> = [{ dir: mobookRoot, depth: 0 }]
-  let dirsVisited = 0
-
-  while (stack.length > 0 && dirsVisited < MOBOOK_FIND_MAX_DIRS) {
-    const { dir, depth } = stack.pop()!
-    if (depth > MOBOOK_FIND_MAX_DEPTH) continue
-    dirsVisited += 1
-
-    let entries: fs.Dirent[]
-    try {
-      entries = fs.readdirSync(dir, { withFileTypes: true })
-    } catch {
-      continue
-    }
-
-    const subdirs: string[] = []
-    for (const ent of entries) {
-      const full = path.join(dir, ent.name)
-      if (ent.isFile()) {
-        const ok = caseInsensitive ? ent.name.toLowerCase() === want : ent.name === basename
-        if (ok) return full
-      } else if (ent.isDirectory() && depth < MOBOOK_FIND_MAX_DEPTH) {
-        if (ent.name.startsWith('.')) continue
-        subdirs.push(full)
-      }
-    }
-    for (let i = subdirs.length - 1; i >= 0; i--) {
-      stack.push({ dir: subdirs[i]!, depth: depth + 1 })
-    }
-  }
-  return undefined
-}
-
-function getMobookRoot(): string | undefined {
-  if (process.platform === 'win32') return path.join('C:\\', 'mobook')
-  if (process.platform === 'darwin') return path.join(os.homedir(), 'mobook')
-  return undefined
-}
-
-export function getFilePathByFile(file: string) {
-  const ws = getWorkspaceDir()
-  const candidates: string[] = [file]
-  candidates.push(path.join(ws, file))
-  candidates.push(path.join(ws, file.replace(/^\//, '')))
-  const underMobook = file.replace(/^\/mobook\//i, '').replace(/^mobook[\\/]/i, '')
-  const workspaceMobookRoot = path.join(ws, 'mobook')
-  const homeMobookRoot = underMobook ? getMobookRoot() : undefined
-
-  if (underMobook) {
-    if (fs.existsSync(workspaceMobookRoot)) {
-      candidates.push(path.join(workspaceMobookRoot, underMobook))
-    }
-    if (homeMobookRoot) {
-      candidates.push(path.join(homeMobookRoot, underMobook))
-    }
-  }
-  const resolved = candidates.find((p) => fs.existsSync(p))
-  if (resolved) return resolved
-
-  if (!underMobook) return undefined
-  const base = path.basename(underMobook)
-  if (fs.existsSync(workspaceMobookRoot)) {
-    const inWorkspace = findMobookFileByBasename(workspaceMobookRoot, base)
-    if (inWorkspace) return inWorkspace
-  }
-  if (homeMobookRoot) {
-    const inHome = findMobookFileByBasename(homeMobookRoot, base)
-    if (inHome) return inHome
-  }
-  return undefined
+/**
+ * 规范路径（去重用）
+ */
+function normalizePath(path: string) {
+  return path
+    .replace(/\/+/g, '/') // 多斜杠 → 单斜杠
+    .replace(/\/$/, '') // 去掉结尾 /
 }