slugsocial 0.0.43 → 0.0.45

package/bin/slugsocial.js

@@ -1,16 +1,13 @@
 #!/usr/bin/env node
 // Ultra-thin shim: exec the Rust `slugsocial` binary bundled via platform packages.
 //
-// npm will download exactly one optionalDependency for this platform:
-// - @sortersocial/slugsocial-darwin-arm64
-// - @sortersocial/slugsocial-darwin-x64
-// - @sortersocial/slugsocial-linux-arm64
-// - @sortersocial/slugsocial-linux-x64
-// - @sortersocial/slugsocial-win32-arm64
-// - @sortersocial/slugsocial-win32-x64
+// Binary comes from optionalDependencies for this platform (darwin/linux × arm64/x64).
+// postinstall also installs the platform package if npm skipped optional deps (npx / omit=optional).
 
+const fs = require("node:fs");
 const path = require("node:path");
 const childProcess = require("node:child_process");
+const { ensurePlatformInstalled } = require("../scripts/ensure-platform.js");
 
 function die(msg) {
   console.error(msg);
@@ -21,7 +18,8 @@ function platformTriple() {
   const p = process.platform;
   const a = process.arch;
 
-  const plat = p === "darwin" ? "darwin" : p === "linux" ? "linux" : p === "win32" ? "windows" : null;
+  // Package names use darwin/linux only (see optionalDependencies).
+  const plat = p === "darwin" ? "darwin" : p === "linux" ? "linux" : null;
   const arch = a === "x64" ? "x64" : a === "arm64" ? "arm64" : null;
   if (!plat || !arch) {
     die(`unsupported platform/arch: ${p}/${a}`);
@@ -32,18 +30,43 @@ function platformTriple() {
 function resolvePlatformPackage() {
   const { plat, arch } = platformTriple();
   const name = `@sortersocial/slugsocial-${plat}-${arch}`;
-  try {
-    const pkgJson = require.resolve(`${name}/package.json`);
-    return path.dirname(pkgJson);
-  } catch {
-    die(
-      [
-        `missing platform package ${name}.`,
-        `This usually means npm didn't install optionalDependencies for your platform.`,
-        `Try: npm_config_optional=true npx slugsocial --help`,
-      ].join("\n")
+  const pkgRoot = path.join(__dirname, "..");
+  function tryResolve() {
+    try {
+      const pkgJson = require.resolve(`${name}/package.json`, {
+        paths: [pkgRoot],
+      });
+      return path.dirname(pkgJson);
+    } catch (_) {
+      /* continue */
+    }
+    const sibling = path.join(
+      pkgRoot,
+      "..",
+      "@sortersocial",
+      `slugsocial-${plat}-${arch}`,
+      "package.json",
     );
+    if (fs.existsSync(sibling)) {
+      return path.dirname(sibling);
+    }
+    return null;
   }
+  let dir = tryResolve();
+  if (!dir) {
+    ensurePlatformInstalled(pkgRoot);
+    dir = tryResolve();
+  }
+  if (dir) {
+    return dir;
+  }
+  die(
+    [
+      `missing platform package ${name}.`,
+      `Reinstall with optional deps, e.g. npm install slugsocial --include=optional`,
+      `or: npm install ${name}@<same version as slugsocial>`,
+    ].join("\n"),
+  );
 }
 
 async function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slugsocial",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "Slug Social CLI shim (execs bundled Rust slugsocial) — npx-friendly",
   "license": "MIT",
   "repository": {
@@ -10,16 +10,20 @@
   "bin": {
     "slugsocial": "bin/slugsocial.js"
   },
+  "scripts": {
+    "postinstall": "node scripts/ensure-platform.js"
+  },
   "files": [
     "bin/slugsocial.js",
+    "scripts/ensure-platform.js",
     "README.md",
     "package.json"
   ],
   "optionalDependencies": {
-    "@sortersocial/slugsocial-darwin-arm64": "0.0.43",
-    "@sortersocial/slugsocial-darwin-x64": "0.0.43",
-    "@sortersocial/slugsocial-linux-arm64": "0.0.43",
-    "@sortersocial/slugsocial-linux-x64": "0.0.43"
+    "@sortersocial/slugsocial-darwin-arm64": "0.0.45",
+    "@sortersocial/slugsocial-darwin-x64": "0.0.45",
+    "@sortersocial/slugsocial-linux-arm64": "0.0.45",
+    "@sortersocial/slugsocial-linux-x64": "0.0.45"
   },
   "engines": {
     "node": ">=18"

package/scripts/ensure-platform.js

@@ -0,0 +1,96 @@
+"use strict";
+/**
+ * npm/npx sometimes skip optionalDependencies (omit=optional) or lifecycle scripts
+ * (npm exec). We run this from postinstall when possible, and from the bin shim
+ * before spawning the native binary so `npx slugsocial` always works.
+ */
+const fs = require("fs");
+const path = require("path");
+const { spawnSync } = require("child_process");
+
+function platformPkgName() {
+  const p = process.platform;
+  const a = process.arch;
+  const plat =
+    p === "darwin" ? "darwin" : p === "linux" ? "linux" : null;
+  const arch = a === "x64" ? "x64" : a === "arm64" ? "arm64" : null;
+  if (!plat || !arch) {
+    return null;
+  }
+  return `@sortersocial/slugsocial-${plat}-${arch}`;
+}
+
+/**
+ * @param {string} pkgRoot absolute path to slugsocial package root (…/node_modules/slugsocial)
+ * @returns {boolean} true if the platform package is available after any install attempt
+ */
+function ensurePlatformInstalled(pkgRoot) {
+  const name = platformPkgName();
+  if (!name) {
+    return false;
+  }
+  try {
+    require.resolve(`${name}/package.json`, { paths: [pkgRoot] });
+    return true;
+  } catch (_) {
+    /* continue */
+  }
+
+  const pkgJsonPath = path.join(pkgRoot, "package.json");
+  if (!fs.existsSync(pkgJsonPath)) {
+    return false;
+  }
+  const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
+  const version = pkg.version;
+  if (!version) {
+    return false;
+  }
+
+  const nm = path.join(pkgRoot, "..");
+  const installRoot = path.dirname(nm);
+  const npm = process.platform === "win32" ? "npm.cmd" : "npm";
+  const args = [
+    "install",
+    "--no-fund",
+    "--no-audit",
+    "--no-package-lock",
+    "--prefer-online",
+    "--include=optional",
+    "--prefix",
+    installRoot,
+    `${name}@${version}`,
+  ];
+  const r = spawnSync(npm, args, {
+    stdio: "inherit",
+    env: process.env,
+  });
+  if (r.status !== 0) {
+    return false;
+  }
+  try {
+    require.resolve(`${name}/package.json`, { paths: [pkgRoot] });
+    return true;
+  } catch (_) {
+    return false;
+  }
+}
+
+function main() {
+  const pkgRoot = path.join(__dirname, "..");
+  if (!ensurePlatformInstalled(pkgRoot)) {
+    const name = platformPkgName();
+    const pkg = JSON.parse(
+      fs.readFileSync(path.join(pkgRoot, "package.json"), "utf8"),
+    );
+    console.warn(
+      `slugsocial: postinstall could not install ${name}@${pkg.version}. ` +
+        `The CLI will retry on first run.`,
+    );
+  }
+}
+
+if (require.main === module) {
+  main();
+}
+
+module.exports = { ensurePlatformInstalled, platformPkgName };