@dcrays/dcgchat-test 0.2.33 → 0.3.0

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",
@@ -13,9 +14,9 @@ const plugin = {
   register(api: OpenClawPluginApi) {
     setDcgchatRuntime(api.runtime)
 
-    console.log('🚀 ~ handleDcgchatMessage ~ process.platform:', process.platform)
     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.33",
+  "version": "0.3.0",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",

package/src/bot.ts

@@ -8,7 +8,7 @@ import {
   getDcgchatRuntime,
   getOpenClawConfig,
   getWorkspaceDir,
-  getWsConnection,
+  setMsgParamsSessionKey,
   setMsgStatus
 } from './utils/global.js'
 import { resolveAccount, sendDcgchatMedia } from './channel.js'
@@ -17,6 +17,7 @@ import { extractMobookFiles } from './utils/searchFile.js'
 import { createMsgContext, sendChunk, sendFinal, sendText as sendTextMsg, sendError, sendText } from './transport.js'
 import { dcgLogger } from './utils/log.js'
 import { channelInfo, systemCommand, interruptCommand, ENV } from './utils/constant.js'
+import { sendMessageToGateway } from './gateway/socket.js'
 
 type MediaInfo = {
   path: string
@@ -30,16 +31,16 @@ 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>()
+// 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)
-  }
-}
+// /** 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)
+//   }
+// }
 
 /**
  * Extract agentId from conversation_id formatted as "agentId::suffix".
@@ -133,6 +134,14 @@ function resolveReplyMediaList(payload: ReplyPayload): string[] {
 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) {
@@ -145,7 +154,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
   if (!text) {
     sendTextMsg(msgCtx, '你需要我帮你做什么呢？')
-    sendFinal(msgCtx)
+    safeSendFinal()
     return
   }
 
@@ -153,6 +162,8 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     const core = getDcgchatRuntime()
 
     const conversationId = msg.content.session_id?.trim()
+    const agentId = msg.content.agent_id?.trim()
+    const realMobook = msg.content.real_mobook?.toString().trim()
 
     const route = core.channel.routing.resolveAgentRoute({
       cfg: config,
@@ -164,20 +175,20 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     // 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 effectiveSessionKey =
+      realMobook === '1' ? route.sessionKey : `agent:main:mobook:direct:${agentId}:${conversationId}`.toLowerCase()
+    setMsgParamsSessionKey(effectiveSessionKey)
 
     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 ?? []
@@ -245,14 +256,14 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         }
       },
       onError: (err: unknown, info: { kind: string }) => {
+        safeSendFinal()
         dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
       },
       onIdle: () => {
-        sendFinal(msgCtx)
+        safeSendFinal()
       }
     })
 
-    let wasAborted = false
     try {
       if (systemCommand.includes(text?.trim())) {
         dcgLogger(`dispatching /new`)
@@ -267,7 +278,13 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         })
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
-        abortMobookappGeneration(conversationId)
+        // abortMobookappGeneration(conversationId)
+        sendMessageToGateway(
+          JSON.stringify({
+            method: 'chat.abort',
+            params: { sessionKey: effectiveSessionKey }
+          })
+        )
         sendFinal(msgCtx)
         return
       } else {
@@ -278,7 +295,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
@@ -309,26 +326,26 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         })
       }
     } 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()
+      markDispatchIdle()
     } catch (err) {
-      dcgLogger(` markRunComplete error: ${String(err)}`, 'error')
+      dcgLogger(` markRunComplete||markRunComplete error: ${String(err)}`, 'error')
     }
-    markDispatchIdle()
     if (![...systemCommand, ...interruptCommand].includes(text?.trim())) {
       for (const file of extractMobookFiles(completeText)) {
         const candidates: string[] = [file]
@@ -342,10 +359,14 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         }
         const resolved = candidates.find((p) => fs.existsSync(p))
         if (!resolved) continue
-        await sendDcgchatMedia({ msgCtx, mediaUrl: resolved, text: '' })
+        try {
+          await sendDcgchatMedia({ msgCtx, mediaUrl: resolved, text: '' })
+        } catch (err) {
+          dcgLogger(` sendDcgchatMedia error: ${String(err)}`, 'error')
+        }
       }
     }
-    sendFinal(msgCtx)
+    safeSendFinal()
     clearSentMediaKeys(msg.content.message_id)
     setMsgStatus('finished')
 
@@ -366,5 +387,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))
+  } finally {
+    safeSendFinal()
   }
 }

package/src/channel.ts

@@ -31,7 +31,7 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
   const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
 
   try {
-    const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, msgCtx.botToken) : ''
+    const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, msgCtx.botToken, 1) : ''
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
       files: [{ url, name: fileName }]

package/src/cron.ts

@@ -0,0 +1,125 @@
+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 { DcgchatMsgContext, sendEventMessage } from './transport.js'
+import { getMsgParams, getWorkspaceDir } from './utils/global.js'
+import { ossUpload } from './request/oss.js'
+import { dcgLogger } from './utils/log.js'
+import { sendMessageToGateway } from './gateway/socket.js'
+
+export function getCronJobsPath(): string {
+  const workspaceDir = getWorkspaceDir()
+  const cronDir = workspaceDir.replace('workspace', 'cron')
+  return path.join(cronDir, 'jobs.json')
+}
+
+function msgParamsToCtx(p: IMsgParams): DcgchatMsgContext | null {
+  if (!p?.token) return null
+  return {
+    userId: p.userId,
+    botToken: p.token,
+    domainId: p.domainId,
+    appId: p.appId,
+    botId: p.botId,
+    agentId: p.agentId,
+    sessionId: p.sessionId,
+    messageId: p.messageId
+  }
+}
+
+const CRON_UPLOAD_DEBOUNCE_MS = 30_000
+
+/** 待合并的上传上下文（短时间内多次调用只保留最后一次） */
+let pendingCronUploadCtx: DcgchatMsgContext | null = null
+let cronUploadFlushTimer: ReturnType<typeof setTimeout> | null = null
+
+async function runCronJobsUpload(msgCtx: DcgchatMsgContext): Promise<void> {
+  const jobPath = getCronJobsPath()
+  if (fs.existsSync(jobPath)) {
+    try {
+      const url = await ossUpload(jobPath, msgCtx.botToken, 0)
+      dcgLogger(`定时任务创建成功: ${url}`)
+      sendEventMessage(msgCtx, url)
+    } 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 可选；省略时使用当前 getMsgParams() 快照
+ */
+export function sendDcgchatCron(): void {
+  const ctx = msgParamsToCtx(getMsgParams() as IMsgParams)
+  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 = getMsgParams()
+  sendMessageToGateway(JSON.stringify({ method: 'cron.update', params: { id: jobId, patch: { sessionKey: params.sessionKey } } }))
+}