@dcrays/dcgchat-test 0.4.13 → 0.4.15

package/package.json

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

package/src/channel.ts

@@ -254,19 +254,19 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         const isCron = ctx.to.indexOf('dcg-cron:') >= 0
         const outboundCtx = getOutboundMsgParams(to)
         const content: Record<string, unknown> = { response: ctx.text }
-        if (isCron) {
-          messageId = getCronMessageId(to) || `${Date.now()}`
-          const { sessionId, agentId } = getInfoBySessionKey(to)
-          content.is_finish = -1
-          content.message_tags = { source: 'cron' }
-          const merged = mergeDefaultParams({
-            agentId: agentId,
-            sessionId: `${sessionId}`,
-            messageId: messageId,
-            real_mobook: !sessionId ? 1 : ''
-          })
-          wsSendRaw(merged, content)
-        } else {
+        if (!isCron) {
+          // messageId = getCronMessageId(to) || `${Date.now()}`
+          // const { sessionId, agentId } = getInfoBySessionKey(to)
+          // content.is_finish = -1
+          // content.message_tags = { source: 'cron' }
+          // const merged = mergeDefaultParams({
+          //   agentId: agentId,
+          //   sessionId: `${sessionId}`,
+          //   messageId: messageId,
+          //   real_mobook: !sessionId ? 1 : ''
+          // })
+          // wsSendRaw(merged, content)
+          // } else {
           if (outboundCtx?.sessionId) {
             messageId = outboundCtx?.messageId || `${Date.now()}`
             const newCtx = { ...outboundCtx, messageId }

package/src/cron.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import fs from 'node:fs'
 import type { IMsgParams } from './types.js'
-import { isWsOpen, mergeDefaultParams, sendEventMessage, sendFinal } from './transport.js'
+import { isWsOpen, mergeDefaultParams, sendEventMessage, sendFinal, wsSendRaw } from './transport.js'
 import { getCronMessageId, getWorkspaceDir, getWsConnection, removeCronMessageId, setCronMessageId } from './utils/global.js'
 import { ossUpload } from './request/oss.js'
 import { dcgLogger } from './utils/log.js'
@@ -135,7 +135,7 @@ export const onRunCronJob = async (jobId: string, messageId: string) => {
   )
   sendMessageToGateway(JSON.stringify({ method: 'cron.run', params: { id: jobId, mode: 'force' } }))
 }
-export const finishedDcgchatCron = async (jobId: string) => {
+export const finishedDcgchatCron = async (jobId: string, summary: string) => {
   const id = jobId?.trim()
   if (!id) {
     dcgLogger('finishedDcgchatCron: empty jobId', 'error')
@@ -147,24 +147,23 @@ export const finishedDcgchatCron = async (jobId: string) => {
     dcgLogger(`finishedDcgchatCron: no sessionKey for job id=${id}`, 'error')
     return
   }
-  const outboundCtx = getEffectiveMsgParams(sessionKey)
-  const messageId = getCronMessageId(sessionKey)
+  const messageId = getCronMessageId(sessionKey) || `${Date.now()}`
   const sessionInfo = sessionKey.split(':')
   const sessionId = sessionInfo.at(-1) ?? ''
   const agentId = sessionInfo.at(-2) ?? ''
-  if (outboundCtx?.sessionId) {
-    const newCtx = messageId ? { ...outboundCtx, messageId } : outboundCtx
-    sendFinal(newCtx, 'cron send')
-  } else {
-    const merged = mergeDefaultParams({
-      agentId: agentId,
-      sessionId: `${sessionId}`,
-      messageId: messageId,
-      is_finish: -1,
-      real_mobook: !sessionId ? 1 : ''
-    })
+  // if (outboundCtx?.sessionId) {
+
+  const merged = mergeDefaultParams({
+    agentId: agentId,
+    sessionId: `${sessionId}`,
+    messageId: messageId || `${Date.now()}`,
+    real_mobook: !sessionId ? 1 : ''
+  })
+  wsSendRaw(merged, { response: summary, message_tags: { source: 'cron' }, is_finish: -1 })
+  setTimeout(() => {
     sendFinal(merged, 'cron send')
-  }
+  }, 200)
+  // }
   const ws = getWsConnection()
   const baseContent = getParamsDefaults()
   if (isWsOpen()) {

package/src/cronToolCall.ts

@@ -132,14 +132,13 @@ function injectBestEffort(params: Record<string, unknown>, sk: string): Record<s
     return newParams
   }
 
-  // job.delivery（须改 job 内对象，勿写 newParams.delivery——顶层可能不存在）
+  // job.delivery
   const job = newParams.job as Record<string, unknown> | undefined
   if (job?.delivery && typeof job.delivery === 'object') {
-    const del = job.delivery as CronDelivery
-    del.bestEffort = true
-    del.to = `dcg-cron:${sk}`
-    del.accountId = agentId
-    del.channel = "dcgchat-test"
+    ;(job.delivery as CronDelivery).bestEffort = true
+    ;(newParams.delivery as CronDelivery).to = `dcg-cron:${sk}`
+    ;(newParams.delivery as CronDelivery).accountId = agentId
+    ;(newParams.delivery as CronDelivery).channel = "dcgchat-test"
     newParams.sessionKey = sk
     return newParams
   }

package/src/utils/gatewayMsgHanlder.ts

@@ -32,7 +32,7 @@ export function handleGatewayEventMessage(msg: { event?: string; payload?: Recor
         sendDcgchatCron(p?.jobId as string)
       }
       if (p?.action === 'finished') {
-        finishedDcgchatCron(p?.jobId as string)
+        finishedDcgchatCron(p?.jobId as string, p?.summary as string)
       }
     }
   } catch (error) {

package/src/utils/global.ts

@@ -108,18 +108,34 @@ export function clearSentMediaKeys(messageId?: string) {
   }
 }
 
-const cronMessageIdMap = new Map<string, string>()
+/** 每个 sessionKey 下多个定时任务 messageId，入队在尾、出队在头（FIFO） */
+const cronMessageIdMap = new Map<string, string[]>()
 
 export function setCronMessageId(sk: string, messageId: string) {
-  cronMessageIdMap.set(sk, messageId)
+  if (!sk?.trim() || !messageId?.trim()) return
+  let q = cronMessageIdMap.get(sk)
+  if (!q) {
+    q = []
+    cronMessageIdMap.set(sk, q)
+  }
+  q.push(messageId)
 }
 
+/** 窥视队首 messageId（不移除），供发送中与 finished 配对使用 */
 export function getCronMessageId(sk: string): string {
-  return cronMessageIdMap.get(sk) ?? ''
+  if (!sk?.trim()) return ''
+  return cronMessageIdMap.get(sk)?.[0] ?? ''
 }
 
+/** 弹出队首一条，与一次 finished 对应；队列为空时移除 key */
 export function removeCronMessageId(sk: string) {
-  cronMessageIdMap.delete(sk)
+  if (!sk?.trim()) return
+  const q = cronMessageIdMap.get(sk)
+  if (!q?.length) return
+  q.shift()
+  if (q.length === 0) {
+    cronMessageIdMap.delete(sk)
+  }
 }
 
 export const getSessionKey = (content: any, accountId: string) => {