@dcrays/dcgchat-test 0.4.2 → 0.4.3

package/package.json

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

package/src/bot.ts

@@ -240,6 +240,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       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 {

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

@@ -1,4 +1,7 @@
 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'
@@ -6,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 { extractZipBufferToDirectory } from './utils/zipExtract.js'
 
 type ISkillParams = {
   path: string
@@ -44,13 +46,87 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
   }
 
   try {
+    // 下载 zip 文件
     const response = await axios({
       method: 'get',
       url: cdnUrl,
-      responseType: 'arraybuffer'
+      responseType: 'stream'
     })
+    // 创建目标目录
     fs.mkdirSync(skillDir, { recursive: true })
-    await extractZipBufferToDirectory(Buffer.from(response.data), skillDir)
+    // 解压文件到目标目录，跳过顶层文件夹
+    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 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('/')
+
+            // 检测根目录
+            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(skillDir, 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}`))
+        })
+    })
     sendEvent({ ...msgContent, status: 'ok' })
     sendMessageToGateway(JSON.stringify({ method: 'skills.status', params: {} }))
   } catch (error) {

package/src/transport.ts

@@ -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') {