@dcrays/dcgchat-test 0.2.34 → 0.3.1

package/index.ts

@@ -4,6 +4,7 @@ import { dcgchatPlugin } from './src/channel.js'
 import { setDcgchatRuntime, setWorkspaceDir } from './src/utils/global.js'
 import { monitoringToolMessage } from './src/tool.js'
 import { setOpenClawConfig } from './src/utils/global.js'
+import { startDcgchatGatewaySocket } from './src/gateway/socket.js'
 
 const plugin = {
   id: "dcgchat-test",
@@ -15,6 +16,7 @@ const plugin = {
 
     monitoringToolMessage(api)
     setOpenClawConfig(api.config)
+    startDcgchatGatewaySocket()
     api.registerChannel({ plugin: dcgchatPlugin })
     setWorkspaceDir(api.config?.agents?.defaults?.workspace)
     api.registerTool((ctx) => {

package/package.json

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

package/src/bot.ts

@@ -7,9 +7,11 @@ import { clearSentMediaKeys, getDcgchatRuntime, getOpenClawConfig, getWorkspaceD
 import { resolveAccount, sendDcgchatMedia } from './channel.js'
 import { generateSignUrl } from './request/api.js'
 import { extractMobookFiles } from './utils/searchFile.js'
-import { createMsgContext, sendChunk, sendFinal, sendText as sendTextMsg, sendError, sendText } from './transport.js'
+import { sendChunk, sendFinal, sendText as sendTextMsg, sendError } from './transport.js'
 import { dcgLogger } from './utils/log.js'
 import { channelInfo, systemCommand, interruptCommand, ENV } from './utils/constant.js'
+import { sendMessageToGateway } from './gateway/socket.js'
+import { getEffectiveMsgParams, setParamsMessage } from './utils/params.js'
 
 type MediaInfo = {
   path: string
@@ -23,16 +25,7 @@ type TFileInfo = { name: string; url: string }
 const mediaMaxBytes = 300 * 1024 * 1024
 
 /** Active LLM generation abort controllers, keyed by conversationId */
-const activeGenerations = new Map<string, AbortController>()
-
-/** Abort an in-progress LLM generation for a given conversationId */
-export function abortMobookappGeneration(conversationId: string): void {
-  const ctrl = activeGenerations.get(conversationId)
-  if (ctrl) {
-    ctrl.abort()
-    activeGenerations.delete(conversationId)
-  }
-}
+// const activeGenerations = new Map<string, AbortController>()
 
 /**
  * Extract agentId from conversation_id formatted as "agentId::suffix".
@@ -124,16 +117,8 @@ function resolveReplyMediaList(payload: ReplyPayload): string[] {
  * 处理一条用户消息，调用 Agent 并返回回复
  */
 export async function handleDcgchatMessage(msg: InboundMessage, accountId: string): Promise<void> {
-  const msgCtx = createMsgContext(msg)
-
   let finalSent = false
 
-  const safeSendFinal = () => {
-    if (finalSent) return
-    finalSent = true
-    sendFinal(msgCtx)
-  }
-
   let completeText = ''
   const config = getOpenClawConfig()
   if (!config) {
@@ -142,43 +127,64 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
   }
   const account = resolveAccount(config, accountId)
   const userId = msg._userId.toString()
+
+  const core = getDcgchatRuntime()
+
+  const conversationId = msg.content.session_id?.trim()
+  const agentId = msg.content.agent_id?.trim()
+  const real_mobook = msg.content.real_mobook?.toString().trim()
+
+  const route = core.channel.routing.resolveAgentRoute({
+    cfg: config,
+    channel: "dcgchat-test",
+    accountId: account.accountId,
+    peer: { kind: 'direct', id: conversationId }
+  })
+
+  const embeddedAgentId = extractAgentIdFromConversationId(conversationId)
+
+  const effectiveAgentId = embeddedAgentId ?? route.agentId
+  const effectiveSessionKey =
+    real_mobook === '1' ? route.sessionKey : `agent:main:mobook:direct:${agentId}:${conversationId}`.toLowerCase()
+
+  setParamsMessage(effectiveSessionKey, {
+    userId: msg._userId,
+    botToken: msg.content.bot_token,
+    sessionId: conversationId,
+    messageId: msg.content.message_id,
+    domainId: msg.content.domain_id,
+    appId: msg.content.app_id,
+    botId: msg.content.bot_id ?? '',
+    agentId: msg.content.agent_id ?? '',
+    sessionKey: effectiveSessionKey,
+    real_mobook
+  })
+  const outboundCtx = getEffectiveMsgParams(effectiveSessionKey)
+  const agentEntry =
+    effectiveAgentId && effectiveAgentId !== 'main' ? config.agents?.list?.find((a) => a.id === effectiveAgentId) : undefined
+  const agentDisplayName = agentEntry?.name ?? (effectiveAgentId && effectiveAgentId !== 'main' ? effectiveAgentId : undefined)
+
+  const safeSendFinal = () => {
+    if (finalSent) return
+    finalSent = true
+    sendFinal(outboundCtx)
+  }
+
   const text = msg.content.text?.trim()
 
   if (!text) {
-    sendTextMsg(msgCtx, '你需要我帮你做什么呢？')
+    sendTextMsg('你需要我帮你做什么呢？', outboundCtx)
     safeSendFinal()
     return
   }
 
   try {
-    const core = getDcgchatRuntime()
-
-    const conversationId = msg.content.session_id?.trim()
-
-    const route = core.channel.routing.resolveAgentRoute({
-      cfg: config,
-      channel: "dcgchat-test",
-      accountId: account.accountId,
-      peer: { kind: 'direct', id: conversationId }
-    })
-
-    // If conversation_id encodes an agentId prefix ("agentId::suffix"), override the route.
-    const embeddedAgentId = extractAgentIdFromConversationId(conversationId)
-    const effectiveAgentId = embeddedAgentId ?? route.agentId
-    const effectiveSessionKey = embeddedAgentId
-      ? `agent:${embeddedAgentId}:mobook:direct:${conversationId}`.toLowerCase()
-      : route.sessionKey
-
-    const agentEntry =
-      effectiveAgentId && effectiveAgentId !== 'main' ? config.agents?.list?.find((a) => a.id === effectiveAgentId) : undefined
-    const agentDisplayName = agentEntry?.name ?? (effectiveAgentId && effectiveAgentId !== 'main' ? effectiveAgentId : undefined)
-
     // Abort any existing generation for this conversation, then start a new one
-    const existingCtrl = activeGenerations.get(conversationId)
-    if (existingCtrl) existingCtrl.abort()
-    const genCtrl = new AbortController()
-    const genSignal = genCtrl.signal
-    activeGenerations.set(conversationId, genCtrl)
+    // const existingCtrl = activeGenerations.get(conversationId)
+    // if (existingCtrl) existingCtrl.abort()
+    // const genCtrl = new AbortController()
+    // const genSignal = genCtrl.signal
+    // activeGenerations.set(conversationId, genCtrl)
 
     // 处理用户上传的文件
     const files = msg.content.files ?? []
@@ -242,7 +248,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
           const key = getMediaKey(mediaUrl)
           if (sentMediaKeys.has(key)) continue
           sentMediaKeys.add(key)
-          await sendDcgchatMedia({ msgCtx, mediaUrl, text: '' })
+          await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl, text: '' })
         }
       },
       onError: (err: unknown, info: { kind: string }) => {
@@ -254,7 +260,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       }
     })
 
-    let wasAborted = false
     try {
       if (systemCommand.includes(text?.trim())) {
         dcgLogger(`dispatching /new`)
@@ -269,7 +274,12 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         })
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
-        abortMobookappGeneration(conversationId)
+        sendMessageToGateway(
+          JSON.stringify({
+            method: 'chat.abort',
+            params: { sessionKey: effectiveSessionKey }
+          })
+        )
         safeSendFinal()
         return
       } else {
@@ -280,7 +290,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
           dispatcher,
           replyOptions: {
             ...replyOptions,
-            abortSignal: genSignal,
+            // abortSignal: genSignal,
             onModelSelected: prefixContext.onModelSelected,
             onPartialReply: async (payload: ReplyPayload) => {
               // Accumulate full text
@@ -293,7 +303,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                   ? payload.text.slice(streamedTextLen)
                   : payload.text
                 if (delta.trim()) {
-                  sendChunk(msgCtx, delta)
+                  sendChunk(delta, outboundCtx)
                   dcgLogger(`[stream]: chunk ${delta.length} chars to user ${msg._userId} ${delta.slice(0, 100)}`)
                 }
                 streamedTextLen = payload.text.length
@@ -304,26 +314,26 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                 const key = getMediaKey(mediaUrl)
                 if (sentMediaKeys.has(key)) continue
                 sentMediaKeys.add(key)
-                await sendDcgchatMedia({ msgCtx, mediaUrl, text: '' })
+                await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl, text: '' })
               }
             }
           }
         })
       }
     } catch (err: unknown) {
-      if (genSignal.aborted) {
-        wasAborted = true
-        dcgLogger(` generation aborted for conversationId=${conversationId}`)
-      } else if (err instanceof Error && err.name === 'AbortError') {
-        wasAborted = true
-        dcgLogger(` generation aborted for conversationId=${conversationId}`)
-      } else {
-        dcgLogger(` dispatchReplyFromConfig error: ${String(err)}`, 'error')
-      }
+      // if (genSignal.aborted) {
+      //   wasAborted = true
+      //   dcgLogger(` generation aborted for conversationId=${conversationId}`)
+      // } else if (err instanceof Error && err.name === 'AbortError') {
+      //   wasAborted = true
+      //   dcgLogger(` generation aborted for conversationId=${conversationId}`)
+      // } else {
+      //   dcgLogger(` dispatchReplyFromConfig error: ${String(err)}`, 'error')
+      // }
     } finally {
-      if (activeGenerations.get(conversationId) === genCtrl) {
-        activeGenerations.delete(conversationId)
-      }
+      // if (activeGenerations.get(conversationId) === genCtrl) {
+      //   activeGenerations.delete(conversationId)
+      // }
     }
     try {
       markRunComplete()
@@ -345,7 +355,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         const resolved = candidates.find((p) => fs.existsSync(p))
         if (!resolved) continue
         try {
-          await sendDcgchatMedia({ msgCtx, mediaUrl: resolved, text: '' })
+          await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl: resolved, text: '' })
         } catch (err) {
           dcgLogger(` sendDcgchatMedia error: ${String(err)}`, 'error')
         }
@@ -371,7 +381,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       })
   } catch (err) {
     dcgLogger(` handle message failed: ${String(err)}`, 'error')
-    sendError(msgCtx, err instanceof Error ? err.message : String(err))
+    sendError(err instanceof Error ? err.message : String(err), outboundCtx)
   } finally {
     safeSendFinal()
   }

package/src/channel.ts

@@ -2,36 +2,40 @@ 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, getMsgParams, hasSentMediaKey } from './utils/global.js'
-import { type DcgchatMsgContext, isWsOpen, sendFinal, wsSendRaw } from './transport.js'
+import { addSentMediaKey, getOpenClawConfig, hasSentMediaKey } from './utils/global.js'
+import { isWsOpen, mergeDefaultParams, mergeSessionParams, sendFinal, wsSendRaw } from './transport.js'
 import { dcgLogger, setLogger } from './utils/log.js'
+import { getParamsDefaults, getEffectiveMsgParams, getCurrentSessionKey } from './utils/params.js'
 
 export type DcgchatMediaSendOptions = {
-  msgCtx: DcgchatMsgContext
+  /** 与 setParamsMessage / map 一致，用于 getEffectiveMsgParams */
+  sessionKey: string
   mediaUrl?: string
   text?: string
 }
 
 export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<void> {
-  const { msgCtx } = opts
+  const msgCtx = getEffectiveMsgParams(opts.sessionKey)
   if (!isWsOpen()) {
     dcgLogger(`outbound media skipped -> ws not open: ${opts.mediaUrl ?? ''}`)
     return
   }
 
   const mediaUrl = opts.mediaUrl
-  if (mediaUrl && hasSentMediaKey(msgCtx.messageId, mediaUrl)) {
+  const dedupeId = msgCtx.messageId
+  if (mediaUrl && dedupeId && hasSentMediaKey(dedupeId, mediaUrl)) {
     dcgLogger(`dcgchat: sendMedia skipped (duplicate in session): ${mediaUrl}`)
     return
   }
-  if (mediaUrl) {
-    addSentMediaKey(msgCtx.messageId, mediaUrl)
+  if (mediaUrl && dedupeId) {
+    addSentMediaKey(dedupeId, mediaUrl)
   }
 
   const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
 
   try {
-    const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, msgCtx.botToken) : ''
+    const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat-test"]?.botToken ?? ''
+    const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
       files: [{ url, name: fileName }]
@@ -61,22 +65,6 @@ export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null):
   }
 }
 
-/** Build a DcgchatMsgContext for the outbound pipeline (uses global msgParams). */
-function createOutboundMsgContext(cfg: OpenClawConfig, accountId?: string | null): DcgchatMsgContext {
-  const params = getMsgParams()
-  const { botToken } = resolveAccount(cfg, accountId)
-  return {
-    userId: params.userId,
-    botToken,
-    domainId: params.domainId,
-    appId: params.appId,
-    botId: params.botId,
-    agentId: params.agentId,
-    sessionId: params.sessionId,
-    messageId: params.messageId
-  }
-}
-
 export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
   id: "dcgchat-test",
   meta: {
@@ -153,24 +141,30 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     deliveryMode: 'direct',
     textChunkLimit: 4000,
     sendText: async (ctx) => {
-      const msgCtx = createOutboundMsgContext(ctx.cfg, ctx.accountId)
       if (isWsOpen()) {
-        wsSendRaw(msgCtx, { response: ctx.text })
-        dcgLogger(`channel sendText to ${msgCtx.userId} ${ctx.text?.slice(0, 50)}`)
+        const merged = mergeDefaultParams({
+          agentId: ctx.accountId ?? '',
+          sessionId: ctx.to,
+          messageId: `${Date.now()}`
+        })
+        wsSendRaw(merged, { response: ctx.text })
+        sendFinal(merged)
+        dcgLogger(`channel sendText to ${ctx.to} ${ctx.text?.slice(0, 50)}`)
       }
       return {
         channel: "dcgchat-test",
         messageId: `dcg-${Date.now()}`,
-        chatId: msgCtx.userId.toString()
+        chatId: ctx.to
       }
     },
     sendMedia: async (ctx) => {
-      const msgCtx = createOutboundMsgContext(ctx.cfg, ctx.accountId)
-      await sendDcgchatMedia({ msgCtx, mediaUrl: ctx.mediaUrl })
+      const sk = getCurrentSessionKey()
+      const msgCtx = getEffectiveMsgParams('sk')
+      await sendDcgchatMedia({ sessionKey: sk ?? '', mediaUrl: ctx.mediaUrl ?? '' })
       return {
         channel: "dcgchat-test",
         messageId: `dcg-${Date.now()}`,
-        chatId: msgCtx.userId.toString()
+        chatId: msgCtx.userId?.toString()
       }
     }
   },

package/src/cron.ts

@@ -0,0 +1,138 @@
+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 { 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 {
+  const workspaceDir = getWorkspaceDir()
+  const cronDir = workspaceDir.replace('workspace', 'cron')
+  return path.join(cronDir, 'jobs.json')
+}
+
+function msgParamsToCtx(p: IMsgParams): IMsgParams | null {
+  if (!p?.botToken) return null
+  return p
+}
+
+const CRON_UPLOAD_DEBOUNCE_MS = 30_000
+
+/** 待合并的上传上下文（短时间内多次调用只保留最后一次） */
+let pendingCronUploadCtx: IMsgParams | null = null
+let cronUploadFlushTimer: ReturnType<typeof setTimeout> | null = null
+
+async function runCronJobsUpload(msgCtx: IMsgParams): Promise<void> {
+  const jobPath = getCronJobsPath()
+  if (fs.existsSync(jobPath)) {
+    try {
+      const url = await ossUpload(jobPath, msgCtx.botToken ?? '', 0)
+      dcgLogger(`定时任务创建成功: ${url}`)
+      if (!msgCtx.sessionKey) {
+        dcgLogger('runCronJobsUpload: missing sessionKey on msgCtx', 'error')
+        return
+      }
+      sendEventMessage(url, msgCtx.sessionKey)
+    } catch (error) {
+      dcgLogger(`${jobPath} upload failed: ${error}`, 'error')
+    }
+  } else {
+    dcgLogger(`${jobPath} not found`, 'error')
+  }
+}
+
+function flushCronUploadQueue(): void {
+  cronUploadFlushTimer = null
+  const ctx = pendingCronUploadCtx
+  pendingCronUploadCtx = null
+  if (!ctx) return
+  void runCronJobsUpload(ctx)
+}
+
+/**
+ * 将 jobs.json 同步到 OSS 并推送事件。30s 内多次调用合并为一次上传；定时触发后清空待处理项，避免重复执行。
+ * @param msgCtx 可选；省略时使用当前会话 getEffectiveMsgParams(sessionKey) 快照
+ */
+export function sendDcgchatCron(): void {
+  const ctx = msgParamsToCtx(getEffectiveMsgParams(getCurrentSessionKey() ?? ''))
+  if (!ctx) {
+    dcgLogger('sendDcgchatCron: no message context (missing token / params)', 'error')
+    return
+  }
+  pendingCronUploadCtx = ctx
+  if (cronUploadFlushTimer !== null) {
+    clearTimeout(cronUploadFlushTimer)
+  }
+  cronUploadFlushTimer = setTimeout(flushCronUploadQueue, CRON_UPLOAD_DEBOUNCE_MS)
+}
+
+/**
+ * 通过 OpenClaw CLI 删除定时任务（走 Gateway，与内存状态一致）。
+ * 文档：运行中请勿手改 jobs.json，应使用 `openclaw cron rm` 或工具 API。
+ */
+export const onRemoveCronJob = async (jobId: string) => {
+  const id = jobId?.trim()
+  if (!id) {
+    dcgLogger('onRemoveCronJob: empty jobId', 'error')
+    return
+  }
+  sendMessageToGateway(JSON.stringify({ method: 'cron.remove', params: { id: jobId } }))
+}
+export const onDisabledCronJob = async (jobId: string) => {
+  const id = jobId?.trim()
+  if (!id) {
+    dcgLogger('onRemoveCronJob: empty jobId', 'error')
+    return
+  }
+  sendMessageToGateway(JSON.stringify({ method: 'cron.update', params: { id: jobId, patch: { enabled: false } } }))
+}
+export const onEnabledCronJob = async (jobId: string) => {
+  const id = jobId?.trim()
+  if (!id) {
+    dcgLogger('onRemoveCronJob: empty jobId', 'error')
+    return
+  }
+  sendMessageToGateway(JSON.stringify({ method: 'cron.update', params: { id: jobId, patch: { enabled: true } } }))
+}
+export const onRunCronJob = async (jobId: string) => {
+  const id = jobId?.trim()
+  if (!id) {
+    dcgLogger('onRemoveCronJob: empty jobId', 'error')
+    return
+  }
+  sendMessageToGateway(JSON.stringify({ method: 'cron.update', jobId }))
+}
+export const updateCronJobSessionKey = async (jobId: string) => {
+  const id = jobId?.trim()
+  if (!id) {
+    dcgLogger('onRemoveCronJob: 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
+          }
+        }
+      }
+    })
+  )
+}