@dcrays/dcgchat-test 0.3.25 → 0.3.26

package/package.json

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

package/src/channel.ts

@@ -5,18 +5,18 @@ import { ossUpload } from './request/oss.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'
+import { getOutboundMsgParams } from './utils/params.js'
 import { startDcgchatGatewaySocket } from './gateway/socket.js'
 
 export type DcgchatMediaSendOptions = {
-  /** 与 setParamsMessage / map 一致，用于 getEffectiveMsgParams */
+  /** 与 setParamsMessage / map 一致，用于 getOutboundMsgParams */
   sessionKey: string
   mediaUrl?: string
   text?: string
 }
 
 export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<void> {
-  const msgCtx = getEffectiveMsgParams(opts.sessionKey)
+  const msgCtx = getOutboundMsgParams(opts.sessionKey ?? '')
   if (!isWsOpen()) {
     dcgLogger(`outbound media skipped -> ws not open: ${opts.mediaUrl ?? ''}`)
     return
@@ -147,7 +147,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       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 outboundCtx = getOutboundMsgParams(to)
       const cronMsgId = getCronMessageId(to)
       const messageId = !!cronMsgId ? cronMsgId : isCron ? `${Date.now()}` : outboundCtx?.messageId
       if (isWsOpen()) {
@@ -176,7 +176,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     },
     sendMedia: async (ctx) => {
       const to = ctx.to.replace('dcg-cron:', '')
-      const msgCtx = getEffectiveMsgParams(to)
+      const msgCtx = getOutboundMsgParams(to)
       const cronMsgId = getCronMessageId(to)
       const isCron = ctx.to.indexOf('dcg-cron:') >= 0
       const messageId = !!cronMsgId ? cronMsgId : isCron ? `${Date.now()}` : msgCtx?.messageId

package/src/cron.ts

@@ -2,18 +2,11 @@ import path from 'node:path'
 import fs from 'node:fs'
 import type { IMsgParams } from './types.js'
 import { isWsOpen, mergeDefaultParams, sendEventMessage, sendFinal } from './transport.js'
-import {
-  getCronMessageId,
-  getWorkspaceDir,
-  getWsConnection,
-  removeCronMessageId,
-  setCronMessageId,
-  setMsgStatus
-} from './utils/global.js'
+import { getCronMessageId, getWorkspaceDir, getWsConnection, removeCronMessageId, setCronMessageId } from './utils/global.js'
 import { ossUpload } from './request/oss.js'
 import { dcgLogger } from './utils/log.js'
 import { sendMessageToGateway } from './gateway/socket.js'
-import { getCurrentSessionKey, getEffectiveMsgParams } from './utils/params.js'
+import { getEffectiveMsgParams } from './utils/params.js'
 
 export function getCronJobsPath(): string {
   const workspaceDir = getWorkspaceDir()
@@ -89,12 +82,15 @@ function flushCronUploadQueue(): void {
  * 将 jobs.json 同步到 OSS 并推送事件。30s 内多次调用合并为一次上传；定时触发后清空待处理项，避免重复执行。
  * @param msgCtx 可选；省略时使用当前会话 getEffectiveMsgParams(sessionKey) 快照
  */
-export function sendDcgchatCron(): void {
-  const ctx = msgParamsToCtx(getEffectiveMsgParams(getCurrentSessionKey() ?? ''))
+export function sendDcgchatCron(jobId: string): void {
+  const jobPath = getCronJobsPath()
+  const { sessionKey } = readCronJob(jobPath, jobId) || {}
+  const ctx = msgParamsToCtx(getEffectiveMsgParams(sessionKey))
   if (!ctx) {
     dcgLogger('sendDcgchatCron: no message context (missing token / params)', 'error')
     return
   }
+  dcgLogger(`sessionKey: ${sessionKey}, jobId: ${jobId}`)
   pendingCronUploadCtx = ctx
   if (cronUploadFlushTimer !== null) {
     clearTimeout(cronUploadFlushTimer)

package/src/request/request.ts

@@ -3,7 +3,7 @@ import axios from 'axios'
 import md5 from 'md5'
 import type { IResponse } from '../types.js'
 import { getUserTokenCache } from './userInfo.js'
-import { getCurrentSessionKey, getEffectiveMsgParams } from '../utils/params.js'
+import { getEffectiveMsgParams } from '../utils/params.js'
 import { ENV } from '../utils/constant.js'
 import { dcgLogger } from '../utils/log.js'
 
@@ -39,9 +39,7 @@ function toCurl(config: {
 }): string {
   const base = config.baseURL ?? ''
   const path = config.url ?? ''
-  const url = path.startsWith('http')
-    ? path
-    : `${base.replace(/\/$/, '')}/${path.replace(/^\//, '')}`
+  const url = path.startsWith('http') ? path : `${base.replace(/\/$/, '')}/${path.replace(/^\//, '')}`
   const method = (config.method ?? 'GET').toUpperCase()
   const headers = config.headers ?? {}
   const parts = ['curl', '-X', method, `'${url}'`]
@@ -82,9 +80,7 @@ export function getSignature(
     sortedKeys
       .map((key) => {
         const val = map[key as keyof typeof map]
-        return val === undefined
-          ? ''
-          : `${key}${typeof val === 'object' ? JSON.stringify(val) : val}`
+        return val === undefined ? '' : `${key}${typeof val === 'object' ? JSON.stringify(val) : val}`
       })
       .join('') + signKey[ENV]
   // 4. MD5 加密并转大写
@@ -130,9 +126,7 @@ axiosInstance.interceptors.request.use(
       if (cachedToken) {
         config.headers = config.headers || {}
         config.headers.authorization = cachedToken
-        dcgLogger(
-          `[request] auto-injected userToken from cache for botToken=${botToken.slice(0, 10)}...`
-        )
+        dcgLogger(`[request] auto-injected userToken from cache for botToken=${botToken.slice(0, 10)}...`)
       }
     }
 
@@ -172,7 +166,7 @@ export function post<T = Record<string, unknown>, R = unknown>(
     botToken?: string
   }
 ): Promise<IResponse<R>> {
-  const params = getEffectiveMsgParams(getCurrentSessionKey() ?? '') || {}
+  const params = getEffectiveMsgParams() || { appId: 100 }
   const config: any = {
     method: 'POST',
     url,

package/src/tool.ts

@@ -2,12 +2,9 @@ import type { OpenClawPluginApi } from 'openclaw/plugin-sdk'
 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 { getEffectiveMsgParams } from './utils/params.js'
 import { cronToolCall } from './cronToolCall.js'
 
-let toolCallId = ''
-let toolName = ''
 type PluginHookName =
   | 'before_model_resolve'
   | 'before_prompt_build'
@@ -56,13 +53,8 @@ const eventList = [
 
 function sendToolCallMessage(sk: string, text: string, toolCallId: string, isCover: number) {
   const params = getEffectiveMsgParams(sk)
-  wsSendRaw(params, {
-    is_finish: -1,
-    tool_call_id: toolCallId,
-    is_cover: isCover,
-    thinking_content: text,
-    response: ''
-  })
+  const content = { is_finish: -1, tool_call_id: toolCallId, is_cover: isCover, thinking_content: text, response: '' }
+  wsSendRaw(params, content, false)
 }
 
 /**

package/src/transport.ts

@@ -150,12 +150,13 @@ export function wsSend(ctx: IMsgParams, content: Record<string, unknown>): boole
  * 媒体 / channel 出站：content 保持嵌套对象（单次编码）。
  * `ctx` 须由调用方解析（如需合并覆盖可先 mergeSessionParams）。
  */
-export function wsSendRaw(ctx: IMsgParams, content: Record<string, unknown>): boolean {
+export function wsSendRaw(ctx: IMsgParams, content: Record<string, unknown>, isLog = true): boolean {
   const ws = getWsConnection()
   if (isWsOpen()) {
     ws?.send(JSON.stringify(buildOpenclawBotChat(ctx, content, { mergeChannelDefaults: true })))
-
-    dcgLogger('已发送：' + JSON.stringify(buildOpenclawBotChat(ctx, content, { mergeChannelDefaults: true })))
+    if (isLog) {
+      dcgLogger('已发送：' + JSON.stringify(buildOpenclawBotChat(ctx, content, { mergeChannelDefaults: true })))
+    }
   }
   return true
 }
@@ -195,7 +196,7 @@ export function sendEventMessage(url: string, sessionKey: string) {
           bot_id: ctx.botId,
           agent_id: ctx.agentId,
           session_id: ctx.sessionId,
-          message_id: ctx.messageId || Date.now().toString()
+          message_id: Date.now().toString()
         }
       })
     )

package/src/utils/params.ts

@@ -7,12 +7,9 @@ import type { DcgchatConfig, IMsgParams } from '../types.js'
  */
 const paramsMessageMap = new Map<string, IMsgParams>()
 
-/** 最近一次 setParamsMessage 的 key，供不传参的 getEffectiveMsgParams() 使用 */
-let currentSessionKey: string | null = null
-
 /** 从 OpenClaw 配置读取当前 channel 的基础参数（唯一来源，供 transport / resolve 等复用） */
 export function getParamsDefaults(): IMsgParams {
-  const ch = (getOpenClawConfig()?.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
+  const ch = (getOpenClawConfig()?.channels?.['dcgchat'] as DcgchatConfig | undefined) ?? {}
   return {
     userId: Number(ch.userId ?? 0),
     botToken: ch.botToken ?? '',
@@ -45,14 +42,25 @@ export function resolveParamsMessage(params: Partial<IMsgParams>): IMsgParams {
  * 统一取值入口：显式 sessionKey，或回落到当前会话；再与配置缺省 merge，保证字段完整。
  */
 export function getEffectiveMsgParams(sessionKey?: string): IMsgParams {
-  const key = sessionKey ?? currentSessionKey
-  const stored = key ? paramsMessageMap.get(key) : undefined
+  const stored = sessionKey ? paramsMessageMap.get(sessionKey) : undefined
   return stored ? resolveParamsMessage(stored) : getParamsDefaults()
 }
 
+/**
+ * Agent `message` 工具常把 `target` 设为用户 ID（如 "150"），而 `setParamsMessage` 使用的 key 是
+ * `effectiveSessionKey`（如 `agent:main:mobook:direct:...`）。若按 preferredKey 查不到 map，
+ * 则回落到当前会话 `currentSessionKey`，避免拿到空 `messageId` / `sessionId` 导致无文件卡片、WS 上下文错误。
+ */
+export function getOutboundMsgParams(preferredKey: string): IMsgParams {
+  const k = preferredKey?.trim()
+  if (k && paramsMessageMap.has(k)) {
+    return getEffectiveMsgParams(k)
+  }
+  return getEffectiveMsgParams()
+}
+
 export function setParamsMessage(sessionKey: string, params: Partial<IMsgParams>) {
   if (!sessionKey) return
-  currentSessionKey = sessionKey
   const previous = paramsMessageMap.get(sessionKey)
   const base = previous ? resolveParamsMessage(previous) : getParamsDefaults()
   paramsMessageMap.set(sessionKey, resolveParamsMessage({ ...base, ...params, sessionKey }))
@@ -61,7 +69,3 @@ export function setParamsMessage(sessionKey: string, params: Partial<IMsgParams>
 export function getParamsMessage(sessionKey: string): IMsgParams | undefined {
   return paramsMessageMap.get(sessionKey)
 }
-
-export function getCurrentSessionKey(): string | null {
-  return currentSessionKey
-}