@dcrays/dcgchat-test 0.3.4 → 0.3.6

package/package.json

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

package/src/bot.ts

@@ -182,10 +182,10 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     effectiveAgentId && effectiveAgentId !== 'main' ? config.agents?.list?.find((a) => a.id === effectiveAgentId) : undefined
   const agentDisplayName = agentEntry?.name ?? (effectiveAgentId && effectiveAgentId !== 'main' ? effectiveAgentId : undefined)
 
-  const safeSendFinal = () => {
+  const safeSendFinal = (tag: string) => {
     if (finalSent) return
     finalSent = true
-    sendFinal(outboundCtx)
+    sendFinal(outboundCtx, tag)
     setMsgStatus(effectiveSessionKey, 'finished')
   }
 
@@ -193,7 +193,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
   if (!text) {
     sendTextMsg('你需要我帮你做什么呢？', outboundCtx)
-    safeSendFinal()
+    safeSendFinal('not text')
     return
   }
 
@@ -272,20 +272,11 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         }
       },
       onError: (err: unknown, info: { kind: string }) => {
-        activeRunIdBySessionKey.delete(effectiveSessionKey)
-        streamChunkIdxBySessionKey.delete(effectiveSessionKey)
-        if (sessionStreamSuppressed.has(effectiveSessionKey)) {
-          dcgLogger(`${info.kind} reply failed (stream suppressed): ${String(err)}`, 'error')
-          return
-        }
-        safeSendFinal()
+        safeSendFinal('error')
         dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
       },
       onIdle: () => {
-        activeRunIdBySessionKey.delete(effectiveSessionKey)
-        streamChunkIdxBySessionKey.delete(effectiveSessionKey)
-        if (sessionStreamSuppressed.has(effectiveSessionKey)) return
-        safeSendFinal()
+        // safeSendFinal()
       }
     })
 
@@ -312,7 +303,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
         sendText('会话已终止', outboundCtx)
-        safeSendFinal()
         sessionStreamSuppressed.add(effectiveSessionKey)
         const runId = activeRunIdBySessionKey.get(effectiveSessionKey)
         sendMessageToGateway(
@@ -325,6 +315,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
           })
         )
         if (runId) activeRunIdBySessionKey.delete(effectiveSessionKey)
+        safeSendFinal('stop')
         return
       } else {
         dcgLogger(`dispatching to agent (session=${route.sessionKey})`)
@@ -433,7 +424,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         }
       }
     }
-    safeSendFinal()
+    safeSendFinal('end')
     clearSentMediaKeys(msg.content.message_id)
 
     // Record session metadata
@@ -454,6 +445,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     dcgLogger(` handle message failed: ${String(err)}`, 'error')
     sendError(err instanceof Error ? err.message : String(err), outboundCtx)
   } finally {
-    safeSendFinal()
+    safeSendFinal('finally')
   }
 }

package/src/channel.ts

@@ -159,7 +159,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         const outboundCtx = getEffectiveMsgParams(ctx.to)
         const messageId = getCronMessageId(ctx.to)
         const newCtx = messageId ? { ...outboundCtx, messageId } : outboundCtx
-        wsSendRaw(newCtx, { response: ctx.text, is_finish: -1 })
+        wsSendRaw(newCtx, { response: ctx.text, is_finish: -1, message_tags: { source: 'channel' } })
         dcgLogger(`channel sendText to ${ctx.to} ${ctx.text?.slice(0, 50)}`)
       }
       return {

package/src/monitor.ts

@@ -8,6 +8,7 @@ import { installSkill, uninstallSkill } from './skill.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'
 
 export type MonitorDcgchatOpts = {
   config?: ClawdbotConfig
@@ -64,22 +65,24 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       heartbeatTimer = null
     }
   }
-
+  function onHeartbeat() {
+    if (isWsOpen()) {
+      const heartbeat = {
+        messageType: 'openclaw_bot_heartbeat',
+        _userId: Number(account.userId) || 0,
+        source: 'client',
+        content: {
+          bot_token: account.botToken,
+          status: '1'
+        }
+      }
+      ws?.send(JSON.stringify(heartbeat))
+    }
+  }
   const startHeartbeat = () => {
     stopHeartbeat()
     heartbeatTimer = setInterval(() => {
-      if (ws?.readyState === WebSocket.OPEN) {
-        const heartbeat = {
-          messageType: 'openclaw_bot_heartbeat',
-          _userId: Number(account.userId) || 0,
-          source: 'client',
-          content: {
-            bot_token: account.botToken,
-            status: '1'
-          }
-        }
-        ws.send(JSON.stringify(heartbeat))
-      }
+      onHeartbeat()
     }, HEARTBEAT_INTERVAL_MS)
   }
 
@@ -94,6 +97,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       dcgLogger(`socket connected`)
       setWsConnection(ws)
       startHeartbeat()
+      onHeartbeat()
     })
 
     ws.on('message', async (data) => {
@@ -109,7 +113,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       const heartbeat = isOpenclawBotHeartbeat(data, parsed)
       if (heartbeat) {
         heartbeatLogCounter += 1
-        if (heartbeatLogCounter % 10 === 0) {
+        if (heartbeatLogCounter % 10 === 0 || heartbeatLogCounter === 1) {
           dcgLogger(`${parsed?.messageType}, ${payloadStr}`)
           dcgLogger(`heartbeat ack received, ${payloadStr}`)
         }

package/src/tool.ts

@@ -109,7 +109,7 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
               if (event.lastAssistant?.errorMessage === '429-账户额度耗尽') {
                 const message = '您的积分已消耗完，您可以通过充值积分来继续使用'
                 sendText(message, msgCtx, { message_tags: { insufficient_balance: 1 }, is_finish: -1 })
-                sendFinal(msgCtx)
+                sendFinal(msgCtx, '积分不足')
                 return
               }
             }

package/src/transport.ts

@@ -162,8 +162,8 @@ export function sendChunk(text: string, ctx: IMsgParams, chunkIdx: number): bool
   return wsSend(ctx, { response: text, state: 'chunk', chunk_idx: chunkIdx })
 }
 
-export function sendFinal(ctx: IMsgParams): boolean {
-  dcgLogger(` message handling complete state: final`)
+export function sendFinal(ctx: IMsgParams, tag?: string): boolean {
+  dcgLogger(` message handling complete state: final tag:${tag}`)
   return wsSend(ctx, { response: '', state: 'final' })
 }