@dcrays/dcgchat-test 0.3.18 → 0.3.20

package/package.json

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

package/src/channel.ts

@@ -39,12 +39,14 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
     const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
+      message_tags: { source: 'file' },
       files: [{ url, name: fileName }]
     })
     dcgLogger(`dcgchat: sendMedia to user ${msgCtx.userId}, file=${fileName}`)
   } catch (error) {
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
+      message_tags: { source: 'file' },
       files: [{ url: opts.mediaUrl ?? '', name: fileName }]
     })
     dcgLogger(`dcgchat: error sendMedia to user ${msgCtx.userId}: ${String(error)}`, 'error')
@@ -142,28 +144,18 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     deliveryMode: 'direct',
     textChunkLimit: 4000,
     sendText: async (ctx) => {
+      const isCron = ctx.to.indexOf('dcg-cron:') >= 0
+      const to = ctx.to.replace('dcg-cron:', '')
+      dcgLogger(`channel sendText to ${ctx.to} `)
+      const outboundCtx = getEffectiveMsgParams(to)
+      const cronMsgId = getCronMessageId(to)
+      const messageId = !!cronMsgId ? cronMsgId : isCron ? `${Date.now()}` : outboundCtx?.messageId
       if (isWsOpen()) {
-        // if (ctx.to.indexOf('cron:') >= 0) {
-        //   const sessionInfo = ctx.to.split(':')[1]
-        //   const sessionId = sessionInfo.split('-')[0]
-        //   const agentId = sessionInfo.split('-')[1]
-        //   const merged = mergeDefaultParams({
-        //     agentId: agentId,
-        //     sessionId: sessionId,
-        //     messageId: `${Date.now()}`,
-        //     is_finish: -1
-        //   })
-        //   wsSendRaw(merged, { response: ctx.text })
-        // } else {
-        // }
-        const outboundCtx = getEffectiveMsgParams(ctx.to)
-        const messageId = getCronMessageId(ctx.to)
         if (outboundCtx?.sessionId) {
-          const newCtx = messageId ? { ...outboundCtx, messageId } : outboundCtx
+          const newCtx = { ...outboundCtx, messageId }
           wsSendRaw(newCtx, { response: ctx.text, is_finish: -1, message_tags: { source: 'channel' } })
-          dcgLogger(`channel sendText to ${ctx.to} ${ctx.text?.slice(0, 50)}`)
         } else {
-          const sessionInfo = ctx.to.split(':')
+          const sessionInfo = to.split(':')
           const sessionId = sessionInfo.at(-1) ?? ''
           const agentId = sessionInfo.at(-2) ?? ''
           const merged = mergeDefaultParams({
@@ -173,23 +165,26 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
             is_finish: -1,
             real_mobook: !sessionId ? 1 : ''
           })
-          dcgLogger(`channel sendText to ${ctx.to} ${ctx.text?.slice(0, 50)}`)
-          wsSendRaw(merged, { response: ctx.text })
+          wsSendRaw(merged, { response: ctx.text, message_tags: { source: 'channel' } })
         }
       }
       return {
         channel: "dcgchat-test",
-        messageId: `dcg-${Date.now()}`,
-        chatId: ctx.to
+        messageId: `${messageId}`,
+        chatId: to
       }
     },
     sendMedia: async (ctx) => {
-      const msgCtx = getEffectiveMsgParams(ctx.to)
-      dcgLogger(`channel sendMedia to ${ctx.to} ${ctx.mediaUrl?.slice(0, 50)}`)
-      await sendDcgchatMedia({ sessionKey: ctx.to ?? '', mediaUrl: ctx.mediaUrl ?? '' })
+      const to = ctx.to.replace('dcg-cron:', '')
+      const msgCtx = getEffectiveMsgParams(to)
+      const cronMsgId = getCronMessageId(to)
+      const isCron = ctx.to.indexOf('dcg-cron:') >= 0
+      const messageId = !!cronMsgId ? cronMsgId : isCron ? `${Date.now()}` : msgCtx?.messageId
+      dcgLogger(`channel sendMedia to ${ctx.to}`)
+      await sendDcgchatMedia({ sessionKey: to ?? '', mediaUrl: ctx.mediaUrl ?? '' })
       return {
         channel: "dcgchat-test",
-        messageId: `dcg-${Date.now()}`,
+        messageId: `${messageId}`,
         chatId: msgCtx.userId?.toString()
       }
     }

package/src/cron.ts

@@ -59,7 +59,7 @@ async function runCronJobsUpload(msgCtx: IMsgParams): Promise<void> {
       const url = await ossUpload(jobPath, msgCtx.botToken ?? '', 0)
       dcgLogger(`定时任务创建成功: ${url}`)
       if (!msgCtx.sessionKey) {
-        dcgLogger('runCronJobsUpload: missing sessionKey on msgCtx', 'error')
+        dcgLogger(`runCronJobsUpload: missing sessionKey ${JSON.stringify(msgCtx)} on msgCtx`, 'error')
         return
       }
       sendEventMessage(url, msgCtx.sessionKey)
@@ -155,7 +155,7 @@ export const finishedDcgchatCron = async (jobId: string) => {
   const messageId = getCronMessageId(sessionKey)
   if (outboundCtx?.sessionId) {
     const newCtx = messageId ? { ...outboundCtx, messageId } : outboundCtx
-    sendFinal(newCtx)
+    sendFinal(newCtx, 'cron send')
   } else {
     const sessionInfo = sessionKey.split(':')
     const sessionId = sessionInfo.at(-1) ?? ''

package/src/cronToolCall.ts

@@ -125,7 +125,7 @@ function injectBestEffort(params: Record<string, unknown>, sk: string): Record<s
   // 顶层 delivery
   if (newParams.delivery && typeof newParams.delivery === 'object') {
     ;(newParams.delivery as CronDelivery).bestEffort = true
-    ;(newParams.delivery as CronDelivery).to = sessionId
+    ;(newParams.delivery as CronDelivery).to = `dcg-cron:${sk}`
     ;(newParams.delivery as CronDelivery).accountId = agentId
     ;(newParams.delivery as CronDelivery).channel = "dcgchat-test"
     newParams.sessionKey = sk
@@ -136,7 +136,7 @@ function injectBestEffort(params: Record<string, unknown>, sk: string): Record<s
   const job = newParams.job as Record<string, unknown> | undefined
   if (job?.delivery && typeof job.delivery === 'object') {
     ;(job.delivery as CronDelivery).bestEffort = true
-    ;(newParams.delivery as CronDelivery).to = sessionId
+    ;(newParams.delivery as CronDelivery).to = `dcg-cron:${sk}`
     ;(newParams.delivery as CronDelivery).accountId = agentId
     ;(newParams.delivery as CronDelivery).channel = "dcgchat-test"
     newParams.sessionKey = sk
@@ -176,7 +176,7 @@ export function cronToolCall(event: { toolName: any; params: any; toolCallId: an
     if (params.command.indexOf('cron create') > -1 || params.command.indexOf('cron add') > -1) {
       const newParams = JSON.parse(JSON.stringify(params)) as Record<string, unknown>
       newParams.command =
-        params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${"dcgchat-test"}  --to ${sk} --json`
+        params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${"dcgchat-test"}  --to dcg-cron:${sk} --json`
       return { params: newParams }
     } else {
       return params

package/src/transport.ts

@@ -154,6 +154,8 @@ export function wsSendRaw(ctx: IMsgParams, content: Record<string, unknown>): bo
   const ws = getWsConnection()
   if (isWsOpen()) {
     ws?.send(JSON.stringify(buildOpenclawBotChat(ctx, content, { mergeChannelDefaults: true })))
+
+    dcgLogger('已发送：' + JSON.stringify(buildOpenclawBotChat(ctx, content, { mergeChannelDefaults: true })))
   }
   return true
 }
@@ -162,7 +164,7 @@ export function sendChunk(text: string, ctx: IMsgParams, chunkIdx: number): bool
   return wsSend(ctx, { response: text, state: 'chunk', chunk_idx: chunkIdx })
 }
 
-export function sendFinal(ctx: IMsgParams, tag?: string): boolean {
+export function sendFinal(ctx: IMsgParams, tag: string): boolean {
   dcgLogger(` message handling complete state: final tag:${tag}`)
   return wsSend(ctx, { response: '', state: 'final' })
 }

package/src/types.ts

@@ -128,4 +128,5 @@ export interface IMsgParams {
   sessionKey?: string
   real_mobook?: string | number
   is_finish?: number
+  message_tags?: Record<string, string>
 }