@dcrays/dcgchat-test 0.3.33 → 0.3.35

package/package.json

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

package/src/cron.ts

@@ -55,12 +55,8 @@ async function runCronJobsUpload(sessionKey: string): Promise<void> {
   if (fs.existsSync(jobPath)) {
     try {
       const url = await ossUpload(jobPath, botToken ?? '', 0)
-      dcgLogger(`定时任务创建成功: ${url}`)
-      if (!sessionKey) {
-        dcgLogger(`runCronJobsUpload: missing sessionKey  on msgCtx`, 'error')
-        return
-      }
-      const sessionInfo = sessionKey.split(':')
+      dcgLogger(`定时任务更新成功: ${url}`)
+      const sessionInfo = sessionKey?.split(':') || []
       const sessionId = sessionInfo.at(-1) ?? ''
       const agentId = sessionInfo.at(-2) ?? ''
       const params = {
@@ -85,10 +81,6 @@ async function runCronJobsUpload(sessionKey: string): Promise<void> {
 export function sendDcgchatCron(jobId: string): void {
   const jobPath = getCronJobsPath()
   const { sessionKey } = readCronJob(jobPath, jobId) || {}
-  if (!sessionKey) {
-    dcgLogger('sendDcgchatCron: no message context (missing token / params)', 'error')
-    return
-  }
   dcgLogger(`sessionKey: ${sessionKey}, jobId: ${jobId}`)
   if (cronUploadFlushTimer !== null) {
     clearTimeout(cronUploadFlushTimer)

package/src/gateway/index.ts

@@ -368,6 +368,9 @@ export class GatewayConnection {
           if (msg.payload?.action === 'updated') {
             sendDcgchatCron(msg.payload?.jobId as string)
           }
+          if (msg.payload?.action === 'removed') {
+            sendDcgchatCron(msg.payload?.jobId as string)
+          }
           if (msg.payload?.action === 'finished') {
             finishedDcgchatCron(msg.payload?.jobId as string)
           }

package/src/monitor.ts

@@ -9,6 +9,7 @@ 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'
+import { onRemoveSession } from './session.js'
 
 export type MonitorDcgchatOpts = {
   config?: ClawdbotConfig
@@ -142,15 +143,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         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
-          }
+          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') {
@@ -169,6 +162,11 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
           } else if (operation_type === 'run') {
             await onRunCronJob(job_id, message_id)
           }
+        } else if (event_type === 'session') {
+          const { agent_id, session_id, agent_clone_code } = parsed.content
+          if (operation_type === 'remove') {
+            await onRemoveSession({ agent_id, session_id, agent_clone_code, account_id: accountId })
+          }
         } else {
           dcgLogger(`openclaw_bot_event unknown operation_type: ${operation_type}, ${data.toString()}`)
         }

package/src/session.ts

@@ -0,0 +1,19 @@
+import { sendMessageToGateway } from './gateway/socket.js'
+import { getSessionKey } from './utils/global.js'
+import { dcgLogger } from './utils/log.js'
+
+interface TSession {
+  agent_id: string
+  session_id: string
+  agent_clone_code?: string
+  account_id?: string
+}
+
+export const onRemoveSession = async ({ agent_id, session_id, agent_clone_code, account_id }: TSession) => {
+  const sessionKey = getSessionKey({ agent_id, session_id }, account_id)
+  if (!session_id) {
+    dcgLogger('onRemoveSession: empty session_id', 'error')
+    return
+  }
+  sendMessageToGateway(JSON.stringify({ method: 'sessions.delete', params: { key: sessionKey, deleteTranscript: true } }))
+}

package/src/utils/global.ts

@@ -117,7 +117,7 @@ export function clearSentMediaKeys(messageId?: string) {
   }
 }
 
-export const getSessionKey = (content: any, accountId: string) => {
+export const getSessionKey = (content: any, accountId?: string) => {
   const { real_mobook, agent_id, conversation_id, session_id } = content
   const core = getDcgchatRuntime()