4.x 优化针对进度回退的处理 (#681)

yinxulai · web-flow · commit b989d3697eb2 · 2024-10-24T14:39:38.000+08:00
* 适当降低虚拟进度条的输出速度

* 细节优化
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qiniu-js",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
   "description": "Qiniu browser upload sdk",
   "miniprogram": "output",
   "main": "output/index.js",
diff --git a/packages/common/src/helper/progress/index.ts b/packages/common/src/helper/progress/index.ts
@@ -34,7 +34,7 @@ export class MockProgress {
 
     let time = 0
     this.progress = 0
-    const intervalFrequency = 100
+    const intervalFrequency = 400
     const intervalIds = setInterval(() => {
       time += intervalFrequency
       this.setProgress(1 - Math.exp(-1 * time / (this.timeConstant * 1000)))
diff --git a/packages/common/src/upload/common/context/index.ts b/packages/common/src/upload/common/context/index.ts
@@ -33,10 +33,7 @@ export function updateTotalIntoProgress(progress: Progress): Progress {
   }
 
   const newPercent = totalPercent / detailValues.length
-
-  // 在失败重试等场景中，进度回退是正常业务导致的，但是客户要求进度不能回退
-  if (newPercent > progress.percent) progress.percent = newPercent // 防止进度倒流
-
+  progress.percent = newPercent
   progress.size = totalSize
   return progress
 }
diff --git a/packages/common/src/upload/multipartv1/index.ts b/packages/common/src/upload/multipartv1/index.ts
@@ -202,7 +202,7 @@ export const createMultipartUploadV1Task = (file: UploadFile, config: UploadConf
       prefix: 'MultipartUploadChildQueue'
     },
     concurrentLimit: 1, // 此接口只能串行
-    // TODO 动态创建任务会导致任务进度倒退
+    // FIXME 动态创建任务会导致任务进度倒退
     tasksCreator: async () => {
       const sliceResult = await file.slice(4 * 1024 * 1024)
       if (isErrorResult(sliceResult)) {
diff --git a/packages/common/src/upload/multipartv2/index.ts b/packages/common/src/upload/multipartv2/index.ts
@@ -318,7 +318,7 @@ export const createMultipartUploadV2Task = (file: UploadFile, config: UploadConf
     },
     concurrentLimit: 3,
 
-    // TODO 动态创建任务会导致任务进度倒退
+    // FIXME: 动态创建任务会导致任务进度倒退
     tasksCreator: async () => {
       const sliceResult = await file.slice(4 * 1024 * 1024)
       if (isErrorResult(sliceResult)) {
diff --git a/packages/wechat-miniprogram/package.json b/packages/wechat-miniprogram/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@qiniu/wechat-miniprogram-upload",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Qiniu wechat-miniprogram upload sdk",
   "miniprogram": "output",
   "main": "output/index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "qiniu-js",`
`3`		`- "version": "4.0.0-beta.5",`
	`3`	`+ "version": "4.0.0-beta.6",`
`4`	`4`	`"description": "Qiniu browser upload sdk",`
`5`	`5`	`"miniprogram": "output",`
`6`	`6`	`"main": "output/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,7 @@ export function updateTotalIntoProgress(progress: Progress): Progress {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`const newPercent = totalPercent / detailValues.length`
`36`		`-`
`37`		`- // 在失败重试等场景中，进度回退是正常业务导致的，但是客户要求进度不能回退`
`38`		`- if (newPercent > progress.percent) progress.percent = newPercent // 防止进度倒流`
`39`		`-`
	`36`	`+ progress.percent = newPercent`
`40`	`37`	`progress.size = totalSize`
`41`	`38`	`return progress`
`42`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@qiniu/wechat-miniprogram-upload",`
`3`		`- "version": "1.0.3",`
	`3`	`+ "version": "1.0.4",`
`4`	`4`	`"description": "Qiniu wechat-miniprogram upload sdk",`
`5`	`5`	`"miniprogram": "output",`
`6`	`6`	`"main": "output/index.js",`