fix the bug of resume upload content buffered when stream not closed

qiniu · Jun 14, 2018 · 48f5ca6 · 48f5ca6
1 parent 8edba1f
commit 48f5ca6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## CHANGE LOG
 
+## v7.1.9
+- 修复新版node下resume up方式文件内容被缓存而导致的上传失败
+
 ## v7.1.8
 - 修复 index.d.ts 文件中zone的设置
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qiniu",
-  "version": "7.1.8",
+  "version": "7.1.9",
   "description": "Node wrapper for Qiniu Resource (Cloud) Storage API",
   "main": "index.js",
   "directories": {

diff --git a/qiniu/storage/resume.js b/qiniu/storage/resume.js
@@ -42,6 +42,7 @@ ResumeUploader.prototype.putStream = function(uploadToken, key, rsStream,
   rsStream.on("error", function(err) {
     //callbackFunc
     callbackFunc(err, null, null);
+    rsStream.close();
     return;
   });
 
@@ -67,6 +68,7 @@ ResumeUploader.prototype.putStream = function(uploadToken, key, rsStream,
       cZoneExpire) {
       if (err) {
         callbackFunc(err, null, null);
+        rsStream.close();
         return;
       }
 
@@ -164,6 +166,7 @@ function putReq(config, uploadToken, key, rsStream, rsStreamLen, putExtra,
           var bodyCrc32 = parseInt("0x" + getCrc32(readData));
           if (respInfo.statusCode != 200 || respBody.crc32 != bodyCrc32) {
             callbackFunc(respErr, respBody, respInfo);
+            rsStream.close();
             return;
           } else {
             finishedBlock += 1;
@@ -197,7 +200,9 @@ function putReq(config, uploadToken, key, rsStream, rsStreamLen, putExtra,
     if (!isSent && rsStreamLen === 0) {
       mkfileReq(upDomain, uploadToken, fileSize, finishedCtxList, key, putExtra, callbackFunc)
     }
-  })
+
+    rsStream.close();
+  });
 }
 
 function mkblkReq(upDomain, uploadToken, blkData, callbackFunc) {