@dcrays/dcgchat 0.2.34 → 0.3.18

package/src/gateway/socket.ts

@@ -0,0 +1,283 @@
+import type { OpenClawConfig } from 'openclaw/plugin-sdk'
+import { getOpenClawConfig } from '../utils/global.js'
+import { GatewayConnection, type GatewayConfig } from './index.js'
+import { dcgLogger } from '../utils/log.js'
+
+/** 与 gateway-methods 中 registerGatewayMethod 名称一致（供引用） */
+export const DCGCHAT_GATEWAY_METHODS = ['dcgchat.cron.status', 'dcgchat.cron.add', 'dcgchat.cron.list', 'dcgchat.cron.remove'] as const
+
+const PING_INTERVAL_MS = 30_000
+const RECONNECT_DELAY_MS = 5_000
+
+type OpenClawGatewaySection = {
+  port?: number
+  bind?: string
+  tls?: { enabled?: boolean }
+  auth?: { mode?: string; token?: string }
+  remote?: { url?: string }
+}
+
+function getGatewaySection(cfg: OpenClawConfig): OpenClawGatewaySection | undefined {
+  return (cfg as OpenClawConfig & { gateway?: OpenClawGatewaySection }).gateway
+}
+
+/**
+ * 从 OpenClaw 配置解析本地/远程 Gateway WebSocket 与 token。
+ * 可用环境变量覆盖：OPENCLAW_GATEWAY_URL、OPENCLAW_GATEWAY_TOKEN。
+ */
+export function resolveGatewayClientConfig(cfg: OpenClawConfig | null): GatewayConfig {
+  if (!cfg) {
+    throw new Error('OpenClaw 配置未初始化（需先完成插件 register）')
+  }
+  const g = getGatewaySection(cfg)
+  const token = process.env.OPENCLAW_GATEWAY_TOKEN || g?.auth?.token || ''
+  if (!token) {
+    throw new Error('缺少 Gateway token：请在 openclaw.json 的 gateway.auth.token 设置，或设置环境变量 OPENCLAW_GATEWAY_TOKEN')
+  }
+
+  const scheme = g?.tls?.enabled === true ? 'wss' : 'ws'
+  const url = process.env.OPENCLAW_GATEWAY_URL || g?.remote?.url || `${scheme}://127.0.0.1:${g?.port ?? 18789}`
+
+  return {
+    url,
+    token,
+    role: 'operator',
+    scopes: ['operator.admin']
+  }
+}
+
+function resolveConfigSafe(): GatewayConfig | null {
+  try {
+    return resolveGatewayClientConfig(getOpenClawConfig())
+  } catch (e) {
+    dcgLogger(`Gateway 持久连接未启动: ${e}`, 'error')
+    return null
+  }
+}
+
+/**
+ * 解析要调用的 Gateway 方法。
+ * - 纯文本：整段为 method，params 为空
+ * - JSON：`{ "method": "dcgchat.cron.list", "params": { "includeDisabled": true } }`
+ */
+export function parseGatewayRpcMessage(message: string): { method: string; params: Record<string, unknown> } {
+  const trimmed = message.trim()
+  if (!trimmed) {
+    throw new Error('message 为空')
+  }
+  if (!trimmed.startsWith('{')) {
+    return { method: trimmed, params: {} }
+  }
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(trimmed)
+  } catch {
+    throw new Error('message 不是合法 JSON')
+  }
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw new Error('message JSON 必须是对象')
+  }
+  const o = parsed as Record<string, unknown>
+  if (typeof o.method !== 'string' || !o.method.trim()) {
+    throw new Error('message JSON 须包含非空字符串字段 method')
+  }
+  if (o.params != null && (typeof o.params !== 'object' || Array.isArray(o.params))) {
+    throw new Error('message JSON 的 params 必须是对象')
+  }
+  return {
+    method: o.method.trim(),
+    params: (o.params as Record<string, unknown>) || {}
+  }
+}
+
+/** 任意 method + params，由调用方决定载荷 */
+export type GatewayRpcPayload = {
+  method: string
+  params?: Record<string, unknown>
+}
+
+let persistentConn: GatewayConnection | null = null
+let pingTimer: ReturnType<typeof setInterval> | null = null
+let reconnectTimer: ReturnType<typeof setTimeout> | null = null
+/** register 可能被调用多次，只保留一个「延迟首次连接」定时器，避免同一时刻触发两次 connect */
+let startupConnectTimer: ReturnType<typeof setTimeout> | null = null
+let connectInFlight = false
+let socketStopped = true
+/** 用于忽略「已被替换的旧连接」上的 close/error */
+let socketGeneration = 0
+
+function clearPingTimer(): void {
+  if (pingTimer) {
+    clearInterval(pingTimer)
+    pingTimer = null
+  }
+}
+
+function clearReconnectTimer(): void {
+  if (reconnectTimer) {
+    clearTimeout(reconnectTimer)
+    reconnectTimer = null
+  }
+}
+
+function clearStartupConnectTimer(): void {
+  if (startupConnectTimer) {
+    clearTimeout(startupConnectTimer)
+    startupConnectTimer = null
+  }
+}
+
+function startPingTimer(gw: GatewayConnection): void {
+  clearPingTimer()
+  pingTimer = setInterval(() => {
+    if (!gw.isConnected()) return
+    try {
+      gw.ping()
+    } catch (e) {
+      dcgLogger(`Gateway ping 失败: ${e}`, 'error')
+    }
+  }, PING_INTERVAL_MS)
+}
+
+function scheduleReconnect(): void {
+  if (socketStopped || reconnectTimer) return
+  reconnectTimer = setTimeout(() => {
+    reconnectTimer = null
+    void connectPersistentGateway()
+  }, RECONNECT_DELAY_MS)
+}
+
+function attachSocketLifecycle(gw: GatewayConnection, generation: number): void {
+  const ws = gw.getWebSocket()
+  if (!ws) return
+
+  const onDown = () => {
+    if (generation !== socketGeneration) return
+    clearPingTimer()
+    if (persistentConn === gw) {
+      persistentConn = null
+    }
+    dcgLogger('Gateway WebSocket 已断开，将在 5s 后重连', 'error')
+    if (!socketStopped) {
+      scheduleReconnect()
+    }
+  }
+
+  ws.once('close', onDown)
+  ws.once('error', onDown)
+}
+
+async function connectPersistentGateway(): Promise<void> {
+  if (socketStopped) return
+  if (persistentConn?.isConnected()) return
+  if (connectInFlight) return
+
+  const cfg = resolveConfigSafe()
+  if (!cfg) return
+
+  connectInFlight = true
+  try {
+    socketGeneration += 1
+    const generation = socketGeneration
+
+    if (persistentConn) {
+      try {
+        persistentConn.close()
+      } catch {
+        /* ignore */
+      }
+      persistentConn = null
+    }
+
+    const gw = new GatewayConnection(cfg)
+    await gw.connect()
+    if (socketStopped) {
+      try {
+        gw.close()
+      } catch {
+        /* ignore */
+      }
+      return
+    }
+    if (generation !== socketGeneration) {
+      try {
+        gw.close()
+      } catch {
+        /* ignore */
+      }
+      return
+    }
+    persistentConn = gw
+    attachSocketLifecycle(gw, generation)
+    startPingTimer(gw)
+    dcgLogger(`Gateway 持久连接成功 connId=${gw.getConnId() ?? '?'}`)
+  } catch (e) {
+    dcgLogger(`Gateway 连接失败11: ${e}`, 'error')
+    persistentConn = null
+    clearPingTimer()
+    if (!socketStopped) {
+      scheduleReconnect()
+    }
+  } finally {
+    connectInFlight = false
+  }
+}
+
+/**
+ * 插件 register 后调用：建立到 OpenClaw Gateway 的长连接，30s 一次 WebSocket ping，断线每 5s 重连。
+ */
+export function startDcgchatGatewaySocket(): void {
+  socketStopped = false
+  clearReconnectTimer()
+  if (startupConnectTimer != null) return
+  startupConnectTimer = null
+  void connectPersistentGateway()
+}
+
+/**
+ * 停止长连接与重连（例如测试或显式下线）。
+ */
+export function stopDcgchatGatewaySocket(): void {
+  socketStopped = true
+  clearReconnectTimer()
+  clearStartupConnectTimer()
+  clearPingTimer()
+  if (persistentConn) {
+    try {
+      persistentConn.close()
+    } catch {
+      /* ignore */
+    }
+    persistentConn = null
+  }
+}
+
+export function isDcgchatGatewaySocketConnected(): boolean {
+  return persistentConn?.isConnected() ?? false
+}
+
+/**
+ * 在已连接时调用 Gateway RPC；`params` 完全由调用方传入，不做固定结构。
+ */
+export async function callGatewayMethod<T = unknown>(method: string, params: Record<string, unknown> = {}): Promise<T> {
+  const gw = persistentConn
+  if (!gw?.isConnected()) {
+    throw new Error('Gateway 未连接（等待重连或检查配置）')
+  }
+  return gw.callMethod<T>(method, params)
+}
+
+/**
+ * 使用对象形式发送 RPC（推荐）。
+ */
+export async function sendGatewayRpc<T = unknown>(payload: GatewayRpcPayload): Promise<T> {
+  return callGatewayMethod<T>(payload.method, payload.params ?? {})
+}
+
+/**
+ * 兼容：字符串方法名，或 JSON 字符串 `{ method, params? }`。
+ */
+export async function sendMessageToGateway(message: string): Promise<unknown> {
+  const { method, params } = parseGatewayRpcMessage(message)
+  return callGatewayMethod(method, params)
+}

package/src/monitor.ts

@@ -2,12 +2,13 @@ import type { ClawdbotConfig, RuntimeEnv } from 'openclaw/plugin-sdk'
 import WebSocket from 'ws'
 import { handleDcgchatMessage } from './bot.js'
 import { resolveAccount } from './channel.js'
-import { setWsConnection, getOpenClawConfig } from './utils/global.js'
+import { setWsConnection, getOpenClawConfig, setMsgStatus, getSessionKey } from './utils/global.js'
 import type { InboundMessage } from './types.js'
-import { setMsgParams, setMsgStatus } from './utils/global.js'
 import { installSkill, uninstallSkill } from './skill.js'
 import { dcgLogger } from './utils/log.js'
+import { onDisabledCronJob, onEnabledCronJob, onRemoveCronJob, onRunCronJob } from './cron.js'
 import { ignoreToolCommand } from './utils/constant.js'
+import { isWsOpen } from './transport.js'
 
 export type MonitorDcgchatOpts = {
   config?: ClawdbotConfig
@@ -64,22 +65,24 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       heartbeatTimer = null
     }
   }
-
+  function onHeartbeat() {
+    if (isWsOpen()) {
+      const heartbeat = {
+        messageType: 'openclaw_bot_heartbeat',
+        _userId: Number(account.userId) || 0,
+        source: 'client',
+        content: {
+          bot_token: account.botToken,
+          status: '1'
+        }
+      }
+      ws?.send(JSON.stringify(heartbeat))
+    }
+  }
   const startHeartbeat = () => {
     stopHeartbeat()
     heartbeatTimer = setInterval(() => {
-      if (ws?.readyState === WebSocket.OPEN) {
-        const heartbeat = {
-          messageType: 'openclaw_bot_heartbeat',
-          _userId: Number(account.userId) || 0,
-          source: 'client',
-          content: {
-            bot_token: account.botToken,
-            status: '1'
-          }
-        }
-        ws.send(JSON.stringify(heartbeat))
-      }
+      onHeartbeat()
     }, HEARTBEAT_INTERVAL_MS)
   }
 
@@ -94,6 +97,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       dcgLogger(`socket connected`)
       setWsConnection(ws)
       startHeartbeat()
+      onHeartbeat()
     })
 
     ws.on('message', async (data) => {
@@ -109,7 +113,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       const heartbeat = isOpenclawBotHeartbeat(data, parsed)
       if (heartbeat) {
         heartbeatLogCounter += 1
-        if (heartbeatLogCounter % 10 === 0) {
+        if (heartbeatLogCounter % 10 === 0 || heartbeatLogCounter === 1) {
           dcgLogger(`${parsed?.messageType}, ${payloadStr}`)
           dcgLogger(`heartbeat ack received, ${payloadStr}`)
         }
@@ -126,38 +130,27 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
 
       if (parsed.messageType == 'openclaw_bot_chat') {
         const msg = parsed as unknown as InboundMessage
-        if (!ignoreToolCommand.includes(msg.content.text?.trim())) {
-          setMsgStatus('running')
+        // 与 monitor 原逻辑一致：工具类指令不进入 running，避免误触工具链监控
+        const effectiveSessionKey = getSessionKey(msg.content, account.accountId)
+        if (!ignoreToolCommand.includes(msg.content.text?.trim() ?? '')) {
+          setMsgStatus(effectiveSessionKey, 'running')
+        } else {
+          setMsgStatus(effectiveSessionKey, 'finished')
         }
-        // 设置获取用户消息消息参数
-        setMsgParams({
-          userId: msg._userId,
-          token: msg.content.bot_token,
-          sessionId: msg.content.session_id,
-          messageId: msg.content.message_id,
-          domainId: account.domainId || 1000,
-          appId: account.appId || '100',
-          botId: msg.content.bot_id,
-          agentId: msg.content.agent_id
-        })
-        msg.content.app_id = account.appId || '100'
-        msg.content.domain_id = account.domainId || '1000'
-
         await handleDcgchatMessage(msg, account.accountId)
       } else if (parsed.messageType == 'openclaw_bot_event') {
-        const { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id } = parsed.content
-          ? parsed.content
-          : ({} as Record<string, any>)
-        const content = {
-          event_type,
-          operation_type,
-          skill_url,
-          skill_code,
-          skill_id,
-          bot_token,
-          websocket_trace_id
-        }
+        const { event_type, operation_type } = parsed.content ? parsed.content : ({} as Record<string, any>)
         if (event_type === 'skill') {
+          const { skill_url, skill_code, skill_id, bot_token, websocket_trace_id } = parsed.content
+          const content = {
+            event_type,
+            operation_type,
+            skill_url,
+            skill_code,
+            skill_id,
+            bot_token,
+            websocket_trace_id
+          }
           if (operation_type === 'install' || operation_type === 'enable' || operation_type === 'update') {
             installSkill({ path: skill_url, code: skill_code }, content)
           } else if (operation_type === 'remove' || operation_type === 'disable') {
@@ -165,6 +158,17 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
           } else {
             dcgLogger(`openclaw_bot_event unknown event_type: ${event_type}, ${data.toString()}`)
           }
+        } else if (event_type === 'cron') {
+          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 === 'run') {
+            await onRunCronJob(job_id, message_id)
+          }
         } else {
           dcgLogger(`openclaw_bot_event unknown operation_type: ${operation_type}, ${data.toString()}`)
         }

package/src/request/api.ts

@@ -3,18 +3,11 @@ import type { IStsToken, IStsTokenReq } from '../types.js'
 import { getUserTokenCache, setUserTokenCache } from './userInfo.js'
 import { dcgLogger } from '../utils/log.js'
 
-export const getStsToken = async (name: string, botToken: string) => {
+export const getStsToken = async (name: string, botToken: string, isPrivate: 1 | 0) => {
   // 确保 userToken 已缓存（如果未缓存会自动获取并缓存）
   await getUserToken(botToken)
 
-  const response = await post<IStsTokenReq, IStsToken>(
-    '/user/getStsToken',
-    {
-      sourceFileName: name,
-      isPrivate: 1
-    },
-    { botToken }
-  )
+  const response = await post<IStsTokenReq, IStsToken>('/user/getStsToken', { sourceFileName: name, isPrivate }, { botToken })
 
   if (!response || !response.data || !response.data.bucket) {
     throw new Error('获取 OSS 临时凭证失败')
@@ -27,11 +20,7 @@ export const generateSignUrl = async (file_url: string, botToken: string) => {
     // 确保 userToken 已缓存（如果未缓存会自动获取并缓存）
     await getUserToken(botToken)
 
-    const response = await post<any>(
-      '/user/generateSignUrl',
-      { loudPlatform: 0, fileName: file_url },
-      { botToken }
-    )
+    const response = await post<any>('/user/generateSignUrl', { loudPlatform: 0, fileName: file_url }, { botToken })
     if (response.code === 0 && response.data) {
       // @ts-ignore
       return response.data?.filePath
@@ -48,10 +37,7 @@ export const generateSignUrl = async (file_url: string, botToken: string) => {
  * @returns userToken
  */
 export const queryUserTokenByBotToken = async (botToken: string): Promise<string> => {
-  const response = await post<{ botToken: string }, { token: string }>(
-    '/organization/queryUserTokenByBotToken',
-    { botToken }
-  )
+  const response = await post<{ botToken: string }, { token: string }>('/organization/queryUserTokenByBotToken', { botToken })
 
   if (!response || !response.data || !response.data.token) {
     dcgLogger('获取绑定的用户信息失败', 'error')

package/src/request/oss.ts

@@ -22,11 +22,11 @@ async function toUploadContent(
   return { content: buf, fileName: input.name }
 }
 
-export const ossUpload = async (file: File | string | Buffer, botToken: string) => {
+export const ossUpload = async (file: File | string | Buffer, botToken: string, isPrivate: 0 | 1 = 1) => {
   await getUserToken(botToken)
 
   const { content, fileName } = await toUploadContent(file)
-  const data = await getStsToken(fileName, botToken)
+  const data = await getStsToken(fileName, botToken, isPrivate)
 
   const options: OSS.Options = {
     // 从STS服务获取的临时访问密钥（AccessKey ID和AccessKey Secret）。
@@ -50,8 +50,9 @@ export const ossUpload = async (file: File | string | Buffer, botToken: string)
     if (objectResult?.res?.status !== 200) {
       dcgLogger(`OSS 上传失败, ${objectResult?.res?.status}`)
     }
-    dcgLogger(JSON.stringify(objectResult))
-    return objectResult.name || objectResult.url
+    dcgLogger(`OSS 上传成功, ${objectResult.name || objectResult.url}`)
+    // const url = `${data.protocol || 'http'}://${data.bucket}.${data.endPoint}/${data.uploadDir}${data.ossFileKey}`
+    return isPrivate === 1 ? objectResult.name || objectResult.url : objectResult.url
   } catch (error) {
     dcgLogger(`OSS 上传失败: ${error}`, 'error')
   }

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 { getMsgParams } from '../utils/global.js'
+import { getCurrentSessionKey, getEffectiveMsgParams } from '../utils/params.js'
 import { ENV } from '../utils/constant.js'
 import { dcgLogger } from '../utils/log.js'
 
@@ -172,7 +172,7 @@ export function post<T = Record<string, unknown>, R = unknown>(
     botToken?: string
   }
 ): Promise<IResponse<R>> {
-  const params = getMsgParams() || {}
+  const params = getEffectiveMsgParams(getCurrentSessionKey() ?? '') || {}
   const config: any = {
     method: 'POST',
     url,

package/src/skill.ts

@@ -8,6 +8,7 @@ import { getWorkspaceDir } from './utils/global.js'
 import { getWsConnection } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
 import { isWsOpen } from './transport.js'
+import { sendMessageToGateway } from './gateway/socket.js'
 
 type ISkillParams = {
   path: string
@@ -127,6 +128,7 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
         })
     })
     sendEvent({ ...msgContent, status: 'ok' })
+    sendMessageToGateway(JSON.stringify({ method: 'skills.status', params: {} }))
   } catch (error) {
     // 如果安装失败，清理目录
     if (fs.existsSync(skillDir)) {