@jeffusion/bungee 6.11.2 → 6.12.0

package/dist/index.js

@@ -11960,7 +11960,7 @@ var require_winston = __commonJS(function(exports) {
 
 // ../../node_modules/object-hash/index.js
 var require_object_hash = __commonJS(function(exports, module) {
-  var crypto = __require("crypto");
+  var crypto2 = __require("crypto");
   exports = module.exports = objectHash;
   function objectHash(object, options) {
     options = applyDefaults(object, options);
@@ -11978,7 +11978,7 @@ var require_object_hash = __commonJS(function(exports, module) {
   exports.keysMD5 = function(object) {
     return objectHash(object, { algorithm: "md5", encoding: "hex", excludeValues: true });
   };
-  var hashes = crypto.getHashes ? crypto.getHashes().slice() : ["sha1", "md5"];
+  var hashes = crypto2.getHashes ? crypto2.getHashes().slice() : ["sha1", "md5"];
   hashes.push("passthrough");
   var encodings = ["buffer", "hex", "binary", "base64"];
   function applyDefaults(object, sourceOptions) {
@@ -12024,7 +12024,7 @@ var require_object_hash = __commonJS(function(exports, module) {
   function hash(object, options) {
     var hashingStream;
     if (options.algorithm !== "passthrough") {
-      hashingStream = crypto.createHash(options.algorithm);
+      hashingStream = crypto2.createHash(options.algorithm);
     } else {
       hashingStream = new PassThrough;
     }
@@ -16112,7 +16112,7 @@ var require_FileStreamRotator = __commonJS(function(exports, module) {
   var fs = __require("fs");
   var path = __require("path");
   var moment = require_moment();
-  var crypto = __require("crypto");
+  var crypto2 = __require("crypto");
   var EventEmitter = __require("events");
   var FileStreamRotator = {};
   module.exports = FileStreamRotator;
@@ -16241,7 +16241,7 @@ var require_FileStreamRotator = __commonJS(function(exports, module) {
     }
   };
   function removeFile(file, verbose) {
-    if (file.hash === crypto.createHash(file.hashType).update(file.name + "LOG_FILE" + file.date).digest("hex")) {
+    if (file.hash === crypto2.createHash(file.hashType).update(file.name + "LOG_FILE" + file.date).digest("hex")) {
       try {
         if (fs.existsSync(file.name)) {
           fs.unlinkSync(file.name);
@@ -16308,7 +16308,7 @@ var require_FileStreamRotator = __commonJS(function(exports, module) {
       audit.files.push({
         date: time,
         name: logfile,
-        hash: crypto.createHash(audit.hashType).update(logfile + "LOG_FILE" + time).digest("hex")
+        hash: crypto2.createHash(audit.hashType).update(logfile + "LOG_FILE" + time).digest("hex")
       });
       if (audit.keep.days) {
         var oldestDate = moment().subtract(audit.keep.amount, "days").valueOf();
@@ -17800,7 +17800,7 @@ function formatDaemonFileAclError(error) {
   return `acl_operation=${operation} outcome=${outcome}` + ` last_phase=${lastPhase} kill_returned_true=${diagnostic.kill_returned_true === true}` + ` spawn_event=${diagnostic.spawn_event === true} exit_event=${diagnostic.exit_event === true}` + ` close_event=${diagnostic.close_event === true}` + ` target_kind=${targetKind} exit_code=${exitCode}`;
 }
 function boundedElapsed(startedAt, deadlineMs) {
-  return Math.min(deadlineMs, Math.max(0, Date.now() - startedAt));
+  return Math.min(deadlineMs, Math.max(0, Math.round(performance.now() - startedAt)));
 }
 function selectWindowsAclExecutable(environment) {
   const programFiles = environment.ProgramFiles;
@@ -17834,7 +17834,7 @@ function processDiagnostic(operation, startedAt, phase, environment, deadlineMs,
   };
 }
 async function runPowerShell(operation, script, environment, deadlineMs) {
-  const startedAt = Date.now();
+  const startedAt = performance.now();
   let phase = null;
   let child;
   try {
@@ -21683,12 +21683,10 @@ async function upgradeCommand(options = {}) {
 }
 
 // src/commands/config-io.ts
-var OPERATION_TIMEOUT_MS = 15000;
-var OPERATION_POLL_INTERVAL_MS = 100;
 function endpoint(options, path) {
   const host = options.host ?? "localhost";
   const port = options.port ?? DEFAULT_MANAGEMENT_PORT;
-  return `http://${host}:${port}/api/config/${path}`;
+  return `http://${host}:${port}/api/config${path === "" ? "" : `/${path}`}`;
 }
 async function writeFile(path, content) {
   await Bun.write(path, content);
@@ -21698,6 +21696,31 @@ function headers(token) {
     ...token === undefined ? {} : { authorization: `Bearer ${token}` }
   };
 }
+function acknowledgement(value) {
+  if (typeof value !== "object" || value === null)
+    return null;
+  const { operation_id, revision } = value;
+  if (typeof operation_id !== "string" || operation_id.length === 0 || typeof revision !== "number" || !Number.isSafeInteger(revision) || revision <= 0)
+    return null;
+  return { operation_id, revision };
+}
+function currentRevision(value) {
+  if (typeof value !== "object" || value === null)
+    return null;
+  const revision = value.revision;
+  return typeof revision === "number" && Number.isSafeInteger(revision) && revision > 0 ? revision : null;
+}
+function unknownOutcome(mutationId, cause) {
+  return new Error(`Import result is unknown; check whether the configuration was saved before retrying. Reference ${mutationId}`, { cause });
+}
+function reportedResultUnknown(body) {
+  try {
+    const value = JSON.parse(body);
+    return value.error === "result_unknown";
+  } catch {
+    return false;
+  }
+}
 async function exportCommand(options) {
   const response = await fetch(endpoint(options, "export"), {
     headers: headers(options.token)
@@ -21711,52 +21734,64 @@ async function exportCommand(options) {
 }
 async function importCommand(options) {
   const snapshot = await Bun.file(options.file).text();
+  let envelope;
+  try {
+    envelope = JSON.parse(snapshot);
+  } catch (cause) {
+    throw new Error(`Import failed: ${options.file} is not valid JSON`, { cause });
+  }
+  const currentResponse = await fetch(endpoint(options, ""), {
+    headers: headers(options.token)
+  });
+  if (!currentResponse.ok) {
+    const body = await currentResponse.text();
+    throw new Error(`Import failed: cannot read current revision: ${currentResponse.status} ${body}`);
+  }
+  let current;
+  try {
+    current = await currentResponse.json();
+  } catch (cause) {
+    throw new Error("Import failed: current revision response is invalid", { cause });
+  }
+  const expectedRevision = currentRevision(current);
+  if (expectedRevision === null) {
+    throw new Error("Import failed: current revision response is invalid");
+  }
+  const mutationId = crypto.randomUUID();
   const response = await fetch(endpoint(options, "import"), {
     method: "POST",
     headers: { ...headers(options.token), "content-type": "application/json" },
-    body: snapshot
+    body: JSON.stringify({ expected_revision: expectedRevision, mutation_id: mutationId, envelope })
+  }).catch((cause) => {
+    throw unknownOutcome(mutationId, cause);
   });
   if (!response.ok) {
-    const body = await response.text();
+    let body;
+    try {
+      body = await response.text();
+    } catch (cause) {
+      throw unknownOutcome(mutationId, cause);
+    }
+    if (reportedResultUnknown(body))
+      throw unknownOutcome(mutationId);
     throw new Error(`Import failed: ${response.status} ${body}`);
   }
-  const accepted = await response.json();
-  const deadline = Date.now() + OPERATION_TIMEOUT_MS;
-  let state = accepted;
-  while (true) {
-    switch (state.operation.state) {
-      case "converged":
-        console.log(`Config imported from ${options.file}: revision ${accepted.revision} operation ${accepted.operation_id}`);
-        return;
-      case "degraded":
-        throw new Error(`Import failed: operation ${accepted.operation_id} degraded: ${state.operation.error_detail}`);
-      case "committed":
-      case "publishing":
-      case "draining":
-        break;
-    }
-    const remainingMs = deadline - Date.now();
-    if (remainingMs <= 0) {
-      throw new Error(`Import failed: operation ${accepted.operation_id} timed out after ${OPERATION_TIMEOUT_MS}ms`);
-    }
-    const poll = await fetch(endpoint(options, `operations/${accepted.operation_id}`), {
-      headers: headers(options.token),
-      signal: AbortSignal.timeout(remainingMs)
-    });
-    if (!poll.ok) {
-      const body = await poll.text();
-      throw new Error(`Import failed: operation poll returned ${poll.status} ${body}`);
-    }
-    state = await poll.json();
-    if (state.operation.result_status === null) {
-      await Bun.sleep(Math.min(OPERATION_POLL_INTERVAL_MS, Math.max(0, deadline - Date.now())));
-    }
+  let value;
+  try {
+    value = await response.json();
+  } catch (cause) {
+    throw unknownOutcome(mutationId, cause);
+  }
+  const accepted = acknowledgement(value);
+  if (accepted === null || accepted.operation_id !== mutationId) {
+    throw unknownOutcome(mutationId);
   }
+  console.log(`Config saved from ${options.file}`);
 }
 // package.json
 var package_default = {
   name: "@jeffusion/bungee",
-  version: "6.11.2",
+  version: "6.12.0",
   description: "High-performance reverse proxy server CLI",
   type: "module",
   bin: {
@@ -21922,8 +21957,8 @@ Usage counts are replacement totals for the specified attempt, applied to its or
   program.command("status").description("Show daemon status and health").action(statusCommand);
   program.command("logs").description("Show daemon logs").option("-f, --follow", "Follow log output").option("-n, --lines <number>", "Number of lines to show", "50").action(logsCommand);
   program.command("ui").description("Open web dashboard from the Management server").option("-p, --port <port>", "Management server port", DEFAULT_MANAGEMENT_PORT).option("-H, --host <host>", "Management server host", "localhost").action(uiCommand);
-  program.command("export").description("Export current configuration from the Management server as a versioned snapshot JSON").requiredOption("-o, --file <path>", "Output file path").option("-p, --port <port>", "Management server port", DEFAULT_MANAGEMENT_PORT).option("-H, --host <host>", "Management server host", "localhost").option("-t, --token <token>", "Management auth token").action(exportCommand);
-  program.command("import").description("Restore configuration on the Management server from a versioned snapshot JSON").requiredOption("-f, --file <path>", "Snapshot file path").option("-p, --port <port>", "Management server port", DEFAULT_MANAGEMENT_PORT).option("-H, --host <host>", "Management server host", "localhost").option("-t, --token <token>", "Management auth token").action(importCommand);
+  program.command("export").description("Export the current configuration from the Management server as a JSON file").requiredOption("-o, --file <path>", "Output file path").option("-p, --port <port>", "Management server port", DEFAULT_MANAGEMENT_PORT).option("-H, --host <host>", "Management server host", "localhost").option("-t, --token <token>", "Management auth token").action(exportCommand);
+  program.command("import").description("Save a configuration file on the Management server").requiredOption("-f, --file <path>", "Configuration file path").option("-p, --port <port>", "Management server port", DEFAULT_MANAGEMENT_PORT).option("-H, --host <host>", "Management server host", "localhost").option("-t, --token <token>", "Management auth token").action(importCommand);
   program.command("upgrade").description("Upgrade Bungee binary to the latest version").option("-f, --force", "Force re-download even if already up to date").action(upgradeCommand);
   return program;
 }

package/package.json

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