优化

Author: yinxulai

.travis.yml

@@ -13,6 +13,7 @@ install:
 script:
   - npm run lint
   - npm run test
+  - npx codecov
   - npm run build
 
 before_deploy:

package.json

@@ -8,11 +8,11 @@
   "types": "esm/index.d.ts",
   "module": "esm/index.js",
   "scripts": {
+    "test": "jest --coverage",
     "clean": "del \"./(lib|dist|esm)\"",
-    "test": "jest --coverage && npx codecov",
     "build": "npm run clean && tsc && babel esm --out-dir lib && webpack --optimize-minimize --config webpack.prod.js",
-    "dev": "npm run lint && webpack-dev-server --open --config webpack.dev.js",
-    "lint": "eslint --ext .ts src/",
+    "dev": "webpack-dev-server --open --config webpack.dev.js",
+    "lint": "tsc --noEmit && eslint --ext .ts src/",
     "server": "node test/server.js"
   },
   "repository": {

src/api/index.mock.ts

@@ -4,15 +4,15 @@ import * as api from '.'
 export const errorMap = {
   networkError: new QiniuNetworkError('mock', 'message'), // 网络错误
 
-  invalidParams: new QiniuRequestError(400, 'mock', 'message', {}), // 无效的参数
-  expiredToken: new QiniuRequestError(401, 'mock', 'message', {}), // token 过期
+  invalidParams: new QiniuRequestError(400, 'mock', 'message'), // 无效的参数
+  expiredToken: new QiniuRequestError(401, 'mock', 'message'), // token 过期
 
-  gatewayUnavailable: new QiniuRequestError(502, 'mock', 'message', {}), // 网关不可用
-  serviceUnavailable: new QiniuRequestError(503, 'mock', 'message', {}), // 服务不可用
-  serviceTimeout: new QiniuRequestError(504, 'mock', 'message', {}), // 服务超时
-  serviceError: new QiniuRequestError(599, 'mock', 'message', {}), // 服务错误
+  gatewayUnavailable: new QiniuRequestError(502, 'mock', 'message'), // 网关不可用
+  serviceUnavailable: new QiniuRequestError(503, 'mock', 'message'), // 服务不可用
+  serviceTimeout: new QiniuRequestError(504, 'mock', 'message'), // 服务超时
+  serviceError: new QiniuRequestError(599, 'mock', 'message'), // 服务错误
 
-  invalidUploadId: new QiniuRequestError(612, 'mock', 'message', {}) // 无效的 upload id
+  invalidUploadId: new QiniuRequestError(612, 'mock', 'message') // 无效的 upload id
 }
 
 export type ApiName =

src/errors/index.ts

@@ -43,11 +43,11 @@ export class QiniuRequestError extends QiniuError {
   public isRequestError = true
 
   /**
- * @description 发生错误时服务端返回的错误信息，如果返回不是一个合法的 json、则该字段为 undefined
- */
-  public data: any = undefined
+   * @description 发生错误时服务端返回的错误信息，如果返回不是一个合法的 json、则该字段为 undefined
+   */
+  public data?: { [key: string]: any }
 
-  constructor(public code: number, public reqId: string, message: string, data: any) {
+  constructor(public code: number, public reqId: string, message: string, data?: { [key: string]: any }) {
     super(QiniuErrorName.RequestError, message)
     this.data = data
   }
@@ -58,6 +58,6 @@ export class QiniuRequestError extends QiniuError {
  */
 export class QiniuNetworkError extends QiniuRequestError {
   constructor(reqId = '', message: string) {
-    super(0, reqId, message, undefined)
+    super(0, reqId, message)
   }
 }

src/upload/hosts.ts

@@ -118,8 +118,9 @@ export class HostPool {
 
     // 无可用的，去取离解冻最近的 host
     const priorityQueue = cachedHostList
-      .slice().sort((hostA, hostB) => (
-        hostA.getUnfreezeTime() || 0) - (hostB.getUnfreezeTime() || 0))
+      .slice().sort(
+        (hostA, hostB) => (hostA.getUnfreezeTime() || 0) - (hostB.getUnfreezeTime() || 0)
+      )
 
     return priorityQueue[0]
   }

src/upload/resume.ts

@@ -8,7 +8,7 @@ export interface UploadedChunkStorage extends UploadChunkData {
   size: number
 
   // 标记该 chunk 是否来自缓存
-  isLocalCached?: true
+  isLocalCache?: boolean
 }
 
 export interface ChunkLoaded {
@@ -107,6 +107,7 @@ export default class Resume extends Base {
       this.updateChunkProgress(chunk.size, index)
     }
 
+    // FIXME: 至少比对一下 size 吧
     if (info && !shouldCheckMD5) {
       reuseSaved()
       return
@@ -213,7 +214,7 @@ export default class Resume extends Base {
       this.uploadedList = localInfo.data
       if (Array.isArray(this.uploadedList)) {
         this.uploadedList.forEach(chunk => {
-          chunk.isLocalCached = true
+          chunk.isLocalCache = true
         })
       }
 

src/utils/pool.test.ts

@@ -21,10 +21,11 @@ describe('test Pool for control concurrency', () => {
       { chunk, index: 5 }
     ]
 
-    for (const item of data) {
-      // eslint-disable-next-line no-await-in-loop
-      await pool.enqueue(item)
+    return Promise.all(data.map(async value => {
+      await pool.enqueue(value)
       expect(pool.processing.length).toBeLessThanOrEqual(2)
-    }
+    })).then(() => {
+      expect(m.mock.calls.length).toBe(6)
+    })
   })
 })