lianrouter 2.1.0 → 2.2.0

package/dist/cli.js

@@ -17,7 +17,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "lianrouter",
-    version: "2.1.0",
+    version: "2.2.0",
     description: "LianRouter launcher: install, run and control the gateway from one command",
     type: "module",
     bin: {
@@ -868,6 +868,9 @@ function resolveBinaryPath(installRoot = resolveInstallRoot(), platform = proces
 function resolveLogFile(installRoot = resolveInstallRoot()) {
   return join5(installRoot, LOGS_DIR, LOG_FILE_NAME);
 }
+function resolveConfigFile(installRoot = resolveInstallRoot()) {
+  return join5(installRoot, CONFIG_FILE_NAME);
+}
 function resolvePidFile(installRoot = resolveInstallRoot()) {
   return join5(resolveStateDir(installRoot), PID_FILE_NAME);
 }
@@ -930,7 +933,7 @@ function consoleUrl(port, host = "localhost") {
 function healthUrl(port) {
   return `http://127.0.0.1:${port}/health`;
 }
-var HOME_ENV = "LIANROUTER_HOME", APP_DIR_NAME = "LianRouter", LOGS_DIR = "logs", CACHE_DIR = "cache", RUN_DIR = "run", UPDATE_CACHE_DIR = "updates", LOG_FILE_NAME = "lianrouter.log", PID_FILE_NAME = "lianrouter.pid", CONTROL_FILE_NAME = "control.json", TRAY_PID_FILE_NAME = "tray.pid", DEFAULT_PORT = 12800;
+var HOME_ENV = "LIANROUTER_HOME", APP_DIR_NAME = "LianRouter", LOGS_DIR = "logs", CACHE_DIR = "cache", RUN_DIR = "run", UPDATE_CACHE_DIR = "updates", CONFIG_FILE_NAME = ".env", LOG_FILE_NAME = "lianrouter.log", PID_FILE_NAME = "lianrouter.pid", CONTROL_FILE_NAME = "control.json", TRAY_PID_FILE_NAME = "tray.pid", DEFAULT_PORT = 12800;
 var init_paths = () => {};
 
 // cli/tui/terminal.ts
@@ -1557,7 +1560,7 @@ var init_app = __esm(async () => {
 
 // cli/src/launcher.ts
 init_version();
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import { join as join8 } from "path";
 
 // cli/src/bootstrap.ts
@@ -2604,9 +2607,143 @@ class GatewaySupervisor {
   }
 }
 
+// cli/src/install-config.ts
+init_paths();
+import { randomBytes } from "crypto";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
+var ALWAYS_REQUIRED = ["DATABASE_URL", "LIANROUTER_ENCRYPTION_KEY"];
+function parseEnvFile(text) {
+  const values = {};
+  for (const rawLine of text.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (line === "" || line.startsWith("#")) {
+      continue;
+    }
+    const separator = line.indexOf("=");
+    if (separator <= 0) {
+      continue;
+    }
+    const key = line.slice(0, separator).trim();
+    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
+      continue;
+    }
+    let value = line.slice(separator + 1).trim();
+    const quote = value[0];
+    if (quote === '"' || quote === "'") {
+      if (value.length >= 2 && value.endsWith(quote)) {
+        value = value.slice(1, -1);
+      }
+    }
+    values[key] = value;
+  }
+  return values;
+}
+function resolveGatewayConfig(installRoot, shellEnv = process.env) {
+  const path = resolveConfigFile(installRoot);
+  const present = existsSync2(path);
+  const fileValues = present ? parseEnvFile(readFileSync2(path, "utf8")) : {};
+  const env = {};
+  for (const [key, value] of Object.entries(fileValues)) {
+    if (shellEnv[key] !== undefined && shellEnv[key].trim() !== "") {
+      continue;
+    }
+    if (value.trim() === "") {
+      continue;
+    }
+    env[key] = value;
+  }
+  const effective = (name) => {
+    const fromShell = shellEnv[name];
+    if (fromShell !== undefined && fromShell.trim() !== "") {
+      return fromShell.trim();
+    }
+    const fromFile = fileValues[name];
+    return fromFile !== undefined && fromFile.trim() !== "" ? fromFile.trim() : undefined;
+  };
+  const required = [...ALWAYS_REQUIRED];
+  if ((effective("REDIS_MODE") ?? "normal") === "normal") {
+    required.push("REDIS_URL");
+  }
+  const missing = required.filter((name) => effective(name) === undefined);
+  return { path, present, env, missing };
+}
+function describeMissingConfig(config) {
+  const location = config.present ? `  config file: ${config.path}` : `  config file: ${config.path} (not found)`;
+  const examples = {
+    DATABASE_URL: "postgres://user:password@localhost:5432/lianrouter",
+    LIANROUTER_ENCRYPTION_KEY: "<base64 or 64-character hex that decodes to exactly 32 bytes>",
+    REDIS_URL: "redis://localhost:6379"
+  };
+  const lines = [
+    "the gateway is not configured, so it cannot start",
+    location,
+    `  missing:     ${config.missing.join(", ")}`,
+    "",
+    "add these lines to that file:",
+    ...config.missing.map((name) => `  ${name}=${examples[name] ?? "<value>"}`),
+    "",
+    "or set them in your shell before starting; a shell value wins over the file.",
+    `run \`lianrouter init\` to write a starter file at ${config.path}`
+  ];
+  if (config.missing.includes("REDIS_URL")) {
+    lines.push("to run a single gateway process without Redis, set REDIS_MODE=single_instance_local instead of REDIS_URL");
+  }
+  return lines.join(`
+`);
+}
+function assertGatewayConfigured(config) {
+  if (config.missing.length > 0) {
+    throw new Error(describeMissingConfig(config));
+  }
+}
+function starterConfigText(encryptionKey) {
+  return `# LianRouter gateway configuration.
+# The launcher reads this file and passes its values to the gateway process.
+# A variable already set in your shell wins over the value written here.
+# Generated by \`lianrouter init\`.
+
+# PostgreSQL connection string. Required.
+# Replace the placeholder below and remove the leading "# ". The gateway never
+# infers a Docker or Laragon connection.
+# DATABASE_URL=postgres://user:password@localhost:5432/lianrouter
+
+# 256-bit key for encrypting provider credentials and hashing API keys.
+# Required. Base64 (44 characters) or hex (64 characters); it must decode to
+# exactly 32 bytes. Keep it secret and keep it stable: a new key cannot decrypt
+# credentials encrypted with the old one.
+LIANROUTER_ENCRYPTION_KEY=${encryptionKey}
+
+# Redis coordination. REDIS_URL is required in the default mode; set
+# REDIS_MODE=single_instance_local to run a single gateway process without
+# Redis at all.
+REDIS_MODE=normal
+# REDIS_URL=redis://localhost:6379
+`;
+}
+function writeStarterConfig(installRoot) {
+  const path = resolveConfigFile(installRoot);
+  mkdirSync2(installRoot, { recursive: true });
+  const encryptionKey = randomBytes(32).toString("base64");
+  try {
+    writeFileSync(path, starterConfigText(encryptionKey), { encoding: "utf8", flag: "wx" });
+  } catch (error) {
+    if (error.code === "EEXIST") {
+      throw new Error(`refusing to overwrite the existing config file at ${path}`);
+    }
+    throw error;
+  }
+  return path;
+}
+
 // cli/src/update-flow.ts
+init_version_file();
+async function resolveGatewayVersion(installRoot, launcherVersion) {
+  const record = await readInstalledVersion(installRoot);
+  return record?.version ?? launcherVersion;
+}
 async function runUpdateSequence(deps) {
-  const info = await deps.checkForUpdate({ currentVersion: deps.currentVersion });
+  const gatewayVersion = await resolveGatewayVersion(deps.installRoot, deps.launcherVersion);
+  const info = await deps.checkForUpdate({ currentVersion: gatewayVersion });
   deps.publish({
     current: info.current,
     latest: info.latest,
@@ -2625,7 +2762,7 @@ async function runUpdateSequence(deps) {
   try {
     await deps.runUpdate({
       installRoot: deps.installRoot,
-      currentVersion: deps.currentVersion,
+      currentVersion: gatewayVersion,
       onProgress: (progress) => {
         deps.publishProgress({
           phase: progress.phase,
@@ -2661,11 +2798,11 @@ async function runUpdateSequence(deps) {
 
 // cli/src/tray-launcher.ts
 init_paths();
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { readFile as readFile2, rm as rm8, writeFile as writeFile3 } from "fs/promises";
 import { join as join7 } from "path";
 function resolveTrayEntry(options) {
-  return trayEntryCandidates(options).find((candidate) => existsSync2(candidate));
+  return trayEntryCandidates(options).find((candidate) => existsSync3(candidate));
 }
 function trayEntryCandidates(options) {
   const bundleDir = options.bundleDir ?? import.meta.dir;
@@ -2799,6 +2936,7 @@ Commands:
   update           Check for and install an update
   tray             Run the gateway in the background with a tray icon
   tui              Open the terminal UI
+  init             Write a starter config file into the install root
 
 Options:
   --port <n>       Gateway port (default ${DEFAULT_PORT}, or $PORT)
@@ -2812,7 +2950,15 @@ Options:
 Environment:
   LIANROUTER_HOME  Override the install/state root
   PORT             Default gateway port`;
-var KNOWN_COMMANDS = ["start", "stop", "status", "update", "tray", "tui"];
+var KNOWN_COMMANDS = [
+  "start",
+  "stop",
+  "status",
+  "update",
+  "tray",
+  "tui",
+  "init"
+];
 function parseArgs(argv) {
   let port;
   let host = "localhost";
@@ -2900,7 +3046,7 @@ function readPortEnv() {
 }
 function resolveRuntime() {
   const repoRoot = resolveDevRepoRoot();
-  if (repoRoot !== undefined && existsSync3(join8(repoRoot, "src", "app.ts"))) {
+  if (repoRoot !== undefined && existsSync4(join8(repoRoot, "src", "app.ts"))) {
     return {
       installRoot: resolveInstallRoot(),
       cwd: repoRoot,
@@ -2912,7 +3058,7 @@ function resolveRuntime() {
   return { installRoot, cwd: installRoot, command: undefined, devRepoRoot: undefined };
 }
 async function ensureInstalledGateway(installRoot) {
-  const present = existsSync3(resolveBinaryPath(installRoot));
+  const present = existsSync4(resolveBinaryPath(installRoot));
   if (present) {
     await ensureGatewayInstalled({ installRoot, currentVersion: CLI_VERSION });
     return;
@@ -2946,6 +3092,17 @@ async function run(argv) {
     return 0;
   }
   const runtime = resolveRuntime();
+  if (options.command === "init") {
+    const path = writeStarterConfig(runtime.installRoot);
+    console.log(`Wrote ${path}`);
+    console.log("Set DATABASE_URL in that file (uncomment the line), then run lianrouter.");
+    return 0;
+  }
+  const startsGateway = options.command === undefined || options.command === "start" || options.command === "tray" || options.command === "tui";
+  const gatewayConfig = runtime.command === undefined && startsGateway ? resolveGatewayConfig(runtime.installRoot) : undefined;
+  if (gatewayConfig !== undefined) {
+    assertGatewayConfigured(gatewayConfig);
+  }
   if (runtime.command === undefined && options.command !== "status" && options.command !== "stop") {
     await ensureInstalledGateway(runtime.installRoot);
   }
@@ -2954,7 +3111,10 @@ async function run(argv) {
     installRoot: runtime.installRoot,
     logFile: resolveLogFile(runtime.installRoot),
     cwd: runtime.cwd,
-    env: { LIANROUTER_LAUNCHER_HOME: runtime.installRoot },
+    env: {
+      LIANROUTER_LAUNCHER_HOME: runtime.installRoot,
+      ...gatewayConfig?.env ?? {}
+    },
     ...runtime.command === undefined ? {} : { command: runtime.command }
   });
   switch (options.command) {
@@ -3041,7 +3201,7 @@ async function openSession(supervisor, runtime, host) {
       try {
         const engine = await Promise.resolve().then(() => (init_engine(), {}));
         await runUpdateSequence({
-          currentVersion: CLI_VERSION,
+          launcherVersion: CLI_VERSION,
           installRoot: runtime.installRoot,
           checkForUpdate: (options) => checkForUpdate(options),
           runUpdate: (options) => runUpdate(options),
@@ -3107,7 +3267,7 @@ async function runInteractive(supervisor, options, runtime) {
   if (options.headless) {
     return await blockUntilTrayExit(supervisor, session, runtime);
   }
-  const update = await readUpdateInfo();
+  const update = await readUpdateInfo(runtime.installRoot);
   const action = await promptMenu({
     version: CLI_VERSION,
     port: supervisor.status.port,
@@ -3158,7 +3318,7 @@ async function runUpdateWithProgress(supervisor, session, runtime) {
   session.control.setUpdateRunning(true);
   try {
     await runUpdateSequence({
-      currentVersion: CLI_VERSION,
+      launcherVersion: CLI_VERSION,
       installRoot: runtime.installRoot,
       checkForUpdate: (options) => checkForUpdate(options),
       runUpdate: (options) => runUpdate(options),
@@ -3266,7 +3426,7 @@ async function runUpdateFlow(supervisor, runtime) {
   const wasRunning = await supervisor.adoptExisting();
   try {
     await runUpdateSequence({
-      currentVersion: CLI_VERSION,
+      launcherVersion: CLI_VERSION,
       installRoot: runtime.installRoot,
       checkForUpdate: (options) => checkForUpdate(options),
       runUpdate: (options) => runUpdate(options),
@@ -3294,10 +3454,12 @@ async function runUpdateFlow(supervisor, runtime) {
   console.log("Update complete.");
   return 0;
 }
-async function readUpdateInfo() {
+async function readUpdateInfo(installRoot) {
   try {
     const engine = await Promise.resolve().then(() => (init_engine(), {}));
-    const info = await checkForUpdate({ currentVersion: CLI_VERSION });
+    const info = await checkForUpdate({
+      currentVersion: await resolveGatewayVersion(installRoot, CLI_VERSION)
+    });
     return { current: info.current, latest: info.latest, available: info.available };
   } catch {
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lianrouter",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "LianRouter launcher: install, run and control the gateway from one command",
   "type": "module",
   "bin": {