@jeffusion/bungee 5.1.3 → 5.1.5

package/dist/index.js

@@ -2773,8 +2773,26 @@ async function secureTarget(targetPath, options, mustExist) {
       fail2("race", "metadata file was detached by rename");
     if (platform !== "win32" && typeof process.geteuid === "function" && item.uid !== process.geteuid())
       fail2("owner", "metadata owner is invalid");
-    if (platform === "win32")
-      await ensureWindowsAcl(target, options.windowsAcl ?? defaultWindowsAclAdapter(), "file", options);
+    if (platform === "win32") {
+      try {
+        await ensureWindowsAcl(target, options.windowsAcl ?? defaultWindowsAclAdapter(), "file", options);
+      } catch (error) {
+        if (error instanceof DaemonFileError && error.code === "acl") {
+          let current;
+          try {
+            current = await lstat(target);
+          } catch (inspectionError) {
+            if (inspectionError.code === "ENOENT")
+              throw inspectionError;
+            throw error;
+          }
+          if (!sameIdentity(identity(item), identity(current))) {
+            fail2("race", "metadata file changed during Windows ACL inspection", error);
+          }
+        }
+        throw error;
+      }
+    }
     testStage(options, "target_realpath");
     const canonical = await realpath(target);
     if (!contained(canonicalRoot, canonical, platform)) {
@@ -3006,7 +3024,9 @@ function formatDaemonFileAclError(error) {
   const operation = WINDOWS_ACL_OPERATIONS.has(diagnostic.operation) ? diagnostic.operation : "unknown";
   const outcome = WINDOWS_ACL_OUTCOMES.has(diagnostic.outcome) ? diagnostic.outcome : "unknown";
   const lastPhase = diagnostic.last_phase === null ? "null" : WINDOWS_ACL_PHASES.has(diagnostic.last_phase) ? diagnostic.last_phase : "unknown";
-  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}`;
+  const targetKind = diagnostic.target_kind !== null && WINDOWS_ACL_TARGET_KINDS.has(diagnostic.target_kind) ? diagnostic.target_kind : "unknown";
+  const exitCode = diagnostic.exit_code === null ? "null" : Number.isSafeInteger(diagnostic.exit_code) && Math.abs(diagnostic.exit_code) <= 2147483647 ? diagnostic.exit_code : "unknown";
+  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));
@@ -3029,6 +3049,7 @@ function processDiagnostic(operation, startedAt, phase, environment, deadlineMs,
     outcome: result.outcome,
     elapsed_ms: boundedElapsed(startedAt, deadlineMs),
     exit_code: typeof result.exitCode === "number" ? result.exitCode : null,
+    target_kind: environment.BUNGEE_DAEMON_ACL_KIND === "directory" || environment.BUNGEE_DAEMON_ACL_KIND === "file" ? environment.BUNGEE_DAEMON_ACL_KIND : null,
     signal: allowedSignal(result.signal ?? null),
     spawn_event: result.spawnEvent,
     exit_event: result.exitEvent,
@@ -3368,7 +3389,7 @@ import { createInterface } from "node:readline";
 // package.json
 var package_default = {
   name: "@jeffusion/bungee",
-  version: "5.1.3",
+  version: "5.1.5",
   description: "High-performance reverse proxy server CLI",
   type: "module",
   bin: {

package/package.json

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