@jeffusion/bungee-core 5.6.1 → 5.6.2

package/dist/main.js

@@ -12479,7 +12479,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@jeffusion/bungee-core",
-    version: "5.6.1",
+    version: "5.6.2",
     description: "Bungee reverse proxy core engine",
     main: "./dist/main.js",
     types: "./dist/main.d.ts",
@@ -188233,8 +188233,6 @@ function restoreWorkerTransportRequest(request, transportSecret) {
     }
   }
   const headers = new Headers(request.headers);
-  if (identity)
-    headers.delete("authorization");
   const strippedHeaders = [];
   headers.forEach((_value, name) => {
     if (name.startsWith("x-bungee-internal-") || name === "x-bungee-next-authorization") {
@@ -211624,8 +211622,6 @@ async function proxyRequest(requestSnapshot, route, upstream, requestLog, config
     stripCredentialHeaders(hookHeaders, managedCredential.policy);
   stripHopHeaders(hookHeaders);
   const finalTargetUrl = new URL(targetUrlForRequest.href);
-  if (attemptOptions?.beforeSend)
-    hookHeaders.delete("authorization");
   const credentialExpectedPath = finalTargetUrl.pathname;
   let credentialRequest;
   if (managedCredential) {
@@ -230877,7 +230873,6 @@ function privateRequestHeaders(request, transportSecret, trustedPeer, identity)
   }
   if (identity) {
     const wire = JSON.stringify(identity);
-    headers.delete("authorization");
     headers.set(INTERNAL_DATA_IDENTITY_HEADER, wire);
     headers.set(INTERNAL_DATA_IDENTITY_MAC_HEADER, signDataIdentity(wire, request.method, request.url, transportSecret));
   }
@@ -233562,27 +233557,42 @@ class SupervisedConfigWorkerProcessAdapter {
       throw new Error("supervised worker control message is unsupported");
     if (message.command === "drain-worker")
       this.drainCommand = message;
+    const startedAt = performance.now();
     let deadline;
-    if (message.command === "drain-worker") {
-      if (message.start_boot_id !== this.kernelBootId)
-        throw new Error("worker start deadline boot identity is unknown or mismatched");
-      const remaining = BigInt(message.start_deadline_ns) - process.hrtime.bigint();
-      if (remaining <= 0n)
-        throw new Error("worker drain start deadline expired before control dispatch");
-      deadline = performance.now() + Number((remaining + 999999n) / 1000000n);
-    }
-    const client = await this.readyClient();
-    if (deadline !== undefined && performance.now() >= deadline) {
-      this.followDrain(client, message);
-      throw new Error("worker drain start deadline expired before control dispatch");
-    }
     try {
-      const status = message.command === "drain-worker" ? await client.drain(message, deadline) : await client.start(message);
-      this.lastStatus = status;
-      this.publish(status.evidence.message);
-    } finally {
-      if (message.command === "drain-worker")
+      if (message.command === "drain-worker") {
+        if (message.start_boot_id !== this.kernelBootId)
+          throw new Error("worker start deadline boot identity is unknown or mismatched");
+        const remaining = BigInt(message.start_deadline_ns) - process.hrtime.bigint();
+        deadline = performance.now() + Number((remaining + 999999n) / 1000000n);
+        if (remaining <= 0n)
+          throw new Error("worker drain start deadline expired before control dispatch");
+      }
+      const client = await this.readyClient();
+      if (deadline !== undefined && performance.now() >= deadline) {
         this.followDrain(client, message);
+        throw new Error("worker drain start deadline expired before control dispatch");
+      }
+      try {
+        const status = message.command === "drain-worker" ? await client.drain(message, deadline) : await client.start(message);
+        this.lastStatus = status;
+        this.publish(status.evidence.message);
+      } finally {
+        if (message.command === "drain-worker")
+          this.followDrain(client, message);
+      }
+    } catch (error) {
+      if (message.command === "drain-worker") {
+        recordShutdownFailure("worker_drain_command", {
+          pid: this.pid,
+          origin: this.origin,
+          elapsedMs: shutdownElapsedMs(startedAt),
+          timeoutMs: message.policy.drain_start_timeout_ms,
+          deadlineExceeded: deadline !== undefined && performance.now() >= deadline,
+          commandOutcome: "failed"
+        }, error);
+      }
+      throw error;
     }
   }
   followDrain(client, command) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeffusion/bungee-core",
-  "version": "5.6.1",
+  "version": "5.6.2",
   "description": "Bungee reverse proxy core engine",
   "main": "./dist/main.js",
   "types": "./dist/main.d.ts",
@@ -12,7 +12,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@jeffusion/bungee-types": "^5.6.1",
+    "@jeffusion/bungee-types": "^5.6.2",
     "@types/lodash-es": "^4.17.12",
     "acorn": "^8.15.0",
     "canonicalize": "3.0.0",