@dcrays/dcgchat-test 0.2.32 → 0.2.34

package/index.ts

@@ -12,6 +12,7 @@ const plugin = {
   configSchema: emptyPluginConfigSchema(),
   register(api: OpenClawPluginApi) {
     setDcgchatRuntime(api.runtime)
+
     monitoringToolMessage(api)
     setOpenClawConfig(api.config)
     api.registerChannel({ plugin: dcgchatPlugin })

package/package.json

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

package/src/bot.ts

@@ -3,14 +3,7 @@ import path from 'node:path'
 import type { ReplyPayload } from 'openclaw/plugin-sdk'
 import { createReplyPrefixContext } from 'openclaw/plugin-sdk'
 import type { InboundMessage } from './types.js'
-import {
-  clearSentMediaKeys,
-  getDcgchatRuntime,
-  getOpenClawConfig,
-  getWorkspaceDir,
-  getWsConnection,
-  setMsgStatus
-} from './utils/global.js'
+import { clearSentMediaKeys, getDcgchatRuntime, getOpenClawConfig, getWorkspaceDir, setMsgStatus } from './utils/global.js'
 import { resolveAccount, sendDcgchatMedia } from './channel.js'
 import { generateSignUrl } from './request/api.js'
 import { extractMobookFiles } from './utils/searchFile.js'
@@ -133,6 +126,14 @@ function resolveReplyMediaList(payload: ReplyPayload): string[] {
 export async function handleDcgchatMessage(msg: InboundMessage, accountId: string): Promise<void> {
   const msgCtx = createMsgContext(msg)
 
+  let finalSent = false
+
+  const safeSendFinal = () => {
+    if (finalSent) return
+    finalSent = true
+    sendFinal(msgCtx)
+  }
+
   let completeText = ''
   const config = getOpenClawConfig()
   if (!config) {
@@ -145,7 +146,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
   if (!text) {
     sendTextMsg(msgCtx, '你需要我帮你做什么呢？')
-    sendFinal(msgCtx)
+    safeSendFinal()
     return
   }
 
@@ -245,10 +246,11 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         }
       },
       onError: (err: unknown, info: { kind: string }) => {
+        safeSendFinal()
         dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
       },
       onIdle: () => {
-        sendFinal(msgCtx)
+        safeSendFinal()
       }
     })
 
@@ -268,7 +270,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
         abortMobookappGeneration(conversationId)
-        sendFinal(msgCtx)
+        safeSendFinal()
         return
       } else {
         dcgLogger(`dispatching to agent (session=${route.sessionKey})`)
@@ -325,21 +327,31 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     }
     try {
       markRunComplete()
+      markDispatchIdle()
     } catch (err) {
-      dcgLogger(` markRunComplete error: ${String(err)}`, 'error')
+      dcgLogger(` markRunComplete||markRunComplete error: ${String(err)}`, 'error')
     }
-    markDispatchIdle()
     if (![...systemCommand, ...interruptCommand].includes(text?.trim())) {
       for (const file of extractMobookFiles(completeText)) {
-        let resolved = file
-        if (!fs.existsSync(resolved)) {
-          resolved = path.join(getWorkspaceDir(), file)
-          if (!fs.existsSync(resolved)) return
+        const candidates: string[] = [file]
+        candidates.push(path.join(getWorkspaceDir(), file))
+        candidates.push(path.join(getWorkspaceDir(), file.replace(/^\//, '')))
+        if (process.platform === 'win32') {
+          const underMobook = file.replace(/^\/mobook\//i, '').replace(/^mobook[\\/]/i, '')
+          if (underMobook) {
+            candidates.push(path.join('C:\\', 'mobook', underMobook))
+          }
+        }
+        const resolved = candidates.find((p) => fs.existsSync(p))
+        if (!resolved) continue
+        try {
+          await sendDcgchatMedia({ msgCtx, mediaUrl: resolved, text: '' })
+        } catch (err) {
+          dcgLogger(` sendDcgchatMedia error: ${String(err)}`, 'error')
         }
-        await sendDcgchatMedia({ msgCtx, mediaUrl: resolved, text: '' })
       }
     }
-    sendFinal(msgCtx)
+    safeSendFinal()
     clearSentMediaKeys(msg.content.message_id)
     setMsgStatus('finished')
 
@@ -360,5 +372,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
   } catch (err) {
     dcgLogger(` handle message failed: ${String(err)}`, 'error')
     sendError(msgCtx, err instanceof Error ? err.message : String(err))
+  } finally {
+    safeSendFinal()
   }
 }

package/src/monitor.ts

@@ -48,6 +48,15 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
   let shouldReconnect = true
   let ws: WebSocket | null = null
   let heartbeatTimer: ReturnType<typeof setInterval> | null = null
+  let heartbeatLogCounter = 0
+
+  const isOpenclawBotHeartbeat = (raw: WebSocket.RawData, parsedMsg: { messageType?: string }): boolean => {
+    if (parsedMsg?.messageType === 'openclaw_bot_heartbeat') return true
+    if (typeof raw === 'object' && raw !== null && !Buffer.isBuffer(raw)) {
+      return (raw as { messageType?: string }).messageType === 'openclaw_bot_heartbeat'
+    }
+    return false
+  }
 
   const stopHeartbeat = () => {
     if (heartbeatTimer) {
@@ -96,11 +105,18 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         return
       }
 
-      dcgLogger(`${parsed?.messageType}, ${data.toString()}`)
-      if (parsed.messageType === 'openclaw_bot_heartbeat') {
-        dcgLogger(`heartbeat ack received, ${data.toString()}`)
+      const payloadStr = data.toString()
+      const heartbeat = isOpenclawBotHeartbeat(data, parsed)
+      if (heartbeat) {
+        heartbeatLogCounter += 1
+        if (heartbeatLogCounter % 10 === 0) {
+          dcgLogger(`${parsed?.messageType}, ${payloadStr}`)
+          dcgLogger(`heartbeat ack received, ${payloadStr}`)
+        }
         return
       }
+
+      dcgLogger(`${parsed?.messageType}, ${payloadStr}`)
       try {
         parsed.content = JSON.parse(parsed.content)
       } catch {

package/src/utils/searchFile.ts

@@ -1,3 +1,5 @@
+import { dcgLogger } from './log.js'
+
 /**
  * 从文本中提取 /mobook 目录下的文件
  * @param {string} text
@@ -182,7 +184,7 @@ export function extractMobookFiles(text = '') {
     // 6️⃣ 兜底：绝对路径等 `.../mobook/<文件名>.<扩展名>` + 最长后缀匹配 + 去脏字符
     collectMobookPathsByScan(text, result)
   } catch (e) {
-    console.warn('extractMobookFiles error:', e)
+    dcgLogger(`extractMobookFiles error:${e}`)
   }
   return [...result]
 }