omnish 2.1.2 → 2.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnish",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "omnish — allowlisted inbox → your real shell (WhatsApp, Telegram, Discord, Slack, and 20+ channels). No AI.",
   "license": "MIT",
   "type": "module",
@@ -26,6 +26,8 @@
   "files": [
     "dist",
     "scripts/check-native-modules.mjs",
+    "scripts/check-node-version.mjs",
+    "scripts/node-version.mjs",
     "scripts/fix-node-pty-perms.mjs",
     "README.md",
     "CHANGELOG.md",
@@ -38,27 +40,6 @@
   "bin": {
     "omnish": "dist/index.js"
   },
-  "scripts": {
-    "reinstall": "rm -rf node_modules && pnpm install",
-    "postinstall": "node scripts/check-native-modules.mjs && node scripts/fix-node-pty-perms.mjs",
-    "prepack": "npm run build",
-    "build": "node scripts/build-bundle.mjs",
-    "build:doc-index": "node scripts/build-doc-index.mjs",
-    "typecheck": "tsc --noEmit",
-    "pretypecheck": "node scripts/build-doc-index.mjs",
-    "pretest": "node scripts/build-doc-index.mjs",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
-    "test": "tsx --test 'src/**/*.test.ts'",
-    "arch:check": "depcruise src --config .dependency-cruiser.cjs",
-    "channel:parity": "tsx scripts/channel-parity.mjs",
-    "omnish": "tsx src/index.ts",
-    "link": "tsx src/index.ts link",
-    "run": "tsx src/index.ts run",
-    "local": "omnish stop || true; node scripts/build-bundle.mjs && npm link && omnish start",
-    "logout": "tsx src/index.ts logout"
-  },
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
   "engines": {
     "node": ">=22.13"
   },
@@ -89,14 +70,6 @@
     "tsx": "^4.19.2",
     "typescript": "^5.7.2"
   },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "@parcel/watcher",
-      "better-sqlite3",
-      "esbuild",
-      "node-pty"
-    ]
-  },
   "allowScripts": {
     "@parcel/watcher": true,
     "@whiskeysockets/baileys": true,
@@ -104,5 +77,25 @@
     "node-pty": true,
     "sharp": true,
     "protobufjs": true
+  },
+  "scripts": {
+    "reinstall": "rm -rf node_modules && pnpm install",
+    "preinstall": "node scripts/check-node-version.mjs",
+    "postinstall": "node scripts/check-native-modules.mjs && node scripts/fix-node-pty-perms.mjs",
+    "build": "node scripts/build-bundle.mjs",
+    "build:doc-index": "node scripts/build-doc-index.mjs",
+    "typecheck": "tsc --noEmit",
+    "pretypecheck": "node scripts/build-doc-index.mjs",
+    "pretest": "node scripts/build-doc-index.mjs",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "test": "tsx --test 'src/**/*.test.ts'",
+    "arch:check": "depcruise src --config .dependency-cruiser.cjs",
+    "channel:parity": "tsx scripts/channel-parity.mjs",
+    "omnish": "tsx src/index.ts",
+    "link": "tsx src/index.ts link",
+    "run": "tsx src/index.ts run",
+    "local": "omnish stop || true; node scripts/build-bundle.mjs && npm link && omnish start",
+    "logout": "tsx src/index.ts logout"
   }
-}
+}

package/scripts/check-native-modules.mjs

@@ -2,12 +2,14 @@
  * Verify native addons load under the current Node ABI (postinstall guard).
  */
 import { createRequire } from "node:module";
+import { formatNativeModuleNodeHint } from "./node-version.mjs";
 
 const require = createRequire(import.meta.url);
 
 const modules = ["better-sqlite3", "node-pty", "@parcel/watcher"];
 
 let failed = false;
+let printedNodeHint = false;
 for (const name of modules) {
   try {
     require(name);
@@ -17,9 +19,15 @@ for (const name of modules) {
       `omnish: native module "${name}" failed to load for Node ${process.version} (ABI ${process.versions.modules}).`,
     );
     console.error(`  ${err instanceof Error ? err.message : String(err)}`);
-    console.error(
-      "  Fix: use the Node version in .nvmrc (nvm use) and run: pnpm rebuild better-sqlite3 node-pty @parcel/watcher",
-    );
+    if (!printedNodeHint) {
+      printedNodeHint = true;
+      console.error(
+        "  Fix: use Node 22.13+ (see package.json engines), then reinstall or rebuild:",
+      );
+      console.error("    npm install -g omnish");
+      console.error("    npm rebuild -g omnish");
+      console.error(formatNativeModuleNodeHint());
+    }
   }
 }
 

package/scripts/check-node-version.mjs

@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+/**
+ * preinstall guard — block unsupported Node with actionable upgrade steps.
+ * Skip with OMNISH_SKIP_NODE_CHECK=1 (not recommended).
+ */
+import { checkNodeVersion, formatNodeUpgradeHelp } from "./node-version.mjs";
+
+if (process.env.OMNISH_SKIP_NODE_CHECK === "1") {
+  console.warn("omnish: skipping Node version check (OMNISH_SKIP_NODE_CHECK=1)");
+  process.exit(0);
+}
+
+const result = checkNodeVersion();
+if (result.ok) {
+  process.exit(0);
+}
+
+console.error(formatNodeUpgradeHelp(result));
+process.exit(1);

package/scripts/node-version.mjs

@@ -0,0 +1,212 @@
+/**
+ * Node.js version policy for omnish installs and runtime checks.
+ * matrix-js-sdk and other deps require Node 22+; package.json engines is the source of truth.
+ */
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const DEFAULT_ENGINES_NODE = ">=22.13";
+const RECOMMENDED_NODE = "22";
+
+function readEnginesNode() {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf8"));
+    return typeof pkg.engines?.node === "string" ? pkg.engines.node : DEFAULT_ENGINES_NODE;
+  } catch {
+    return DEFAULT_ENGINES_NODE;
+  }
+}
+
+/** @returns {{ major: number, minor: number, patch: number } | null} */
+export function parseSemver(version) {
+  const raw = String(version).trim().replace(/^v/, "");
+  const m = /^(\d+)\.(\d+)\.(\d+)/.exec(raw);
+  if (!m) {
+    return null;
+  }
+  return { major: Number(m[1]), minor: Number(m[2]), patch: Number(m[3]) };
+}
+
+/** @returns {{ op: ">=" | ">" | "<=" | "<" | "=", major: number, minor: number, patch: number } | null} */
+export function parseEnginesConstraint(constraint) {
+  const m = /^(>=|>|<=|<|=)?\s*v?(\d+)(?:\.(\d+))?(?:\.(\d+))?/.exec(String(constraint).trim());
+  if (!m) {
+    return null;
+  }
+  return {
+    op: /** @type {">=" | ">" | "<=" | "<" | "="} */ (m[1] || ">="),
+    major: Number(m[2]),
+    minor: m[3] !== undefined ? Number(m[3]) : 0,
+    patch: m[4] !== undefined ? Number(m[4]) : 0,
+  };
+}
+
+/**
+ * @param {{ major: number, minor: number, patch: number }} current
+ * @param {{ op: string, major: number, minor: number, patch: number }} required
+ */
+export function satisfiesEngines(current, required) {
+  const cmp = (a, b) => {
+    if (a.major !== b.major) {
+      return a.major - b.major;
+    }
+    if (a.minor !== b.minor) {
+      return a.minor - b.minor;
+    }
+    return a.patch - b.patch;
+  };
+  const delta = cmp(current, required);
+  switch (required.op) {
+    case ">=":
+      return delta >= 0;
+    case ">":
+      return delta > 0;
+    case "<=":
+      return delta <= 0;
+    case "<":
+      return delta < 0;
+    case "=":
+      return delta === 0;
+    default:
+      return delta >= 0;
+  }
+}
+
+/**
+ * @param {string} [nodeVersion] process.version
+ * @param {string} [enginesNode] package.json engines.node
+ */
+export function checkNodeVersion(nodeVersion = process.version, enginesNode = readEnginesNode()) {
+  const current = parseSemver(nodeVersion);
+  const required = parseEnginesConstraint(enginesNode);
+  if (!current || !required) {
+    return {
+      ok: false,
+      current: nodeVersion,
+      required: enginesNode,
+      recommended: RECOMMENDED_NODE,
+      reason: "could not parse Node or engines constraint",
+    };
+  }
+  const ok = satisfiesEngines(current, required);
+  return {
+    ok,
+    current: `v${current.major}.${current.minor}.${current.patch}`,
+    required: enginesNode,
+    recommended: RECOMMENDED_NODE,
+    reason: ok ? null : `need Node ${enginesNode}, found v${current.major}.${current.minor}.${current.patch}`,
+  };
+}
+
+function shellComment(platform) {
+  if (platform === "win32") {
+    return "REM";
+  }
+  return "#";
+}
+
+/**
+ * @param {string} [platform] os.platform()
+ */
+export function formatNodeUpgradeHelp(result, platform = os.platform()) {
+  const lines = [];
+  const c = shellComment(platform);
+  lines.push("");
+  lines.push("omnish needs a newer Node.js to install and run.");
+  lines.push(`  Required : Node ${result.required} (see package.json engines)`);
+  lines.push(`  You have : ${result.current}`);
+  lines.push(`  Recommend: Node ${result.recommended} LTS (matches .nvmrc in the repo)`);
+  lines.push("");
+  lines.push("Why: omnish ships native addons (better-sqlite3, node-pty) and depends on");
+  lines.push("packages that require Node 22+. Older Node often fails at install or first run.");
+  lines.push("");
+  lines.push("Pick one upgrade path, then re-run:");
+  lines.push(`  npm install -g omnish`);
+  lines.push("");
+
+  if (platform === "win32") {
+    lines.push("Windows — nvm-windows (recommended if you use nvm):");
+    lines.push("  nvm install 22");
+    lines.push("  nvm use 22");
+    lines.push("  node -v");
+    lines.push("  npm install -g omnish");
+    lines.push("");
+    lines.push("Windows — official installer / winget:");
+    lines.push("  winget install OpenJS.NodeJS.LTS");
+    lines.push("  node -v");
+    lines.push("  npm install -g omnish");
+    lines.push("");
+    lines.push("If npm still uses an old Node, open a new terminal after upgrading.");
+    return lines.join("\n");
+  }
+
+  if (platform === "darwin") {
+    lines.push("macOS — nvm (install + set default + install omnish):");
+    lines.push(`${c} install nvm: https://github.com/nvm-sh/nvm#installing-and-updating`);
+    lines.push("  curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash");
+    lines.push(`${c} restart your shell, then:`);
+    lines.push("  nvm install 22");
+    lines.push("  nvm alias default 22");
+    lines.push("  node -v");
+    lines.push("  npm install -g omnish");
+    lines.push("");
+    lines.push("macOS — Homebrew:");
+    lines.push("  brew install node@22");
+    lines.push("  brew link --overwrite --force node@22");
+    lines.push("  node -v");
+    lines.push("  npm install -g omnish");
+    lines.push("");
+    lines.push("macOS — fnm:");
+    lines.push("  fnm install 22");
+    lines.push("  fnm default 22");
+    lines.push("  npm install -g omnish");
+    return lines.join("\n");
+  }
+
+  lines.push("Linux — nvm (install + set default + install omnish):");
+  lines.push(`${c} install nvm: https://github.com/nvm-sh/nvm#installing-and-updating`);
+  lines.push("  curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash");
+  lines.push(`${c} restart your shell, then:`);
+  lines.push("  nvm install 22");
+  lines.push("  nvm alias default 22");
+  lines.push("  node -v");
+  lines.push("  npm install -g omnish");
+  lines.push("");
+  lines.push("Linux — fnm:");
+  lines.push("  fnm install 22");
+  lines.push("  fnm default 22");
+  lines.push("  npm install -g omnish");
+  lines.push("");
+  lines.push("Linux — NodeSource / distro packages:");
+  lines.push("  https://nodejs.org/en/download  (pick 22.x Current/LTS)");
+  lines.push("");
+  lines.push("One-liner bootstrap (tries nvm/fnm, then installs omnish):");
+  lines.push(
+    "  curl -fsSL https://raw.githubusercontent.com/labKnowledge/omnish/main/contrib/install-omnish.sh | bash",
+  );
+  return lines.join("\n");
+}
+
+/**
+ * @param {{ current?: string, required?: string, recommended?: string }} [overrides]
+ */
+export function formatNativeModuleNodeHint(overrides = {}) {
+  const result = checkNodeVersion(overrides.current ?? process.version, overrides.required);
+  const lines = [
+    "",
+    "This often means Node was upgraded/downgraded after omnish was installed, or npm used",
+    "a different Node than your shell default.",
+    "",
+    `Node now: ${result.current} (required: ${result.required})`,
+    "",
+    "Fix:",
+    "  1. Switch to Node 22+ and set it as default (see commands below)",
+    "  2. Reinstall: npm install -g omnish",
+    "  3. Or rebuild natives: npm rebuild -g omnish",
+    formatNodeUpgradeHelp(result),
+  ];
+  return lines.join("\n");
+}