@dcrays/dcgchat-test 0.3.31 → 0.3.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "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,36 +162,40 @@ 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
+      let messageId = ''
+      const to = normalizeSessionTarget(ctx.to)
       if (isWsOpen()) {
-        if (outboundCtx?.sessionId) {
-          const newCtx = { ...outboundCtx, messageId }
-          wsSendRaw(newCtx, { response: ctx.text, is_finish: -1, message_tags: { source: 'channel' } })
-        } 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}`,
             messageId: messageId,
-            is_finish: -1,
             real_mobook: !sessionId ? 1 : ''
           })
-          wsSendRaw(merged, { response: ctx.text, message_tags: { source: 'channel' } })
+          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

@@ -6,7 +6,7 @@ import { getCronMessageId, getWorkspaceDir, getWsConnection, removeCronMessageId
 import { ossUpload } from './request/oss.js'
 import { dcgLogger } from './utils/log.js'
 import { sendMessageToGateway } from './gateway/socket.js'
-import { getEffectiveMsgParams } from './utils/params.js'
+import { getEffectiveMsgParams, getParamsDefaults } from './utils/params.js'
 
 export function getCronJobsPath(): string {
   const workspaceDir = getWorkspaceDir()
@@ -45,23 +45,31 @@ 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(msgCtx: IMsgParams): Promise<void> {
+async function runCronJobsUpload(sessionKey: string): Promise<void> {
   const jobPath = getCronJobsPath()
+  const botToken = getParamsDefaults().botToken
   if (fs.existsSync(jobPath)) {
     try {
-      const url = await ossUpload(jobPath, msgCtx.botToken ?? '', 0)
+      const url = await ossUpload(jobPath, botToken ?? '', 0)
       dcgLogger(`定时任务创建成功: ${url}`)
-      if (!msgCtx.sessionKey) {
-        dcgLogger(`runCronJobsUpload: missing sessionKey ${JSON.stringify(msgCtx)} on msgCtx`, 'error')
+      if (!sessionKey) {
+        dcgLogger(`runCronJobsUpload: missing sessionKey  on msgCtx`, 'error')
         return
       }
-      sendEventMessage(url, msgCtx.sessionKey)
+      const sessionInfo = sessionKey.split(':')
+      const sessionId = sessionInfo.at(-1) ?? ''
+      const agentId = sessionInfo.at(-2) ?? ''
+      const params = {
+        event_type: 'cron',
+        operation_type: 'install',
+        session_id: sessionId,
+        agent_id: agentId
+      }
+      sendEventMessage(url, params)
     } catch (error) {
       dcgLogger(`${jobPath} upload failed: ${error}`, 'error')
     }
@@ -70,14 +78,6 @@ async function runCronJobsUpload(msgCtx: IMsgParams): Promise<void> {
   }
 }
 
-function flushCronUploadQueue(): void {
-  cronUploadFlushTimer = null
-  const ctx = pendingCronUploadCtx
-  pendingCronUploadCtx = null
-  if (!ctx) return
-  void runCronJobsUpload(ctx)
-}
-
 /**
  * 将 jobs.json 同步到 OSS 并推送事件。30s 内多次调用合并为一次上传；定时触发后清空待处理项，避免重复执行。
  * @param msgCtx 可选；省略时使用当前会话 getEffectiveMsgParams(sessionKey) 快照
@@ -85,17 +85,17 @@ function flushCronUploadQueue(): void {
 export function sendDcgchatCron(jobId: string): void {
   const jobPath = getCronJobsPath()
   const { sessionKey } = readCronJob(jobPath, jobId) || {}
-  const ctx = msgParamsToCtx(getEffectiveMsgParams(sessionKey))
-  if (!ctx) {
+  if (!sessionKey) {
     dcgLogger('sendDcgchatCron: no message context (missing token / params)', 'error')
     return
   }
   dcgLogger(`sessionKey: ${sessionKey}, jobId: ${jobId}`)
-  pendingCronUploadCtx = ctx
   if (cronUploadFlushTimer !== null) {
     clearTimeout(cronUploadFlushTimer)
   }
-  cronUploadFlushTimer = setTimeout(flushCronUploadQueue, CRON_UPLOAD_DEBOUNCE_MS)
+  cronUploadFlushTimer = setTimeout(() => {
+    runCronJobsUpload(sessionKey)
+  }, CRON_UPLOAD_DEBOUNCE_MS)
 }
 
 /**

package/src/gateway/index.ts

@@ -363,10 +363,10 @@ export class GatewayConnection {
         if (msg.event === 'cron') {
           dcgLogger(`[Gateway] 收到事件: ${JSON.stringify(msg)}`)
           if (msg.payload?.action === 'added') {
-            sendDcgchatCron()
+            sendDcgchatCron(msg.payload?.jobId)
           }
           if (msg.payload?.action === 'updated') {
-            sendDcgchatCron()
+            sendDcgchatCron(msg.payload?.jobId as string)
           }
           if (msg.payload?.action === 'finished') {
             finishedDcgchatCron(msg.payload?.jobId as string)

package/src/request/api.ts

@@ -40,7 +40,7 @@ export const queryUserTokenByBotToken = async (botToken: string): Promise<string
   const response = await post<{ botToken: string }, { token: string }>('/organization/queryUserTokenByBotToken', { botToken })
 
   if (!response || !response.data || !response.data.token) {
-    dcgLogger('获取绑定的用户信息失败: ' + JSON.stringify(response), 'error')
+    dcgLogger('获取绑定的用户信息失败: token:' + botToken + '|' + JSON.stringify(response), 'error')
     return ''
   }
 

package/src/transport.ts

@@ -178,8 +178,8 @@ export function sendError(errorMsg: string, ctx: IMsgParams): boolean {
   return wsSend(ctx, { response: `[错误] ${errorMsg}`, state: 'final' })
 }
 
-export function sendEventMessage(url: string, sessionKey: string) {
-  const ctx = getEffectiveMsgParams(sessionKey)
+export function sendEventMessage(url: string, params: Record<string, string> = {}) {
+  const ctx = getParamsDefaults()
   const ws = getWsConnection()
   if (isWsOpen()) {
     ws?.send(
@@ -187,16 +187,12 @@ export function sendEventMessage(url: string, sessionKey: string) {
         messageType: 'openclaw_bot_event',
         source: 'client',
         content: {
-          event_type: 'cron',
-          operation_type: 'install',
           bot_token: ctx.botToken,
           domain_id: ctx.domainId,
           app_id: ctx.appId,
           oss_url: url,
           bot_id: ctx.botId,
-          agent_id: ctx.agentId,
-          session_id: ctx.sessionId,
-          message_id: Date.now().toString()
+          ...params
         }
       })
     )

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) ?? '' }
+}

package/src/utils/params.ts

@@ -9,7 +9,7 @@ const paramsMessageMap = new Map<string, IMsgParams>()
 
 /** 从 OpenClaw 配置读取当前 channel 的基础参数（唯一来源，供 transport / resolve 等复用） */
 export function getParamsDefaults(): IMsgParams {
-  const ch = (getOpenClawConfig()?.channels?.['dcgchat'] as DcgchatConfig | undefined) ?? {}
+  const ch = (getOpenClawConfig()?.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
   return {
     userId: Number(ch.userId ?? 0),
     botToken: ch.botToken ?? '',