9router 0.4.25 → 0.4.26

package/hooks/postinstall.js

@@ -1,73 +1,15 @@
 #!/usr/bin/env node
 
-/**
- * Postinstall hook for 9router CLI
- * Rebuilds better-sqlite3 native addon for the current platform
- */
-
-const { execSync } = require("child_process");
-const fs = require("fs");
-const path = require("path");
-
-const appDir = path.join(__dirname, "..", "app");
-const betterSqlitePath = path.join(appDir, "node_modules", "better-sqlite3");
-
-// Check if better-sqlite3 exists
-if (!fs.existsSync(betterSqlitePath)) {
-  console.log("better-sqlite3 not found, skipping rebuild");
-  process.exit(0);
-}
-
-// Check if native binary is valid for current platform
-function isValidBinary() {
-  const buildDir = path.join(betterSqlitePath, "build", "Release");
-  const binaryPath = path.join(buildDir, "better_sqlite3.node");
-
-  if (!fs.existsSync(binaryPath)) {
-    return false;
-  }
-
-  const fd = fs.openSync(binaryPath, "r");
-  const buffer = Buffer.alloc(4);
-  fs.readSync(fd, buffer, 0, 4, 0);
-  fs.closeSync(fd);
-
-  const magic = buffer.toString("hex");
-
-  // ELF (Linux): 7f454c46
-  // Mach-O (macOS): cffaedfe or cefaedfe (little/big endian)
-  // PE (Windows): 4d5a (MZ)
-  const isLinux = magic.startsWith("7f454c46");
-  const isMacOS = magic.startsWith("cffaedfe") || magic.startsWith("cefaedfe");
-  const isWindows = magic.startsWith("4d5a");
-
-  const platform = process.platform;
-  const expectedLinux = platform === "linux" && isLinux;
-  const expectedMacOS = platform === "darwin" && isMacOS;
-  const expectedWindows = platform === "win32" && isWindows;
-
-  return expectedLinux || expectedMacOS || expectedWindows;
-}
-
-// Skip rebuild if binary is already valid
-if (isValidBinary()) {
-  console.log("better-sqlite3 binary is valid for this platform, skipping rebuild");
-  process.exit(0);
-}
-
-console.log("Rebuilding better-sqlite3 for current platform...");
+// Postinstall: warm-up SQLite deps into ~/.9router/runtime so the first
+// `9router` start doesn't need network. Failure here is non-fatal —
+// cli.js will retry at runtime if anything is missing.
+const { ensureSqliteRuntime } = require("./sqliteRuntime");
 
 try {
-  execSync("npm rebuild better-sqlite3 --build-from-source", {
-    cwd: appDir,
-    stdio: "inherit",
-    timeout: 120000
-  });
-  console.log("better-sqlite3 rebuilt successfully");
-} catch (error) {
-  console.warn("Failed to rebuild better-sqlite3. The app may not work correctly.");
-  console.warn("Make sure you have build tools installed (python, make, gcc/node-gyp)");
-  console.warn("Error:", error.message);
-  // Don't exit with error code - allow install to complete
-  process.exit(0);
+  ensureSqliteRuntime({ silent: false });
+  console.log("[9router] runtime SQLite deps ready");
+} catch (e) {
+  console.warn(`[9router] runtime warm-up skipped: ${e.message}`);
 }
+
+process.exit(0);

package/hooks/sqliteRuntime.js

@@ -0,0 +1,127 @@
+// Shared logic: ensure sql.js + better-sqlite3 are installed in
+// USER_DATA_DIR/runtime/node_modules so they can be hot-replaced
+// without touching the (possibly Windows-locked) global install dir.
+const { execSync, spawnSync } = require("child_process");
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+
+const SQL_JS_VERSION = "1.14.1";
+const BETTER_SQLITE3_VERSION = "12.6.2";
+
+function getDataDir() {
+  if (process.env.DATA_DIR) return process.env.DATA_DIR;
+  return process.platform === "win32"
+    ? path.join(process.env.APPDATA || os.homedir(), "9router")
+    : path.join(os.homedir(), ".9router");
+}
+
+function getRuntimeDir() {
+  return path.join(getDataDir(), "runtime");
+}
+
+function getRuntimeNodeModules() {
+  return path.join(getRuntimeDir(), "node_modules");
+}
+
+function ensureRuntimeDir() {
+  const dir = getRuntimeDir();
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+
+  // Minimal package.json so npm treats it as a project root
+  const pkgPath = path.join(dir, "package.json");
+  if (!fs.existsSync(pkgPath)) {
+    fs.writeFileSync(pkgPath, JSON.stringify({
+      name: "9router-runtime",
+      version: "1.0.0",
+      private: true,
+      description: "User-writable runtime deps for 9router (sql.js + better-sqlite3)",
+    }, null, 2));
+  }
+  return dir;
+}
+
+function hasModule(name) {
+  return fs.existsSync(path.join(getRuntimeNodeModules(), name, "package.json"));
+}
+
+function isBetterSqliteBinaryValid() {
+  const binary = path.join(getRuntimeNodeModules(), "better-sqlite3", "build", "Release", "better_sqlite3.node");
+  if (!fs.existsSync(binary)) return false;
+  try {
+    const fd = fs.openSync(binary, "r");
+    const buf = Buffer.alloc(4);
+    fs.readSync(fd, buf, 0, 4, 0);
+    fs.closeSync(fd);
+    const magic = buf.toString("hex");
+    if (process.platform === "linux") return magic.startsWith("7f454c46");
+    if (process.platform === "darwin") return magic.startsWith("cffaedfe") || magic.startsWith("cefaedfe");
+    if (process.platform === "win32") return magic.startsWith("4d5a");
+    return true;
+  } catch { return false; }
+}
+
+function npmInstall(pkgs, opts = {}) {
+  const cwd = ensureRuntimeDir();
+  const args = ["install", ...pkgs, "--no-audit", "--no-fund", "--prefer-online"];
+  if (opts.optional) args.push("--no-save");
+  const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
+  console.log(`[9router][runtime] ${npmCmd} ${args.join(" ")}  (cwd: ${cwd})`);
+  const res = spawnSync(npmCmd, args, {
+    cwd,
+    stdio: opts.silent ? "ignore" : "inherit",
+    timeout: opts.timeout || 180000,
+    shell: process.platform === "win32",
+  });
+  return res.status === 0;
+}
+
+// Public: ensure runtime SQLite deps. Called from cli.js startup AND postinstall.
+function ensureSqliteRuntime({ silent = false } = {}) {
+  ensureRuntimeDir();
+
+  const needSqlJs = !hasModule("sql.js");
+  const needBetterSqlite = !hasModule("better-sqlite3") || !isBetterSqliteBinaryValid();
+
+  if (!needSqlJs && !needBetterSqlite) {
+    if (!silent) console.log("[9router][runtime] SQLite deps OK");
+    return { sqljs: true, betterSqlite: hasModule("better-sqlite3") && isBetterSqliteBinaryValid() };
+  }
+
+  // sql.js — required
+  if (needSqlJs) {
+    const ok = npmInstall([`sql.js@${SQL_JS_VERSION}`], { silent });
+    if (!ok && !silent) console.warn("[9router][runtime] sql.js install failed");
+  }
+
+  // better-sqlite3 — optional (skip on failure)
+  let betterOk = !needBetterSqlite;
+  if (needBetterSqlite) {
+    betterOk = npmInstall([`better-sqlite3@${BETTER_SQLITE3_VERSION}`], { optional: true, silent });
+    if (!betterOk && !silent) {
+      console.warn("[9router][runtime] better-sqlite3 install failed (will use sql.js fallback)");
+    }
+  }
+
+  return {
+    sqljs: hasModule("sql.js"),
+    betterSqlite: betterOk && hasModule("better-sqlite3") && isBetterSqliteBinaryValid(),
+  };
+}
+
+// Inject runtime node_modules into NODE_PATH so child Node processes resolve them.
+function buildEnvWithRuntime(baseEnv = process.env) {
+  const runtimeNm = getRuntimeNodeModules();
+  const existing = baseEnv.NODE_PATH || "";
+  const NODE_PATH = existing
+    ? `${runtimeNm}${path.delimiter}${existing}`
+    : runtimeNm;
+  return { ...baseEnv, NODE_PATH };
+}
+
+module.exports = {
+  ensureSqliteRuntime,
+  buildEnvWithRuntime,
+  getRuntimeDir,
+  getRuntimeNodeModules,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "9router",
-  "version": "0.4.25",
+  "version": "0.4.26",
   "description": "9Router CLI - Start and manage 9Router server",
   "bin": {
     "9router": "./cli.js"
@@ -24,6 +24,7 @@
     "react-dom": "19.2.1",
     "systray": "^1.0.5"
   },
+  "comment_sqlite": "sql.js + better-sqlite3 are NOT bundled here. They are installed into ~/.9router/runtime/node_modules by hooks/postinstall.js (and re-checked at runtime by cli.js). This avoids Windows EBUSY errors when updating the global CLI, since native .node files no longer live under the locked install dir.",
   "engines": {
     "node": ">=18.0.0"
   },

package/app/node_modules/better-sqlite3/lib/database.js

@@ -1,90 +0,0 @@
-'use strict';
-const fs = require('fs');
-const path = require('path');
-const util = require('./util');
-const SqliteError = require('./sqlite-error');
-
-let DEFAULT_ADDON;
-
-function Database(filenameGiven, options) {
-	if (new.target == null) {
-		return new Database(filenameGiven, options);
-	}
-
-	// Apply defaults
-	let buffer;
-	if (Buffer.isBuffer(filenameGiven)) {
-		buffer = filenameGiven;
-		filenameGiven = ':memory:';
-	}
-	if (filenameGiven == null) filenameGiven = '';
-	if (options == null) options = {};
-
-	// Validate arguments
-	if (typeof filenameGiven !== 'string') throw new TypeError('Expected first argument to be a string');
-	if (typeof options !== 'object') throw new TypeError('Expected second argument to be an options object');
-	if ('readOnly' in options) throw new TypeError('Misspelled option "readOnly" should be "readonly"');
-	if ('memory' in options) throw new TypeError('Option "memory" was removed in v7.0.0 (use ":memory:" filename instead)');
-
-	// Interpret options
-	const filename = filenameGiven.trim();
-	const anonymous = filename === '' || filename === ':memory:';
-	const readonly = util.getBooleanOption(options, 'readonly');
-	const fileMustExist = util.getBooleanOption(options, 'fileMustExist');
-	const timeout = 'timeout' in options ? options.timeout : 5000;
-	const verbose = 'verbose' in options ? options.verbose : null;
-	const nativeBinding = 'nativeBinding' in options ? options.nativeBinding : null;
-
-	// Validate interpreted options
-	if (readonly && anonymous && !buffer) throw new TypeError('In-memory/temporary databases cannot be readonly');
-	if (!Number.isInteger(timeout) || timeout < 0) throw new TypeError('Expected the "timeout" option to be a positive integer');
-	if (timeout > 0x7fffffff) throw new RangeError('Option "timeout" cannot be greater than 2147483647');
-	if (verbose != null && typeof verbose !== 'function') throw new TypeError('Expected the "verbose" option to be a function');
-	if (nativeBinding != null && typeof nativeBinding !== 'string' && typeof nativeBinding !== 'object') throw new TypeError('Expected the "nativeBinding" option to be a string or addon object');
-
-	// Load the native addon
-	let addon;
-	if (nativeBinding == null) {
-		addon = DEFAULT_ADDON || (DEFAULT_ADDON = require('bindings')('better_sqlite3.node'));
-	} else if (typeof nativeBinding === 'string') {
-		// See <https://webpack.js.org/api/module-variables/#__non_webpack_require__-webpack-specific>
-		const requireFunc = typeof __non_webpack_require__ === 'function' ? __non_webpack_require__ : require;
-		addon = requireFunc(path.resolve(nativeBinding).replace(/(\.node)?$/, '.node'));
-	} else {
-		// See <https://github.com/WiseLibs/better-sqlite3/issues/972>
-		addon = nativeBinding;
-	}
-
-	if (!addon.isInitialized) {
-		addon.setErrorConstructor(SqliteError);
-		addon.isInitialized = true;
-	}
-
-	// Make sure the specified directory exists
-	if (!anonymous && !filename.startsWith('file:') && !fs.existsSync(path.dirname(filename))) {
-		throw new TypeError('Cannot open database because the directory does not exist');
-	}
-
-	Object.defineProperties(this, {
-		[util.cppdb]: { value: new addon.Database(filename, filenameGiven, anonymous, readonly, fileMustExist, timeout, verbose || null, buffer || null) },
-		...wrappers.getters,
-	});
-}
-
-const wrappers = require('./methods/wrappers');
-Database.prototype.prepare = wrappers.prepare;
-Database.prototype.transaction = require('./methods/transaction');
-Database.prototype.pragma = require('./methods/pragma');
-Database.prototype.backup = require('./methods/backup');
-Database.prototype.serialize = require('./methods/serialize');
-Database.prototype.function = require('./methods/function');
-Database.prototype.aggregate = require('./methods/aggregate');
-Database.prototype.table = require('./methods/table');
-Database.prototype.loadExtension = wrappers.loadExtension;
-Database.prototype.exec = wrappers.exec;
-Database.prototype.close = wrappers.close;
-Database.prototype.defaultSafeIntegers = wrappers.defaultSafeIntegers;
-Database.prototype.unsafeMode = wrappers.unsafeMode;
-Database.prototype[util.inspect] = require('./methods/inspect');
-
-module.exports = Database;

package/app/node_modules/better-sqlite3/lib/index.js

@@ -1,3 +0,0 @@
-'use strict';
-module.exports = require('./database');
-module.exports.SqliteError = require('./sqlite-error');

package/app/node_modules/better-sqlite3/lib/methods/aggregate.js

@@ -1,43 +0,0 @@
-'use strict';
-const { getBooleanOption, cppdb } = require('../util');
-
-module.exports = function defineAggregate(name, options) {
-	// Validate arguments
-	if (typeof name !== 'string') throw new TypeError('Expected first argument to be a string');
-	if (typeof options !== 'object' || options === null) throw new TypeError('Expected second argument to be an options object');
-	if (!name) throw new TypeError('User-defined function name cannot be an empty string');
-
-	// Interpret options
-	const start = 'start' in options ? options.start : null;
-	const step = getFunctionOption(options, 'step', true);
-	const inverse = getFunctionOption(options, 'inverse', false);
-	const result = getFunctionOption(options, 'result', false);
-	const safeIntegers = 'safeIntegers' in options ? +getBooleanOption(options, 'safeIntegers') : 2;
-	const deterministic = getBooleanOption(options, 'deterministic');
-	const directOnly = getBooleanOption(options, 'directOnly');
-	const varargs = getBooleanOption(options, 'varargs');
-	let argCount = -1;
-
-	// Determine argument count
-	if (!varargs) {
-		argCount = Math.max(getLength(step), inverse ? getLength(inverse) : 0);
-		if (argCount > 0) argCount -= 1;
-		if (argCount > 100) throw new RangeError('User-defined functions cannot have more than 100 arguments');
-	}
-
-	this[cppdb].aggregate(start, step, inverse, result, name, argCount, safeIntegers, deterministic, directOnly);
-	return this;
-};
-
-const getFunctionOption = (options, key, required) => {
-	const value = key in options ? options[key] : null;
-	if (typeof value === 'function') return value;
-	if (value != null) throw new TypeError(`Expected the "${key}" option to be a function`);
-	if (required) throw new TypeError(`Missing required option "${key}"`);
-	return null;
-};
-
-const getLength = ({ length }) => {
-	if (Number.isInteger(length) && length >= 0) return length;
-	throw new TypeError('Expected function.length to be a positive integer');
-};

package/app/node_modules/better-sqlite3/lib/methods/backup.js

@@ -1,67 +0,0 @@
-'use strict';
-const fs = require('fs');
-const path = require('path');
-const { promisify } = require('util');
-const { cppdb } = require('../util');
-const fsAccess = promisify(fs.access);
-
-module.exports = async function backup(filename, options) {
-	if (options == null) options = {};
-
-	// Validate arguments
-	if (typeof filename !== 'string') throw new TypeError('Expected first argument to be a string');
-	if (typeof options !== 'object') throw new TypeError('Expected second argument to be an options object');
-
-	// Interpret options
-	filename = filename.trim();
-	const attachedName = 'attached' in options ? options.attached : 'main';
-	const handler = 'progress' in options ? options.progress : null;
-
-	// Validate interpreted options
-	if (!filename) throw new TypeError('Backup filename cannot be an empty string');
-	if (filename === ':memory:') throw new TypeError('Invalid backup filename ":memory:"');
-	if (typeof attachedName !== 'string') throw new TypeError('Expected the "attached" option to be a string');
-	if (!attachedName) throw new TypeError('The "attached" option cannot be an empty string');
-	if (handler != null && typeof handler !== 'function') throw new TypeError('Expected the "progress" option to be a function');
-
-	// Make sure the specified directory exists
-	await fsAccess(path.dirname(filename)).catch(() => {
-		throw new TypeError('Cannot save backup because the directory does not exist');
-	});
-
-	const isNewFile = await fsAccess(filename).then(() => false, () => true);
-	return runBackup(this[cppdb].backup(this, attachedName, filename, isNewFile), handler || null);
-};
-
-const runBackup = (backup, handler) => {
-	let rate = 0;
-	let useDefault = true;
-
-	return new Promise((resolve, reject) => {
-		setImmediate(function step() {
-			try {
-				const progress = backup.transfer(rate);
-				if (!progress.remainingPages) {
-					backup.close();
-					resolve(progress);
-					return;
-				}
-				if (useDefault) {
-					useDefault = false;
-					rate = 100;
-				}
-				if (handler) {
-					const ret = handler(progress);
-					if (ret !== undefined) {
-						if (typeof ret === 'number' && ret === ret) rate = Math.max(0, Math.min(0x7fffffff, Math.round(ret)));
-						else throw new TypeError('Expected progress callback to return a number or undefined');
-					}
-				}
-				setImmediate(step);
-			} catch (err) {
-				backup.close();
-				reject(err);
-			}
-		});
-	});
-};

package/app/node_modules/better-sqlite3/lib/methods/function.js

@@ -1,31 +0,0 @@
-'use strict';
-const { getBooleanOption, cppdb } = require('../util');
-
-module.exports = function defineFunction(name, options, fn) {
-	// Apply defaults
-	if (options == null) options = {};
-	if (typeof options === 'function') { fn = options; options = {}; }
-
-	// Validate arguments
-	if (typeof name !== 'string') throw new TypeError('Expected first argument to be a string');
-	if (typeof fn !== 'function') throw new TypeError('Expected last argument to be a function');
-	if (typeof options !== 'object') throw new TypeError('Expected second argument to be an options object');
-	if (!name) throw new TypeError('User-defined function name cannot be an empty string');
-
-	// Interpret options
-	const safeIntegers = 'safeIntegers' in options ? +getBooleanOption(options, 'safeIntegers') : 2;
-	const deterministic = getBooleanOption(options, 'deterministic');
-	const directOnly = getBooleanOption(options, 'directOnly');
-	const varargs = getBooleanOption(options, 'varargs');
-	let argCount = -1;
-
-	// Determine argument count
-	if (!varargs) {
-		argCount = fn.length;
-		if (!Number.isInteger(argCount) || argCount < 0) throw new TypeError('Expected function.length to be a positive integer');
-		if (argCount > 100) throw new RangeError('User-defined functions cannot have more than 100 arguments');
-	}
-
-	this[cppdb].function(fn, name, argCount, safeIntegers, deterministic, directOnly);
-	return this;
-};

package/app/node_modules/better-sqlite3/lib/methods/inspect.js

@@ -1,7 +0,0 @@
-'use strict';
-const DatabaseInspection = function Database() {};
-
-module.exports = function inspect(depth, opts) {
-	return Object.assign(new DatabaseInspection(), this);
-};
-

package/app/node_modules/better-sqlite3/lib/methods/pragma.js

@@ -1,12 +0,0 @@
-'use strict';
-const { getBooleanOption, cppdb } = require('../util');
-
-module.exports = function pragma(source, options) {
-	if (options == null) options = {};
-	if (typeof source !== 'string') throw new TypeError('Expected first argument to be a string');
-	if (typeof options !== 'object') throw new TypeError('Expected second argument to be an options object');
-	const simple = getBooleanOption(options, 'simple');
-
-	const stmt = this[cppdb].prepare(`PRAGMA ${source}`, this, true);
-	return simple ? stmt.pluck().get() : stmt.all();
-};

package/app/node_modules/better-sqlite3/lib/methods/serialize.js

@@ -1,16 +0,0 @@
-'use strict';
-const { cppdb } = require('../util');
-
-module.exports = function serialize(options) {
-	if (options == null) options = {};
-
-	// Validate arguments
-	if (typeof options !== 'object') throw new TypeError('Expected first argument to be an options object');
-
-	// Interpret and validate options
-	const attachedName = 'attached' in options ? options.attached : 'main';
-	if (typeof attachedName !== 'string') throw new TypeError('Expected the "attached" option to be a string');
-	if (!attachedName) throw new TypeError('The "attached" option cannot be an empty string');
-
-	return this[cppdb].serialize(attachedName);
-};