@dcrays/dcgchat-test 0.4.26 → 0.4.28

package/index.ts

@@ -3,12 +3,11 @@ import { emptyPluginConfigSchema } from 'openclaw/plugin-sdk'
 import { dcgchatPlugin } from './src/channel.js'
 import { setDcgchatRuntime, setWorkspaceDir } from './src/utils/global.js'
 import { monitoringToolMessage } from './src/tool.js'
-import { channelInfo, ENV } from './src/utils/constant.js'
 import { setOpenClawConfig } from './src/utils/global.js'
 import { createDcgchatMessageTool } from './src/tools/messageTool.js'
 
 const plugin = {
-  id: channelInfo[ENV],
+  id: "dcgchat-test",
   name: '书灵墨宝',
   description: '连接 OpenClaw 与 书灵墨宝 产品（WebSocket）',
   configSchema: emptyPluginConfigSchema(),

package/openclaw.plugin.json

@@ -1,9 +1,11 @@
 {
   "id": "dcgchat-test",
-  "channels": ["dcgchat-test"],
+  "channels": [
+    "dcgchat-test"
+  ],
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
     "properties": {}
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.4.26",
+  "version": "0.4.28",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",
@@ -16,12 +16,6 @@
     "websocket",
     "ai"
   ],
-  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "build:production": "npx tsx scripts/build.ts production",
-    "build:prod": "npx tsx scripts/build.ts production",
-    "build:test": "npx tsx scripts/build.ts test"
-  },
   "dependencies": {
     "ali-oss": "file:src/libs/ali-oss-6.23.0.tgz",
     "axios": "file:src/libs/axios-1.13.6.tgz",
@@ -37,19 +31,15 @@
       "id": "dcgchat-test",
       "label": "书灵墨宝",
       "selectionLabel": "书灵墨宝",
-      "docsPath": "/channels/dcgchat",
+      "docsPath": "/channels/dcgchat-test",
       "docsLabel": "dcgchat-test",
       "blurb": "连接 OpenClaw 与 书灵墨宝 产品",
       "order": 80
     },
     "install": {
       "npmSpec": "@dcrays/dcgchat-test",
-      "localPath": "extensions/dcgchat",
+      "localPath": "extensions/dcgchat-test",
       "defaultChoice": "npm"
     }
-  },
-  "devDependencies": {
-    "openclaw": "^2026.3.13",
-    "typescript": "~5.8.0"
   }
 }

package/src/bot.ts

@@ -190,7 +190,7 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
 
   const route = core.channel.routing.resolveAgentRoute({
     cfg: config,
-    channel: channelInfo[ENV],
+    channel: "dcgchat-test",
     accountId: account.accountId,
     peer: { kind: 'direct', id: conversationId }
   })
@@ -207,7 +207,7 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
     sessionId: conversationId,
     messageId: msg.content.message_id,
     domainId: msg.content.domain_id,
-    appId: config.channels?.[channelInfo[ENV]]?.appId || 100,
+    appId: config.channels?.["dcgchat-test"]?.appId || 100,
     botId: msg.content.bot_id ?? '',
     agentId: msg.content.agent_id ?? '',
     sessionKey: dcgSessionKey,
@@ -269,13 +269,13 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
       ChatType: 'direct',
       SenderName: agentDisplayName,
       SenderId: userId,
-      Provider: channelInfo[ENV],
-      Surface: channelInfo[ENV],
+      Provider: "dcgchat-test",
+      Surface: "dcgchat-test",
       MessageSid: msg.content.message_id,
       Timestamp: Date.now(),
       WasMentioned: true,
       CommandAuthorized: true,
-      OriginatingChannel: channelInfo[ENV],
+      OriginatingChannel: "dcgchat-test",
       OriginatingTo: dcgSessionKey,
       Target: dcgSessionKey,
       SourceTarget: dcgSessionKey,
@@ -298,7 +298,7 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
     const prefixContext = createReplyPrefixContext({
       cfg: config,
       agentId: effectiveAgentId ?? '',
-      channel: channelInfo[ENV],
+      channel: "dcgchat-test",
       accountId: account.accountId
     })
 
@@ -479,7 +479,7 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
         ctx: ctxPayload,
         updateLastRoute: {
           sessionKey: dcgSessionKey,
-          channel: channelInfo[ENV],
+          channel: "dcgchat-test",
           to: dcgSessionKey,
           accountId: route.accountId
         },

package/src/channel.ts

@@ -13,7 +13,6 @@ import {
   setCronMessageId
 } from './utils/global.js'
 import { isWsOpen, mergeDefaultParams, mergeSessionParams, sendFinal, wsSendRaw } from './transport.js'
-import { channelInfo, ENV } from './utils/constant.js'
 import { dcgLogger, setLogger } from './utils/log.js'
 import { getOutboundMsgParams, getParamsMessage } from './utils/params.js'
 import { isSessionActiveForTool } from './tool.js'
@@ -21,7 +20,7 @@ import { startDcgchatGatewaySocket } from './gateway/socket.js'
 import { getCronJobsPath, readCronJob } from './cron.js'
 
 function dcgchatChannelCfg(): DcgchatConfig {
-  return (getOpenClawConfig()?.channels?.[channelInfo[ENV]] as DcgchatConfig | undefined) ?? {}
+  return (getOpenClawConfig()?.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
 }
 
 /** `agent:<code>:mobook:direct:<agentId>:<sessionId>`（与 getSessionKey 非 real_mobook 分支一致） */
@@ -222,8 +221,8 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
   const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
   const notMessageId = `${msgCtx?.messageId}`?.length === 13 || !msgCtx?.messageId
   try {
-    const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.[channelInfo[ENV]]?.botToken ?? ''
-    const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
+    const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat-test"]?.botToken ?? ''
+    const url = mediaUrl ? await ossUpload(mediaUrl, botToken, 1) : ''
     if (!msgCtx.agentId) {
       msgCtx.agentId = agentId
     }
@@ -247,7 +246,7 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
 
 export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null): ResolvedDcgchatAccount {
   const id = accountId ?? DEFAULT_ACCOUNT_ID
-  const raw = (cfg.channels?.[channelInfo[ENV]] as DcgchatConfig | undefined) ?? {}
+  const raw = (cfg.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
   return {
     accountId: id,
     enabled: raw.enabled !== false,
@@ -261,13 +260,13 @@ export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null):
 }
 
 export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
-  id: channelInfo[ENV],
+  id: "dcgchat-test",
   meta: {
-    id: channelInfo[ENV],
+    id: "dcgchat-test",
     label: '书灵墨宝',
     selectionLabel: '书灵墨宝',
     docsPath: '/channels/dcgchat',
-    docsLabel: channelInfo[ENV],
+    docsLabel: "dcgchat-test",
     blurb: '连接 OpenClaw 与 书灵墨宝 产品',
     order: 80
   },
@@ -284,7 +283,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     // blockStreaming: true,
   },
   /** 当前构建的 channel id + 兼容旧配置键 `channels.dcgchat` */
-  reload: { configPrefixes: [`channels.${channelInfo[ENV]}`, 'channels.dcgchat'] },
+  reload: { configPrefixes: [`channels.${"dcgchat-test"}`, 'channels.dcgchat'] },
   configSchema: {
     schema: {
       type: 'object',
@@ -320,7 +319,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     resolveAccount: (cfg, accountId) => resolveAccount(cfg, accountId),
     defaultAccountId: () => DEFAULT_ACCOUNT_ID,
     setAccountEnabled: ({ cfg, enabled }) => {
-      const channelKey = channelInfo[ENV]
+      const channelKey = "dcgchat-test"
       const prev = (cfg.channels?.[channelKey as keyof NonNullable<typeof cfg.channels>] as Record<string, unknown> | undefined) ?? {}
       return {
         ...cfg,
@@ -392,7 +391,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
             if (!isSessionActiveForTool(to)) {
               dcgLogger(`channel sendText dropped (session not active): to=${to}`)
               return {
-                channel: channelInfo[ENV],
+                channel: "dcgchat-test",
                 messageId: '',
                 chatId: outboundChatId(ctx.to, to)
               }
@@ -404,7 +403,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         }
       }
       return {
-        channel: channelInfo[ENV],
+        channel: "dcgchat-test",
         messageId: `${messageId}`,
         chatId: outboundChatId(ctx.to, to)
       }
@@ -425,7 +424,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       if (!sessionId) {
         dcgLogger(`channel sendMedia to ${ctx.to} -> sessionId not found`, 'error')
         return {
-          channel: channelInfo[ENV],
+          channel: "dcgchat-test",
           messageId,
           chatId: outboundChatId(ctx.to, to || '')
         }
@@ -444,7 +443,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         })
       }
       return {
-        channel: channelInfo[ENV],
+        channel: "dcgchat-test",
         messageId,
         chatId: outboundChatId(ctx.to, to || '')
       }

package/src/cronToolCall.ts

@@ -137,7 +137,7 @@ function patchCronDeliveryInParams(
     if (agentId) d.accountId = agentId
     if (announceNoChannel) {
       d.bestEffort = true
-      d.channel = 'dcgchat-test'
+      d.channel = "dcgchat-test"
     }
   }
 
@@ -191,7 +191,7 @@ export function cronToolCall(event: { toolName: any; params: any; toolCallId: an
     if (params.command.indexOf('cron create') > -1 || params.command.indexOf('cron add') > -1) {
       const newParams = JSON.parse(JSON.stringify(params)) as Record<string, unknown>
       newParams.command =
-        params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${'dcgchat-test'}  --to dcg-cron:${sk} --json`
+        params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${"dcgchat-test"}  --to dcg-cron:${sk} --json`
       return { params: newParams }
     } else {
       return undefined

package/src/request/oss.ts

@@ -1,32 +1,89 @@
-import { createReadStream } from 'node:fs'
+import { fileURLToPath } from 'node:url'
 // @ts-ignore
 import OSS from 'ali-oss'
 import { getStsToken, getUserToken } from './api.js'
 import { dcgLogger } from '../utils/log.js'
 
-/** 将 File/路径/Buffer 转为 ali-oss put 所需的 Buffer 或 ReadableStream */
-async function toUploadContent(
-  input: File | string | Buffer
-): Promise<{ content: Buffer | ReturnType<typeof createReadStream>; fileName: string }> {
+/** 分片大小：OSS 要求每片 ≥100 KB（最后一片可更小） */
+const MULTIPART_PART_SIZE = 1024 * 1024
+
+/** ali-oss 默认 timeout 为 60s，大文件单 PUT 或慢网易触发 ResponseTimeoutError */
+const OSS_HTTP_TIMEOUT_MS = 10 * 60 * 1000
+
+/** 归一化入参，避免 file://、包装对象、TypedArray 等导致 SDK 识别失败 */
+function coerceOssFileInput(input: File | string | Buffer): File | string | Buffer {
+  if (typeof input === 'string') {
+    const t = input.trim()
+    if (t.startsWith('file:')) {
+      try {
+        return fileURLToPath(t)
+      } catch {
+        return input
+      }
+    }
+    return input
+  }
+  if (Buffer.isBuffer(input)) {
+    return input
+  }
+  if (input && typeof input === 'object') {
+    if (ArrayBuffer.isView(input) && !(input instanceof DataView) && !Buffer.isBuffer(input)) {
+      const v = input as ArrayBufferView
+      return Buffer.from(v.buffer, v.byteOffset, v.byteLength)
+    }
+    const o = input as unknown as Record<string, unknown>
+    const p = o.path ?? o.filePath
+    if (typeof p === 'string' && p.trim()) return p.trim()
+  }
+  return input
+}
+
+function resolveMime(input: File | string | Buffer): string {
+  if (typeof input !== 'string' && !Buffer.isBuffer(input) && input.type) {
+    return input.type
+  }
+  return 'application/octet-stream'
+}
+
+/**
+ * 将 File/路径/Buffer 转为 ali-oss 接受的类型。
+ * 本地路径保持为字符串：put 内部用 contentLength + ReadStream，大文件也稳定。
+ */
+async function toUploadContent(input: File | string | Buffer): Promise<{ content: Buffer | string; fileName: string }> {
   if (Buffer.isBuffer(input)) {
     return { content: input, fileName: 'file' }
   }
   if (typeof input === 'string') {
     return {
-      content: createReadStream(input),
-      fileName: input.split('/').pop() ?? 'file'
+      content: input,
+      fileName: input.split(/[/\\]/).pop() ?? 'file'
     }
   }
-  // File: ali-oss 需要 Buffer/Stream，用 arrayBuffer 转 Buffer
   const buf = Buffer.from(await input.arrayBuffer())
-  return { content: buf, fileName: input.name }
+  const n = (input as { name?: string }).name
+  return { content: buf, fileName: typeof n === 'string' && n ? n : 'file' }
 }
 
-export const ossUpload = async (file: File | string | Buffer, botToken: string, isPrivate: 0 | 1 = 1) => {
+export type OssUploadOptions = {
+  /** 分片上传进度，p 为 0～1（仅大 Buffer 分片时触发） */
+  onProgress?: (p: number) => void
+  /** HTTP 超时（毫秒），覆盖默认 15 分钟；可传 `30 * 60 * 1000` 等 */
+  timeoutMs?: number
+}
+
+export const ossUpload = async (
+  rawFile: File | string | Buffer,
+  botToken: string,
+  isPrivate: 0 | 1 = 1,
+  uploadOptions?: OssUploadOptions
+) => {
   await getUserToken(botToken)
 
+  const file = coerceOssFileInput(rawFile)
   const { content, fileName } = await toUploadContent(file)
   const data = await getStsToken(fileName, botToken, isPrivate)
+  const mime = resolveMime(file)
+  const onProgress = uploadOptions?.onProgress
 
   const options: OSS.Options = {
     // 从STS服务获取的临时访问密钥（AccessKey ID和AccessKey Secret）。
@@ -40,7 +97,8 @@ export const ossUpload = async (file: File | string | Buffer, botToken: string,
     region: data.region,
     secure: true,
     cname: true,
-    authorizationV4: true
+    authorizationV4: true,
+    timeout: uploadOptions?.timeoutMs ?? OSS_HTTP_TIMEOUT_MS
   }
 
   const client = new OSS(options)
@@ -48,12 +106,22 @@ export const ossUpload = async (file: File | string | Buffer, botToken: string,
   const name = `${data.uploadDir}${data.ossFileKey}`
 
   try {
-    const objectResult = await client.put(name, content)
+    let objectResult: OSS.PutObjectResult | OSS.CompleteMultipartUploadResult
+
+    const multipartUploadOptions: OSS.MultipartUploadOptions = {
+      progress: (p: number) => {
+        onProgress?.(p)
+      },
+      parallel: 4,
+      partSize: MULTIPART_PART_SIZE,
+      mime
+    }
+    objectResult = await client.multipartUpload(name, content, multipartUploadOptions)
+
     if (objectResult?.res?.status !== 200) {
       dcgLogger(`OSS 上传失败, ${objectResult?.res?.status}`)
     }
     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/utils/constant.ts

@@ -1,9 +1,5 @@
 export const ENV: 'production' | 'test' | 'develop' = 'test'
 
-export const channelInfo: Record<string, string> = {
-  production: 'dcgchat',
-  test: 'dcgchat-test'
-}
 
 export const systemCommand = ['/new', '/status']
 export const stopCommand = ['/stop']

package/src/utils/global.ts

@@ -30,7 +30,7 @@ export function getOpenClawConfig(): OpenClawConfig | null {
 function getWorkspacePath(): string | null {
   const workspacePath = path.join(
     os.homedir(),
-    config?.channels?.[channelInfo[ENV]]?.appId == 110 ? '.mobook' : '.openclaw',
+    config?.channels?.["dcgchat-test"]?.appId == 110 ? '.mobook' : '.openclaw',
     'workspace'
   )
   if (fs.existsSync(workspacePath)) {
@@ -55,7 +55,7 @@ export function getWorkspaceDir(): string {
 }
 
 const { setRuntime: setDcgchatRuntime, getRuntime: getDcgchatRuntime } = createPluginRuntimeStore<PluginRuntime>(
-  `${channelInfo[ENV]} runtime not initialized`
+  `${"dcgchat-test"} runtime not initialized`
 )
 export { setDcgchatRuntime, getDcgchatRuntime }
 
@@ -147,7 +147,7 @@ export const getSessionKey = (content: any, accountId: string) => {
 
   const route = core.channel.routing.resolveAgentRoute({
     cfg: getOpenClawConfig() as OpenClawConfig,
-    channel: channelInfo[ENV],
+    channel: "dcgchat-test",
     accountId: accountId || 'default',
     peer: { kind: 'direct', id: session_id }
   })

package/src/utils/log.ts

@@ -1,5 +1,4 @@
 import { RuntimeEnv } from 'openclaw/plugin-sdk'
-import { channelInfo, ENV } from './constant.js'
 
 let logger: RuntimeEnv | null = null
 
@@ -11,6 +10,6 @@ export function dcgLogger(message: string, type: 'log' | 'error' = 'log'): void
   if (logger) {
     logger[type](`书灵墨宝🚀 ~ [${new Date().toISOString()}] ${message}`)
   } else {
-    console[type](`书灵墨宝🚀 ~ ${new Date().toISOString()} [${channelInfo[ENV]}]: ${message}`)
+    console[type](`书灵墨宝🚀 ~ ${new Date().toISOString()} [${"dcgchat-test"}]: ${message}`)
   }
 }

package/src/utils/params.ts

@@ -9,7 +9,7 @@ const paramsMessageMap = new Map<string, IMsgParams>()
 
 /** 从 OpenClaw 配置读取当前 channel 的基础参数（唯一来源，供 transport / resolve 等复用） */
 export function getParamsDefaults(): IMsgParams {
-  const ch = (getOpenClawConfig()?.channels?.[channelInfo[ENV]] as DcgchatConfig | undefined) ?? {}
+  const ch = (getOpenClawConfig()?.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
   return {
     userId: Number(ch.userId ?? 0),
     botToken: ch.botToken ?? '',

package/README.md

@@ -1,83 +0,0 @@
-# OpenClaw 书灵墨宝 插件
-
-连接 OpenClaw 与 书灵墨宝 产品的通道插件。
-
-## 架构
-
-```
-┌──────────┐      WebSocket       ┌──────────────┐      WebSocket      ┌─────────────────────┐
-│ Web 前端 │  ←───────────────→   │  公司后端服务  │  ←───────────────→  │ OpenClaw（工作电脑） │
-└──────────┘                      └──────────────┘   (OpenClaw 主动连)   └─────────────────────┘
-```
-
-- OpenClaw 插件**主动连接**后端的 WebSocket 服务（不需要公网 IP）
-- 后端收到用户消息后转发给 OpenClaw，OpenClaw 回复后发回后端
-
-## 快速开始
-
-### 1. 安装插件
-
-```bash
-pnpm openclaw plugins install -l /path/to/openclaw-dcgchat
-```
-
-### 2. 配置
-
-```bash
-openclaw config set channels.dcgchat.enabled true
-openclaw config set channels.dcgchat.wsUrl "ws://your-backend:8080/openclaw/ws"
-```
-
-### 3. 启动
-
-```bash
-pnpm openclaw gateway
-```
-
-## 消息协议（MVP）
-
-### 下行：后端 → OpenClaw（用户消息）
-
-```json
-{ "type": "message", "userId": "user_001", "text": "你好" }
-```
-
-### 上行：OpenClaw → 后端（Agent 回复）
-
-```json
-{ "type": "reply", "userId": "user_001", "text": "你好！有什么可以帮你的？" }
-```
-
-## 配置项
-
-| 配置键 | 类型 | 说明 |
-|--------|------|------|
-| `channels.dcgchat.enabled` | boolean | 是否启用 |
-| `channels.dcgchat.wsUrl` | string | 后端 WebSocket 地址 |
-
-## 开发
-
-```bash
-# 安装依赖
-pnpm install
-
-# 类型检查
-pnpm typecheck
-```
-
-## 文件结构
-
-- `index.ts` - 插件入口
-- `src/channel.ts` - ChannelPlugin 定义
-- `src/runtime.ts` - 插件 runtime
-- `src/types.ts` - 类型定义
-- `src/monitor.ts` - WebSocket 连接与断线重连
-- `src/bot.ts` - 消息处理与 Agent 调用
-
-## 后续迭代
-
-- [ ] Token 认证
-- [ ] 流式输出
-- [ ] Typing 指示
-- [ ] messageId 去重
-- [ ] 错误消息类型