添加测试用例

okbang9 · okbang9 · commit 6cfeb44fdbab · 2021-06-08T10:58:38.000+08:00
diff --git a/index.d.ts b/index.d.ts
@@ -304,8 +304,11 @@ export declare namespace resume_up {
          * @param mimeType 指定文件的mimeType
          * @param resumeRecordFile
          * @param progressCallback
+         * @param version 分片上传版本 目前支持v1/v2版本 默认v1
+         * @param partSize 分片上传v2必传字段 默认大小为4MB 分片大小范围为1 MB - 1 GB
          */
-        constructor(fname?: string, params?: any, mimeType?: string, resumeRecordFile?: string, progressCallback?: (data: any) => void);
+        constructor(fname?: string, params?: any, mimeType?: string, resumeRecordFile?: string, version?:string, partSize?:bigint,
+                    progressCallback?: (data: any) => void);
     }
 }
 
diff --git a/qiniu/storage/resume.js b/qiniu/storage/resume.js
@@ -106,7 +106,6 @@ function putReq (config, uploadToken, key, rsStream, rsStreamLen, putExtra, call
         uploadId: '',
         expiredAt: 0
     };
-    var encodedObjectName = key ? util.urlsafeBase64Encode(key) : '~';
     // read resumeRecordFile
     if (putExtra.resumeRecordFile) {
         try {
@@ -138,9 +137,11 @@ function putReq (config, uploadToken, key, rsStream, rsStreamLen, putExtra, call
                     finishedBlock = finishedEtags.etags.length;
                 }
 
+            } else {
+                throw  new Error("分片上传版本号错误")
             }
         } catch (e) {
-            // log(e);
+            //log(e)
         }
     }
 
@@ -192,6 +193,7 @@ function putReq (config, uploadToken, key, rsStream, rsStreamLen, putExtra, call
         });
 
     } else if (putExtra.version === 'v2'){
+        var encodedObjectName = key ? util.urlsafeBase64Encode(key) : '~';
         if (finishedEtags.uploadId) {
             //if it has resumeRecordFile
             resumUploadV2(uploadToken, bucket, encodedObjectName, upDomain, blkStream, isSent, readLen, curBlock, finishedEtags, finishedBlock,
@@ -201,6 +203,8 @@ function putReq (config, uploadToken, key, rsStream, rsStreamLen, putExtra, call
             initReq(uploadToken, bucket, encodedObjectName, upDomain, blkStream, isSent, readLen, curBlock, finishedEtags, finishedBlock,
                 totalBlockNum, putExtra, rsStreamLen, rsStream, callbackFunc);
         }
+    } else {
+        throw  new Error("分片上传版本号错误")
     }
 }
 
@@ -282,7 +286,7 @@ function resumUploadV2(uploadToken, bucket, encodedObjectName, upDomain, blkStre
             blkStream.pause();
             partNumber = finishedBlock + 1;
             var bodyMd5 = util.getMd5(chunk);
-            mkbklReqV2(bucket, upDomain, uploadToken, encodedObjectName, chunk, finishedEtags.uploadId, partNumber,
+            uploadPart(bucket, upDomain, uploadToken, encodedObjectName, chunk, finishedEtags.uploadId, partNumber,
                 function (respErr, respBody, respInfo) {
                     if (respInfo.statusCode != 200 || respBody.md5 != bodyMd5) {
                         callbackFunc(respErr, respBody, respInfo);
@@ -306,7 +310,7 @@ function resumUploadV2(uploadToken, bucket, encodedObjectName, upDomain, blkStre
                         }
                         blkStream.resume();
                         if (finishedEtags.etags.length === totalBlockNum) {
-                            mkfileReqV2(upDomain, bucket, encodedObjectName, uploadToken, finishedEtags,
+                            completeParts(upDomain, bucket, encodedObjectName, uploadToken, finishedEtags,
                                 '', putExtra, callbackFunc);
                             isSent = true;
                         }
@@ -317,14 +321,14 @@ function resumUploadV2(uploadToken, bucket, encodedObjectName, upDomain, blkStre
 
     blkStream.on('end', function () {
         if (!isSent && rsStreamLen === 0) {
-            mkfileReqV2(upDomain, bucket, encodedObjectName, uploadToken, finishedEtags,
+            completeParts(upDomain, bucket, encodedObjectName, uploadToken, finishedEtags,
                 '', putExtra, callbackFunc);
         }
         destroy(rsStream);
     });
 }
 
-function mkbklReqV2(bucket, upDomain, uploadToken, encodedObjectName, chunk, uploadId, partNumber, callbackFunc) {
+function uploadPart(bucket, upDomain, uploadToken, encodedObjectName, chunk, uploadId, partNumber, callbackFunc) {
     var headers = {
         Authorization: 'UpToken ' + uploadToken,
         'Content-Type': 'application/octet-stream',
@@ -335,7 +339,7 @@ function mkbklReqV2(bucket, upDomain, uploadToken, encodedObjectName, chunk, upl
     rpc.put(requestUrl, chunk, headers, callbackFunc);
 }
 
-function mkfileReqV2(upDomain, bucket, encodedObjectName, uploadToken, finishedEtags,
+function completeParts(upDomain, bucket, encodedObjectName, uploadToken, finishedEtags,
                      customVars, putExtra, callbackFunc) {
     var headers = {
         Authorization: 'UpToken ' + uploadToken,
diff --git a/test/resume_up.test.js b/test/resume_up.test.js
@@ -211,13 +211,13 @@ describe('test resume up', function () {
                 });
         });
 
-        it('test resume up#putStream resume_v2', function (done) {
+        it('test resume up#putStream resume_v2_2m', function (done) {
             config.zone = null;
 
-            var key = 'storage_putStream_resume_test_v2' + Math.random(1000);
+            var key = 'storage_putStream_resume_test_v2_2m' + Math.random(1000);
             var stream = new Readable();
             var blkSize = 1024 * 1024;
-            var blkCnt = 5;
+            var blkCnt = 2;
             for (var i = 0; i < blkCnt; i++) {
                 stream.push(crypto.randomBytes(blkSize));
             }
@@ -246,5 +246,114 @@ describe('test resume up', function () {
                     keysToDelete.push(respBody.key);
                 });
         });
+
+        it('test resume up#putStream resume_v2_4m', function (done) {
+            config.zone = null;
+
+            var key = 'storage_putStream_resume_test_v2_4m' + Math.random(1000);
+            var stream = new Readable();
+            var blkSize = 1024 * 1024;
+            var blkCnt = 4;
+            for (var i = 0; i < blkCnt; i++) {
+                stream.push(crypto.randomBytes(blkSize));
+            }
+            stream.push(null);
+            var tmpfile = path.join(os.tmpdir(), '/resume_file');
+            fs.writeFileSync(tmpfile, '');
+            putExtra.resumeRecordFile = tmpfile;
+            putExtra.partSize = 6 * 1024 * 1024
+            putExtra.version = 'v2'
+            putExtra.progressCallback = function (len, total) {
+                if (len === total) {
+                    var content = fs.readFileSync(tmpfile);
+                    var data = JSON.parse(content);
+                    data.etags.forEach(function (item) {
+                        item.should.have.keys('etag', 'partNumber');
+                    });
+                }
+            };
+            resumeUploader.putStream(uploadToken, key, stream, blkCnt * blkSize, putExtra,
+                function (
+                    respErr,
+                    respBody, respInfo) {
+                    console.log(respBody, respInfo);
+                    should.not.exist(respErr);
+                    respBody.should.have.keys('key', 'hash');
+                    keysToDelete.push(respBody.key);
+                });
+        });
+
+        it('test resume up#putStream resume_v2_6m', function (done) {
+            config.zone = null;
+
+            var key = 'storage_putStream_resume_test_v2_6m' + Math.random(1000);
+            var stream = new Readable();
+            var blkSize = 1024 * 1024;
+            var blkCnt = 6;
+            for (var i = 0; i < blkCnt; i++) {
+                stream.push(crypto.randomBytes(blkSize));
+            }
+            stream.push(null);
+            var tmpfile = path.join(os.tmpdir(), '/resume_file');
+            fs.writeFileSync(tmpfile, '');
+            putExtra.resumeRecordFile = tmpfile;
+            putExtra.partSize = 6 * 1024 * 1024
+            putExtra.version = 'v2'
+            putExtra.progressCallback = function (len, total) {
+                if (len === total) {
+                    var content = fs.readFileSync(tmpfile);
+                    var data = JSON.parse(content);
+                    data.etags.forEach(function (item) {
+                        item.should.have.keys('etag', 'partNumber');
+                    });
+                }
+            };
+            resumeUploader.putStream(uploadToken, key, stream, blkCnt * blkSize, putExtra,
+                function (
+                    respErr,
+                    respBody, respInfo) {
+                    console.log(respBody, respInfo);
+                    should.not.exist(respErr);
+                    respBody.should.have.keys('key', 'hash');
+                    keysToDelete.push(respBody.key);
+                });
+        });
+
+        it('test resume up#putStream resume_v2_10m', function (done) {
+            config.zone = null;
+
+            var key = 'storage_putStream_resume_test_v2_10m' + Math.random(1000);
+            var stream = new Readable();
+            var blkSize = 1024 * 1024;
+            var blkCnt = 10;
+            for (var i = 0; i < blkCnt; i++) {
+                stream.push(crypto.randomBytes(blkSize));
+            }
+            stream.push(null);
+            var tmpfile = path.join(os.tmpdir(), '/resume_file');
+            fs.writeFileSync(tmpfile, '');
+            putExtra.resumeRecordFile = tmpfile;
+            putExtra.partSize = 6 * 1024 * 1024
+            putExtra.version = 'v2'
+            putExtra.progressCallback = function (len, total) {
+                if (len === total) {
+                    var content = fs.readFileSync(tmpfile);
+                    var data = JSON.parse(content);
+                    data.etags.forEach(function (item) {
+                        item.should.have.keys('etag', 'partNumber');
+                    });
+                }
+            };
+            resumeUploader.putStream(uploadToken, key, stream, blkCnt * blkSize, putExtra,
+                function (
+                    respErr,
+                    respBody, respInfo) {
+                    console.log(respBody, respInfo);
+                    should.not.exist(respErr);
+                    respBody.should.have.keys('key', 'hash');
+                    keysToDelete.push(respBody.key);
+                });
+        });
+
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -304,8 +304,11 @@ export declare namespace resume_up {`
`304`	`304`	`* @param mimeType 指定文件的mimeType`
`305`	`305`	`* @param resumeRecordFile`
`306`	`306`	`* @param progressCallback`
	`307`	`+ * @param version 分片上传版本目前支持v1/v2版本默认v1`
	`308`	`+ * @param partSize 分片上传v2必传字段默认大小为4MB 分片大小范围为1 MB - 1 GB`
`307`	`309`	`*/`
`308`		`- constructor(fname?: string, params?: any, mimeType?: string, resumeRecordFile?: string, progressCallback?: (data: any) => void);`
	`310`	`+ constructor(fname?: string, params?: any, mimeType?: string, resumeRecordFile?: string, version?:string, partSize?:bigint,`
	`311`	`+ progressCallback?: (data: any) => void);`
`309`	`312`	`}`
`310`	`313`	`}`
`311`	`314`