调整 isCache 实现

Author: yinxulai

README.md

@@ -167,7 +167,13 @@ qiniu.compressImage(file, options).then(data => {
         * uploadInfo: `object`，只有分片上传时才返回该字段
           * uploadInfo.id: 上传任务的唯一标识。
           * uploadInfo.url: 上传地址。
-        * total: 包含`loaded`、`total`、`percent`三个属性:
+        * chunks: `Array<ProgressCompose>` 每个 `chunk` 的上传信息，只有分片上传有此字段
+          * ProgressCompose 的信息如下
+            * size: `number` chunk 的尺寸
+            * loaded: `number` 已经发送完毕的尺寸
+            * percent: `number` 进度比例，范围在 0 - 1
+            * isCache?: `boolean` 是否使用的缓存
+        * total: 包含 `loaded`、`total`、`percent` 三个属性:
           * total.loaded: `number`，已上传大小，单位为字节。
           * total.total: `number`，本次上传的总量控制信息，单位为字节，注意这里的 total 跟文件大小并不一致。
           * total.percent: `number`，当前上传进度，范围：0～100。

src/upload/base.ts

@@ -83,14 +83,15 @@ export interface UploadHandlers {
 }
 
 export interface Progress {
-  loaded: number
   total: number
+  loaded: number
 }
 
 export interface ProgressCompose {
-  loaded: number
   size: number
+  loaded: number
   percent: number
+  isCache?: boolean
 }
 
 export type XHRHandler = (xhr: XMLHttpRequest) => void
@@ -325,10 +326,11 @@ export default abstract class Base {
     })
   }
 
-  public getProgressInfoItem(loaded: number, size: number) {
+  public getProgressInfoItem(loaded: number, size: number, isCache?: boolean): ProgressCompose {
     return {
-      loaded,
       size,
+      loaded,
+      isCache,
       percent: loaded / size * 100
     }
   }

src/upload/index.ts

@@ -1,9 +1,9 @@
 import Resume from './resume'
 import Direct from './direct'
 import Logger from '../logger'
-import { QiniuError, QiniuNetworkError, QiniuRequestError } from '../errors'
 import { UploadCompleteData } from '../api'
 import { Observable, IObserver, MB, normalizeUploadConfig } from '../utils'
+import { QiniuError, QiniuNetworkError, QiniuRequestError } from '../errors'
 import { Extra, UploadOptions, UploadHandlers, UploadProgress, Config } from './base'
 import { HostPool } from './hosts'
 
@@ -43,7 +43,7 @@ export default function upload(
   key: string | null | undefined,
   token: string,
   putExtra?: Partial<Extra>,
-  config?: Config
+  config?: Partial<Config>
 ): Observable<UploadProgress, QiniuError | QiniuRequestError | QiniuNetworkError, UploadCompleteData> {
 
   // 为每个任务创建单独的 Logger

src/upload/resume.ts

@@ -6,9 +6,6 @@ import Base, { Progress, UploadInfo, Extra } from './base'
 
 export interface UploadedChunkStorage extends UploadChunkData {
   size: number
-
-  // 标记该 chunk 是否来自缓存
-  isLocalCache?: boolean
 }
 
 export interface ChunkLoaded {
@@ -43,6 +40,8 @@ function isPositiveInteger(n: number) {
 
 export default class Resume extends Base {
   private chunks: Blob[]
+  /** 使用的缓存分片索引 */
+  private usedCaches: number[] = []
   /** 当前上传过程中已完成的上传信息 */
   private uploadedList: UploadedChunkStorage[]
   /** 当前上传片进度信息 */
@@ -104,10 +103,11 @@ export default class Resume extends Base {
 
     const shouldCheckMD5 = this.config.checkByMD5
     const reuseSaved = () => {
+      this.usedCaches.push(index)
       this.updateChunkProgress(chunk.size, index)
     }
 
-    // FIXME: 至少比对一下 size 吧
+    // FIXME: 至少判断一下 size
     if (info && !shouldCheckMD5) {
       reuseSaved()
       return
@@ -212,12 +212,6 @@ export default class Resume extends Base {
 
       this.logger.info(infoMessage.join(', '))
       this.uploadedList = localInfo.data
-      if (Array.isArray(this.uploadedList)) {
-        this.uploadedList.forEach(chunk => {
-          chunk.isLocalCache = true
-        })
-      }
-
       this.uploadId = localInfo.id
     }
 
@@ -256,9 +250,10 @@ export default class Resume extends Base {
         utils.sum(this.loaded.chunks) + this.loaded.mkFileProgress,
         this.file.size + 1 // 防止在 complete 未调用的时候进度显示 100%
       ),
-      chunks: this.chunks.map((chunk, index) => (
-        this.getProgressInfoItem(this.loaded.chunks[index], chunk.size)
-      )),
+      chunks: this.chunks.map((chunk, index) => {
+        const isCache = this.usedCaches.includes(index)
+        return this.getProgressInfoItem(this.loaded.chunks[index], chunk.size, isCache)
+      }),
       uploadInfo: {
         id: this.uploadId,
         url: this.uploadHost!.getUrl()