@dcrays/dcgchat-test 0.4.21 → 0.4.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.4.21",
+  "version": "0.4.23",
   "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,26 @@ 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
@@ -131,7 +148,7 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
     return
   }
   const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
-  const notMessageId = `${msgCtx?.messageId}`?.length !== 13 || !msgCtx?.messageId
+  const notMessageId = `${msgCtx?.messageId}`?.length === 13 || !msgCtx?.messageId
   try {
     const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat-test"]?.botToken ?? ''
     const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
@@ -326,6 +343,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)

package/src/cronToolCall.ts

@@ -7,6 +7,9 @@ import { channelInfo, ENV } from './utils/constant.js'
  * 自动注入 bestEffort: true，使投递失败时静默降级，
  * 不影响 cron 执行结果的保存。
  *
+ * 另：拦截高危 exec，避免对话内 `openclaw gateway start` 向已运行网关发 SIGTERM、
+ * 以及反复 `openclaw cron add` 阻塞与握手超时——应改用内置 `cron` 工具或 Gateway RPC。
+ *
  * 背景：
  * - 定时任务的 delivery 设为 announce 模式，如果没有指定 channel，
  *   投递可能因找不到有效渠道而失败
@@ -79,6 +82,23 @@ function isCronTool(toolName: string): boolean {
   return toolName === 'cron'
 }
 
+/** 非 running 会话（如定时触发）也需跑本钩子的 exec 子串 */
+export function execCommandNeedsCronToolHook(command: string): boolean {
+  const c = command.trim()
+  if (!c) return false
+  if (c.includes('cron create') || c.includes('cron add')) return true
+  return /\bopenclaw\s+gateway\s+start\b/i.test(c)
+}
+
+const BLOCK_GATEWAY_START =
+  '禁止在对话内 exec `openclaw gateway start`：当前会话可能正跑在本网关上，重复启动会先 SIGTERM 旧进程导致断连。' +
+  '若仅需确认存活，请改用只读命令，例如 `openclaw gateway health --json` 或 `openclaw gateway probe`（以本机 CLI 为准）。' +
+  '若确认网关未运行，请在宿主机/服务管理（systemd 等）中启动，勿由 Agent 代 exec。'
+
+const BLOCK_CRON_CLI =
+  '请勿用 exec 跑 `openclaw cron add` / `openclaw cron create`：请改用内置 **`cron` 工具**（框架走 Gateway `cron.*`，由本插件自动补全 delivery / sessionKey）。' +
+  '高频 exec CLI 易长时间占满子进程并加剧网关 WebSocket 握手压力。'
+
 /**
  * 从 cron 参数中提取 delivery 配置
  * cron 工具的参数结构可能是:
@@ -188,14 +208,22 @@ export function cronToolCall(event: { toolName: any; params: any; toolCallId: an
 
     return { params: newParams }
   } else if (toolName === 'exec') {
-    if (params.command.indexOf('cron create') > -1 || params.command.indexOf('cron add') > -1) {
+    const cmd = typeof params.command === 'string' ? params.command : ''
+    if (/\bopenclaw\s+gateway\s+start\b/i.test(cmd)) {
+      dcgLogger(`[${LOG_TAG}] blocked exec gateway start (${toolCallId})`)
+      return { block: true, blockReason: BLOCK_GATEWAY_START }
+    }
+    if (/\bopenclaw\s+cron\s+(add|create)\b/i.test(cmd)) {
+      dcgLogger(`[${LOG_TAG}] blocked exec openclaw cron add/create (${toolCallId})`)
+      return { block: true, blockReason: BLOCK_CRON_CLI }
+    }
+    if (cmd.includes('cron create') || cmd.includes('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 dcg-cron:${sk} --json`
+        cmd.replace(/--json/g, '').trimEnd() + `  --session-key ${sk}  --channel ${"dcgchat-test"}  --to dcg-cron:${sk} --json`
       return { params: newParams }
-    } else {
-      return undefined
     }
+    return undefined
   }
 
   return undefined

package/src/tool.ts

@@ -3,7 +3,7 @@ import { getMsgStatus } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
 import { sendFinal, sendText, wsSendRaw } from './transport.js'
 import { getEffectiveMsgParams, deleteSessionKeyBySubAgentRunId, setSessionKeyBySubAgentRunId } from './utils/params.js'
-import { cronToolCall } from './cronToolCall.js'
+import { cronToolCall, execCommandNeedsCronToolHook } from './cronToolCall.js'
 
 type PluginHookName =
   | 'before_model_resolve'
@@ -330,7 +330,7 @@ function shouldRunBeforeToolCallWithoutRunningSession(event: { toolName?: string
   if (event?.toolName === 'cron') return true
   const cmd = event?.params?.command
   if (event?.toolName === 'exec' && typeof cmd === 'string') {
-    return cmd.includes('cron create') || cmd.includes('cron add')
+    return execCommandNeedsCronToolHook(cmd)
   }
   return false
 }