@dcrays/dcgchat-test 0.6.12 → 0.6.13

package/src/utils/wsMessageHandler.ts

@@ -1,124 +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/message.js'
-import { ignoreToolCommand } from './constant.js'
-import { createAgent, onRemoveAgent, onUpdateAgent } from '../agent.js'
-import { onRemoveSession } from '../session.js'
-
-interface WsEventContent {
-  event_type?: string
-  operation_type?: string
-  skill_url?: string
-  skill_code?: string
-  skill_id?: string
-  bot_token?: string
-  websocket_trace_id?: string
-  job_id?: string
-  message_id?: string
-  agent_id?: string
-  session_id?: string
-  agent_clone_code?: string
-  url?: string
-  clone_code?: string
-  name?: string
-  description?: string
-  [key: string]: unknown
-}
-
-export type ParsedWsPayload = {
-  messageType?: string
-  content: WsEventContent | null
-}
-
-function logUnsupportedOpenclawBotEvent(
-  branch: 'skill' | 'agent',
-  eventType: string,
-  operationType: unknown,
-  rawPayload: string
-): void {
-  dcgLogger(
-    `openclaw_bot_event ${branch}: unsupported operation_type=${String(operationType)} (event_type=${eventType}), ${rawPayload}`,
-    'error'
-  )
-}
-
-/**
- * 处理 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)
-    const isToolOnly = ignoreToolCommand.includes(msg.content.text?.trim() ?? '')
-    if (!isToolOnly) {
-      setMsgStatus(effectiveSessionKey, 'running')
-    } else {
-      setMsgStatus(effectiveSessionKey, 'finished')
-    }
-    try {
-      await handleDcgchatMessage(msg, accountId)
-    } catch (err) {
-      dcgLogger(`handleDcgchatMessage failed: ${String(err)}`, 'error')
-      if (!isToolOnly) {
-        setMsgStatus(effectiveSessionKey, '')
-      }
-      // 不再向上 throw：否则 async onMessage 未接住的 rejection 会触发 Unhandled promise rejection
-    }
-  } else if (parsed.messageType === 'openclaw_bot_event') {
-    if (!parsed.content) {
-      dcgLogger(`openclaw_bot_event: content is null, ${rawPayload}`, 'error')
-      return
-    }
-    const { event_type, operation_type } = parsed.content
-    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 {
-        logUnsupportedOpenclawBotEvent('skill', event_type, operation_type, rawPayload)
-      }
-    } else if (event_type === 'agent') {
-      if (operation_type === 'create') {
-        await createAgent(parsed.content)
-      } else if (operation_type === 'remove') {
-        await onRemoveAgent(parsed.content)
-      } else if (operation_type === 'update') {
-        await onUpdateAgent(parsed.content)
-      } else {
-        logUnsupportedOpenclawBotEvent('agent', event_type, operation_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 cron: unsupported operation_type=${String(operation_type)}, ${rawPayload}`, 'error')
-      }
-    } else if (event_type === 'session') {
-      const { agent_id = '', session_id = '', agent_clone_code } = parsed.content
-      if (operation_type === 'remove') {
-        await onRemoveSession({ agent_id, session_id, agent_clone_code, account_id: accountId })
-      }
-    } else {
-      dcgLogger(
-        `openclaw_bot_event: unknown event_type=${String(event_type)}, operation_type=${String(operation_type)}, ${rawPayload}`,
-        'error'
-      )
-    }
-  } 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
-}