@jeffusion/bungee-types 5.1.3 → 5.1.5

package/dist/daemon-file.js

@@ -208,8 +208,30 @@ async function secureTarget(targetPath, options, mustExist) {
             fail('race', 'metadata file was detached by rename');
         if (platform !== 'win32' && typeof process.geteuid === 'function' && item.uid !== process.geteuid())
             fail('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') {
+                    // Shutdown may unlink or replace metadata while PowerShell is inspecting it.
+                    // Recheck locally; an unchanged file must still surface its ACL failure.
+                    let current;
+                    try {
+                        current = await lstat(target);
+                    }
+                    catch (inspectionError) {
+                        if (inspectionError.code === 'ENOENT')
+                            throw inspectionError;
+                        throw error;
+                    }
+                    if (!sameIdentity(identity(item), identity(current))) {
+                        fail('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)) {
@@ -439,10 +461,14 @@ export 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';
+    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}`;
+        + ` 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));
@@ -465,6 +491,8 @@ 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,
@@ -712,7 +740,8 @@ export function __testCreateDaemonFileAclError(overrides = {}) {
         ? overrides.last_phase : 'forged_phase';
     const diagnostic = {
         operation, outcome, elapsed_ms: typeof overrides.elapsed_ms === 'number' ? overrides.elapsed_ms : 1,
-        exit_code: typeof overrides.exit_code === 'number' ? overrides.exit_code : 17,
+        exit_code: Object.prototype.hasOwnProperty.call(overrides, 'exit_code') ? overrides.exit_code : 17,
+        target_kind: overrides.target_kind ?? null,
         signal: typeof overrides.signal === 'string' && WINDOWS_ACL_SIGNALS.has(overrides.signal) ? overrides.signal : null,
         spawn_event: overrides.spawn_event === true,
         exit_event: overrides.exit_event === true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeffusion/bungee-types",
-  "version": "5.1.3",
+  "version": "5.1.5",
   "description": "TypeScript type definitions for Bungee",
   "type": "module",
   "main": "./dist/index.js",