@dcrays/dcgchat-test 0.3.3 → 0.3.4

package/package.json

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

package/src/bot.ts

@@ -164,7 +164,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
   const effectiveAgentId = embeddedAgentId ?? route.agentId
   const effectiveSessionKey = getSessionKey(msg.content, account.accountId)
-  console.log('🚀 ~ handleDcgchatMessage ~ effectiveSessionKey:', effectiveSessionKey)
 
   setParamsMessage(effectiveSessionKey, {
     userId: msg._userId,
@@ -229,7 +228,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       RawBody: text,
       CommandBody: text,
       From: userId,
-      To: conversationId,
+      To: effectiveSessionKey,
       SessionKey: effectiveSessionKey,
       AccountId: route.accountId,
       ChatType: 'direct',
@@ -242,7 +241,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       WasMentioned: true,
       CommandAuthorized: true,
       OriginatingChannel: "dcgchat-test",
-      OriginatingTo: `user:${userId}`,
+      OriginatingTo: effectiveSessionKey,
       ...mediaPayload
     })
 
@@ -359,10 +358,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
             },
             onPartialReply: async (payload: ReplyPayload) => {
               if (sessionStreamSuppressed.has(effectiveSessionKey)) return
-              console.log(
-                '🚀 ~ handleDcgchatMessage ~ sessionStreamSuppressed.has(effectiveSessionKey):',
-                sessionStreamSuppressed.has(effectiveSessionKey)
-              )
+
               // Accumulate full text
               if (payload.text) {
                 completeText = payload.text

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, getOpenClawConfig, hasSentMediaKey } from './utils/global.js'
+import { addSentMediaKey, getCronMessageId, getOpenClawConfig, hasSentMediaKey } from './utils/global.js'
 import { isWsOpen, mergeDefaultParams, mergeSessionParams, sendFinal, wsSendRaw } from './transport.js'
 import { dcgLogger, setLogger } from './utils/log.js'
 import { getEffectiveMsgParams, getCurrentSessionKey } from './utils/params.js'
@@ -143,14 +143,23 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     textChunkLimit: 4000,
     sendText: async (ctx) => {
       if (isWsOpen()) {
-        const merged = mergeDefaultParams({
-          agentId: ctx.accountId ?? '',
-          sessionId: ctx.to,
-          messageId: `${Date.now()}`,
-          is_finish: -1
-        })
-        wsSendRaw(merged, { response: ctx.text })
-        sendFinal(merged)
+        // 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)
+        const newCtx = messageId ? { ...outboundCtx, messageId } : outboundCtx
+        wsSendRaw(newCtx, { response: ctx.text, is_finish: -1 })
         dcgLogger(`channel sendText to ${ctx.to} ${ctx.text?.slice(0, 50)}`)
       }
       return {

package/src/cron.ts

@@ -1,17 +1,11 @@
 import path from 'node:path'
 import fs from 'node:fs'
-import crypto from 'node:crypto'
-import { execFile } from 'node:child_process'
-import { promisify } from 'node:util'
-
-const execFileAsync = promisify(execFile)
 import type { IMsgParams } from './types.js'
-import { sendEventMessage } from './transport.js'
-import { getWorkspaceDir } from './utils/global.js'
+import { sendEventMessage, sendFinal } from './transport.js'
+import { getWorkspaceDir, removeCronMessageId, setCronMessageId, setMsgStatus } from './utils/global.js'
 import { ossUpload } from './request/oss.js'
 import { dcgLogger } from './utils/log.js'
 import { sendMessageToGateway } from './gateway/socket.js'
-import { channelInfo, ENV } from './utils/constant.js'
 import { getCurrentSessionKey, getEffectiveMsgParams } from './utils/params.js'
 
 export function getCronJobsPath(): string {
@@ -20,6 +14,33 @@ export function getCronJobsPath(): string {
   return path.join(cronDir, 'jobs.json')
 }
 
+type CronJobsFile = {
+  version?: number
+  jobs?: Array<{ id?: string; sessionKey?: string }>
+}
+
+/**
+ * 在 `jobPath` 指向的 jobs.json（通常为 getCronJobsPath()）中按 id 查找任务并返回其 sessionKey。
+ */
+export function readCronJobSessionKey(jobPath: string, jobId: string): string | null {
+  const id = jobId?.trim()
+  if (!id) return null
+  if (!fs.existsSync(jobPath)) {
+    dcgLogger(`readCronJobSessionKey: file not found ${jobPath}`, 'error')
+    return null
+  }
+  try {
+    const raw = fs.readFileSync(jobPath, 'utf8')
+    const data = JSON.parse(raw) as CronJobsFile
+    const job = (data.jobs ?? []).find((j) => j.id === id)
+    const sk = job?.sessionKey?.trim()
+    return sk || null
+  } catch (e) {
+    dcgLogger(`readCronJobSessionKey: failed to read ${jobPath}: ${String(e)}`, 'error')
+    return null
+  }
+}
+
 function msgParamsToCtx(p: IMsgParams): IMsgParams | null {
   if (!p?.botToken) return null
   return p
@@ -103,36 +124,35 @@ export const onEnabledCronJob = async (jobId: string) => {
   }
   sendMessageToGateway(JSON.stringify({ method: 'cron.update', params: { id: jobId, patch: { enabled: true } } }))
 }
-export const onRunCronJob = async (jobId: string) => {
+export const onRunCronJob = async (jobId: string, messageId: string) => {
   const id = jobId?.trim()
   if (!id) {
     dcgLogger('onRemoveCronJob: empty jobId', 'error')
     return
   }
-  sendMessageToGateway(JSON.stringify({ method: 'cron.update', jobId }))
+  const jobPath = getCronJobsPath()
+  const sessionKey = readCronJobSessionKey(jobPath, jobId) || ''
+  if (!sessionKey) {
+    dcgLogger(`finishedDcgchatCron: no sessionKey for job id=${id}`, 'error')
+    return
+  }
+  setCronMessageId(sessionKey, messageId)
+  sendMessageToGateway(JSON.stringify({ method: 'cron.run', params: { id: jobId } }))
 }
-export const updateCronJobSessionKey = async (jobId: string) => {
+export const finishedDcgchatCron = async (jobId: string) => {
   const id = jobId?.trim()
   if (!id) {
-    dcgLogger('onRemoveCronJob: empty jobId', 'error')
+    dcgLogger('finishedDcgchatCron: empty jobId', 'error')
     return
   }
-  const params = getEffectiveMsgParams(getCurrentSessionKey() ?? '')
-  sendMessageToGateway(
-    JSON.stringify({
-      method: 'cron.update',
-      params: {
-        id: jobId,
-        patch: {
-          sessionKey: params.sessionKey,
-          delivery: {
-            channel: "dcgchat-test",
-            to: params.sessionId,
-            accountId: 14,
-            bestEffort: true
-          }
-        }
-      }
-    })
-  )
+  const jobPath = getCronJobsPath()
+  const sessionKey = readCronJobSessionKey(jobPath, id)
+  if (!sessionKey) {
+    dcgLogger(`finishedDcgchatCron: no sessionKey for job id=${id}`, 'error')
+    return
+  }
+  const outboundCtx = getEffectiveMsgParams(sessionKey)
+  sendFinal(outboundCtx)
+  removeCronMessageId(sessionKey)
+  dcgLogger(`finishedDcgchatCron: job=${id} sessionKey=${sessionKey}`)
 }

package/src/cronToolCall.ts

@@ -0,0 +1,185 @@
+import { channelInfo, ENV } from './utils/constant.js'
+/**
+ * cron-delivery-guard — 定时任务投递守护插件
+ *
+ * 核心机制：通过 before_tool_call 钩子拦截 cron 工具调用，
+ * 当 delivery.mode 为 "announce" 且未指定 channel 时，
+ * 自动注入 bestEffort: true，使投递失败时静默降级，
+ * 不影响 cron 执行结果的保存。
+ *
+ * 背景：
+ * - 定时任务的 delivery 设为 announce 模式，如果没有指定 channel，
+ *   投递可能因找不到有效渠道而失败
+ * - bestEffort: true 让框架在投递失败时不报错，避免丢失执行结果
+ */
+
+import { dcgLogger } from './utils/log.js'
+
+const LOG_TAG = 'cron-delivery-guard'
+
+// ---- 类型定义 ----
+
+interface ToolCallEvent {
+  toolName: string
+  toolCallId: string
+  params: Record<string, unknown>
+  result?: { content: string }
+}
+
+interface HookContext {
+  agentId: string
+  sessionKey: string
+}
+
+interface BeforeToolCallResult {
+  block?: boolean
+  blockReason?: string
+  params?: Record<string, unknown>
+}
+
+// ---- delivery 类型 ----
+
+interface CronDelivery {
+  mode?: string
+  channel?: string
+  to?: string
+  bestEffort?: boolean
+  [key: string]: unknown
+}
+/**
+ * 解析 OpenClaw mobook direct 会话 key。
+ * 形如 `agent:main:mobook:direct:14:5466`（大小写不敏感，与路由 toLowerCase 一致）
+ * - 倒数第二段：account / peer（delivery.accountId）
+ * - 最后一段：会话 id（delivery.to）
+ */
+export function formatterSessionKey(sessionKey: string): { agentId: string; sessionId: string } {
+  const parts = sessionKey.split(':').filter((s) => s.length > 0)
+  const norm = parts.map((s) => s.toLowerCase())
+  if (parts.length >= 6 && norm[0] === 'agent' && norm[2] === 'mobook' && norm[3] === 'direct') {
+    return {
+      agentId: parts[4] ?? '',
+      sessionId: parts[5] ?? ''
+    }
+  }
+  if (parts.length >= 2) {
+    return {
+      agentId: parts[parts.length - 2] ?? '',
+      sessionId: parts[parts.length - 1] ?? ''
+    }
+  }
+  return { agentId: '', sessionId: '' }
+}
+
+// ---- 辅助函数 ----
+
+/**
+ * 判断是否为 cron 工具调用
+ */
+function isCronTool(toolName: string): boolean {
+  return toolName === 'cron'
+}
+
+/**
+ * 从 cron 参数中提取 delivery 配置
+ * cron 工具的参数结构可能是:
+ * - params.delivery (顶层)
+ * - params.job.delivery (嵌套在 job 中)
+ */
+function extractDelivery(params: Record<string, unknown>): CronDelivery | null {
+  // 尝试顶层 delivery
+  if (params.delivery && typeof params.delivery === 'object') {
+    return params.delivery as CronDelivery
+  }
+
+  // 尝试 job.delivery
+  const job = params.job as Record<string, unknown> | undefined
+  if (job?.delivery && typeof job.delivery === 'object') {
+    return job.delivery as CronDelivery
+  }
+
+  // 尝试 payload 中的 deliver 相关字段 (兼容 qqbot-cron 风格)
+  const payload = job?.payload as Record<string, unknown> | undefined
+  if (payload?.deliver === true && payload.channel === undefined) {
+    // payload 风格: { deliver: true, channel?: string }
+    // 这种情况不是 delivery 对象，跳过
+    return null
+  }
+
+  return null
+}
+
+/**
+ * 判断 delivery 是否需要注入 bestEffort
+ * 条件: mode 为 "announce" 且没有 channel
+ */
+function needsBestEffort(delivery: CronDelivery): boolean {
+  return delivery.mode === 'announce' && !delivery.channel && !delivery.bestEffort
+}
+
+/**
+ * 深拷贝 params 并注入 bestEffort: true
+ */
+function injectBestEffort(params: Record<string, unknown>, sk: string): Record<string, unknown> {
+  const newParams = JSON.parse(JSON.stringify(params)) as Record<string, unknown>
+  const { agentId, sessionId } = formatterSessionKey(sk)
+  // 顶层 delivery
+  if (newParams.delivery && typeof newParams.delivery === 'object') {
+    ;(newParams.delivery as CronDelivery).bestEffort = true
+    ;(newParams.delivery as CronDelivery).to = sessionId
+    ;(newParams.delivery as CronDelivery).accountId = agentId
+    ;(newParams.delivery as CronDelivery).channel = "dcgchat-test"
+    newParams.sessionKey = sk
+    return newParams
+  }
+
+  // job.delivery
+  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).accountId = agentId
+    ;(newParams.delivery as CronDelivery).channel = "dcgchat-test"
+    newParams.sessionKey = sk
+    return newParams
+  }
+
+  return newParams
+}
+
+export function cronToolCall(event: { toolName: any; params: any; toolCallId: any }, sk: string) {
+  const { toolName, params, toolCallId } = event
+
+  // 仅处理 cron 工具
+  if (isCronTool(toolName)) {
+    const delivery = extractDelivery(params)
+    if (!delivery) {
+      dcgLogger(`[${LOG_TAG}] cron call (${toolCallId}) has no delivery config, skip.`)
+      return undefined
+    }
+    if (!needsBestEffort(delivery)) {
+      dcgLogger(
+        `[${LOG_TAG}] cron call (${toolCallId}) delivery does not need bestEffort ` +
+          `(mode=${String(delivery.mode)}, channel=${String(delivery.channel)}, bestEffort=${String(delivery.bestEffort)}), skip.`
+      )
+      return undefined
+    }
+
+    // ★ 核心：注入 bestEffort: true
+    const newParams = injectBestEffort(params, sk)
+    dcgLogger(
+      `[${LOG_TAG}] cron call (${toolCallId}) injected bestEffort=true ` +
+        `(mode=announce, no channel). delivery=${JSON.stringify(newParams.delivery || (newParams.job as Record<string, unknown>)?.delivery)}`
+    )
+
+    return { params: newParams }
+  } else if (toolName === 'exec') {
+    if (params.command.indexOf('cron create') || params.command.indexOf('cron add')) {
+      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`
+      return { params: newParams }
+    }
+  }
+
+  return undefined
+}

package/src/gateway/index.ts

@@ -3,7 +3,7 @@ import { WebSocket } from 'ws'
 import crypto from 'crypto'
 import { deriveDeviceIdFromPublicKey, publicKeyRawBase64UrlFromPem, buildDeviceAuthPayloadV3, signDevicePayload } from './security.js'
 import { dcgLogger } from '../utils/log.js'
-import { sendDcgchatCron, updateCronJobSessionKey } from '../cron.js'
+import { finishedDcgchatCron, sendDcgchatCron } from '../cron.js'
 
 export interface GatewayEvent {
   type: string
@@ -196,7 +196,7 @@ export class GatewayConnection {
         dcgLogger('Gateway connection opened（等待 connect.challenge）')
       })
 
-      this.ws.on('message', (data) => {
+      this.ws.on('message', (data, ...args) => {
         try {
           const msg = JSON.parse(data.toString())
           this.handleMessage(
@@ -357,20 +357,18 @@ export class GatewayConnection {
 
     if (msg.type === 'event') {
       try {
+        // 定时任务相关事件
         if (msg.event === 'cron') {
           dcgLogger(`[Gateway] 收到事件: ${JSON.stringify(msg)}`)
           if (msg.payload?.action === 'added') {
-            updateCronJobSessionKey(msg.payload?.jobId as string)
-          }
-          if (msg.payload?.action === 'updated') {
             sendDcgchatCron()
           }
-          if (msg.payload?.action === 'added') {
-            updateCronJobSessionKey(msg.payload?.jobId as string)
-          }
           if (msg.payload?.action === 'updated') {
             sendDcgchatCron()
           }
+          if (msg.payload?.action === 'finished') {
+            finishedDcgchatCron(msg.payload?.jobId as string)
+          }
         }
       } catch (error) {
         dcgLogger(`[Gateway] 处理事件失败: ${error}`, 'error')

package/src/monitor.ts

@@ -128,7 +128,6 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         const msg = parsed as unknown as InboundMessage
         // 与 monitor 原逻辑一致：工具类指令不进入 running，避免误触工具链监控
         const effectiveSessionKey = getSessionKey(msg.content, account.accountId)
-        console.log('🚀 ~ connect ~ effectiveSessionKey:', effectiveSessionKey)
         if (!ignoreToolCommand.includes(msg.content.text?.trim() ?? '')) {
           setMsgStatus(effectiveSessionKey, 'running')
         } else {
@@ -156,15 +155,15 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
             dcgLogger(`openclaw_bot_event unknown event_type: ${event_type}, ${data.toString()}`)
           }
         } else if (event_type === 'cron') {
-          const { job_id } = parsed.content
+          const { job_id, message_id } = parsed.content
           if (operation_type === 'remove') {
             await onRemoveCronJob(job_id)
           } else if (operation_type === 'enable') {
             await onEnabledCronJob(job_id)
           } else if (operation_type === 'disable') {
             await onDisabledCronJob(job_id)
-          } else if (operation_type === 'exec') {
-            await onRunCronJob(job_id)
+          } else if (operation_type === 'run') {
+            await onRunCronJob(job_id, message_id)
           }
         } else {
           dcgLogger(`openclaw_bot_event unknown operation_type: ${operation_type}, ${data.toString()}`)

package/src/tool.ts

@@ -3,6 +3,8 @@ import { getMsgStatus } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
 import { sendFinal, sendText, wsSendRaw } from './transport.js'
 import { getCurrentSessionKey, getEffectiveMsgParams } from './utils/params.js'
+import { channelInfo, ENV } from './utils/constant.js'
+import { cronToolCall } from './cronToolCall.js'
 
 let toolCallId = ''
 let toolName = ''
@@ -63,6 +65,17 @@ function sendToolCallMessage(sk: string, text: string, toolCallId: string, isCov
   })
 }
 
+/**
+ * 深拷贝 params 并注入 bestEffort: true
+ */
+interface CronDelivery {
+  mode?: string
+  channel?: string
+  to?: string
+  bestEffort?: boolean
+  [key: string]: unknown
+}
+
 export function monitoringToolMessage(api: OpenClawPluginApi) {
   for (const item of eventList) {
     api.on(item.event as PluginHookName, (event: any, args: any) => {
@@ -73,6 +86,10 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
           if (['after_tool_call', 'before_tool_call'].includes(item.event)) {
             const { result: _result, ...rest } = event
             dcgLogger(`工具调用结果： ~ event:${item.event} ~ params:${JSON.stringify(rest)}`)
+
+            if (item.event === 'before_tool_call') {
+              return cronToolCall(rest, sk)
+            }
             const text = JSON.stringify({
               type: item.event,
               specialIdentification: 'dcgchat_tool_call_special_identification',

package/src/utils/global.ts

@@ -129,3 +129,17 @@ export const getSessionKey = (content: any, accountId: string) => {
   })
   return real_mobook === '1' ? route.sessionKey : `agent:main:mobook:direct:${agent_id}:${session_id}`.toLowerCase()
 }
+
+const cronMessageIdMap = new Map<string, string>()
+
+export function setCronMessageId(sk: string, messageId: string) {
+  cronMessageIdMap.set(sk, messageId)
+}
+
+export function getCronMessageId(sk: string): string {
+  return cronMessageIdMap.get(sk) ?? ''
+}
+
+export function removeCronMessageId(sk: string) {
+  cronMessageIdMap.delete(sk)
+}

package/src/utils/params.ts

@@ -53,7 +53,9 @@ export function getEffectiveMsgParams(sessionKey?: string): IMsgParams {
 export function setParamsMessage(sessionKey: string, params: Partial<IMsgParams>) {
   if (!sessionKey) return
   currentSessionKey = sessionKey
-  paramsMessageMap.set(sessionKey, resolveParamsMessage({ ...params, sessionKey }))
+  const previous = paramsMessageMap.get(sessionKey)
+  const base = previous ? resolveParamsMessage(previous) : getParamsDefaults()
+  paramsMessageMap.set(sessionKey, resolveParamsMessage({ ...base, ...params, sessionKey }))
 }
 
 export function getParamsMessage(sessionKey: string): IMsgParams | undefined {