@jeffusion/bungee 5.26.0 → 6.0.1

package/dist/index.js

@@ -3502,7 +3502,7 @@ import { createInterface } from "node:readline";
 // package.json
 var package_default = {
   name: "@jeffusion/bungee",
-  version: "5.26.0",
+  version: "6.0.1",
   description: "High-performance reverse proxy server CLI",
   type: "module",
   bin: {
@@ -5908,6 +5908,11 @@ async function openRecoveryInputFile(path, options = {}) {
 
 // src/commands/recover.ts
 async function recoverCommand(options = {}) {
+  const interactive = options.plugin !== undefined || options.action !== undefined;
+  if (interactive && (options.file !== undefined || !options.plugin || !/^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(options.plugin) || !["issue-setup-code", "reset", "release-auth"].includes(options.action ?? "")))
+    throw new Error("invalid_recovery_arguments");
+  if (interactive && (!process.stdin.isTTY || !process.stdout.isTTY))
+    throw new Error("recovery_requires_terminal");
   const db = resolve4(process.env.BUNGEE_CONFIG_DB_PATH ?? join8(ConfigPaths.DATA_DIR, "bungee.db"));
   let file;
   try {
@@ -5917,7 +5922,13 @@ async function recoverCommand(options = {}) {
     const key = await readPluginSecretsKey(db);
     const launch = await resolveCoreLaunchDescriptor(options);
     await new Promise((accept, reject) => {
-      const child = spawn3(launch.executable, [...launch.entrypoint === null ? [] : [launch.entrypoint], "--recover", db], { cwd: dirname3(db), stdio: [file?.fd ?? "inherit", "inherit", "inherit"], env: { ...withPluginSecretsKey(process.env, key), BUNGEE_ROLE: "master", BUNGEE_ACCESS_DB_PATH: process.env.BUNGEE_ACCESS_DB_PATH ?? join8(ConfigPaths.LOGS_DIR, "access.db") } });
+      const args = [
+        ...launch.entrypoint === null ? [] : [launch.entrypoint],
+        "--recover",
+        db,
+        ...interactive ? ["--plugin", options.plugin, "--action", options.action] : []
+      ];
+      const child = spawn3(launch.executable, args, { cwd: dirname3(db), stdio: [file?.fd ?? "inherit", "inherit", "inherit"], env: { ...withPluginSecretsKey(process.env, key), BUNGEE_ROLE: "master", BUNGEE_ACCESS_DB_PATH: process.env.BUNGEE_ACCESS_DB_PATH ?? join8(ConfigPaths.LOGS_DIR, "access.db") } });
       child.once("error", reject);
       child.once("exit", (code) => code === 0 ? accept() : reject(new Error("Offline recovery failed")));
     });
@@ -6267,12 +6278,22 @@ function createProgram() {
     }
   });
   program.command("init").description("Initialize the Bungee SQLite data directory and persistent plugin secrets key").option("--plugin-secrets-key <base64>", "Initialize with a canonical Base64 key for 32 bytes (otherwise use BUNGEE_PLUGIN_SECRETS_KEY or generate one)").action(initCommand);
-  program.command("recover").description("Recover a stopped instance using bounded JSON from stdin or a 0600 file").option("--file <path>", "Owner-only 0600 recovery JSON input file").addHelpText("after", `
+  program.command("recover").description("Recover a stopped instance using plugin terminal actions or bounded JSON").option("--file <path>", "Owner-only 0600 recovery JSON input file").option("--plugin <name>", "Management plugin for an interactive offline action").option("--action <action>", "Terminal action: issue-setup-code, reset, or release-auth").addHelpText("after", `
 Stop the instance first. Supply one JSON object via stdin or bungee recover --file recovery.json (chmod 600).
-Administrator identity: {"kind":"identity","plugin":"local-accounts","payload":{"username":"admin","password":"<new password, 15-128 characters>","reason":"Lost credentials"}}
+Initialize management access: bungee recover --plugin user-auth --action issue-setup-code
+Reset identity: bungee recover --plugin user-auth --action reset
+Release required authentication locally: bungee recover --plugin user-auth --action release-auth
+These actions require a terminal. Reset asks for the plugin's fields and recovery reason; secret fields are hidden.
 Unresolved usage: {"kind":"plugin-state","plugin":"token-budget","payload":{"keyId":"KEY_ID","requestId":"REQUEST_ID","attemptId":"ATTEMPT_ID","inputTokens":100,"outputTokens":200,"reason":"Verified usage evidence"}}
 Usage counts are replacement totals for the specified attempt, applied to its original period.
-`).action(recoverCommand);
+`).action(async (options) => {
+    try {
+      await recoverCommand(options);
+    } catch (error) {
+      console.error(error instanceof Error && error.message === "recovery_requires_terminal" ? "Offline recovery action requires an interactive terminal." : "Offline recovery failed; no recovery input is logged.");
+      process.exitCode = 1;
+    }
+  });
   program.command("start").description("Start proxy server as daemon").option("-p, --port <port>", "Override default port").option("-w, --workers <count>", "Number of worker processes", "2").option("-d, --detach", "Run as daemon (default)", true).option("--auto-upgrade", "Automatically upgrade binary if version mismatch").action(startCommand);
   program.command("stop").description("Stop proxy server daemon").action(stopCommand);
   program.command("restart").description("Restart proxy server daemon").option("-p, --port <port>", "Override default port").option("-w, --workers <count>", "Number of worker processes", "2").option("--auto-upgrade", "Automatically upgrade binary if version mismatch").action(restartCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeffusion/bungee",
-  "version": "5.26.0",
+  "version": "6.0.1",
   "description": "High-performance reverse proxy server CLI",
   "type": "module",
   "bin": {
@@ -13,8 +13,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@jeffusion/bungee-core": "^5.26.0",
-    "@jeffusion/bungee-types": "^5.26.0",
+    "@jeffusion/bungee-core": "^6.0.1",
+    "@jeffusion/bungee-types": "^6.0.1",
     "cli-progress": "^3.12.0",
     "commander": "^14.0.1"
   },