Skip to content

Commit 48f5ca6

Browse files
committed
fix the bug of resume upload content buffered when stream not closed
1 parent 8edba1f commit 48f5ca6

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## CHANGE LOG
22

3+
## v7.1.9
4+
- 修复新版node下resume up方式文件内容被缓存而导致的上传失败
5+
36
## v7.1.8
47
- 修复 index.d.ts 文件中zone的设置
58

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "qiniu",
3-
"version": "7.1.8",
3+
"version": "7.1.9",
44
"description": "Node wrapper for Qiniu Resource (Cloud) Storage API",
55
"main": "index.js",
66
"directories": {

qiniu/storage/resume.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ ResumeUploader.prototype.putStream = function(uploadToken, key, rsStream,
4242
rsStream.on("error", function(err) {
4343
//callbackFunc
4444
callbackFunc(err, null, null);
45+
rsStream.close();
4546
return;
4647
});
4748

@@ -67,6 +68,7 @@ ResumeUploader.prototype.putStream = function(uploadToken, key, rsStream,
6768
cZoneExpire) {
6869
if (err) {
6970
callbackFunc(err, null, null);
71+
rsStream.close();
7072
return;
7173
}
7274

@@ -164,6 +166,7 @@ function putReq(config, uploadToken, key, rsStream, rsStreamLen, putExtra,
164166
var bodyCrc32 = parseInt("0x" + getCrc32(readData));
165167
if (respInfo.statusCode != 200 || respBody.crc32 != bodyCrc32) {
166168
callbackFunc(respErr, respBody, respInfo);
169+
rsStream.close();
167170
return;
168171
} else {
169172
finishedBlock += 1;
@@ -197,7 +200,9 @@ function putReq(config, uploadToken, key, rsStream, rsStreamLen, putExtra,
197200
if (!isSent && rsStreamLen === 0) {
198201
mkfileReq(upDomain, uploadToken, fileSize, finishedCtxList, key, putExtra, callbackFunc)
199202
}
200-
})
203+
204+
rsStream.close();
205+
});
201206
}
202207

203208
function mkblkReq(upDomain, uploadToken, blkData, callbackFunc) {

0 commit comments

Comments
 (0)