使用sort方法 添加putExtra缺失参数

Author: okbang9

index.d.ts

@@ -285,18 +285,38 @@ export declare namespace resume_up {
         /**
          * @default ''
          */
-        fname: string;
+        fname?: string;
 
         /**
          * @default {}
          */
-        params: any;
+        params?: any;
 
         /**
          * @default null
          */
         mimeType?: string;
 
+        /**
+         * @default null
+         */
+        resumeRecordFile?: string
+
+        /**
+         * @default null
+         */
+        progressCallback?: any
+
+        /**
+         * @default v1
+         */
+        version?: string
+
+        /**
+         * @default 4 * 1024 * 1024
+         */
+        partSize?: number
+
         /**
          * 上传可选参数
          * @param fname 请求体中的文件的名称
@@ -307,7 +327,7 @@ export declare namespace resume_up {
          * @param version 分片上传版本 目前支持v1/v2版本 默认v1
          * @param partSize 分片上传v2必传字段 默认大小为4MB 分片大小范围为1 MB - 1 GB
          */
-        constructor(fname?: string, params?: any, mimeType?: string, resumeRecordFile?: string, version?:string, partSize?:bigint,
+        constructor(fname?: string, params?: any, mimeType?: string, resumeRecordFile?: string, version?:string, partSize?:number,
                     progressCallback?: (data: any) => void);
     }
 }

qiniu/storage/resume.js

@@ -344,11 +344,14 @@ function completeParts(upDomain, bucket, encodedObjectName, uploadToken, finishe
         Authorization: 'UpToken ' + uploadToken,
         'Content-Type': 'application/json'
     };
+    var sortedParts = finishedEtags.etags.sort(function (a, b) {
+        return a.partNumber - b.partNumber;
+    });
     var body = {
         'fname': putExtra.fname,
         'mimeType': putExtra.mimeType,
         'customVars': customVars || {},
-        'parts': util.sortObjArr(finishedEtags.etags)
+        'parts': sortedParts
     };
     var requestUrl = upDomain + '/buckets/' + bucket + '/objects/' + encodedObjectName + '/uploads/' + finishedEtags.uploadId;
     var requestBody = JSON.stringify(body);

qiniu/util.js

@@ -62,20 +62,6 @@ exports.hmacSha1 = function (encodedFlags, secretKey) {
     return hmac.digest('base64');
 };
 
-// sort object array by asc
-exports.sortObjArr = function (arr) {
-    for (var i = 0; i < arr.length; i ++) {
-        for (var j = i + 1; j < arr.length; j ++) {
-            if (arr[i].uploadId > arr[j].uploadId) {
-                var mid = arr[i];
-                arr[i] = arr[j];
-                arr[j] = mid;
-            }
-        }
-    }
-    return arr;
-};
-
 // get md5
 exports.getMd5 = function (data) {
     var md5 = crypto.createHash('md5');