@dcrays/dcgchat-test 0.3.37 → 0.3.38

package/index.ts

@@ -5,6 +5,7 @@ import { setDcgchatRuntime, setWorkspaceDir } from './src/utils/global.js'
 import { monitoringToolMessage } from './src/tool.js'
 import { setOpenClawConfig } from './src/utils/global.js'
 import { startDcgchatGatewaySocket } from './src/gateway/socket.js'
+import { createDcgchatMessageTool } from './src/tools/meeageToll.js'
 
 const plugin = {
   id: "dcgchat-test",
@@ -18,9 +19,8 @@ const plugin = {
     api.registerChannel({ plugin: dcgchatPlugin })
     setWorkspaceDir(api.config?.agents?.defaults?.workspace)
     api.registerTool((ctx) => {
-      const workspaceDir = ctx.workspaceDir
-      setWorkspaceDir(workspaceDir)
-      return null
+      setWorkspaceDir(ctx.workspaceDir)
+      return createDcgchatMessageTool(ctx)
     })
   }
 }

package/package.json

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

package/src/bot.ts

@@ -428,27 +428,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     if (![...systemCommand, ...interruptCommand].includes(text?.trim())) {
       if (sessionStreamSuppressed.has(effectiveSessionKey)) {
         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))
-          if (!resolved) continue
-          try {
-            await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl: resolved, text: '' })
-          } catch (err) {
-            dcgLogger(` sendDcgchatMedia error: ${String(err)}`, 'error')
-          }
-        }
       }
     }
     clearSentMediaKeys(msg.content.message_id)

package/src/tools/meeageToll.ts

@@ -0,0 +1,145 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { Type } from '@sinclair/typebox'
+import type { AnyAgentTool } from 'openclaw/plugin-sdk'
+import { jsonResult } from 'openclaw/plugin-sdk'
+
+/** 与 `registerTool` 工厂入参一致（主包未导出 `OpenClawPluginToolContext` 时仅用所需字段）。 */
+export type DcgchatMessageToolContext = {
+  sessionKey?: string
+  workspaceDir?: string
+}
+import { sendDcgchatMedia } from '../channel.js'
+import { getOutboundMsgParams } from '../utils/params.js'
+import { sendText } from '../transport.js'
+
+const SAFE_PREFIXES = ['/workspace/', '/mobook/']
+
+const fileType1 = ['.webp', '.gif', '.bmp', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.pdf', '.txt', '.rtf', '.odt', '.json']
+const fileType2 = ['.xml', '.csv', '.yaml', '.yml', '.html', '.htm', '.md', '.markdown', '.css', '.js', '.ts', '.png', '.jpg', '.jpeg']
+const fileType3 = ['.zip', '.rar', '.7z', '.tar', '.gz', '.bz2', '.xz', '.exe', '.dmg', '.pkg', '.apk', '.ipa', '.log', '.dat', '.bin']
+const fileType4 = ['.svg', '.ico', '.mp3', '.wav', '.ogg', '.aac', '.m4a', '.mp4', '.avi', '.mov', '.wmv', '.flv', '.mkv', '.webm']
+const SAFE_EXTENSIONS = new Set([...fileType1, ...fileType2, ...fileType3, ...fileType4])
+
+const messageToolParameters = {
+  type: 'object',
+  properties: {
+    content: {
+      type: 'string',
+      description: '发送文本内容'
+    },
+    media: {
+      type: 'array',
+      description: '发送附件',
+      items: {
+        type: 'object',
+        properties: {
+          file: {
+            type: 'string',
+            description: '文件路径，例如 /workspace/output/report.pdf'
+          }
+        },
+        required: ['file']
+      }
+    }
+  }
+}
+
+function extractPaths(text?: string) {
+  if (!text) return []
+  const regex = /(\/workspace\/[^\s]+|\/mobook\/[^\s]+)/g
+  return text.match(regex) ?? []
+}
+
+function isSafePath(filepath: string) {
+  return SAFE_PREFIXES.some((prefix) => filepath.startsWith(prefix))
+}
+
+function isSafeFile(filepath: string) {
+  if (!fs.existsSync(filepath)) return false
+  const stat = fs.statSync(filepath)
+  if (!stat.isFile()) return false
+  if (stat.size === 0) return false
+  const ext = path.extname(filepath)
+  return SAFE_EXTENSIONS.has(ext)
+}
+
+/**
+ * 书灵墨宝 message 工具：须符合 OpenClaw `AgentTool`（execute 返回 `AgentToolResult`）。
+ * 通过注册时的 `OpenClawPluginToolContext.sessionKey` 出站，不再使用非标准的 `execute(args, ctx)`。
+ */
+export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext): AnyAgentTool {
+  console.log('🚀 ~ createDcgchatMessageTool ~ pluginCtx:', pluginCtx)
+  return {
+    name: 'message',
+    label: 'message',
+    description: `
+      向用户发送消息。
+      如果发送附件：必须使用 media 字段
+      支持路径目录：
+      /workspace/
+      /mobook/
+      禁止直接输出路径文本
+    `,
+    parameters: messageToolParameters,
+    execute: async (_toolCallId, args, signal) => {
+      if (signal?.aborted) {
+        const err = new Error('Message send aborted')
+        err.name = 'AbortError'
+        throw err
+      }
+
+      const sessionKey = pluginCtx.sessionKey?.trim()
+      if (!sessionKey) {
+        return jsonResult({ error: '缺少 sessionKey，无法向当前会话发送消息' })
+      }
+
+      try {
+        const sentFiles = new Set<string>()
+
+        if (args.media?.length) {
+          for (const media of args.media) {
+            const filepath = media.file
+            if (!filepath) continue
+            if (!isSafePath(filepath)) continue
+            if (!isSafeFile(filepath)) continue
+            if (sentFiles.has(filepath)) continue
+
+            await sendDcgchatMedia({ sessionKey, mediaUrl: filepath })
+            sentFiles.add(filepath)
+          }
+        }
+
+        const fallbackPaths = extractPaths(args.content)
+        for (const filepath of fallbackPaths) {
+          if (!isSafePath(filepath)) continue
+          if (!isSafeFile(filepath)) continue
+          if (sentFiles.has(filepath)) continue
+
+          await sendDcgchatMedia({ sessionKey, mediaUrl: filepath })
+          sentFiles.add(filepath)
+        }
+
+        let content = args.content ?? ''
+        for (const filepath of sentFiles) {
+          content = content.replace(filepath, '')
+        }
+        content = content.trim()
+
+        if (content.length > 0) {
+          const msgCtx = getOutboundMsgParams(sessionKey)
+          sendText(content, msgCtx)
+        }
+
+        return jsonResult({
+          success: true,
+          sentMediaCount: sentFiles.size
+        })
+      } catch (err) {
+        return jsonResult({
+          error: err instanceof Error ? err.message : String(err)
+        })
+      }
+    }
+  }
+}