@dcrays/dcgchat-test 0.4.1 → 0.4.3

package/package.json

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

package/src/agent.ts

@@ -1,7 +1,4 @@
 import axios from 'axios'
-/** @ts-ignore */
-import unzipper from 'unzipper'
-import { pipeline } from 'stream/promises'
 import fs from 'fs'
 import path from 'path'
 import { getWorkspaceDir } from './utils/global.js'
@@ -9,7 +6,7 @@ import { getWsConnection } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
 import { isWsOpen } from './transport.js'
 import { sendMessageToGateway } from './gateway/socket.js'
-import { decodeZipEntryPath } from './utils/zipPath.js'
+import { extractZipBufferToDirectory } from './utils/zipExtract.js'
 
 type IAgentParams = {
   url: string
@@ -110,81 +107,13 @@ export async function createAgent(msgContent: Record<string, any>) {
   }
 
   try {
-    // 下载 zip 文件
     const response = await axios({
       method: 'get',
       url,
-      responseType: 'stream'
+      responseType: 'arraybuffer'
     })
-    // 创建目标目录
     fs.mkdirSync(workspaceDir, { recursive: true })
-    // 解压文件到目标目录，跳过顶层文件夹
-    await new Promise((resolve, reject) => {
-      const tasks: Promise<void>[] = []
-      let rootDir: string | null = null
-      let hasError = false
-
-      response.data
-        .pipe(unzipper.Parse())
-        .on('entry', (entry: any) => {
-          if (hasError) {
-            entry.autodrain()
-            return
-          }
-          try {
-            const flags = entry.props?.flags ?? 0
-            const entryPath = decodeZipEntryPath(entry.props?.pathBuffer, flags, entry.path)
-            const pathParts = entryPath.split('/')
-
-            // 检测根目录
-            if (!rootDir && pathParts.length > 1) {
-              rootDir = pathParts[0]
-            }
-            let newPath = entryPath
-            // 移除顶层文件夹
-            if (rootDir && entryPath.startsWith(rootDir + '/')) {
-              newPath = entryPath.slice(rootDir.length + 1)
-            }
-
-            if (!newPath) {
-              entry.autodrain()
-              return
-            }
-
-            const targetPath = path.join(workspaceDir, newPath)
-
-            if (entry.type === 'Directory') {
-              fs.mkdirSync(targetPath, { recursive: true })
-              entry.autodrain()
-            } else {
-              const parentDir = path.dirname(targetPath)
-              fs.mkdirSync(parentDir, { recursive: true })
-              const writeStream = fs.createWriteStream(targetPath)
-              const task = pipeline(entry, writeStream).catch((err) => {
-                hasError = true
-                throw new Error(`解压文件失败 ${entryPath}: ${err.message}`)
-              })
-              tasks.push(task)
-            }
-          } catch (err) {
-            hasError = true
-            entry.autodrain()
-            reject(new Error(`处理entry失败: ${err}`))
-          }
-        })
-        .on('close', async () => {
-          try {
-            await Promise.all(tasks)
-            resolve(null)
-          } catch (err) {
-            reject(err)
-          }
-        })
-        .on('error', (err: { message: any }) => {
-          hasError = true
-          reject(new Error(`解压流错误: ${err.message}`))
-        })
-    })
+    await extractZipBufferToDirectory(Buffer.from(response.data), workspaceDir)
     await onCreateAgent(msgContent)
   } catch (error) {
     // 如果安装失败，清理目录

package/src/bot.ts

@@ -235,11 +235,12 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
     let streamedTextLen = 0
 
-    if (msg.content.skills_scope.length > 0) {
+    if (msg.content.skills_scope.length > 0 && !msg.content?.agent_clone_code) {
       const workspaceDir = getWorkspaceDir()
       const skillCode = msg.content.skills_scope.map((skill) => `${workspaceDir}/skills/${skill.skill_code}`).join('\n')
       const skillText = `技能${skillCode} 在目录${skillCode}下，在目录${skillCode}下读取技能 \n`
       text = skillText ? `${skillText} \n ${text}` : text
+      dcgLogger('skill: skillText: ${skillText}')
     }
     const prefixContext = createReplyPrefixContext({
       cfg: config,
@@ -336,7 +337,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         clearSentMediaKeys(msg.content.message_id)
         clearParamsMessage(dcgSessionKey)
         clearParamsMessage(userId)
-
         sendFinal(outboundCtx, 'stop')
         return
       } else {
@@ -385,7 +385,9 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                       const prev = streamChunkIdxBySessionKey.get(dcgSessionKey) ?? 0
                       streamChunkIdxBySessionKey.set(dcgSessionKey, prev + 1)
                       sendChunk(delta, outboundCtx, prev)
-                      dcgLogger(`[stream]: chunkIdx=${prev} len=${delta.length} user=${outboundCtx.sessionId} ${delta.slice(0, 100)}`)
+                      dcgLogger(
+                        `[stream]: chunkIdx=${prev} len=${delta.length} sessionId=${outboundCtx.sessionId} ${delta.slice(0, 100)}`
+                      )
                     }
                     streamedTextLen = payload.text.length
                   } else {

package/src/cron.ts

@@ -40,11 +40,6 @@ export function readCronJob(jobPath: string, jobId: string): Record<string, any>
   }
 }
 
-function msgParamsToCtx(p: IMsgParams): IMsgParams | null {
-  if (!p?.botToken) return null
-  return p
-}
-
 const CRON_UPLOAD_DEBOUNCE_MS = 2400
 
 let cronUploadFlushTimer: ReturnType<typeof setTimeout> | null = null
@@ -63,9 +58,10 @@ async function runCronJobsUpload(sessionKey: string): Promise<void> {
         event_type: 'cron',
         operation_type: 'install',
         session_id: sessionId,
-        agent_id: agentId
+        agent_id: agentId,
+        oss_url: url
       }
-      sendEventMessage(url, params)
+      sendEventMessage(params)
     } catch (error) {
       dcgLogger(`${jobPath} upload failed: ${error}`, 'error')
     }
@@ -170,6 +166,7 @@ export const finishedDcgchatCron = async (jobId: string) => {
     sendFinal(merged, 'cron send')
   }
   const ws = getWsConnection()
+  const baseContent = getParamsDefaults()
   if (isWsOpen()) {
     ws?.send(
       JSON.stringify({
@@ -178,15 +175,17 @@ export const finishedDcgchatCron = async (jobId: string) => {
         content: {
           event_type: 'notify',
           operation_type: 'cron',
+          bot_token: baseContent.botToken,
+          app_id: baseContent.appId,
           session_id: sessionId,
-          agentId: agentId,
+          agent_id: agentId,
           real_mobook: !sessionId ? 1 : '',
           title: name
         }
       })
     )
-    dcgLogger(`定时任务执行成功: ${id}`)
   }
+  dcgLogger(`定时任务执行成功: ${id}`)
   removeCronMessageId(sessionKey)
   dcgLogger(`finishedDcgchatCron: job=${id} sessionKey=${sessionKey}`)
 }

package/src/skill.ts

@@ -9,7 +9,6 @@ import { getWsConnection } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
 import { isWsOpen } from './transport.js'
 import { sendMessageToGateway } from './gateway/socket.js'
-import { decodeZipEntryPath } from './utils/zipPath.js'
 
 type ISkillParams = {
   path: string
@@ -70,7 +69,13 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
           }
           try {
             const flags = entry.props?.flags ?? 0
-            const entryPath = decodeZipEntryPath(entry.props?.pathBuffer, flags, entry.path)
+            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('/')
 
             // 检测根目录

package/src/transport.ts

@@ -169,7 +169,7 @@ export function sendChunk(text: string, ctx: IMsgParams, chunkIdx: number): bool
 }
 
 export function sendFinal(ctx: IMsgParams, tag: string): boolean {
-  dcgLogger(` message handling complete state: final tag:${tag}`)
+  dcgLogger(` message handling complete state: to=${ctx.sessionId} final tag:${tag}`)
   return wsSend(ctx, { response: '', state: 'final' })
 }
 
@@ -181,7 +181,7 @@ export function sendError(errorMsg: string, ctx: IMsgParams): boolean {
   return wsSend(ctx, { response: `[错误] ${errorMsg}`, state: 'final' })
 }
 
-export function sendEventMessage(url: string, params: Record<string, string> = {}) {
+export function sendEventMessage(params: Record<string, string> = {}) {
   const ctx = getParamsDefaults()
   const ws = getWsConnection()
   if (isWsOpen()) {
@@ -193,7 +193,6 @@ export function sendEventMessage(url: string, params: Record<string, string> = {
           bot_token: ctx.botToken,
           domain_id: ctx.domainId,
           app_id: ctx.appId,
-          oss_url: url,
           bot_id: ctx.botId,
           ...params
         }

package/src/utils/gatewayMsgHanlder.ts

@@ -14,8 +14,10 @@ export function handleGatewayEventMessage(msg: { event?: string; payload?: Recor
       const sessionKey = getSessionKeyBySubAgentRunId(pl.runId)
       const outboundCtx = getEffectiveMsgParams(sessionKey)
       if (pl.data?.delta) {
-        dcgLogger(`[Gateway] 收到agent事件: ${JSON.stringify(msg).slice(0, 100)}`)
-        if (outboundCtx.sessionId) sendChunk(pl.data.delta as string, outboundCtx, 0)
+        if (outboundCtx.sessionId) {
+          dcgLogger(`[Gateway] 收到agent事件: ${JSON.stringify(msg).slice(0, 100)}`)
+          sendChunk(pl.data.delta as string, outboundCtx, 0)
+        }
       }
     }
     if (msg.event === 'cron') {

package/src/utils/zipExtract.ts

@@ -0,0 +1,97 @@
+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}`)
+    }
+  }
+}