Skip to content

Commit 4664268

Browse files
authored
[webdeployment-common] Replace DecompressZip with node-stream-zip (#292)
1 parent 7e23ac3 commit 4664268

File tree

3 files changed

+10
-114
lines changed

3 files changed

+10
-114
lines changed

common-npm-packages/webdeployment-common/package-lock.json

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

common-npm-packages/webdeployment-common/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "azure-pipelines-tasks-webdeployment-common",
3-
"version": "4.233.0",
3+
"version": "4.236.0",
44
"description": "Common Lib for MSDeploy Utility",
55
"repository": {
66
"type": "git",
@@ -23,7 +23,6 @@
2323
"@xmldom/xmldom": "git+https://github.com/xmldom/xmldom.git#0.8.6",
2424
"archiver": "1.2.0",
2525
"azure-pipelines-task-lib": "^4.2.0",
26-
"decompress-zip": "^0.3.3",
2726
"ltx": "2.8.0",
2827
"node-stream-zip": "^1.15.0",
2928
"q": "1.4.1",

common-npm-packages/webdeployment-common/ziputility.ts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import Q = require('q');
44
import fs = require('fs');
55
import StreamZip = require('node-stream-zip');
66
import tr = require('azure-pipelines-task-lib/toolrunner');
7-
8-
var DecompressZip = require('decompress-zip');
97
var archiver = require('archiver');
108

119
const deleteDir = (path: string) => tl.exist(path) && tl.rmRF(path);
@@ -148,17 +146,16 @@ export async function archiveFolder(folderPath, targetPath, zipName) {
148146
*/
149147
export async function getArchivedEntries(archivedPackage: string) {
150148
var deferred = Q.defer();
151-
var unzipper = new DecompressZip(archivedPackage);
152-
unzipper.on('error', function (error) {
149+
const zip = new StreamZip.async({file: archivedPackage});
150+
zip.entries().then(entries => {
151+
var packageConmponent = {
152+
'entries': Object.keys(entries)
153+
}
154+
zip.close();
155+
deferred.resolve(packageConmponent);
156+
}).catch(error => {
153157
deferred.reject(error);
154158
});
155-
unzipper.on('list', function (files) {
156-
var packageComponent = {
157-
"entries":files
158-
};
159-
deferred.resolve(packageComponent);
160-
});
161-
unzipper.list();
162159
return deferred.promise;
163160
}
164161

0 commit comments

Comments
 (0)