@fabr-client/core 0.1.4 → 0.1.6

package/bin/fabr-client.js

@@ -15,34 +15,145 @@ const packageByPlatform = {
   "darwin-arm64": "@fabr-client/core-darwin-arm64",
 };
 
-function resolvePlatformPackageBinary() {
-  const pkg = packageByPlatform[platformDir];
-  if (!pkg) {
-    return null;
-  }
-  try {
-    return path.join(path.dirname(require.resolve(`${pkg}/package.json`)), "bin", exe);
-  } catch {
-    return null;
-  }
-}
-
-const candidates = [
-  process.env.FABR_CLIENT_BIN,
-  resolvePlatformPackageBinary(),
-  // Local development fallback: package payloads staged next to this repo.
-  path.join(__dirname, "..", "..", "npm-platforms", platformDir, "bin", exe),
-  path.join(__dirname, platformDir, exe),
+function resolvePlatformPackageBinary(pkg) {
+  if (!pkg) {
+    return null;
+  }
+  try {
+    return path.join(path.dirname(require.resolve(`${pkg}/package.json`)), "bin", exe);
+  } catch {
+    return null;
+  }
+}
+
+function npmCommand() {
+  const npmExecPath = process.env.npm_execpath;
+  if (npmExecPath) {
+    return { command: process.execPath, args: [npmExecPath] };
+  }
+  return {
+    command: platform === "win32" ? "npm.cmd" : "npm",
+    args: [],
+  };
+}
+
+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;
+  }
+  if (process.env.FABR_CLIENT_PLATFORM_PACKAGE_TARBALL) {
+    return process.env.FABR_CLIENT_PLATFORM_PACKAGE_TARBALL;
+  }
+
+  const ownPackage = require("../package.json");
+  const version = ownPackage.optionalDependencies?.[pkg] || ownPackage.version;
+  return `${pkg}@${version}`;
+}
+
+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(`${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 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;
+    }
+  }
+
+  return null;
+}
+
+const pkg = packageByPlatform[platformDir];
+const candidates = [
+  process.env.FABR_CLIENT_BIN,
+  resolvePlatformPackageBinary(pkg),
+  // Local development fallback: package payloads staged next to this repo.
+  path.join(__dirname, "..", "..", "npm-platforms", platformDir, "bin", exe),
+  path.join(__dirname, platformDir, exe),
   path.join(__dirname, "..", platformDir, exe),
   path.join(__dirname, exe),
 ].filter(Boolean);
-
-const binary = candidates.find((candidate) => fs.existsSync(candidate));
-
+
+let binary = candidates.find((candidate) => fs.existsSync(candidate));
+
+if (!binary) {
+  binary = installAndResolvePlatformPackage(pkg);
+}
+
 if (!binary) {
-  const pkg = packageByPlatform[platformDir];
+  const spec = pkg ? packageSpec(pkg) : null;
   const installHint = pkg
-    ? `Try: npm install -g ${pkg}`
+    ? `Try: npm install -g ${spec}`
     : "This platform is not currently supported by @fabr-client/core.";
   console.error(
     `Fabr Client does not include a binary for ${platformDir}.\n` +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabr-client/core",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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.4",
-    "@fabr-client/core-darwin-x64": "0.1.4",
-    "@fabr-client/core-darwin-arm64": "0.1.4"
+    "@fabr-client/core-win32-x64": "0.1.6",
+    "@fabr-client/core-darwin-x64": "0.1.6",
+    "@fabr-client/core-darwin-arm64": "0.1.6"
   },
   "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,
 });