fix macos downloads

Author: christian-bromann

.gitignore

@@ -4,4 +4,4 @@ node_modules
 *.tar.gz
 *.log
 dist
-./.bin
+.bin/

src/install.ts

@@ -54,8 +54,8 @@ export async function download (geckodriverVersion: string = process.env.GECKODR
   log.info(`Downloading Geckodriver from ${url}`)
   const res = await fetch(url, fetchOpts)
 
-  if (!res.body) {
-    throw new Error(`Failed to download binary (statusCode ${res.status})`)
+  if (res.status !== 200) {
+    throw new Error(`Failed to download binary (statusCode ${res.status}): ${res.statusText}`)
   }
 
   await fsp.mkdir(targetDir, { recursive: true })

src/utils.ts

@@ -19,9 +19,11 @@ export function getDownloadUrl (version: string) {
       : 'linux'
   const arch = os.arch() === 'arm64'
     ? '-aarch64'
-    : os.arch() === 'x64'
-      ? '64'
-      : '32'
+    : platformIdentifier === 'macos'
+      ? ''
+      : os.arch() === 'x64'
+        ? '64'
+        : '32'
   const ext = os.platform() === 'win32' ? '.zip' : '.tar.gz'
   return util.format(GECKODRIVER_DOWNLOAD_PATH, version, version, platformIdentifier, arch, ext)
 }

tests/__snapshots__/unit.test.ts.snap

@@ -8,7 +8,7 @@ exports[`getDownloadUrl 3`] = `"https://github.com/mozilla/geckodriver/releases/
 
 exports[`getDownloadUrl 4`] = `"https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-win-aarch64.zip"`;
 
-exports[`getDownloadUrl 5`] = `"https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-macos64.tar.gz"`;
+exports[`getDownloadUrl 5`] = `"https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-macos.tar.gz"`;
 
 exports[`getDownloadUrl 6`] = `"https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-macos-aarch64.tar.gz"`;