调整实现细节

Author: yinxulai

src/upload/base.ts

@@ -330,8 +330,8 @@ export default abstract class Base {
     return {
       size,
       loaded,
-      fromCache,
-      percent: loaded / size * 100
+      percent: loaded / size * 100,
+      ...(fromCache == null ? {} : { fromCache })
     }
   }
 }

src/upload/resume.ts

@@ -6,8 +6,6 @@ import Base, { Progress, UploadInfo, Extra } from './base'
 
 export interface UploadedChunkStorage extends UploadChunkData {
   size: number
-
-  fromCache?: boolean
 }
 
 export interface ChunkLoaded {
@@ -46,6 +44,11 @@ export default class Resume extends Base {
    */
   private chunks: Blob[]
 
+  /**
+   * @description 使用的缓存的 chunks
+   */
+  private usedCacheList: boolean[]
+
   /**
    * @description 来自缓存的上传信息
    */
@@ -121,8 +124,10 @@ export default class Resume extends Base {
 
     const shouldCheckMD5 = this.config.checkByMD5
     const reuseSaved = () => {
-      info.fromCache = true
-      this.uploadedList[index] = info
+      this.uploadedList[index] = { ...info }
+      this.usedCacheList[index] = true
+      this.updateLocalCache()
+
       this.updateChunkProgress(chunk.size, index)
     }
 
@@ -140,9 +145,6 @@ export default class Resume extends Base {
       return
     }
 
-    // 有缓存但是没有使用则调整标记
-    if (info) { info.fromCache = false }
-
     const onProgress = (data: Progress) => {
       this.updateChunkProgress(data.loaded, index)
     }
@@ -175,10 +177,7 @@ export default class Resume extends Base {
       size: chunk.size
     }
 
-    utils.setLocalFileInfo(this.getLocalKey(), {
-      id: this.uploadId,
-      data: this.uploadedList
-    }, this.logger)
+    this.updateLocalCache()
   }
 
   private async mkFileReq() {
@@ -211,6 +210,7 @@ export default class Resume extends Base {
 
   private async initBeforeUploadChunks() {
     this.uploadedList = []
+    this.usedCacheList = []
     const cachedInfo = utils.getLocalFileInfo(this.getLocalKey(), this.logger)
 
     // 分片必须和当时使用的 uploadId 配套，所以断点续传需要把本地存储的 uploadId 拿出来
@@ -257,6 +257,13 @@ export default class Resume extends Base {
     return utils.createLocalKey(this.file.name, this.key, this.file.size)
   }
 
+  private updateLocalCache() {
+    utils.setLocalFileInfo(this.getLocalKey(), {
+      id: this.uploadId,
+      data: this.uploadedList
+    }, this.logger)
+  }
+
   private updateChunkProgress(loaded: number, index: number) {
     this.loaded.chunks[index] = loaded
     this.notifyResumeProgress()
@@ -275,8 +282,7 @@ export default class Resume extends Base {
         this.file.size + 1 // 防止在 complete 未调用的时候进度显示 100%
       ),
       chunks: this.chunks.map((chunk, index) => {
-        const info = this.uploadedList[index]
-        const fromCache = info && info.fromCache
+        const fromCache = this.usedCacheList[index]
         return this.getProgressInfoItem(this.loaded.chunks[index], chunk.size, fromCache)
       }),
       uploadInfo: {