@dcrays/dcgchat-test 0.3.20 → 0.3.23

package/package.json

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

package/src/bot.ts

@@ -1,20 +1,11 @@
-import fs from 'node:fs'
 import path from 'node:path'
 import type { ReplyPayload } from 'openclaw/plugin-sdk'
 import { createReplyPrefixContext } from 'openclaw/plugin-sdk'
 import type { InboundMessage } from './types.js'
-import os from 'node:os'
-import {
-  clearSentMediaKeys,
-  getDcgchatRuntime,
-  getOpenClawConfig,
-  getSessionKey,
-  getWorkspaceDir,
-  setMsgStatus
-} from './utils/global.js'
+import { clearSentMediaKeys, getDcgchatRuntime, getOpenClawConfig, getSessionKey, setMsgStatus } from './utils/global.js'
 import { resolveAccount, sendDcgchatMedia } from './channel.js'
 import { generateSignUrl } from './request/api.js'
-import { extractMobookFiles } from './utils/searchFile.js'
+import { extractMobookFiles, getFilePathByFile } from './utils/searchFile.js'
 import { sendChunk, sendFinal, sendText as sendTextMsg, sendError, wsSendRaw, sendText } from './transport.js'
 import { dcgLogger } from './utils/log.js'
 import { channelInfo, systemCommand, interruptCommand, ENV, ignoreToolCommand } from './utils/constant.js'
@@ -412,18 +403,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         sessionStreamSuppressed.delete(effectiveSessionKey)
       } else {
         for (const file of extractMobookFiles(completeText)) {
-          const candidates: string[] = [file]
-          candidates.push(path.join(getWorkspaceDir(), file))
-          candidates.push(path.join(getWorkspaceDir(), file.replace(/^\//, '')))
-          const underMobook = file.replace(/^\/mobook\//i, '').replace(/^mobook[\\/]/i, '')
-          if (underMobook) {
-            if (process.platform === 'win32') {
-              candidates.push(path.join('C:\\', 'mobook', underMobook))
-            } else if (process.platform === 'darwin') {
-              candidates.push(path.join(os.homedir(), 'mobook', underMobook))
-            }
-          }
-          const resolved = candidates.find((p) => fs.existsSync(p))
+          const resolved = getFilePathByFile(file)
           if (!resolved) continue
           try {
             await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl: resolved, text: '' })

package/src/cron.ts

@@ -1,8 +1,15 @@
 import path from 'node:path'
 import fs from 'node:fs'
 import type { IMsgParams } from './types.js'
-import { mergeDefaultParams, sendEventMessage, sendFinal } from './transport.js'
-import { getCronMessageId, getWorkspaceDir, removeCronMessageId, setCronMessageId, setMsgStatus } from './utils/global.js'
+import { isWsOpen, mergeDefaultParams, sendEventMessage, sendFinal } from './transport.js'
+import {
+  getCronMessageId,
+  getWorkspaceDir,
+  getWsConnection,
+  removeCronMessageId,
+  setCronMessageId,
+  setMsgStatus
+} from './utils/global.js'
 import { ossUpload } from './request/oss.js'
 import { dcgLogger } from './utils/log.js'
 import { sendMessageToGateway } from './gateway/socket.js'
@@ -16,13 +23,13 @@ export function getCronJobsPath(): string {
 
 type CronJobsFile = {
   version?: number
-  jobs?: Array<{ id?: string; sessionKey?: string }>
+  jobs?: Array<{ id?: string; sessionKey?: string; name?: string }>
 }
 
 /**
  * 在 `jobPath` 指向的 jobs.json（通常为 getCronJobsPath()）中按 id 查找任务并返回其 sessionKey。
  */
-export function readCronJobSessionKey(jobPath: string, jobId: string): string | null {
+export function readCronJob(jobPath: string, jobId: string): Record<string, any> | null {
   const id = jobId?.trim()
   if (!id) return null
   if (!fs.existsSync(jobPath)) {
@@ -33,8 +40,7 @@ export function readCronJobSessionKey(jobPath: string, jobId: string): string |
     const raw = fs.readFileSync(jobPath, 'utf8')
     const data = JSON.parse(raw) as CronJobsFile
     const job = (data.jobs ?? []).find((j) => j.id === id)
-    const sk = job?.sessionKey?.trim()
-    return sk || null
+    return job || null
   } catch (e) {
     dcgLogger(`readCronJobSessionKey: failed to read ${jobPath}: ${String(e)}`, 'error')
     return null
@@ -131,13 +137,19 @@ export const onRunCronJob = async (jobId: string, messageId: string) => {
     return
   }
   const jobPath = getCronJobsPath()
-  const sessionKey = readCronJobSessionKey(jobPath, jobId) || ''
+  const { sessionKey } = readCronJob(jobPath, jobId) || {}
   if (!sessionKey) {
     dcgLogger(`finishedDcgchatCron: no sessionKey for job id=${id}`, 'error')
     return
   }
   setCronMessageId(sessionKey, messageId)
-  sendMessageToGateway(JSON.stringify({ method: 'cron.run', params: { id: jobId } }))
+  sendMessageToGateway(
+    JSON.stringify({
+      method: 'cron.runs',
+      params: { scope: 'job', id: jobId, limit: 50, offset: 0, status: 'all', sortDir: 'desc' }
+    })
+  )
+  sendMessageToGateway(JSON.stringify({ method: 'cron.run', params: { id: jobId, mode: 'force' } }))
 }
 export const finishedDcgchatCron = async (jobId: string) => {
   const id = jobId?.trim()
@@ -146,20 +158,20 @@ export const finishedDcgchatCron = async (jobId: string) => {
     return
   }
   const jobPath = getCronJobsPath()
-  const sessionKey = readCronJobSessionKey(jobPath, id)
+  const { sessionKey, name } = readCronJob(jobPath, id) || {}
   if (!sessionKey) {
     dcgLogger(`finishedDcgchatCron: no sessionKey for job id=${id}`, 'error')
     return
   }
   const outboundCtx = getEffectiveMsgParams(sessionKey)
   const messageId = getCronMessageId(sessionKey)
+  const sessionInfo = sessionKey.split(':')
+  const sessionId = sessionInfo.at(-1) ?? ''
+  const agentId = sessionInfo.at(-2) ?? ''
   if (outboundCtx?.sessionId) {
     const newCtx = messageId ? { ...outboundCtx, messageId } : outboundCtx
     sendFinal(newCtx, 'cron send')
   } else {
-    const sessionInfo = sessionKey.split(':')
-    const sessionId = sessionInfo.at(-1) ?? ''
-    const agentId = sessionInfo.at(-2) ?? ''
     const merged = mergeDefaultParams({
       agentId: agentId,
       sessionId: `${sessionId}`,
@@ -169,6 +181,24 @@ export const finishedDcgchatCron = async (jobId: string) => {
     })
     sendFinal(merged, 'cron send')
   }
+  const ws = getWsConnection()
+  if (isWsOpen()) {
+    ws?.send(
+      JSON.stringify({
+        messageType: 'openclaw_bot_event',
+        source: 'client',
+        content: {
+          event_type: 'notify',
+          operation_type: 'cron',
+          session_id: sessionId,
+          agentId: agentId,
+          real_mobook: !sessionId ? 1 : '',
+          title: name
+        }
+      })
+    )
+    dcgLogger(`定时任务执行成功: ${id}`)
+  }
   removeCronMessageId(sessionKey)
   dcgLogger(`finishedDcgchatCron: job=${id} sessionKey=${sessionKey}`)
 }

package/src/gateway/index.ts

@@ -4,6 +4,7 @@ import crypto from 'crypto'
 import { deriveDeviceIdFromPublicKey, publicKeyRawBase64UrlFromPem, buildDeviceAuthPayloadV3, signDevicePayload } from './security.js'
 import { dcgLogger } from '../utils/log.js'
 import { finishedDcgchatCron, sendDcgchatCron } from '../cron.js'
+import { getWorkspaceDir } from '../utils/global.js'
 
 export interface GatewayEvent {
   type: string
@@ -114,7 +115,8 @@ export class GatewayConnection {
   private loadOrCreateDeviceIdentity() {
     const fs = require('fs')
     const path = require('path')
-    const stateDir = path.join(process.cwd(), '.state')
+    const workspaceDir = getWorkspaceDir()
+    const stateDir = path.join(workspaceDir, '.state')
     const deviceFile = path.join(stateDir, 'device.json')
 
     // Try to load existing identity

package/src/request/api.ts

@@ -7,7 +7,7 @@ export const getStsToken = async (name: string, botToken: string, isPrivate: 1 |
   // 确保 userToken 已缓存（如果未缓存会自动获取并缓存）
   await getUserToken(botToken)
 
-  const response = await post<IStsTokenReq, IStsToken>('/user/getStsToken', { sourceFileName: name, isPrivate }, { botToken })
+  const response = await post<IStsTokenReq, IStsToken>('/user/getStsTokenByAsync', { sourceFileName: name, isPrivate }, { botToken })
 
   if (!response || !response.data || !response.data.bucket) {
     throw new Error('获取 OSS 临时凭证失败')

package/src/request/oss.ts

@@ -38,7 +38,9 @@ export const ossUpload = async (file: File | string | Buffer, botToken: string,
     bucket: data.bucket,
     endpoint: data.endPoint,
     region: data.region,
-    secure: true
+    secure: true,
+    cname: true,
+    authorizationV4: true
   }
 
   const client = new OSS(options)

package/src/utils/searchFile.ts

@@ -1,4 +1,8 @@
+import { getWorkspaceDir } from './global.js'
 import { dcgLogger } from './log.js'
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
 
 /**
  * 从文本中提取 /mobook 目录下的文件
@@ -155,7 +159,7 @@ export function extractMobookFiles(text = '') {
     ;(text.match(backtickReg) || []).forEach((item) => {
       const name = item.replace(/`/g, '').trim()
       if (isValidFileName(name)) {
-        result.add(`/mobook/${name}`)
+        result.add(`${name}`)
       }
     })
     // 2️⃣ /mobook/xxx.xxx
@@ -168,7 +172,7 @@ export function extractMobookFiles(text = '') {
     ;(text.match(winMobookReg) || []).forEach((full) => {
       const name = full.replace(/^(?:[a-zA-Z]:)?[/\\\\]mobook[/\\\\]/i, '').trim()
       if (isValidFileName(name)) {
-        result.add(normalizePath(`/mobook/${name}`))
+        result.add(normalizePath(`${name}`))
       }
     })
     // 3️⃣ mobook下的 xxx.xxx
@@ -184,7 +188,7 @@ export function extractMobookFiles(text = '') {
     ;(text.match(boldReg) || []).forEach((item) => {
       const name = item.replace(/\*\*/g, '').trim()
       if (isValidFileName(name)) {
-        result.add(`/mobook/${name}`)
+        result.add(`${name}`)
       }
     })
     // 🆕 5️⃣ xxx.xxx (123字节)
@@ -192,7 +196,7 @@ export function extractMobookFiles(text = '') {
     ;(text.match(looseReg) || []).forEach((item) => {
       const name = item.replace(/\s*\(.+$/, '').trim()
       if (isValidFileName(name)) {
-        result.add(`/mobook/${name}`)
+        result.add(`${name}`)
       }
     })
     // 6️⃣ 兜底：绝对路径等 `.../mobook/<文件名>.<扩展名>` + 最长后缀匹配 + 去脏字符
@@ -226,3 +230,85 @@ function normalizePath(path: string) {
     .replace(/\/+/g, '/') // 多斜杠 → 单斜杠
     .replace(/\/$/, '') // 去掉结尾 /
 }
+
+/** mobook 下按文件名递归查找：仅在直线路径均失败时调用；有深度/目录数上限，找到即停 */
+const MOBOOK_FIND_MAX_DEPTH = 10
+const MOBOOK_FIND_MAX_DIRS = 2000
+
+function findMobookFileByBasename(mobookRoot: string, basename: string): string | undefined {
+  if (!basename || basename === '.' || basename === '..') return undefined
+  if (!fs.existsSync(mobookRoot)) return undefined
+  const caseInsensitive = process.platform === 'win32' || process.platform === 'darwin'
+  const want = caseInsensitive ? basename.toLowerCase() : basename
+
+  const stack: Array<{ dir: string; depth: number }> = [{ dir: mobookRoot, depth: 0 }]
+  let dirsVisited = 0
+
+  while (stack.length > 0 && dirsVisited < MOBOOK_FIND_MAX_DIRS) {
+    const { dir, depth } = stack.pop()!
+    if (depth > MOBOOK_FIND_MAX_DEPTH) continue
+    dirsVisited += 1
+
+    let entries: fs.Dirent[]
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true })
+    } catch {
+      continue
+    }
+
+    const subdirs: string[] = []
+    for (const ent of entries) {
+      const full = path.join(dir, ent.name)
+      if (ent.isFile()) {
+        const ok = caseInsensitive ? ent.name.toLowerCase() === want : ent.name === basename
+        if (ok) return full
+      } else if (ent.isDirectory() && depth < MOBOOK_FIND_MAX_DEPTH) {
+        if (ent.name.startsWith('.')) continue
+        subdirs.push(full)
+      }
+    }
+    for (let i = subdirs.length - 1; i >= 0; i--) {
+      stack.push({ dir: subdirs[i]!, depth: depth + 1 })
+    }
+  }
+  return undefined
+}
+
+function getMobookRoot(): string | undefined {
+  if (process.platform === 'win32') return path.join('C:\\', 'mobook')
+  if (process.platform === 'darwin') return path.join(os.homedir(), 'mobook')
+  return undefined
+}
+
+export function getFilePathByFile(file: string) {
+  const ws = getWorkspaceDir()
+  const candidates: string[] = [file]
+  candidates.push(path.join(ws, file))
+  candidates.push(path.join(ws, file.replace(/^\//, '')))
+  const underMobook = file.replace(/^\/mobook\//i, '').replace(/^mobook[\\/]/i, '')
+  const workspaceMobookRoot = path.join(ws, 'mobook')
+  const homeMobookRoot = underMobook ? getMobookRoot() : undefined
+
+  if (underMobook) {
+    if (fs.existsSync(workspaceMobookRoot)) {
+      candidates.push(path.join(workspaceMobookRoot, underMobook))
+    }
+    if (homeMobookRoot) {
+      candidates.push(path.join(homeMobookRoot, underMobook))
+    }
+  }
+  const resolved = candidates.find((p) => fs.existsSync(p))
+  if (resolved) return resolved
+
+  if (!underMobook) return undefined
+  const base = path.basename(underMobook)
+  if (fs.existsSync(workspaceMobookRoot)) {
+    const inWorkspace = findMobookFileByBasename(workspaceMobookRoot, base)
+    if (inWorkspace) return inWorkspace
+  }
+  if (homeMobookRoot) {
+    const inHome = findMobookFileByBasename(homeMobookRoot, base)
+    if (inHome) return inHome
+  }
+  return undefined
+}