@dcrays/dcgchat-test 0.4.27 → 0.4.29

package/package.json

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

package/src/channel.ts

@@ -192,6 +192,14 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
     return
   }
   const mediaUrl = expanded[0]
+
+  const { sessionId, agentId } = getInfoBySessionKey(sessionKey)
+  if (!msgCtx.sessionId) {
+    msgCtx.sessionId = sessionId
+  }
+  if (!msgCtx.agentId) {
+    msgCtx.agentId = agentId
+  }
   if (!mediaUrl || !msgCtx.sessionId) {
     dcgLogger(`dcgchat: sendMedia skipped (duplicate in session): ${mediaUrl} sessionId=${msgCtx.sessionId} sessionKey=${sessionKey}`)
     return
@@ -213,19 +221,11 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
     }
     addSentMediaKey(msgCtx.sessionId, mediaUrl)
   }
-
-  const { sessionId, agentId } = getInfoBySessionKey(sessionKey)
-  if (!msgCtx.sessionId) {
-    msgCtx.sessionId = sessionId
-  }
   const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
   const notMessageId = `${msgCtx?.messageId}`?.length === 13 || !msgCtx?.messageId
   try {
     const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat-test"]?.botToken ?? ''
-    const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
-    if (!msgCtx.agentId) {
-      msgCtx.agentId = agentId
-    }
+    const url = mediaUrl ? await ossUpload(mediaUrl, botToken, 1) : ''
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
       is_finish: notMessageId ? -1 : 0,

package/src/request/oss.ts

@@ -1,32 +1,166 @@
-import { createReadStream } from 'node:fs'
+import { stat } from 'node:fs/promises'
+import { extname } from 'node:path'
+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 }> {
+/** 仅对内存 Buffer 超过此大小使用分片（本地路径一律走 put，避免 multipart 对类型的限制） */
+const MULTIPART_THRESHOLD_BYTES = 1024 * 1024
+
+/** 分片大小：OSS 要求每片 ≥100 KB（最后一片可更小） */
+const MULTIPART_PART_SIZE = 1024 * 1024
+
+/** ali-oss 默认 timeout 为 60s，大文件单 PUT 或慢网易触发 ResponseTimeoutError */
+const OSS_HTTP_TIMEOUT_MS = 15 * 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
+}
+
+async function getUploadByteLength(input: File | string | Buffer): Promise<number> {
+  if (Buffer.isBuffer(input)) return input.length
+  if (typeof input === 'string') {
+    const s = await stat(input)
+    return s.size
+  }
+  return input.size
+}
+
+/** 常见可在浏览器内联预览的类型（避免一律 application/octet-stream 触发下载） */
+const PREVIEW_EXT_MIME: Record<string, string> = {
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
+  '.png': 'image/png',
+  '.gif': 'image/gif',
+  '.webp': 'image/webp',
+  '.bmp': 'image/bmp',
+  '.svg': 'image/svg+xml',
+  '.ico': 'image/x-icon',
+  '.avif': 'image/avif',
+  '.heic': 'image/heic',
+  '.heif': 'image/heif',
+  '.pdf': 'application/pdf',
+  '.mp4': 'video/mp4',
+  '.webm': 'video/webm',
+  '.mov': 'video/quicktime',
+  '.mp3': 'audio/mpeg',
+  '.wav': 'audio/wav',
+  '.ogg': 'audio/ogg',
+  '.opus': 'audio/opus',
+  '.m4a': 'audio/mp4',
+  '.aac': 'audio/aac',
+  '.flac': 'audio/flac',
+  '.txt': 'text/plain; charset=utf-8',
+  '.log': 'text/plain; charset=utf-8',
+  '.csv': 'text/csv; charset=utf-8',
+  '.html': 'text/html; charset=utf-8',
+  '.htm': 'text/html; charset=utf-8',
+  '.css': 'text/css; charset=utf-8',
+  '.js': 'text/javascript; charset=utf-8',
+  '.mjs': 'text/javascript; charset=utf-8',
+  '.json': 'application/json; charset=utf-8',
+  '.xml': 'application/xml; charset=utf-8',
+  '.md': 'text/markdown; charset=utf-8',
+  '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  '.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+}
+
+function mimeFromPathOrName(pathOrName: string): string | undefined {
+  const base = pathOrName.split(/[/\\]/).pop() ?? pathOrName
+  const ext = extname(base).toLowerCase()
+  return ext ? PREVIEW_EXT_MIME[ext] : undefined
+}
+
+/** 解析上传 Content-Type，并配合 Content-Disposition: inline 便于直链预览 */
+function resolveMime(input: File | string | Buffer, fileNameHint?: string): string {
+  if (typeof input === 'string') {
+    return mimeFromPathOrName(input) ?? 'application/octet-stream'
+  }
+  if (Buffer.isBuffer(input)) {
+    if (fileNameHint) {
+      const fromName = mimeFromPathOrName(fileNameHint)
+      if (fromName) return fromName
+    }
+    return 'application/octet-stream'
+  }
+  const declared = input.type?.trim()
+  if (declared && declared !== 'application/octet-stream') {
+    return declared
+  }
+  const name = typeof input.name === 'string' && input.name ? input.name : ''
+  if (name) {
+    const fromName = mimeFromPathOrName(name)
+    if (fromName) return fromName
+  }
+  return declared || '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 type OssUploadOptions = {
+  /** 分片上传进度，p 为 0～1（仅大 Buffer 分片时触发） */
+  onProgress?: (p: number) => void
+  /** HTTP 超时（毫秒），覆盖默认 15 分钟；可传 `30 * 60 * 1000` 等 */
+  timeoutMs?: number
 }
 
-export const ossUpload = async (file: File | string | Buffer, botToken: string, isPrivate: 0 | 1 = 1) => {
+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, fileName)
+  const onProgress = uploadOptions?.onProgress
 
   const options: OSS.Options = {
     // 从STS服务获取的临时访问密钥（AccessKey ID和AccessKey Secret）。
@@ -40,7 +174,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,13 +183,29 @@ 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,
+      /** 直链打开时优先内联展示，而非附件下载 */
+      headers: {
+        'Content-Disposition': 'inline'
+      }
+    }
+    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
+    const requestUrls = objectResult?.res?.requestUrls || []
+    const url = requestUrls[0] || ''
+    dcgLogger(`OSS 上传成功, ${isPrivate === 1 ? objectResult.name || url : url}`)
+    return isPrivate === 1 ? objectResult.name || url : url
   } catch (error) {
     dcgLogger(`OSS 上传失败: ${error}`, 'error')
   }

package/src/tools/messageTool.ts

@@ -82,7 +82,7 @@ const messageToolParameters = {
       }
     }
   },
-  oneOf: [{ required: ['content'] }, { required: ['media'] }]
+  anyOf: [{ required: ['content'] }, { required: ['media'] }]
 }
 
 /** 从正文提取可发送的文件路径（固定挂载 + 当前工作区前缀）。 */