@dcrays/dcgchat-test 0.3.34 → 0.3.36

package/package.json

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

package/src/agent.ts

@@ -0,0 +1,204 @@
+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'
+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 IAgentParams = {
+  url: string
+  agent_code: string
+  agent_name: string
+  agent_description: string
+}
+
+function sendEvent(msgContent: Record<string, any>) {
+  const ws = getWsConnection()
+  if (isWsOpen()) {
+    ws?.send(
+      JSON.stringify({
+        messageType: 'openclaw_bot_event',
+        source: 'client',
+        content: msgContent
+      })
+    )
+    dcgLogger(`agent安装: ${JSON.stringify(msgContent)}`)
+  }
+}
+
+interface ICreateAgentParams {
+  code: string
+  workspace: string
+  name?: string
+  description?: string
+  msgContent?: Record<string, any>
+}
+
+/** 若 workspace-${code}/agent 存在，则复制到 agents/${code}/agent */
+function copyAgentsFiles(code: string) {
+  const workspacePath = getWorkspaceDir()
+  if (!workspacePath) return
+  const workspaceDir = path.join(workspacePath, '../', `workspace-${code}`)
+  const agentDir = path.join(workspacePath, '../', `agents/${code}`)
+  const sourceAgent = path.join(workspaceDir, 'agent')
+  try {
+    if (!fs.existsSync(sourceAgent)) return
+    if (!fs.statSync(sourceAgent).isDirectory()) return
+    fs.mkdirSync(agentDir, { recursive: true })
+    const dest = path.join(agentDir, 'agent')
+    if (fs.existsSync(dest)) {
+      fs.rmSync(dest, { recursive: true, force: true })
+    }
+    fs.cpSync(sourceAgent, dest, { recursive: true })
+  } catch (err: unknown) {
+    dcgLogger(`copyAgentsFiles failed: ${String(err)}`, 'error')
+  }
+}
+
+export async function onCreateAgent(params: Record<string, any>) {
+  const { code, name, description } = params
+  try {
+    await sendMessageToGateway(JSON.stringify({ method: 'agents.create', params: { name: code, workspace: code } }))
+  } catch (err: unknown) {
+    dcgLogger(`agents.create failed: ${String(err)}`, 'error')
+  }
+  // Update config.name to the user-supplied display name (may contain CJK, spaces, etc.)
+  try {
+    await sendMessageToGateway(JSON.stringify({ method: 'agents.update', params: { name: name, agentId: code } }))
+  } catch (err: unknown) {
+    dcgLogger(`agents.update failed: ${String(err)}`, 'error')
+  }
+  if (description?.trim()) {
+    try {
+      await sendMessageToGateway(
+        JSON.stringify({
+          method: 'agents.files.set',
+          params: { agentId: code, name: 'IDENTITY.md', content: description.trim() }
+        })
+      )
+    } catch {
+      // Non-fatal
+    }
+  }
+  if (name?.trim()) {
+    try {
+      await sendMessageToGateway(
+        JSON.stringify({
+          method: 'agents.files.set',
+          params: { agentId: code, name: 'USER.md', content: name.trim() }
+        })
+      )
+    } catch {
+      // Non-fatal
+    }
+  }
+  copyAgentsFiles(code)
+  sendEvent({ ...params, status: 'ok' })
+}
+
+export async function createAgent(msgContent: Record<string, any>) {
+  const { url, code } = msgContent
+  if (!url || !code) {
+    dcgLogger(`createAgent failed empty url&code: ${JSON.stringify(msgContent)}`, 'error')
+    sendEvent({ ...msgContent, status: 'fail' })
+    return
+  }
+  const workspacePath = getWorkspaceDir()
+  const workspaceDir = path.join(workspacePath, '../', `workspace-${code}`)
+
+  // 如果目标目录已存在，先删除
+  if (fs.existsSync(workspaceDir)) {
+    fs.rmSync(workspaceDir, { recursive: true, force: true })
+  }
+
+  try {
+    // 下载 zip 文件
+    const response = await axios({
+      method: 'get',
+      url,
+      responseType: 'stream'
+    })
+    // 创建目标目录
+    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(workspacePath, 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 onCreateAgent(msgContent)
+  } catch (error) {
+    // 如果安装失败，清理目录
+    if (fs.existsSync(workspaceDir)) {
+      fs.rmSync(workspaceDir, { recursive: true, force: true })
+    }
+    sendEvent({ ...msgContent, status: 'fail' })
+  }
+}

package/src/bot.ts

@@ -151,7 +151,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
   const core = getDcgchatRuntime()
 
   const conversationId = msg.content.session_id?.trim()
-  const agentId = msg.content.agent_id?.trim()
   const real_mobook = msg.content.real_mobook?.toString().trim()
 
   const route = core.channel.routing.resolveAgentRoute({
@@ -252,9 +251,9 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       OriginatingTo: effectiveSessionKey,
       ...mediaPayload
     })
-  dcgLogger(
-    `inbound context target: rawTarget=${userId}, normalizedTarget=${effectiveSessionKey}, ctx.To=${String(ctxPayload.To ?? '')}, ctx.SessionKey=${String(ctxPayload.SessionKey ?? '')}, ctx.OriginatingTo=${String(ctxPayload.OriginatingTo ?? '')}`
-  )
+    dcgLogger(
+      `inbound context target: rawTarget=${userId}, normalizedTarget=${effectiveSessionKey}, ctx.To=${String(ctxPayload.To ?? '')}, ctx.SessionKey=${String(ctxPayload.SessionKey ?? '')}, ctx.OriginatingTo=${String(ctxPayload.OriginatingTo ?? '')}`
+    )
 
     const sentMediaKeys = new Set<string>()
     const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
@@ -318,7 +317,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         })
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
-        safeSendFinal('abort')
+        sendFinal(outboundCtx, 'abort')
         sendText('会话已终止', outboundCtx)
         sessionStreamSuppressed.add(effectiveSessionKey)
         const runId = activeRunIdBySessionKey.get(effectiveSessionKey)

package/src/monitor.ts

@@ -1,14 +1,10 @@
 import type { ClawdbotConfig, RuntimeEnv } from 'openclaw/plugin-sdk'
 import WebSocket from 'ws'
-import { handleDcgchatMessage } from './bot.js'
 import { resolveAccount } from './channel.js'
-import { setWsConnection, getOpenClawConfig, setMsgStatus, getSessionKey } from './utils/global.js'
-import type { InboundMessage } from './types.js'
-import { installSkill, uninstallSkill } from './skill.js'
+import { setWsConnection, getOpenClawConfig } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
-import { onDisabledCronJob, onEnabledCronJob, onRemoveCronJob, onRunCronJob } from './cron.js'
-import { ignoreToolCommand } from './utils/constant.js'
 import { isWsOpen } from './transport.js'
+import { handleParsedWsMessage } from './utils/wsMessageHandler.js'
 
 export type MonitorDcgchatOpts = {
   config?: ClawdbotConfig
@@ -128,53 +124,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         return
       }
 
-      if (parsed.messageType == 'openclaw_bot_chat') {
-        const msg = parsed as unknown as InboundMessage
-        // 与 monitor 原逻辑一致：工具类指令不进入 running，避免误触工具链监控
-        const effectiveSessionKey = getSessionKey(msg.content, account.accountId)
-        if (!ignoreToolCommand.includes(msg.content.text?.trim() ?? '')) {
-          setMsgStatus(effectiveSessionKey, 'running')
-        } else {
-          setMsgStatus(effectiveSessionKey, 'finished')
-        }
-        await handleDcgchatMessage(msg, account.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}, ${data.toString()}`)
-          }
-        } 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}, ${data.toString()}`)
-        }
-      } else {
-        dcgLogger(`ignoring unknown messageType: ${parsed.messageType}`, 'error')
-      }
+      await handleParsedWsMessage(parsed, payloadStr, account.accountId)
     })
 
     ws.on('close', (code, reason) => {

package/src/session.ts

@@ -0,0 +1,19 @@
+import { sendMessageToGateway } from './gateway/socket.js'
+import { getSessionKey } from './utils/global.js'
+import { dcgLogger } from './utils/log.js'
+
+interface TSession {
+  agent_id: string
+  session_id: string
+  agent_clone_code?: string
+  account_id?: string
+}
+
+export const onRemoveSession = async ({ agent_id, session_id, agent_clone_code, account_id }: TSession) => {
+  const sessionKey = getSessionKey({ agent_id, session_id }, account_id)
+  if (!session_id) {
+    dcgLogger('onRemoveSession: empty session_id', 'error')
+    return
+  }
+  sendMessageToGateway(JSON.stringify({ method: 'sessions.delete', params: { key: sessionKey, deleteTranscript: true } }))
+}

package/src/skill.ts

@@ -9,6 +9,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'
 
 type ISkillParams = {
   path: string
@@ -69,13 +70,7 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
           }
           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 entryPath = decodeZipEntryPath(entry.props?.pathBuffer, flags, entry.path)
             const pathParts = entryPath.split('/')
 
             // 检测根目录

package/src/types.ts

@@ -39,6 +39,7 @@ export type InboundMessage = {
   // content: string;
   content: {
     bot_token: string
+    agent_clone_code?: string
     domain_id?: string
     app_id?: string
     bot_id?: string

package/src/utils/global.ts

@@ -117,19 +117,6 @@ export function clearSentMediaKeys(messageId?: string) {
   }
 }
 
-export const getSessionKey = (content: any, accountId: string) => {
-  const { real_mobook, agent_id, conversation_id, session_id } = content
-  const core = getDcgchatRuntime()
-
-  const route = core.channel.routing.resolveAgentRoute({
-    cfg: getOpenClawConfig() as OpenClawConfig,
-    channel: "dcgchat-test",
-    accountId: accountId || 'default',
-    peer: { kind: 'direct', id: session_id }
-  })
-  return real_mobook == '1' ? route.sessionKey : `agent:main:mobook:direct:${agent_id}:${session_id}`.toLowerCase()
-}
-
 const cronMessageIdMap = new Map<string, string>()
 
 export function setCronMessageId(sk: string, messageId: string) {
@@ -144,6 +131,21 @@ export function removeCronMessageId(sk: string) {
   cronMessageIdMap.delete(sk)
 }
 
+export const getSessionKey = (content: any, accountId: string) => {
+  const { real_mobook, agent_id, agent_clone_code, session_id } = content
+  const core = getDcgchatRuntime()
+
+  const anentCode = agent_clone_code || 'main'
+
+  const route = core.channel.routing.resolveAgentRoute({
+    cfg: getOpenClawConfig() as OpenClawConfig,
+    channel: "dcgchat-test",
+    accountId: accountId || 'default',
+    peer: { kind: 'direct', id: session_id }
+  })
+  return real_mobook == '1' ? route.sessionKey : `agent:${anentCode}:mobook:direct:${agent_id}:${session_id}`.toLowerCase()
+}
+
 export function getInfoBySessionKey(sk: string): { sessionId: string; agentId: string } {
   const sessionInfo = sk.split(':')
   return { sessionId: sessionInfo.at(-1) ?? '', agentId: sessionInfo.at(-2) ?? '' }

package/src/utils/wsMessageHandler.ts

@@ -0,0 +1,64 @@
+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 === 'install') {
+        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/zipPath.ts

@@ -0,0 +1,24 @@
+/**
+ * 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
+}