[DownloadPackageV1] replace decompress-zip with extract-zip (#19570)

* [DownloadPackageV1] replace decompress-zip with extract-zip * bump task version * fix variable name
microsoft · Feb 29, 2024 · 95ec9cc · 95ec9cc
1 parent 67e1fd6
commit 95ec9cc
Show file tree

Hide file tree

Showing 14 changed files with 205 additions and 35 deletions.
diff --git a/Tasks/DownloadPackageV1/_buildConfigs/Node20/package-lock.json b/Tasks/DownloadPackageV1/_buildConfigs/Node20/package-lock.json
diff --git a/Tasks/DownloadPackageV1/_buildConfigs/Node20/package.json b/Tasks/DownloadPackageV1/_buildConfigs/Node20/package.json
@@ -24,7 +24,8 @@
     "azure-pipelines-tasks-packaging-common": "3.206.0",
     "azure-pipelines-tasks-utility-common": "^3.198.1",
     "decompress-zip": "0.3.3",
-    "tar-fs": "1.16.3"
+    "tar-fs": "1.16.3",
+    "extract-zip": "2.0.1"
   },
   "devDependencies": {
     "typescript": "5.1.6"

diff --git a/Tasks/DownloadPackageV1/packagefile.ts b/Tasks/DownloadPackageV1/packagefile.ts
@@ -1,9 +1,15 @@
 import * as tl from "azure-pipelines-task-lib/task";
 import * as path from "path";
 import * as fs from "fs";
+#if NODE20
+import * as extract from 'extract-zip'
+#else
+var DecompressZip = require('decompress-zip');
+#endif
+
 var tar = require("tar-fs");
 var zlib = require("zlib");
-var DecompressZip = require('decompress-zip');
+
 
 export class PackageFile {
     public readonly win: boolean;
@@ -62,7 +68,14 @@ export class PackageFile {
     private async unzip(zipLocation: string, unzipLocation: string): Promise<void> {
         return new Promise<void>(function(resolve, reject) {
             tl.debug("Extracting " + zipLocation + " to " + unzipLocation);
-
+#if NODE20
+            tl.debug(`Using extract-zip package for extracting archive`);
+            extract(zipLocation, { dir: unzipLocation }).then(() => {
+                resolve();
+            }).catch((error) => {
+                reject(error);
+            });
+#else
             var unzipper = new DecompressZip(zipLocation);
             unzipper.on("error", err => {
                 return reject(tl.loc("ExtractionFailed", err));
@@ -75,6 +88,7 @@ export class PackageFile {
             unzipper.extract({
                 path: path.normalize(unzipLocation)
             });
+#endif
         });
     }
 }
diff --git a/Tasks/DownloadPackageV1/task.json b/Tasks/DownloadPackageV1/task.json
@@ -9,7 +9,7 @@
     "author": "ms-vscs-rm",
     "version": {
         "Major": 1,
-        "Minor": 231,
+        "Minor": 236,
         "Patch": 0
     },
     "demands": [],

diff --git a/Tasks/DownloadPackageV1/task.loc.json b/Tasks/DownloadPackageV1/task.loc.json
@@ -9,7 +9,7 @@
   "author": "ms-vscs-rm",
   "version": {
     "Major": 1,
-    "Minor": 231,
+    "Minor": 236,
     "Patch": 0
   },
   "demands": [],

diff --git a/_generated/DownloadPackageV1.versionmap.txt b/_generated/DownloadPackageV1.versionmap.txt
@@ -1,2 +1,2 @@
-Default|1.231.0
-Node20_229_1|1.231.1
+Default|1.236.0
+Node20_229_1|1.236.1
diff --git a/_generated/DownloadPackageV1/packagefile.ts b/_generated/DownloadPackageV1/packagefile.ts
@@ -1,9 +1,11 @@
 import * as tl from "azure-pipelines-task-lib/task";
 import * as path from "path";
 import * as fs from "fs";
+var DecompressZip = require('decompress-zip');
+
 var tar = require("tar-fs");
 var zlib = require("zlib");
-var DecompressZip = require('decompress-zip');
+
 
 export class PackageFile {
     public readonly win: boolean;
@@ -62,7 +64,6 @@ export class PackageFile {
     private async unzip(zipLocation: string, unzipLocation: string): Promise<void> {
         return new Promise<void>(function(resolve, reject) {
             tl.debug("Extracting " + zipLocation + " to " + unzipLocation);
-
             var unzipper = new DecompressZip(zipLocation);
             unzipper.on("error", err => {
                 return reject(tl.loc("ExtractionFailed", err));

diff --git a/_generated/DownloadPackageV1/task.json b/_generated/DownloadPackageV1/task.json
@@ -9,7 +9,7 @@
   "author": "ms-vscs-rm",
   "version": {
     "Major": 1,
-    "Minor": 231,
+    "Minor": 236,
     "Patch": 0
   },
   "demands": [],
@@ -195,7 +195,7 @@
     "Info_ResolvedLatestVersion": "Resolved latest package version: %s"
   },
   "_buildConfigMapping": {
-    "Default": "1.231.0",
-    "Node20_229_1": "1.231.1"
+    "Default": "1.236.0",
+    "Node20_229_1": "1.236.1"
   }
 }
diff --git a/_generated/DownloadPackageV1/task.loc.json b/_generated/DownloadPackageV1/task.loc.json
@@ -9,7 +9,7 @@
   "author": "ms-vscs-rm",
   "version": {
     "Major": 1,
-    "Minor": 231,
+    "Minor": 236,
     "Patch": 0
   },
   "demands": [],
@@ -195,7 +195,7 @@
     "Info_ResolvedLatestVersion": "ms-resource:loc.messages.Info_ResolvedLatestVersion"
   },
   "_buildConfigMapping": {
-    "Default": "1.231.0",
-    "Node20_229_1": "1.231.1"
+    "Default": "1.236.0",
+    "Node20_229_1": "1.236.1"
   }
 }