merge master

Author: zhangheng

README.md

@@ -256,6 +256,9 @@ qiniu.compressImage(file, options).then(data => {
   var headers = qiniu.getHeadersForMkFile(token)
   ```
 
+### qiniu.getResumeUploadedSize(file: blob): number
+  断点续传时返回文件之前已上传的字节数，为 0 代表当前并无该文件的断点信息
+
 ### qiniu.filterParams(params: object): array
 
   返回[[k, v],...]格式的数组，k 为自定义变量 `key` 名，v 为自定义变量值，用来提取 `putExtra.params` 包含的自定义变量

src/index.js

@@ -2,7 +2,7 @@ import { region } from "./config";
 import {
   createMkFileUrl,
   getUploadUrl,
-  getLocalFileInfo,
+  getResumeUploadedSize,
   getHeadersForMkFile,
   getHeadersForChunkUpload,
   filterParams
@@ -40,7 +40,7 @@ export {
   region,
   createMkFileUrl,
   getHeadersForChunkUpload,
-  getLocalFileInfo,
+  getResumeUploadedSize,
   getHeadersForMkFile,
   filterParams,
   getUploadUrl,

src/upload.js

@@ -240,6 +240,7 @@ export class UploadManager {
         this.ctxList[index] = {
           time: new Date().getTime(),
           ctx: response.data.ctx,
+          size: chunk.size,
           md5: md5
         };
       });

src/utils.js

@@ -70,6 +70,15 @@ export function getLocalFileInfo(file) {
   }
 }
 
+export function getResumeUploadedSize(file) {
+  return getLocalFileInfo(file).filter(
+      value => value && !isChunkExpired(value.time)
+    ).reduce(
+      (result, value) => result + value.size,
+      0
+    );
+}
+
 // 构造file上传url
 export function createMkFileUrl(url, size, key, putExtra) {
   let requestUrl = url + "/mkfile/" + size;