@dcrays/dcgchat-test 0.4.27 → 0.4.28

package/package.json

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

package/src/channel.ts

@@ -222,7 +222,7 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
   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) : ''
+    const url = mediaUrl ? await ossUpload(mediaUrl, botToken, 1) : ''
     if (!msgCtx.agentId) {
       msgCtx.agentId = agentId
     }

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')