@vscode/test-web 0.0.41 → 0.0.42

package/out/server/download.js

@@ -12,24 +12,24 @@ const http = require("http");
 const createHttpsProxyAgent = require("https-proxy-agent");
 const createHttpProxyAgent = require("http-proxy-agent");
 const url_1 = require("url");
-const decompress = require("decompress");
-const decompressTargz = require("decompress-targz");
 async function getLatestVersion(quality) {
     const update = await fetchJSON(`https://update.code.visualstudio.com/api/update/web-standalone/${quality}/latest`);
     return update;
 }
 const reset = '\x1b[G\x1b[0K';
-async function download(downloadUrl, destination, message) {
+async function downloadAndUntar(downloadUrl, destination, message) {
     process.stdout.write(message);
+    if (!(0, fs_1.existsSync)(destination)) {
+        await fs_1.promises.mkdir(destination, { recursive: true });
+    }
+    const tar = await Promise.resolve().then(() => require('tar-fs'));
+    const gunzip = await Promise.resolve().then(() => require('gunzip-maybe'));
     return new Promise((resolve, reject) => {
         const httpLibrary = downloadUrl.startsWith('https') ? https : http;
         httpLibrary.get(downloadUrl, getAgent(downloadUrl), res => {
             const total = Number(res.headers['content-length']);
             let received = 0;
             let timeout;
-            const outStream = (0, fs_1.createWriteStream)(destination);
-            outStream.on('close', () => resolve(destination));
-            outStream.on('error', reject);
             res.on('data', chunk => {
                 if (!timeout) {
                     timeout = setTimeout(() => {
@@ -45,26 +45,20 @@ async function download(downloadUrl, destination, message) {
                 }
                 process.stdout.write(`${reset}${message}: complete\n`);
             });
-            res.on('error', reject);
-            res.pipe(outStream);
+            const extract = res.pipe(gunzip()).pipe(tar.extract(destination, { strip: 1 }));
+            extract.on('finish', () => {
+                process.stdout.write(`Extracted to ${destination}\n`);
+                resolve();
+            });
+            extract.on('error', reject);
         });
     });
 }
-async function unzip(source, destination, message) {
-    process.stdout.write(message);
-    if (!(0, fs_1.existsSync)(destination)) {
-        await fs_1.promises.mkdir(destination, { recursive: true });
-    }
-    await decompress(source, destination, {
-        plugins: [
-            decompressTargz()
-        ],
-        strip: 1
-    });
-    process.stdout.write(`${reset}${message}: complete\n`);
-}
 async function downloadAndUnzipVSCode(quality, vscodeTestDir) {
     const info = await getLatestVersion(quality);
+    if (!info.url.endsWith('.tar.gz')) {
+        throw new Error(`Unexpected download URL: ${info.url}. Should end with .tar.gz`);
+    }
     const folderName = `vscode-web-${quality}-${info.version}`;
     const downloadedPath = path.resolve(vscodeTestDir, folderName);
     if ((0, fs_1.existsSync)(downloadedPath) && (0, fs_1.existsSync)(path.join(downloadedPath, 'version'))) {
@@ -75,24 +69,14 @@ async function downloadAndUnzipVSCode(quality, vscodeTestDir) {
     }
     await fs_1.promises.mkdir(vscodeTestDir, { recursive: true });
     const productName = `VS Code ${quality === 'stable' ? 'Stable' : 'Insiders'}`;
-    const tmpArchiveName = path.join(vscodeTestDir, `vscode-web-${quality}-${info.version}-tmp`);
     try {
-        await download(info.url, tmpArchiveName, `Downloading ${productName}`);
-        await unzip(tmpArchiveName, downloadedPath, `Unpacking ${productName}`);
+        await downloadAndUntar(info.url, downloadedPath, `Downloading ${productName}`);
         await fs_1.promises.writeFile(path.join(downloadedPath, 'version'), folderName);
     }
     catch (err) {
         console.error(err);
         throw Error(`Failed to download and unpack ${productName}`);
     }
-    finally {
-        try {
-            fs_1.promises.unlink(tmpArchiveName);
-        }
-        catch (e) {
-            // ignore
-        }
-    }
     return { type: 'static', location: downloadedPath, quality, version: info.version };
 }
 exports.downloadAndUnzipVSCode = downloadAndUnzipVSCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "scripts": {
     "install-extensions": "yarn --cwd=fs-provider && yarn --cwd=sample",
     "compile": "tsc -p ./ && yarn compile-fs-provider",
@@ -25,18 +25,18 @@
   "dependencies": {
     "@koa/router": "^12.0.0",
     "@koa/cors": "^4.0.0",
-    "koa": "^2.14.1",
+    "koa": "^2.14.2",
     "koa-morgan": "^1.0.1",
     "koa-mount": "^4.0.0",
     "koa-static": "^5.0.0",
     "minimist": "^1.2.8",
-    "playwright": "^1.32.2",
+    "playwright": "^1.32.3",
     "vscode-uri": "^3.0.7",
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.1",
-    "decompress": "^4.2.1",
-    "decompress-targz": "^4.1.1",
-    "get-stream": "6.0.1"
+    "get-stream": "6.0.1",
+    "tar-fs": "^2.1.1",
+    "gunzip-maybe": "^1.4.2"
   },
   "devDependencies": {
     "@types/koa": "^2.13.6",
@@ -46,12 +46,13 @@
     "@types/koa__router": "^12.0.0",
     "@types/minimist": "^1.2.2",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
-    "@types/decompress": "^4.2.4",
-    "eslint": "^8.37.0",
+    "@types/gunzip-maybe": "^1.4.0",
+    "@types/tar-fs": "^2.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
+    "eslint": "^8.38.0",
     "eslint-plugin-header": "^3.1.1",
-    "typescript": "^5.0.3"
+    "typescript": "^5.0.4"
   },
   "license": "MIT",
   "author": "Visual Studio Code Team",