test

Author: sylingd

patches/@puppeteer__browsers.patch

@@ -1,28 +1,8 @@
-diff --git a/lib/cjs/CLI.js b/lib/cjs/CLI.js
-index a4746096241ebaaf7b3eca40a6d8b0fd13191118..77e6517fe29ea97112d36b6464139f95fc4e40d9 100644
---- a/lib/cjs/CLI.js
-+++ b/lib/cjs/CLI.js
-@@ -319,6 +319,7 @@ class CLI {
-         }
-         const originalBuildId = args.browser.buildId;
-         args.browser.buildId = await (0, browser_data_js_1.resolveBuildId)(args.browser.name, args.platform, args.browser.buildId);
-+      console.log('after resolveBuildId', args.browser);
-         await (0, install_js_1.install)({
-             browser: args.browser.name,
-             buildId: args.browser.buildId,
 diff --git a/lib/cjs/install.js b/lib/cjs/install.js
-index 35c7229df92528c119d5836d9c863a7de01f0977..81ebebf19eb5a4f956f67061281341b3d53ae9bd 100644
+index 35c7229df92528c119d5836d9c863a7de01f0977..f024f869e98845ff70199a1809e1cb8fafc8d3ac 100644
 --- a/lib/cjs/install.js
 +++ b/lib/cjs/install.js
-@@ -84,6 +84,7 @@ async function install(options) {
-                 const backupUrl = version.downloads[options.browser]?.find(link => {
-                     return link['platform'] === platform;
-                 })?.url;
-+      console.log('install backupUrl', options, backupUrl);
-                 if (backupUrl) {
-                     // If the URL is the same, skip the retry.
-                     if (backupUrl === url.toString()) {
-@@ -140,10 +141,12 @@ async function installUrl(url, options) {
+@@ -140,10 +140,12 @@ async function installUrl(url, options) {
          downloadProgressCallback = await makeProgressCallback(options.browser, options.buildIdAlias ?? options.buildId);
      }
      const fileName = decodeURIComponent(url.toString()).split('/').pop();
@@ -35,31 +15,23 @@ index 35c7229df92528c119d5836d9c863a7de01f0977..81ebebf19eb5a4f956f67061281341b3
      if (!(0, node_fs_1.existsSync)(browserRoot)) {
          await (0, promises_1.mkdir)(browserRoot, { recursive: true });
      }
-@@ -158,6 +161,7 @@ async function installUrl(url, options) {
+@@ -158,6 +160,7 @@ async function installUrl(url, options) {
          return archivePath;
      }
      const outputPath = cache.installationDir(options.browser, options.platform, options.buildId);
 +    console.log('installUrl outputPath', options.browser, outputPath);
      try {
          if ((0, node_fs_1.existsSync)(outputPath)) {
              const installedBrowser = new Cache_js_1.InstalledBrowser(cache, options.browser, options.buildId, options.platform);
-@@ -170,6 +174,7 @@ async function installUrl(url, options) {
-             }
-             return installedBrowser;
-         }
-+    console.log('installUrl Downloading binary', options.browser, url);
-         debugInstall(`Downloading binary from ${url}`);
-         try {
-             debugTime('download');
-@@ -178,6 +183,7 @@ async function installUrl(url, options) {
+@@ -178,6 +181,7 @@ async function installUrl(url, options) {
          finally {
              debugTimeEnd('download');
          }
 +    console.log('installUrl', options.browser, `Installing ${archivePath} to ${outputPath}`);
          debugInstall(`Installing ${archivePath} to ${outputPath}`);
          try {
              debugTime('extract');
-@@ -186,12 +192,14 @@ async function installUrl(url, options) {
+@@ -186,12 +190,14 @@ async function installUrl(url, options) {
          finally {
              debugTimeEnd('extract');
          }
@@ -74,3 +46,19 @@ index 35c7229df92528c119d5836d9c863a7de01f0977..81ebebf19eb5a4f956f67061281341b3
          await runSetup(installedBrowser);
          if (options.installDeps) {
              await installDeps(installedBrowser);
+diff --git a/src/fileUtil.ts b/src/fileUtil.ts
+index e2876460c35cb01b54ab8ed4f10327da24e4766a..df2652e8f78ab18e41f6a13aec0b5400bbb132af 100644
+--- a/src/fileUtil.ts
++++ b/src/fileUtil.ts
+@@ -27,8 +27,11 @@ export async function unpackArchive(
+     folderPath = path.resolve(process.cwd(), folderPath);
+   }
+   if (archivePath.endsWith('.zip')) {
++    console.log('unpackArchive 1', archivePath);
+     const extractZip = await import('extract-zip');
++    console.log('unpackArchive 2', archivePath, typeof extractZip);
+     await extractZip.default(archivePath, {dir: folderPath});
++    console.log('unpackArchive 3', archivePath);
+   } else if (archivePath.endsWith('.tar.bz2')) {
+     await extractTar(archivePath, folderPath, 'bzip2');
+   } else if (archivePath.endsWith('.dmg')) {