Skip to content

Commit 08725d7

Browse files
authored
Merge pull request #1200 from ivanduplenskikh/users/ivanduplenskikh/416704362
Add zipStream destroy call when response is aborted
2 parents 6a88be6 + 030a885 commit 08725d7

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Extensions/ArtifactEngine/Providers/webProvider.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export class WebProvider implements IArtifactProvider {
5050
var downloadSize: number = 0;
5151
var contentType: string = artifactItem.contentType;
5252
var itemUrl: string = artifactItem.metadata['downloadUrl'];
53+
var zipStream = null;
5354
itemUrl = itemUrl.replace(/([^:]\/)\/+/g, "$1");
5455
this.webClient.get(itemUrl, contentType ? { 'Accept': contentType } : undefined).then((res: HttpClientResponse) => {
5556
res.message.on('data', (chunk) => {
@@ -59,12 +60,17 @@ export class WebProvider implements IArtifactProvider {
5960
this.artifactItemStore.updateDownloadSize(artifactItem, downloadSize);
6061
});
6162
res.message.on('error', (error) => {
63+
if (zipStream) {
64+
zipStream.destroy(error);
65+
Logger.logMessage(error);
66+
}
6267
reject(error);
6368
});
6469

6570
if (res.message.headers['content-encoding'] === 'gzip') {
6671
try {
67-
resolve(res.message.pipe(zlib.createUnzip()));
72+
zipStream = zlib.createUnzip();
73+
resolve(res.message.pipe(zipStream));
6874
}
6975
catch (err) {
7076
reject(err);

Extensions/ArtifactEngine/npm-shrinkwrap.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Extensions/ArtifactEngine/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "artifact-engine",
3-
"version": "1.2.0",
3+
"version": "1.3.0",
44
"description": "Artifact Engine to download artifacts from jenkins, teamcity, vsts",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)