添加 v1 分片上传支持

Author: yinxulai

examples/wechat-miniprogram/pages/index/index.ts

@@ -62,7 +62,7 @@ Component({
       await this.printTask(task)
     },
 
-    async uploadFile() {
+    async uploadFileDirect() {
       const file: qiniu.FileData = {
         type: 'path',
         data: this.data.file,
@@ -73,7 +73,44 @@ Component({
           '223123231231': '2231232313'
         }
       }
-      const task = qiniu.createMultipartUploadTask(file, {
+      const task = qiniu.createDirectUploadTask(file, {
+        vars: { 'test': '2222222' },
+        tokenProvider: () => Promise.resolve(this.data.token)
+      })
+      await this.printTask(task)
+    },
+
+    async uploadFileV1() {
+      const file: qiniu.FileData = {
+        type: 'path',
+        data: this.data.file,
+        filename: 'test.test2312',
+        mimeType: 'test/test',
+        metadata: {
+          '222222123': '222231222',
+          '223123231231': '2231232313'
+        }
+      }
+      const task = qiniu.createMultipartUploadV1Task(file, {
+        // logLevel: "INFO",
+        vars: { 'test': '2222222' },
+        tokenProvider: () => Promise.resolve(this.data.token)
+      })
+      await this.printTask(task)
+    },
+
+    async uploadFileV2() {
+      const file: qiniu.FileData = {
+        type: 'path',
+        data: this.data.file,
+        filename: 'test.test2312',
+        mimeType: 'test/test',
+        metadata: {
+          '222222123': '222231222',
+          '223123231231': '2231232313'
+        }
+      }
+      const task = qiniu.createMultipartUploadV2Task(file, {
         vars: { 'test': '2222222' },
         tokenProvider: () => Promise.resolve(this.data.token)
       })

examples/wechat-miniprogram/pages/index/index.wxml

@@ -7,7 +7,9 @@
     <button class="button" bind:tap="uploadArrayBuffer">ArrayBuffer 上传测试</button>
     <textarea class="textarea" model:value="{{file}}"></textarea>
     <button class="button" bind:tap="selectMedia">选择文件</button>
-    <button class="button" bind:tap="uploadFile">文件上传测试</button>
+    <button class="button" bind:tap="uploadFileDirect">直传</button>
+    <button class="button" bind:tap="uploadFileV1">分片 v1</button>
+    <button class="button" bind:tap="uploadFileV2">分片 v2</button>
     <button class="button" bind:tap="stopTask">停止上传</button>
     <button class="button" bind:tap="startTask">继续上传</button>
   </view>

packages/browser/src/index.ts

@@ -27,10 +27,20 @@ export const createDirectUploadTask = (file: FileData, config: common.UploadConf
   return task
 }
 
-export const createMultipartUploadTask = (file: FileData, config: common.UploadConfig) => {
+export const createMultipartUploadV1Task = (file: FileData, config: common.UploadConfig) => {
   const innerFile = new UploadFile(file)
   config.httpClient = config.httpClient ?? new HttpClient()
-  const task = common.createMultipartUploadTask(innerFile, config)
+  const task = common.createMultipartUploadV1Task(innerFile, config)
+  task.onError(() => innerFile.free())
+  task.onComplete(() => innerFile.free())
+  afterCancel(task, () => innerFile.free())
+  return task
+}
+
+export const createMultipartUploadV2Task = (file: FileData, config: common.UploadConfig) => {
+  const innerFile = new UploadFile(file)
+  config.httpClient = config.httpClient ?? new HttpClient()
+  const task = common.createMultipartUploadV2Task(innerFile, config)
   task.onError(() => innerFile.free())
   task.onComplete(() => innerFile.free())
   afterCancel(task, () => innerFile.free())

packages/common/src/api/index.ts

@@ -33,7 +33,7 @@ interface UploadPartParams extends BasicWithAuthParams {
   key?: string
 }
 
-interface ListMultipartUploadPartsParams extends BasicWithAuthParams {
+interface ListPartsParams extends BasicWithAuthParams {
   uploadId: string
   bucket: string
   key?: string
@@ -44,7 +44,7 @@ export interface UploadedPart extends PartMeta {
   putTime: number
 }
 
-interface ListUploadPartsData {
+interface ListPartsData {
   uploadId: string
   expireAt: number
   partNumberMarker: number
@@ -87,6 +87,29 @@ interface GetChunkRequestPathParams extends BasicWithAuthParams {
   key?: string
 }
 
+interface MkblkParams extends BasicWithAuthParams {
+  // 第一个块的二进制内容
+  firstChunkBinary: UploadBlob
+}
+
+export interface MkblkData {
+  ctx: string
+  checksum: string
+  crc32: number
+  offset: number
+  host: string
+  expired_at: number
+}
+
+interface MkfileParams extends BasicWithAuthParams {
+  fileSize: number // 资源文件大小，单位字节。
+  key?: string // 进行URL 安全的 Base64 编码后的资源名。若未指定，则使用saveKey；若未指定 saveKey，则使用资源内容的 SHA1 值作为资源名。
+  fname?: string // 进行URL安全的Base64编码后的文件名称。若未指定，则魔法变量中无法使用fname, ext, fprefix。
+  mimeType?: string // 进行URL 安全的 Base64 编码后的文件 mimeType。若未指定，则根据文件内容自动检测 mimeType。
+  userVars?: Record<string, string> // 指定自定义变量，进行URL 安全的 Base64 编码后的 user-var。
+  lastCtxOfBlock: string[]
+}
+
 interface DirectUploadParams extends BasicWithAuthParams {
   file: UploadFile
   fileName: string
@@ -174,6 +197,8 @@ export class UploadApis {
     return parseResponseJson<InitPartsUploadData>(response.result)
   }
 
+  // v2 接口
+
   async uploadPart(params: UploadPartParams): Promise<Result<UploadChunkData>> {
     const requestPathResult = await this.getBaseRequestPath(params)
     if (!isSuccessResult(requestPathResult)) return requestPathResult
@@ -201,7 +226,7 @@ export class UploadApis {
     return parseResponseJson<UploadChunkData>(response.result)
   }
 
-  async listUploadParts(params: ListMultipartUploadPartsParams): Promise<Result<ListUploadPartsData>> {
+  async listParts(params: ListPartsParams): Promise<Result<ListPartsData>> {
     const requestPathResult = await this.getBaseRequestPath(params)
     if (!isSuccessResult(requestPathResult)) return requestPathResult
 
@@ -222,7 +247,7 @@ export class UploadApis {
       return handleResponseError(response.result)
     }
 
-    return parseResponseJson<ListUploadPartsData>(response.result)
+    return parseResponseJson<ListPartsData>(response.result)
   }
 
   async completeMultipartUpload(params: CompleteMultipartUploadParams): Promise<Result<string>> {
@@ -296,6 +321,76 @@ export class UploadApis {
     return { result: response.result.data }
   }
 
+  // v1 接口
+
+  async mkblk(params: MkblkParams): Promise<Result<MkblkData>> {
+    const blobSize = params.firstChunkBinary.size()
+    const url = `${params.uploadHostUrl}/mkblk/${blobSize}`
+    const headers = this.generateAuthHeaders(params.token.signature)
+    headers['content-type'] = 'application/octet-stream'
+
+    const response = await this.httpClient.post(url, {
+      headers,
+      abort: params.abort,
+      body: params.firstChunkBinary,
+      onProgress: params.onProgress
+    })
+
+    if (!isSuccessResult(response)) {
+      return response
+    }
+
+    if (response.result.code !== 200) {
+      return handleResponseError(response.result)
+    }
+
+    return parseResponseJson<MkblkData>(response.result)
+  }
+
+  async mkfile(params: MkfileParams): Promise<Result<string>> {
+    let url = `${params.uploadHostUrl}/mkfile/${params.fileSize}`
+
+    if (params.key) {
+      url += `/key/${urlSafeBase64Encode(params.key)}`
+    }
+
+    if (params.fname) {
+      url += `/fname/${urlSafeBase64Encode(params.fname)}`
+    }
+
+    if (params.mimeType) {
+      url += `/mimeType/${urlSafeBase64Encode(params.mimeType)}`
+    }
+
+    if (params.userVars && Array.isArray(params.userVars)) {
+      for (const [key, value] of Object.entries(params.userVars)) {
+        url += `/x:${key}/${value}`
+      }
+    }
+
+    const headers = this.generateAuthHeaders(params.token.signature)
+    headers['content-type'] = 'text/plain'
+
+    const response = await this.httpClient.post(url, {
+      headers,
+      abort: params.abort,
+      onProgress: params.onProgress,
+      body: params.lastCtxOfBlock.join(',')
+    })
+
+    if (!isSuccessResult(response)) {
+      return response
+    }
+
+    if (response.result.code !== 200) {
+      return handleResponseError(response.result)
+    }
+
+    return { result: response.result.data }
+  }
+
+  //  直传接口
+
   async directUpload<T>(params: DirectUploadParams): Promise<Result<string>> {
     const formData = new HttpFormData()
     formData.set('token', params.token.signature)

packages/common/src/upload/common/queue/index.ts

@@ -66,6 +66,7 @@ export class TaskQueue {
 
   constructor(private options?: TaskQueueOptions) {
     this.tasksCreator = options?.tasksCreator
+    this.concurrentTicket = options?.concurrentLimit || 1
     this.logger = new Logger(options?.logger?.level, options?.logger?.prefix)
   }
 

packages/common/src/upload/index.ts

@@ -1,3 +1,4 @@
 export { UploadConfig, UploadTask, UploadTaskCreator, Progress } from './types'
-export { createMultipartUploadTask, MultipartUploadContext } from './multipart'
+export { createMultipartUploadV1Task, MultipartUploadV1Context } from './multipartv1'
+export { createMultipartUploadV2Task, MultipartUploadV2Context } from './multipartv2'
 export { createDirectUploadTask, DirectUploadContext } from './direct'