@yaakapp/cli 0.0.37 → 0.0.39

package/common.js

@@ -9,4 +9,16 @@ const BINARY_DISTRIBUTION_PACKAGES = {
 // Adjust the version you want to install. You can also make this dynamic.
 const BINARY_DISTRIBUTION_VERSION = require('./package.json').version;
 
-module.exports = {BINARY_DISTRIBUTION_PACKAGES, BINARY_DISTRIBUTION_VERSION};
+// Windows binaries end with .exe so we need to special case them.
+const BINARY_NAME = process.platform === "win32" ? "yaakcli.exe" : "yaakcli";
+
+// Determine package name for this platform
+const PLATFORM_SPECIFIC_PACKAGE_NAME =
+  BINARY_DISTRIBUTION_PACKAGES[process.platform + '_' + process.arch];
+
+module.exports = {
+  BINARY_DISTRIBUTION_PACKAGES,
+  BINARY_DISTRIBUTION_VERSION,
+  BINARY_NAME,
+  PLATFORM_SPECIFIC_PACKAGE_NAME
+};

package/index.js

@@ -1,20 +1,13 @@
 const path = require("path");
 const childProcess = require("child_process");
-const {BINARY_DISTRIBUTION_PACKAGES} = require("./common");
-
-// Windows binaries end with .exe so we need to special case them.
-const binaryName = process.platform === "win32" ? "my-binary.exe" : "my-binary";
-
-// Determine package name for this platform
-const platformSpecificPackageName =
-  BINARY_DISTRIBUTION_PACKAGES[process.platform];
+const {PLATFORM_SPECIFIC_PACKAGE_NAME, BINARY_NAME} = require("./common");
 
 function getBinaryPath() {
   try {
     // Resolving will fail if the optionalDependency was not installed
-    return require.resolve(`${platformSpecificPackageName}/bin/${binaryName}`);
+    return require.resolve(`${PLATFORM_SPECIFIC_PACKAGE_NAME}/bin/${BINARY_NAME}`);
   } catch (e) {
-    return path.join(__dirname, "..", binaryName);
+    return path.join(__dirname, "..", BINARY_NAME);
   }
 }
 

package/install.js

@@ -2,17 +2,10 @@ const fs = require("fs");
 const path = require("path");
 const zlib = require("zlib");
 const https = require("https");
-const {BINARY_DISTRIBUTION_PACKAGES, BINARY_DISTRIBUTION_VERSION} = require("./common");
-
-// Windows binaries end with .exe so we need to special case them.
-const binaryName = process.platform === "win32" ? "yaakcli.exe" : "yaakcli";
-
-// Determine package name for this platform
-const platformSpecificPackageName =
-  BINARY_DISTRIBUTION_PACKAGES[process.platform];
+const {BINARY_DISTRIBUTION_VERSION, BINARY_NAME, PLATFORM_SPECIFIC_PACKAGE_NAME} = require("./common");
 
 // Compute the path we want to emit the fallback binary to
-const fallbackBinaryPath = path.join(__dirname, binaryName);
+const fallbackBinaryPath = path.join(__dirname, BINARY_NAME);
 
 function makeRequest(url) {
   return new Promise((resolve, reject) => {
@@ -34,7 +27,7 @@ function makeRequest(url) {
         } else {
           reject(
             new Error(
-              `npm responded with status code ${response.statusCode} when downloading the package!`
+              `npm responded with status code ${response.statusCode} when downloading the package! ${url}`
             )
           );
         }
@@ -73,8 +66,9 @@ function extractFileFromTarball(tarballBuffer, filepath) {
 
 async function downloadBinaryFromNpm() {
   // Download the tarball of the right binary distribution package
+  const platformSpecificPackageNameWithoutOrg = PLATFORM_SPECIFIC_PACKAGE_NAME.split('/')[1];
   const tarballDownloadBuffer = await makeRequest(
-    `https://registry.npmjs.org/${platformSpecificPackageName}/-/${platformSpecificPackageName}-${BINARY_DISTRIBUTION_VERSION}.tgz`
+    `https://registry.npmjs.org/${platformSpecificPackageName}/-/${platformSpecificPackageNameWithoutOrg}-${BINARY_DISTRIBUTION_VERSION}.tgz`,
   );
 
   const tarballBuffer = zlib.unzipSync(tarballDownloadBuffer);
@@ -82,7 +76,7 @@ async function downloadBinaryFromNpm() {
   // Extract binary from package and write to disk
   fs.writeFileSync(
     fallbackBinaryPath,
-    extractFileFromTarball(tarballBuffer, `package/bin/${binaryName}`)
+    extractFileFromTarball(tarballBuffer, `package/bin/${BINARY_NAME}`)
   );
 
   // Make binary executable
@@ -92,7 +86,9 @@ async function downloadBinaryFromNpm() {
 function isPlatformSpecificPackageInstalled() {
   try {
     // Resolving will fail if the optionalDependency was not installed
-    require.resolve(`${platformSpecificPackageName}/bin/${binaryName}`);
+    const binPath = `${PLATFORM_SPECIFIC_PACKAGE_NAME}/bin/${BINARY_NAME}`;
+    console.log('Checking if binary is installed', binPath);
+    require.resolve(binPath);
     return true;
   } catch (e) {
     return false;
@@ -104,7 +100,7 @@ if (!isPlatformSpecificPackageInstalled()) {
   console.log(
     "Platform specific package not found. Will manually download binary."
   );
-  downloadBinaryFromNpm();
+  downloadBinaryFromNpm().catch(console.error);
 } else {
   console.log(
     "Platform specific package already installed. Will fall back to manually downloading binary."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp/cli",
-  "version": "v0.0.37",
+  "version": "v0.0.39",
   "main": "./index.js",
   "repository": {
     "type": "git",
@@ -13,9 +13,9 @@
     "yaakcli": "bin/cli.js"
   },
   "optionalDependencies": {
-    "@yaakapp/cli-darwin-x64": "v0.0.37",
-    "@yaakapp/cli-darwin-arm64": "v0.0.37",
-    "@yaakapp/cli-linux-x64": "v0.0.37",
-    "@yaakapp/cli-win32-x64": "v0.0.37"
+    "@yaakapp/cli-darwin-x64": "v0.0.39",
+    "@yaakapp/cli-darwin-arm64": "v0.0.39",
+    "@yaakapp/cli-linux-x64": "v0.0.39",
+    "@yaakapp/cli-win32-x64": "v0.0.39"
   }
 }