@dcrays/dcgchat-test 0.3.32 → 0.3.34

package/package.json

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

package/src/channel.ts

@@ -2,7 +2,7 @@ import type { ChannelPlugin, OpenClawConfig } from 'openclaw/plugin-sdk'
 import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk'
 import type { ResolvedDcgchatAccount, DcgchatConfig } from './types.js'
 import { ossUpload } from './request/oss.js'
-import { addSentMediaKey, getCronMessageId, getOpenClawConfig, hasSentMediaKey } from './utils/global.js'
+import { addSentMediaKey, getCronMessageId, getInfoBySessionKey, getOpenClawConfig, hasSentMediaKey } from './utils/global.js'
 import { isWsOpen, mergeDefaultParams, mergeSessionParams, sendFinal, wsSendRaw } from './transport.js'
 import { dcgLogger, setLogger } from './utils/log.js'
 import { getOutboundMsgParams, getParamsMessage } from './utils/params.js'
@@ -147,7 +147,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     })
   },
   messaging: {
-    normalizeTarget: (raw) => normalizeSessionTarget(raw ?? '') || undefined,
+    normalizeTarget: (raw) => raw || undefined,
     targetResolver: {
       looksLikeId: (raw) => Boolean(raw?.trim()),
       hint: 'effectiveSessionKey（与 SessionKey 一致；勿填配置里的 WS userId）'
@@ -162,33 +162,25 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
   outbound: {
     deliveryMode: 'direct',
     resolveTarget: ({ to }) => {
-      const normalized = normalizeSessionTarget(to ?? '')
-      if (!normalized) {
+      if (!to) {
         return { ok: false, error: new Error('target is empty') }
       }
-      return { ok: true, to: normalized }
+      return { ok: true, to: to }
     },
     textChunkLimit: 4000,
     sendText: async (ctx) => {
-      const isCron = ctx.to.indexOf('dcg-cron:') >= 0
-      const to = normalizeSessionTarget(ctx.to)
       dcgLogger(`channel sendText to ${ctx.to} `)
-      const outboundCtx = getOutboundMsgParams(to)
-      const cronMsgId = getCronMessageId(to)
-      const messageId = !!cronMsgId ? cronMsgId : isCron ? `${Date.now()}` : outboundCtx?.messageId
-      const content: Record<string, unknown> = { response: ctx.text }
-      if (isCron || !outboundCtx?.messageId) {
-        content.is_finish = -1
-        content.message_tags = { source: 'cron' }
-      }
+      let messageId = ''
+      const to = normalizeSessionTarget(ctx.to)
       if (isWsOpen()) {
-        if (outboundCtx?.sessionId) {
-          const newCtx = { ...outboundCtx, messageId }
-          wsSendRaw(newCtx, content)
-        } else {
-          const sessionInfo = to.split(':')
-          const sessionId = sessionInfo.at(-1) ?? ''
-          const agentId = sessionInfo.at(-2) ?? ''
+        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}`,
@@ -196,6 +188,14 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
             real_mobook: !sessionId ? 1 : ''
           })
           wsSendRaw(merged, content)
+        } else {
+          if (outboundCtx?.sessionId) {
+            messageId = outboundCtx?.messageId || `${Date.now()}`
+            const newCtx = { ...outboundCtx, messageId }
+            wsSendRaw(newCtx, content)
+          } else {
+            dcgLogger(`channel sendText to ${ctx.to} -> sessionId not found`, 'error')
+          }
         }
       }
       return {

package/src/cron.ts

@@ -45,10 +45,8 @@ function msgParamsToCtx(p: IMsgParams): IMsgParams | null {
   return p
 }
 
-const CRON_UPLOAD_DEBOUNCE_MS = 6600
+const CRON_UPLOAD_DEBOUNCE_MS = 2400
 
-/** 待合并的上传上下文（短时间内多次调用只保留最后一次） */
-let pendingCronUploadCtx: IMsgParams | null = null
 let cronUploadFlushTimer: ReturnType<typeof setTimeout> | null = null
 
 async function runCronJobsUpload(sessionKey: string): Promise<void> {
@@ -57,12 +55,8 @@ async function runCronJobsUpload(sessionKey: string): Promise<void> {
   if (fs.existsSync(jobPath)) {
     try {
       const url = await ossUpload(jobPath, botToken ?? '', 0)
-      dcgLogger(`定时任务创建成功: ${url}`)
-      if (!sessionKey) {
-        dcgLogger(`runCronJobsUpload: missing sessionKey  on msgCtx`, 'error')
-        return
-      }
-      const sessionInfo = sessionKey.split(':')
+      dcgLogger(`定时任务更新成功: ${url}`)
+      const sessionInfo = sessionKey?.split(':') || []
       const sessionId = sessionInfo.at(-1) ?? ''
       const agentId = sessionInfo.at(-2) ?? ''
       const params = {
@@ -87,10 +81,6 @@ async function runCronJobsUpload(sessionKey: string): Promise<void> {
 export function sendDcgchatCron(jobId: string): void {
   const jobPath = getCronJobsPath()
   const { sessionKey } = readCronJob(jobPath, jobId) || {}
-  if (!sessionKey) {
-    dcgLogger('sendDcgchatCron: no message context (missing token / params)', 'error')
-    return
-  }
   dcgLogger(`sessionKey: ${sessionKey}, jobId: ${jobId}`)
   if (cronUploadFlushTimer !== null) {
     clearTimeout(cronUploadFlushTimer)

package/src/gateway/index.ts

@@ -368,6 +368,9 @@ export class GatewayConnection {
           if (msg.payload?.action === 'updated') {
             sendDcgchatCron(msg.payload?.jobId as string)
           }
+          if (msg.payload?.action === 'removed') {
+            sendDcgchatCron(msg.payload?.jobId as string)
+          }
           if (msg.payload?.action === 'finished') {
             finishedDcgchatCron(msg.payload?.jobId as string)
           }

package/src/utils/global.ts

@@ -143,3 +143,8 @@ export function getCronMessageId(sk: string): string {
 export function removeCronMessageId(sk: string) {
   cronMessageIdMap.delete(sk)
 }
+
+export function getInfoBySessionKey(sk: string): { sessionId: string; agentId: string } {
+  const sessionInfo = sk.split(':')
+  return { sessionId: sessionInfo.at(-1) ?? '', agentId: sessionInfo.at(-2) ?? '' }
+}