@dcrays/dcgchat-test 0.4.21 → 0.4.22

package/package.json

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

package/src/channel.ts

@@ -8,7 +8,8 @@ import {
   getDcgchatRuntime,
   getInfoBySessionKey,
   getOpenClawConfig,
-  hasSentMediaKey
+  hasSentMediaKey,
+  setCronMessageId
 } from './utils/global.js'
 import { isWsOpen, mergeDefaultParams, mergeSessionParams, sendFinal, wsSendRaw } from './transport.js'
 import { dcgLogger, setLogger } from './utils/log.js'
@@ -103,10 +104,30 @@ function outboundChatId(rawTo: string | undefined, normalizedTo: string): string
 }
 
 export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<void> {
+  const rawOpt = (opts.sessionKey ?? '').trim()
+  const strippedForCron = rawOpt.replace(/^dcg-cron:/i, '').trim()
+  const fromIsolatedCron = extractCronJobIdFromIsolatedSessionKey(strippedForCron) !== null
+  const fromDcgCronWrapper = rawOpt.toLowerCase().startsWith('dcg-cron:')
+
   let sessionKey = normalizeSessionTarget(opts.sessionKey ?? '')
   sessionKey = resolveIsolatedCronSessionToJobSessionKey(sessionKey)
+
+  /** 定时自动执行未走 onRunCronJob，须与 finishedDcgchatCron 共用同一 messageId，否则附件与气泡错位 */
+  if (
+    !opts.messageId?.trim() &&
+    (fromIsolatedCron || fromDcgCronWrapper) &&
+    !getCronMessageId(sessionKey)
+  ) {
+    setCronMessageId(sessionKey, `${Date.now()}`)
+  }
+
+  const cronMid = getCronMessageId(sessionKey)
   const baseCtx = getOutboundMsgParams(sessionKey)
-  const msgCtx = opts.messageId?.trim() ? { ...baseCtx, messageId: opts.messageId.trim() } : baseCtx
+  const msgCtx = opts.messageId?.trim()
+    ? { ...baseCtx, messageId: opts.messageId.trim() }
+    : cronMid
+      ? { ...baseCtx, messageId: cronMid }
+      : baseCtx
   if (!isWsOpen()) {
     dcgLogger(`outbound media skipped -> ws not isWsOpen failed open: ${opts.mediaUrl ?? ''}`)
     return
@@ -326,6 +347,9 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       const to = resolveIsolatedCronSessionToJobSessionKey(normalizedFromTo)
       const outboundCtx = getOutboundMsgParams(to)
       const msgCtx = getParamsMessage(to) ?? outboundCtx
+      if (isCron && !getCronMessageId(to)) {
+        setCronMessageId(to, `${Date.now()}`)
+      }
       const cronMsgId = getCronMessageId(to)
       const fallbackMessageId = `${Date.now()}`
       const messageId = cronMsgId || (isCron ? fallbackMessageId : msgCtx?.messageId || fallbackMessageId)