@fabr-client/core 0.1.5 → 0.1.8

package/bin/fabr-client.js

@@ -37,6 +37,20 @@ function npmCommand() {
   };
 }
 
+function npmSpawnOptions(cwd) {
+  const npm = npmCommand();
+  return {
+    npm,
+    options: {
+      cwd,
+      env: process.env,
+      shell: platform === "win32" && npm.command.endsWith(".cmd"),
+      stdio: "inherit",
+      windowsHide: true,
+    },
+  };
+}
+
 function packageSpec(pkg) {
   if (process.env.FABR_CLIENT_PLATFORM_PACKAGE_SPEC) {
     return process.env.FABR_CLIENT_PLATFORM_PACKAGE_SPEC;
@@ -50,39 +64,101 @@ function packageSpec(pkg) {
   return `${pkg}@${version}`;
 }
 
-function installPlatformPackage(pkg) {
-  if (!pkg || process.env.FABR_CLIENT_SKIP_PLATFORM_INSTALL === "1") {
-    return false;
-  }
-
-  const spec = packageSpec(pkg);
-  const npm = npmCommand();
-  const args = [
-    ...npm.args,
-    "install",
-    spec,
-    "--no-save",
-    "--package-lock=false",
-    "--include=optional",
-  ];
-
-  console.error(`Installing Fabr Client native payload: ${spec}`);
-  const result = spawnSync(npm.command, args, {
-    cwd: path.join(__dirname, ".."),
-    env: process.env,
-    stdio: "inherit",
-    windowsHide: true,
-  });
+function runNpmInstall(label, args, cwd) {
+  const { npm, options } = npmSpawnOptions(cwd);
+  console.error(label);
+  const result = spawnSync(npm.command, [...npm.args, ...args], options);
 
   if (result.error || result.status !== 0) {
     const message = result.error ? result.error.message : `npm exited with status ${result.status}`;
-    console.error(`Unable to install ${pkg} automatically: ${message}`);
+    console.error(`${label} failed: ${message}`);
     return false;
   }
 
   return true;
 }
 
+function installPlatformPackageLocal(spec) {
+  return runNpmInstall(
+    `Installing Fabr Client native payload: ${spec}`,
+    [
+      "install",
+      spec,
+      "--no-save",
+      "--package-lock=false",
+      "--include=optional",
+    ],
+    path.join(__dirname, ".."),
+  );
+}
+
+function installPlatformPackageGlobal(spec) {
+  return runNpmInstall(
+    `Installing Fabr Client native payload globally: ${spec}`,
+    [
+      "install",
+      "-g",
+      spec,
+      "--include=optional",
+    ],
+    path.join(__dirname, ".."),
+  );
+}
+
+function installPlatformPackageGlobalFromFallbackRegistry(spec) {
+  if (process.env.FABR_CLIENT_SKIP_REGISTRY_FALLBACK === "1") {
+    return false;
+  }
+  const registry =
+    process.env.FABR_CLIENT_NPM_FALLBACK_REGISTRY || "https://registry.npmjs.org";
+  return runNpmInstall(
+    `Installing Fabr Client native payload globally from fallback registry: ${spec}`,
+    [
+      "install",
+      "-g",
+      spec,
+      "--include=optional",
+      `--registry=${registry}`,
+    ],
+    path.join(__dirname, ".."),
+  );
+}
+
+function resolveInstalledBinary(pkg) {
+  const binary = resolvePlatformPackageBinary(pkg);
+  return binary && fs.existsSync(binary) ? binary : null;
+}
+
+function installAndResolvePlatformPackage(pkg) {
+  if (!pkg || process.env.FABR_CLIENT_SKIP_PLATFORM_INSTALL === "1") {
+    return null;
+  }
+
+  const spec = packageSpec(pkg);
+  if (installPlatformPackageLocal(spec)) {
+    const binary = resolveInstalledBinary(pkg);
+    if (binary) {
+      return binary;
+    }
+  }
+
+  if (installPlatformPackageGlobal(spec)) {
+    const binary = resolveInstalledBinary(pkg);
+    if (binary) {
+      return binary;
+    }
+  }
+
+  if (installPlatformPackageGlobalFromFallbackRegistry(spec)) {
+    const binary = resolveInstalledBinary(pkg);
+    if (binary) {
+      return binary;
+    }
+  }
+
+  return null;
+}
+
 const pkg = packageByPlatform[platformDir];
 const candidates = [
   process.env.FABR_CLIENT_BIN,
@@ -96,11 +172,8 @@ const candidates = [
 
 let binary = candidates.find((candidate) => fs.existsSync(candidate));
 
-if (!binary && installPlatformPackage(pkg)) {
-  binary = resolvePlatformPackageBinary(pkg);
-  if (binary && !fs.existsSync(binary)) {
-    binary = null;
-  }
+if (!binary) {
+  binary = installAndResolvePlatformPackage(pkg);
 }
 
 if (!binary) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabr-client/core",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "description": "Cross-platform launcher for Fabr Client",
   "license": "MIT",
   "homepage": "https://pivot.enclaws.com",
@@ -19,9 +19,9 @@
     "smoke": "node bin/fabr-client.js --help"
   },
   "optionalDependencies": {
-    "@fabr-client/core-win32-x64": "0.1.5",
-    "@fabr-client/core-darwin-x64": "0.1.5",
-    "@fabr-client/core-darwin-arm64": "0.1.5"
+    "@fabr-client/core-win32-x64": "0.1.8",
+    "@fabr-client/core-darwin-x64": "0.1.8",
+    "@fabr-client/core-darwin-arm64": "0.1.8"
   },
   "files": [
     "bin/",

package/postinstall.js

@@ -71,6 +71,7 @@ console.log(`Installing Fabr Client native payload: ${spec}`);
 const result = spawnSync(npm.command, args, {
   cwd: __dirname,
   env: process.env,
+  shell: platform === "win32" && npm.command.endsWith(".cmd"),
   stdio: "inherit",
   windowsHide: true,
 });