omnish 2.1.4 → 2.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnish",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "omnish — allowlisted inbox → your real shell (WhatsApp, Telegram, Discord, Slack, and 20+ channels). No AI.",
   "license": "MIT",
   "type": "module",
@@ -26,8 +26,8 @@
   "files": [
     "dist",
     "scripts/check-native-modules.mjs",
-    "scripts/check-node-version.mjs",
-    "scripts/node-version.mjs",
+    "scripts/check-node-version.cjs",
+    "scripts/node-version.cjs",
     "scripts/fix-node-pty-perms.mjs",
     "README.md",
     "CHANGELOG.md",
@@ -80,7 +80,7 @@
   },
   "scripts": {
     "reinstall": "rm -rf node_modules && pnpm install",
-    "preinstall": "node scripts/check-node-version.mjs",
+    "preinstall": "node scripts/check-node-version.cjs",
     "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",

package/scripts/check-native-modules.mjs

@@ -2,9 +2,9 @@
  * 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 { formatNativeModuleNodeHint } = require("./node-version.cjs");
 
 const modules = ["better-sqlite3", "node-pty", "@parcel/watcher"];
 

package/scripts/{check-node-version.mjs → check-node-version.cjs}

@@ -1,19 +1,22 @@
 #!/usr/bin/env node
 /**
  * preinstall guard — block unsupported Node with actionable upgrade steps.
+ * CommonJS so this runs on Node 10+ (including ancient distro Node 12).
  * Skip with OMNISH_SKIP_NODE_CHECK=1 (not recommended).
  */
-import { checkNodeVersion, formatNodeUpgradeHelp } from "./node-version.mjs";
+"use strict";
+
+var nodeVersion = require("./node-version.cjs");
 
 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();
+var result = nodeVersion.checkNodeVersion();
 if (result.ok) {
   process.exit(0);
 }
 
-console.error(formatNodeUpgradeHelp(result));
+console.error(nodeVersion.formatNodeUpgradeHelp(result));
 process.exit(1);

package/scripts/{node-version.mjs → node-version.cjs}

@@ -1,55 +1,56 @@
 /**
- * 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.
+ * Node.js version policy for omnish installs (CommonJS, parseable on Node 10+).
+ * Used by preinstall on hosts that may still run distro Node 12/14/16/18.
  */
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
+"use strict";
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const DEFAULT_ENGINES_NODE = ">=22.13";
-const RECOMMENDED_NODE = "22";
+var fs = require("fs");
+var os = require("os");
+var path = require("path");
+
+var DEFAULT_ENGINES_NODE = ">=22.13";
+var 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 {
+    var pkg = JSON.parse(
+      fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf8"),
+    );
+    if (pkg.engines && typeof pkg.engines.node === "string") {
+      return pkg.engines.node;
+    }
+    return DEFAULT_ENGINES_NODE;
+  } catch (err) {
     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);
+function parseSemver(version) {
+  var raw = String(version).trim().replace(/^v/, "");
+  var 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());
+function parseEnginesConstraint(constraint) {
+  var m = /^(>=|>|<=|<|=)?\s*v?(\d+)(?:\.(\d+))?(?:\.(\d+))?/.exec(
+    String(constraint).trim(),
+  );
   if (!m) {
     return null;
   }
   return {
-    op: /** @type {">=" | ">" | "<=" | "<" | "="} */ (m[1] || ">="),
+    op: 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) => {
+function satisfiesEngines(current, required) {
+  function cmp(a, b) {
     if (a.major !== b.major) {
       return a.major - b.major;
     }
@@ -57,8 +58,8 @@ export function satisfiesEngines(current, required) {
       return a.minor - b.minor;
     }
     return a.patch - b.patch;
-  };
-  const delta = cmp(current, required);
+  }
+  var delta = cmp(current, required);
   switch (required.op) {
     case ">=":
       return delta >= 0;
@@ -75,13 +76,15 @@ export function satisfiesEngines(current, required) {
   }
 }
 
-/**
- * @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);
+function checkNodeVersion(nodeVersion, enginesNode) {
+  if (nodeVersion === undefined) {
+    nodeVersion = process.version;
+  }
+  if (enginesNode === undefined) {
+    enginesNode = readEnginesNode();
+  }
+  var current = parseSemver(nodeVersion);
+  var required = parseEnginesConstraint(enginesNode);
   if (!current || !required) {
     return {
       ok: false,
@@ -91,13 +94,22 @@ export function checkNodeVersion(nodeVersion = process.version, enginesNode = re
       reason: "could not parse Node or engines constraint",
     };
   }
-  const ok = satisfiesEngines(current, required);
+  var ok = satisfiesEngines(current, required);
   return {
-    ok,
-    current: `v${current.major}.${current.minor}.${current.patch}`,
+    ok: 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}`,
+    reason: ok
+      ? null
+      : "need Node " +
+        enginesNode +
+        ", found v" +
+        current.major +
+        "." +
+        current.minor +
+        "." +
+        current.patch,
   };
 }
 
@@ -108,23 +120,23 @@ function shellComment(platform) {
   return "#";
 }
 
-/**
- * @param {string} [platform] os.platform()
- */
-export function formatNodeUpgradeHelp(result, platform = os.platform()) {
-  const lines = [];
-  const c = shellComment(platform);
+function formatNodeUpgradeHelp(result, platform) {
+  if (platform === undefined) {
+    platform = os.platform();
+  }
+  var lines = [];
+  var 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("  Required : Node " + result.required + " (see package.json engines)");
+  lines.push("  You have : " + result.current);
+  lines.push("  Recommend: Node " + result.recommended + " (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("packages that require Node 22+. Older Node cannot install or run omnish.");
   lines.push("");
   lines.push("Pick one upgrade path, then re-run:");
-  lines.push(`  npm install -g omnish`);
+  lines.push("  npm install -g omnish");
   lines.push("");
 
   if (platform === "win32") {
@@ -145,9 +157,11 @@ export function formatNodeUpgradeHelp(result, platform = os.platform()) {
 
   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(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");
@@ -166,10 +180,18 @@ export function formatNodeUpgradeHelp(result, platform = os.platform()) {
     return lines.join("\n");
   }
 
+  lines.push("Linux VPS / server — Debian or Ubuntu (replaces old apt node, e.g. v12):");
+  lines.push("  curl -fsSL https://deb.nodesource.com/setup_22.x | bash -");
+  lines.push("  apt-get install -y nodejs");
+  lines.push("  node -v");
+  lines.push("  npm install -g omnish");
+  lines.push("");
   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(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");
@@ -180,8 +202,8 @@ export function formatNodeUpgradeHelp(result, platform = os.platform()) {
   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("Linux — official builds:");
+  lines.push("  https://nodejs.org/en/download  (pick 22.x)");
   lines.push("");
   lines.push("One-liner bootstrap (tries nvm/fnm, then installs omnish):");
   lines.push(
@@ -190,17 +212,17 @@ export function formatNodeUpgradeHelp(result, platform = os.platform()) {
   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 = [
+function formatNativeModuleNodeHint(overrides) {
+  overrides = overrides || {};
+  var current =
+    overrides.current !== undefined ? overrides.current : process.version;
+  var result = checkNodeVersion(current, overrides.required);
+  var 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})`,
+    "Node now: " + result.current + " (required: " + result.required + ")",
     "",
     "Fix:",
     "  1. Switch to Node 22+ and set it as default (see commands below)",
@@ -210,3 +232,12 @@ export function formatNativeModuleNodeHint(overrides = {}) {
   ];
   return lines.join("\n");
 }
+
+module.exports = {
+  parseSemver: parseSemver,
+  parseEnginesConstraint: parseEnginesConstraint,
+  satisfiesEngines: satisfiesEngines,
+  checkNodeVersion: checkNodeVersion,
+  formatNodeUpgradeHelp: formatNodeUpgradeHelp,
+  formatNativeModuleNodeHint: formatNativeModuleNodeHint,
+};