@dcrays/dcgchat-test 0.3.4 → 0.3.5

package/package.json

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

package/src/bot.ts

@@ -282,10 +282,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
       },
       onIdle: () => {
-        activeRunIdBySessionKey.delete(effectiveSessionKey)
-        streamChunkIdxBySessionKey.delete(effectiveSessionKey)
-        if (sessionStreamSuppressed.has(effectiveSessionKey)) return
-        safeSendFinal()
+        // safeSendFinal()
       }
     })
 

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}`)
         }