@fabr-client/core 0.1.0 → 0.1.2

package/README.md

@@ -39,6 +39,10 @@ Set the shared Rust and npm package version first:
 pwsh ./scripts/set-package-version.ps1 -Version 0.0.3
 ```
 
+```bash
+bash ./scripts/set-package-version.sh 0.0.3
+```
+
 For maintainers, build the Windows payload with PowerShell:
 
 ```powershell

package/bin/fabr-client.js

@@ -39,13 +39,18 @@ const candidates = [
 
 const binary = candidates.find((candidate) => fs.existsSync(candidate));
 
-if (!binary) {
-  console.error(
-    `Fabr Client does not include a binary for ${platformDir}.\n` +
-      "Please reinstall @fabr-client/core, or install the matching platform package."
-  );
-  process.exit(1);
-}
+if (!binary) {
+  const pkg = packageByPlatform[platformDir];
+  const installHint = pkg
+    ? `Try: npm install -g ${pkg}`
+    : "This platform is not currently supported by @fabr-client/core.";
+  console.error(
+    `Fabr Client does not include a binary for ${platformDir}.\n` +
+      "Please reinstall @fabr-client/core with optional dependencies enabled, or install the matching platform package.\n" +
+      installHint
+  );
+  process.exit(1);
+}
 
 const result = spawnSync(binary, process.argv.slice(2), {
   stdio: "inherit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabr-client/core",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Cross-platform launcher for Fabr Client",
   "license": "MIT",
   "homepage": "https://pivot.enclaws.com",
@@ -15,15 +15,17 @@
     "fabr-client": "bin/fabr-client.js"
   },
   "scripts": {
+    "postinstall": "node postinstall.js",
     "smoke": "node bin/fabr-client.js --help"
   },
   "optionalDependencies": {
-    "@fabr-client/core-win32-x64": "0.1.0",
-    "@fabr-client/core-darwin-x64": "0.1.0",
-    "@fabr-client/core-darwin-arm64": "0.1.0"
+    "@fabr-client/core-win32-x64": "0.1.2",
+    "@fabr-client/core-darwin-x64": "0.1.2",
+    "@fabr-client/core-darwin-arm64": "0.1.2"
   },
   "files": [
     "bin/",
+    "postinstall.js",
     "README.md"
   ],
   "engines": {

package/postinstall.js

@@ -0,0 +1,93 @@
+"use strict";
+
+const { spawnSync } = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
+
+const platform = process.platform;
+const arch = process.arch;
+const exe = platform === "win32" ? "fabr-client.exe" : "fabr-client";
+const platformDir = `${platform}-${arch}`;
+const packageByPlatform = {
+  "win32-x64": "@fabr-client/core-win32-x64",
+  "darwin-x64": "@fabr-client/core-darwin-x64",
+  "darwin-arm64": "@fabr-client/core-darwin-arm64",
+};
+
+function resolvePlatformPackageBinary(pkg) {
+  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 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}`;
+}
+
+const pkg = packageByPlatform[platformDir];
+if (!pkg || process.env.FABR_CLIENT_SKIP_PLATFORM_INSTALL === "1") {
+  process.exit(0);
+}
+
+const existingBinary = resolvePlatformPackageBinary(pkg);
+if (existingBinary && fs.existsSync(existingBinary)) {
+  process.exit(0);
+}
+
+const spec = packageSpec(pkg);
+const npm = npmCommand();
+const args = [
+  ...npm.args,
+  "install",
+  spec,
+  "--no-save",
+  "--package-lock=false",
+  "--include=optional",
+];
+
+console.log(`Installing Fabr Client native payload: ${spec}`);
+const result = spawnSync(npm.command, args, {
+  cwd: __dirname,
+  env: process.env,
+  stdio: "inherit",
+  windowsHide: true,
+});
+
+if (result.error || result.status !== 0) {
+  const message = result.error ? result.error.message : `npm exited with status ${result.status}`;
+  console.warn(
+    `Unable to install ${pkg} automatically: ${message}\n` +
+      `Run "npm install -g ${pkg}" if "fabr-client" cannot find its native binary.`
+  );
+  process.exit(0);
+}
+
+const installedBinary = resolvePlatformPackageBinary(pkg);
+if (!installedBinary || !fs.existsSync(installedBinary)) {
+  console.warn(
+    `Installed ${pkg}, but ${exe} was not found.\n` +
+      `Run "npm install -g ${pkg}" if "fabr-client" cannot find its native binary.`
+  );
+}