添加重试场景

Author: yinxulai

src/upload/base.ts

@@ -6,6 +6,8 @@ import { Host, HostPool } from './hosts'
 
 export const DEFAULT_CHUNK_SIZE = 4 // 单位 MB
 
+export const RETRY_CODE = [502, 503, 504, 599]
+
 /** 上传文件的资源信息配置 */
 export interface Extra {
   /** 文件原文件名 */
@@ -186,6 +188,7 @@ export default abstract class Base {
 
   // 检查并更新解冻当前的 host
   protected checkAndUnfreezeHost() {
+    this.logger.info('check unfreeze host.')
     if (this.uploadHost != null && this.uploadHost.isFrozen()) {
       this.uploadHost.unfreeze()
       this.logger.warn(`${this.uploadHost.host} will be unfreeze.`)
@@ -194,10 +197,11 @@ export default abstract class Base {
 
   // 检查并更新冻结当前的 host
   private checkAndFreezeHost(error: utils.QiniuError) {
-    if (utils.isResponseError(error)) {
-      if ([502, 503, 504, 599].includes(error.code)) {
-        this.uploadHost.freeze()
+    this.logger.info('check freeze host.')
+    if (utils.isResponseError(error) && this.uploadHost != null) {
+      if (RETRY_CODE.includes(error.code)) {
         this.logger.warn(`${this.uploadHost.host} will be temporarily frozen.`)
+        this.uploadHost.freeze()
       }
     }
   }
@@ -256,8 +260,8 @@ export default abstract class Base {
 
       // 检查并冻结当前的 host
       this.checkAndFreezeHost(err)
-      const needRetry = err.isRequestError && err.code === 0 && !this.aborted
       const notReachRetryCount = ++this.retryCount <= this.config.retryCount
+      const needRetry = err.isRequestError && !this.aborted && [0, ...RETRY_CODE].includes(err.code)
 
       // 以下条件满足其中之一则会进行重新上传：
       // 1. 满足 needRetry 的条件且 retryCount 不为 0

src/upload/hosts.ts

@@ -67,9 +67,10 @@ export class HostPool {
    * @param  {string[]} hosts
    * @description 如果在构造时传入 hosts，则该 host 池始终使用传入的 host 做为可用的数据
    */
-  constructor(hosts?: string[]) {
+  constructor(hosts?: string[] | string) {
     if (hosts == null) return
-    this.hosts = hosts
+    if (Array.isArray(hosts)) this.hosts = hosts
+    if (typeof hosts === 'string') this.hosts = [hosts]
   }
 
   /**

src/upload/index.ts

@@ -1,9 +1,8 @@
 import Resume from './resume'
 import Direct from './direct'
 import Logger from '../logger'
-import { regionUphostMap } from '../config'
 import { UploadCompleteData } from '../api'
-import { QiniuError, Observable, IObserver, MB } from '../utils'
+import { QiniuError, Observable, IObserver, MB, normalizeUploadConfig } from '../utils'
 
 import { Config, Extra, UploadHandler, UploadOptions, UploadProgress } from './base'
 import { HostPool } from './hosts'
@@ -52,32 +51,11 @@ export default function upload(
     key,
     token,
     putExtra,
-    config
-  }
-
-  const hostList: string[] = []
-
-  // 如果用户传了 region，添加指定 region 的 host 到可用 host 列表
-  if (config?.region) {
-    const hostMap = regionUphostMap[config?.region]
-    if (config.useCdnDomain) {
-      hostList.push(hostMap.cdnUphost)
-    } else {
-      hostList.push(hostMap.srcUphost)
-    }
-  }
-
-  // 如果同时指定了 uphost 参数，添加到可用 host 列表
-  if (config?.uphost != null) {
-    if (Array.isArray(config?.uphost)) {
-      hostList.push(...config?.uphost)
-    } else {
-      hostList.push(config?.uphost)
-    }
+    config: normalizeUploadConfig(config)
   }
 
   // 创建 host 池
-  const hostPool = new HostPool(hostList)
+  const hostPool = new HostPool(options.config?.uphost)
 
   // 为每个任务创建单独的 Logger
   const logger = new Logger(options.token, config?.disableStatisticsReport, config?.debugLogLevel)

src/upload/resume.ts

@@ -187,7 +187,7 @@ export default class Resume extends Base {
       }
     )
 
-    this.logger.info('finishResumeProgress.')
+    this.logger.info('finish Resume Progress.')
     this.updateMkFileProgress(1)
     this.checkAndUnfreezeHost()
     return result

src/utils/config.ts

@@ -1,10 +1,10 @@
-import { Config, DEFAULT_CHUNK_SIZE } from 'upload'
+import { regionUphostMap } from '../config'
+import { Config, DEFAULT_CHUNK_SIZE } from '../upload'
 
-export function normalizeUploadConfig(config: Config): Config {
-  if (config == null) return config
-  const { upprotocol } = config
+export function normalizeUploadConfig(config?: Partial<Config>): Config {
+  const { upprotocol } = { ...config }
 
-  const normalizeData: Config = {
+  const normalizeConfig: Config = {
     uphost: '',
     retryCount: 3,
 
@@ -21,5 +21,26 @@ export function normalizeUploadConfig(config: Config): Config {
     disableStatisticsReport: false
   }
 
-  return { ...normalizeData, ...config }
+  const hostList: string[] = []
+
+  // 如果用户传了 region，添加指定 region 的 host 到可用 host 列表
+  if (config?.region) {
+    const hostMap = regionUphostMap[config?.region]
+    if (config.useCdnDomain) {
+      hostList.push(hostMap.cdnUphost)
+    } else {
+      hostList.push(hostMap.srcUphost)
+    }
+  }
+
+  // 如果同时指定了 uphost 参数，添加到可用 host 列表
+  if (config?.uphost != null) {
+    if (Array.isArray(config?.uphost)) {
+      hostList.push(...config?.uphost)
+    } else {
+      hostList.push(config?.uphost)
+    }
+  }
+
+  return { ...config, ...normalizeConfig, uphost: hostList }
 }

src/utils/index.ts

@@ -3,5 +3,6 @@ export * from './observable'
 
 export * from './base64'
 export * from './helper'
+export * from './config'
 
 export { default as compressImage, CompressResult } from './compress'