@dcrays/dcgchat 0.4.27 → 0.5.0

package/src/utils/searchFile.ts

@@ -1,228 +0,0 @@
-import { dcgLogger } from './log.js'
-
-/**
- * 从文本中提取 /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'
-]
-/**
- * 扩展名按长度降序，用于正则交替，避免 xls 抢先匹配 xlsx、htm 抢先匹配 html 等
- */
-const EXT_SORTED_FOR_REGEX = [...EXT_LIST].sort((a, b) => b.length - a.length)
-
-/** 去除控制符、零宽字符等常见脏值 */
-function stripMobookNoise(s: string) {
-  return s.replace(/[\u0000-\u001F\u007F\u200B-\u200D\u200E\u200F\uFEFF]/g, '')
-}
-
-/**
- * 从文本中扫描 `.../mobook/...` 或 `...\mobook\...` 片段，按最长后缀匹配合法扩展名（兜底）
- */
-function collectMobookPathsAfterNeedle(text: string, lower: string, needle: string, result: Set<string>): void {
-  let from = 0
-  while (from < text.length) {
-    const i = lower.indexOf(needle, from)
-    if (i < 0) break
-    const start = i + needle.length
-    const tail = text.slice(start)
-    const seg = tail.match(/^([^\s\]\)'"}\u3002，,]+)/)
-    if (!seg) {
-      from = start + 1
-      continue
-    }
-    let raw = stripMobookNoise(seg[1]).trim()
-    if (!raw || raw.includes('\uFFFD')) {
-      from = start + 1
-      continue
-    }
-    const low = raw.toLowerCase()
-    let matchedExt: string | undefined
-    for (const ext of EXT_SORTED_FOR_REGEX) {
-      if (low.endsWith(`.${ext}`)) {
-        matchedExt = ext
-        break
-      }
-    }
-    if (!matchedExt) {
-      from = start + 1
-      continue
-    }
-    const base = raw.slice(0, -(matchedExt.length + 1))
-    const fileName = `${base}.${matchedExt}`
-    if (isValidFileName(fileName)) {
-      result.add(normalizePath(`/mobook/${fileName}`))
-    }
-    from = start + 1
-  }
-}
-
-function collectMobookPathsByScan(text: string, result: Set<string>): void {
-  const lower = text.toLowerCase()
-  collectMobookPathsAfterNeedle(text, lower, '/mobook/', result)
-  collectMobookPathsAfterNeedle(text, lower, '\\mobook\\', result)
-}
-
-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 {
-    // 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))
-    })
-    // 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()
-      if (isValidFileName(name)) {
-        result.add(normalizePath(`/mobook/${name}`))
-      }
-    })
-    // 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}`)
-      }
-    })
-    // 6️⃣ 兜底：绝对路径等 `.../mobook/<文件名>.<扩展名>` + 最长后缀匹配 + 去脏字符
-    collectMobookPathsByScan(text, result)
-  } catch (e) {
-    dcgLogger(`extractMobookFiles error:${e}`)
-  }
-  return [...result]
-}
-
-/**
- * 校验文件名是否合法（避免脏数据）
- */
-function isValidFileName(name: string) {
-  if (!name) return false
-  const cleaned = stripMobookNoise(name).trim()
-  if (!cleaned) return false
-  if (cleaned.includes('\uFFFD')) return false
-  // 过滤异常字符
-  if (/[\/\\<>:"|?*]/.test(cleaned)) return false
-  // 长度限制（防止异常长字符串）
-  if (cleaned.length > 200) return false
-  return true
-}
-
-/**
- * 规范路径（去重用）
- */
-function normalizePath(path: string) {
-  return path
-    .replace(/\/+/g, '/') // 多斜杠 → 单斜杠
-    .replace(/\/$/, '') // 去掉结尾 /
-}

package/src/utils/wsMessageHandler.ts

@@ -1,64 +0,0 @@
-import { handleDcgchatMessage } from '../bot.js'
-import { setMsgStatus, getSessionKey } from './global.js'
-import type { InboundMessage } from '../types.js'
-import { installSkill, uninstallSkill } from '../skill.js'
-import { dcgLogger } from './log.js'
-import { onDisabledCronJob, onEnabledCronJob, onRemoveCronJob, onRunCronJob } from '../cron.js'
-import { ignoreToolCommand } from './constant.js'
-import { createAgent } from '../agent.js'
-
-export type ParsedWsPayload = {
-  messageType?: string
-  content: any
-}
-
-/**
- * 处理 WebSocket 已解析 JSON 且 content 已二次 parse 后的业务消息（openclaw_bot_chat / openclaw_bot_event）。
- */
-export async function handleParsedWsMessage(parsed: ParsedWsPayload, rawPayload: string, accountId: string): Promise<void> {
-  if (parsed.messageType == 'openclaw_bot_chat') {
-    const msg = parsed as unknown as InboundMessage
-    // 与 monitor 原逻辑一致：工具类指令不进入 running，避免误触工具链监控
-    const effectiveSessionKey = getSessionKey(msg.content, accountId)
-    if (!ignoreToolCommand.includes(msg.content.text?.trim() ?? '')) {
-      setMsgStatus(effectiveSessionKey, 'running')
-    } else {
-      setMsgStatus(effectiveSessionKey, 'finished')
-    }
-    await handleDcgchatMessage(msg, accountId)
-  } else if (parsed.messageType == 'openclaw_bot_event') {
-    const { event_type, operation_type } = parsed.content ? parsed.content : ({} as Record<string, any>)
-    if (event_type === 'skill') {
-      const { skill_url, skill_code, skill_id, bot_token, websocket_trace_id } = parsed.content
-      const content = { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id }
-      if (operation_type === 'install' || operation_type === 'enable' || operation_type === 'update') {
-        installSkill({ path: skill_url, code: skill_code }, content)
-      } else if (operation_type === 'remove' || operation_type === 'disable') {
-        uninstallSkill({ code: skill_code }, content)
-      } else {
-        dcgLogger(`openclaw_bot_event unknown event_type: ${event_type}, ${rawPayload}`)
-      }
-    } else if (event_type === 'agent') {
-      if (operation_type === 'create') {
-        await createAgent(parsed.content)
-      } else {
-        dcgLogger(`openclaw_bot_event unknown event_type: ${event_type}, ${rawPayload}`)
-      }
-    } else if (event_type === 'cron') {
-      const { job_id, message_id } = parsed.content
-      if (operation_type === 'remove') {
-        await onRemoveCronJob(job_id)
-      } else if (operation_type === 'enable') {
-        await onEnabledCronJob(job_id)
-      } else if (operation_type === 'disable') {
-        await onDisabledCronJob(job_id)
-      } else if (operation_type === 'run') {
-        await onRunCronJob(job_id, message_id)
-      }
-    } else {
-      dcgLogger(`openclaw_bot_event unknown operation_type: ${operation_type}, ${rawPayload}`)
-    }
-  } else {
-    dcgLogger(`ignoring unknown messageType: ${parsed.messageType}`, 'error')
-  }
-}

package/src/utils/zipExtract.ts

@@ -1,97 +0,0 @@
-import path from 'path'
-import fs from 'fs'
-/** @ts-ignore */
-import unzipper from 'unzipper'
-import { pipeline } from 'stream/promises'
-import { decodeZipEntryPath } from './zipPath.js'
-
-/**
- * 若且唯若所有条目都在同一顶层目录下（如 GitHub 下载的 repo-name/...），返回该目录名；否则返回 null。
- * 不能再用「第一个多段路径的第一段」推断，否则 ZIP 条目顺序变化时会误判（例如先出现 .github/ 或 src/）。
- */
-export function computeSharedZipRootPrefix(decodedPaths: string[]): string | null {
-  const normalized = decodedPaths
-    .map((p) => p.replace(/\\/g, '/').replace(/\/+$/, ''))
-    .filter((p) => p.length > 0)
-
-  if (normalized.length === 0) return null
-
-  const firstSegs = new Set<string>()
-  for (const p of normalized) {
-    const seg = p.split('/').filter(Boolean)[0]
-    if (seg) firstSegs.add(seg)
-  }
-  if (firstSegs.size !== 1) return null
-
-  const root = [...firstSegs][0]!
-  const prefix = `${root}/`
-  for (const p of normalized) {
-    if (p !== root && !p.startsWith(prefix)) return null
-  }
-  return root
-}
-
-function assertSafeZipTarget(destDir: string, relativePath: string): string {
-  const resolvedPath = path.resolve(destDir, relativePath)
-  const resolvedDest = path.resolve(destDir)
-  const rel = path.relative(resolvedDest, resolvedPath)
-  if (rel.startsWith('..') || path.isAbsolute(rel)) {
-    throw new Error(`zip 路径越界: ${relativePath}`)
-  }
-  return resolvedPath
-}
-
-type ZipEntry = {
-  path: string
-  pathBuffer: Buffer
-  flags: number
-  type: string
-  stream: (password?: string) => NodeJS.ReadableStream
-}
-
-/**
- * 将已下载的 zip 解压到 destDir；顶层单根目录（若存在）会被剥掉，与原先流式 Parse 行为一致，但根目录由全量路径计算，与条目顺序无关。
- */
-export async function extractZipBufferToDirectory(buf: Buffer, destDir: string): Promise<void> {
-  const directory = await unzipper.Open.buffer(buf)
-  const files = (await directory.files) as ZipEntry[]
-
-  const decodedPaths = files.map((entry) =>
-    decodeZipEntryPath(entry.pathBuffer, entry.flags ?? 0, entry.path)
-  )
-  const rootDir = computeSharedZipRootPrefix(decodedPaths)
-
-  // 与 unzipper 默认 extract 一致：串行读各 entry，避免同一 buffer 上多路解压竞争
-  for (let i = 0; i < files.length; i++) {
-    const entry = files[i]!
-    const entryPath = decodedPaths[i]!
-    let newPath = entryPath.replace(/\\/g, '/')
-    if (rootDir) {
-      if (newPath === rootDir || newPath === `${rootDir}/`) {
-        continue
-      }
-      if (newPath.startsWith(`${rootDir}/`)) {
-        newPath = newPath.slice(rootDir.length + 1)
-      }
-    }
-    newPath = newPath.replace(/\/+$/, '')
-    if (!newPath) continue
-
-    const targetPath = assertSafeZipTarget(destDir, newPath)
-
-    if (entry.type === 'Directory') {
-      fs.mkdirSync(targetPath, { recursive: true })
-      continue
-    }
-
-    const parentDir = path.dirname(targetPath)
-    fs.mkdirSync(parentDir, { recursive: true })
-    const writeStream = fs.createWriteStream(targetPath)
-    try {
-      await pipeline(entry.stream(), writeStream)
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err)
-      throw new Error(`解压文件失败 ${entryPath}: ${message}`)
-    }
-  }
-}

package/src/utils/zipPath.ts

@@ -1,24 +0,0 @@
-/**
- * ZIP 文件名编码：规范要求 UTF-8 时设置 0x800；很多工具未设标志但仍写 UTF-8 字节。
- * 无标志时若一律按 GBK 解码，会得到「鍥句功…」类乱码。先严格 UTF-8，失败再 GBK（兼容 Windows 中文 ZIP）。
- */
-export function decodeZipEntryPath(
-  pathBuffer: Buffer | Uint8Array | undefined,
-  flags: number,
-  fallbackPath: string
-): string {
-  if ((flags & 0x800) !== 0) {
-    if (pathBuffer) {
-      return new TextDecoder('utf-8').decode(pathBuffer)
-    }
-    return fallbackPath
-  }
-  if (pathBuffer && pathBuffer.length > 0) {
-    try {
-      return new TextDecoder('utf-8', { fatal: true }).decode(pathBuffer)
-    } catch {
-      return new TextDecoder('gbk').decode(pathBuffer)
-    }
-  }
-  return fallbackPath
-}