@dcrays/dcgchat-test 0.6.12 → 0.7.0

package/src/cron/message.ts

@@ -1,114 +0,0 @@
-import { isWsOpen, mergeDefaultParams, sendFinal, wsSendRaw } from '../transport.js'
-import {
-  getCronMessageId,
-  getWsConnection,
-  removeCronMessageId,
-  setCronMessageId,
-  takeApartSessionKey
-} from '../utils/global.js'
-import { dcgLogger } from '../utils/log.js'
-import { sendGatewayRpc } from '../gateway/socket.js'
-import { getParamsDefaults } from '../utils/params.js'
-import { getSessionKeyByJobId } from './params.js'
-import { deleteCronSessionKeyMap, deleteCronSessionKeyMapsForJob } from '../channel/outboundTarget.js'
-
-/**
- * 通过 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
-  }
-  try {
-    await sendGatewayRpc({ method: 'cron.remove', params: { id } })
-  } catch (err) {
-    dcgLogger(`onRemoveCronJob failed: id=${id}, error=${String(err)}`, 'error')
-  }
-}
-export const onDisabledCronJob = async (jobId: string) => {
-  const id = jobId?.trim()
-  if (!id) {
-    dcgLogger('onDisabledCronJob: empty jobId', 'error')
-    return
-  }
-  sendGatewayRpc({ method: 'cron.update', params: { id: jobId, patch: { enabled: false } } })
-}
-export const onEnabledCronJob = async (jobId: string) => {
-  const id = jobId?.trim()
-  if (!id) {
-    dcgLogger('onEnabledCronJob: empty jobId', 'error')
-    return
-  }
-  sendGatewayRpc({ method: 'cron.update', params: { id: jobId, patch: { enabled: true } } })
-}
-export const onRunCronJob = async (jobId: string, messageId: string) => {
-  const sessionKey = await getSessionKeyByJobId(jobId)
-  if (!sessionKey) {
-    dcgLogger(`onRunCronJob: no sessionKey for job id=${jobId}`, 'error')
-    return
-  }
-  setCronMessageId(sessionKey, messageId)
-  // sendGatewayRpc({
-  //   method: 'cron.runs',
-  //   params: { scope: 'job', id: jobId, limit: 50, offset: 0, status: 'all', sortDir: 'desc' }
-  // })
-  sendGatewayRpc({ method: 'cron.run', params: { id: jobId, mode: 'force' } })
-}
-/**
- * 发送定时完成摘要（纯文本）。
- */
-export const finishedDcgchatCron = async (jobId: string, summary?: string) => {
-  if (!jobId) {
-    dcgLogger('finishedDcgchatCron: empty jobId', 'error')
-    return
-  }
-  const cronData = (await sendGatewayRpc({ method: 'cron.get', params: { id: jobId } })) as Record<string, any>
-  const sessionKey = cronData?.sessionKey || cronData.delivery?.to?.replace('dcg-cron:', '').trim()
-  const name = cronData?.name
-  const description = cronData?.description
-
-  const messageId = getCronMessageId(sessionKey) || `${Date.now()}`
-  const { sessionId, agentId } = takeApartSessionKey(sessionKey)
-  const merged = mergeDefaultParams({
-    agentId: agentId,
-    sessionId: `${sessionId}`,
-    messageId: messageId || `${Date.now()}`,
-    real_mobook: !sessionId ? 1 : ''
-  })
-  if (summary) {
-    wsSendRaw(merged, { response: summary, message_tags: { source: 'cron' }, is_finish: -1 })
-  }
-  setTimeout(() => {
-    sendFinal(merged, 'cron send', '', { message_tags: { isFinal: 1 } })
-  }, 1250)
-  const ws = getWsConnection()
-  const baseContent = getParamsDefaults()
-  if (isWsOpen()) {
-    ws?.send(
-      JSON.stringify({
-        messageType: 'openclaw_bot_event',
-        source: 'client',
-        content: {
-          event_type: 'notify',
-          operation_type: 'cron',
-          bot_token: baseContent.botToken,
-          app_id: baseContent.appId,
-          session_id: sessionId,
-          agent_id: agentId,
-          real_mobook: !sessionId ? 1 : '',
-          title: name,
-          description: description
-        }
-      })
-    )
-  }
-  setTimeout(() => {
-    removeCronMessageId(sessionKey)
-    deleteCronSessionKeyMapsForJob(jobId)
-    deleteCronSessionKeyMap(sessionKey)
-  }, 1200)
-  dcgLogger(`finishedDcgchatCron: job=${jobId} sessionKey=${sessionKey}`)
-}

package/src/cron/params.ts

@@ -1,164 +0,0 @@
-import { PluginHookAfterToolCallEvent } from 'openclaw/plugin-sdk/plugin-runtime'
-import { dcgLogger } from '../utils/log.js'
-import { CHANNEL_ID } from '../utils/constant.js'
-import { sendGatewayRpc } from '../gateway/socket.js'
-import { sendEventMessage } from '../transport.js'
-import { isCronCreateExecCommand } from './toolGuard.js'
-
-// 为处理的jobId列表
-const processedJobIds = new Set<string>()
-// 定时任务执行时间处理
-export async function cronAddHandler(jobId: string) {
-  const hasSessionKey = await checkCronSessionKey(jobId, true)
-  if (!hasSessionKey) {
-    processedJobIds.add(jobId)
-  }
-}
-// 删除处理的jobId
-export function removeProcessedJobId(jobId: string) {
-  processedJobIds.delete(jobId)
-}
-
-export async function getSessionKeyByJobId(jobId: string) {
-  const cronData = (await sendGatewayRpc({ method: 'cron.get', params: { id: jobId } })) as Record<string, any>
-  return cronData?.sessionKey || cronData.delivery?.to?.replace('dcg-cron:', '').trim()
-}
-
-/**
- * 检查定时任务中是否含有sessionKey或deliveryTo，数据完整直接返回true，否则返回false 两者有一个补充数据更新
- * @param jobId
- * @returns
- */
-export async function checkCronSessionKey(jobId: string, isSend?: boolean) {
-  const cronData = (await sendGatewayRpc({ method: 'cron.get', params: { id: jobId } })) as Record<string, any>
-  if (!cronData) {
-    dcgLogger(`getJobIdBySessionKey failed for jobId: ${jobId}`, 'error')
-    return
-  }
-  const sessionKey = cronData?.sessionKey
-  const deliveryTo = cronData.delivery?.to?.replace('dcg-cron:', '').trim()
-  if (!sessionKey && !deliveryTo) {
-    dcgLogger(`checkCronSessionKey failed for jobId: ${jobId}`, 'error')
-    processedJobIds.add(jobId)
-    return false
-  }
-  if (sessionKey && deliveryTo) {
-    if (isSend) {
-      const params = {
-        event_type: 'cron',
-        operation_type: 'install',
-        data: cronData
-      }
-      sendEventMessage(params)
-    }
-    return true
-  }
-  return (await supplementSessionKey(jobId)) !== null
-}
-
-// 判断after_tool_call中是否含有jobId
-export function getJobIdInAfterToolCall(event: PluginHookAfterToolCallEvent) {
-  if (event.toolName !== 'cron') return null
-  if (!isCronAddAction(event.params)) return
-  if (event.error) return
-
-  const result = event.result as { details?: { id?: unknown } }
-  const jobId = result.details?.id
-
-  if (typeof jobId === 'string') {
-    return jobId
-  }
-  const evtStr = JSON.stringify(event)
-  // 便利processedJobIds，找到包含在evtStr的jobId
-  for (const id of processedJobIds) {
-    if (evtStr.includes(id)) {
-      return id
-    }
-  }
-  return null
-}
-
-// 添加jobId -> sessionKey 映射
-export async function cronAfterToolCallHandler(event: PluginHookAfterToolCallEvent, sessionKey: string) {
-  const jobId = getJobIdInAfterToolCall(event)
-  if (!jobId) return dcgLogger(`getJobIdInAfterToolCall failed for event not has jobId: ${JSON.stringify(event)}`, 'error')
-  jobIdToSessionKeyMap.set(jobId, sessionKey)
-  sessionKeyToJobIdMap.set(sessionKey, jobId)
-  const hasCompleteSessionKey = await checkCronSessionKey(jobId)
-  if (hasCompleteSessionKey) {
-    removeProcessedJobId(jobId)
-    return
-  }
-  if (processedJobIds.has(jobId)) {
-    await supplementSessionKey(jobId)
-  }
-}
-
-// jobId -> sessionKey 映射
-const jobIdToSessionKeyMap = new Map<string, string>()
-const sessionKeyToJobIdMap = new Map<string, string>()
-// 获取jobId -> sessionKey 映射
-function getJobIdToSessionKeyMap(jobId: string) {
-  return jobIdToSessionKeyMap.get(jobId)
-}
-// 删除jobId -> sessionKey 映射
-export function removeJobIdToSessionKeyMap(jobId: string) {
-  const sessionKey = jobIdToSessionKeyMap.get(jobId)
-  jobIdToSessionKeyMap.delete(jobId)
-  if (sessionKey) sessionKeyToJobIdMap.delete(sessionKey)
-}
-// 补充定时任务数据
-export async function supplementSessionKey(jobId: string) {
-  const sk = getJobIdToSessionKeyMap(jobId)
-  if (!sk) {
-    dcgLogger(`getJobIdToSessionKeyMap failed for jobId: ${jobId}`, 'error')
-    return null
-  }
-  const cronData = (await sendGatewayRpc({ method: 'cron.get', params: { id: jobId } })) as Record<string, any>
-  if (!cronData) {
-    dcgLogger(`getJobIdToSessionKeyMap failed for jobId: ${jobId}`, 'error')
-    return null
-  }
-  const patch = structuredClone(cronData)
-  patch.sessionKey = sk
-  if (!patch?.delivery) {
-    patch.delivery = {}
-  }
-  patch.delivery.to = `dcg-cron:${sk}`
-  patch.delivery.channel = CHANNEL_ID
-  delete patch.id
-  delete patch.createdAtMs
-  delete patch.updatedAtMs
-  try {
-    await sendGatewayRpc({ method: 'cron.update', params: { id: jobId, patch } })
-    removeProcessedJobId(jobId)
-    removeJobIdToSessionKeyMap(jobId)
-    return true
-  } catch (e) {
-    dcgLogger(`supplementSessionKey failed for jobId: ${jobId}: ${String(e)}`, 'error')
-    return null
-  }
-}
-
-export function isCronAddAction(params: unknown): boolean {
-  const record = params !== null && typeof params === 'object' && !Array.isArray(params) ? (params as Record<string, unknown>) : null
-  const action = typeof record?.action === 'string' ? record.action.trim().toLowerCase() : ''
-  return action === 'add' || action === 'create'
-}
-
-export { isCronCreateExecCommand } from './toolGuard.js'
-
-export function isCreateCronTool(event: { toolName: any; params: any; toolCallId: any }) {
-  const { toolName, params } = event
-
-  if (toolName === 'cron') {
-    return isCronAddAction(params)
-  }
-
-  if (toolName === 'exec') {
-    const record = params !== null && typeof params === 'object' && !Array.isArray(params) ? (params as Record<string, unknown>) : null
-    return isCronCreateExecCommand(record?.command)
-  }
-
-  return false
-}