@holo-js/queue 0.3.16 → 0.3.17

package/dist/index.mjs

@@ -878,8 +878,16 @@ function resetQueueRuntimeState(state) {
 }
 async function shutdownQueueRuntime() {
   const state = getQueueRuntimeState();
-  await closeQueueDrivers(state.drivers.values());
-  resetQueueRuntimeState(state);
+  const drivers = [...new Set(state.drivers.values())];
+  state.drivers.clear();
+  try {
+    const results = await Promise.allSettled(drivers.map(async (driver) => driver.close()));
+    const failures = results.flatMap((result) => result.status === "rejected" ? [result.reason] : []);
+    if (failures.length === 1) throw failures[0];
+    if (failures.length > 1) throw new AggregateError(failures, "Queue drivers failed to close.");
+  } finally {
+    resetQueueRuntimeState(state);
+  }
 }
 function resetQueueRuntime() {
   const state = getQueueRuntimeState();
@@ -1175,6 +1183,7 @@ async function processReservedJob(driver, reserved, options) {
   let requestedReleaseDelay;
   let requestedFailure;
   let action;
+  let handlerError;
   try {
     await runWithTimeout(
       queueRuntimeInternals.executeRegisteredQueueJob(envelope, {
@@ -1202,123 +1211,57 @@ async function processReservedJob(driver, reserved, options) {
         executionState.timedOut = true;
       }
     );
-    if (action === "release") {
-      await driver.release(reserved, typeof requestedReleaseDelay === "number" ? { delaySeconds: requestedReleaseDelay } : void 0);
-      if (options.onJobReleased) {
-        await runWorkerHook(envelope.name, "onJobReleased", async () => {
-          await options.onJobReleased?.({
-            ...event,
-            ...typeof requestedReleaseDelay === "number" ? { delaySeconds: requestedReleaseDelay } : {}
-          });
+  } catch (error) {
+    handlerError = normalizeHookError(error);
+  }
+  const failure = handlerError instanceof QueueWorkerTimeoutError ? handlerError : requestedFailure ?? handlerError;
+  let outcome;
+  if (handlerError instanceof QueueWorkerTimeoutError) {
+    outcome = { kind: "failed", error: handlerError };
+  } else if (action === "release") {
+    outcome = {
+      kind: "released",
+      ...typeof requestedReleaseDelay === "number" ? { delaySeconds: requestedReleaseDelay } : {},
+      ...failure ? { error: failure } : {}
+    };
+  } else if (failure) {
+    outcome = action === "fail" || event.attempt >= maxAttempts ? { kind: "failed", error: failure } : {
+      kind: "released",
+      delaySeconds: resolveRetryDelaySeconds(definition, event.attempt),
+      error: failure
+    };
+  } else {
+    outcome = { kind: "processed" };
+  }
+  if (outcome.kind === "released") {
+    await driver.release(reserved, typeof outcome.delaySeconds === "number" ? { delaySeconds: outcome.delaySeconds } : void 0);
+    if (options.onJobReleased) {
+      await runWorkerHook(envelope.name, "onJobReleased", async () => {
+        await options.onJobReleased?.({
+          ...event,
+          ...typeof outcome.delaySeconds === "number" ? { delaySeconds: outcome.delaySeconds } : {},
+          ...outcome.error ? { error: outcome.error } : {}
         });
-      }
-      return {
-        kind: "released",
-        ...typeof requestedReleaseDelay === "number" ? { delaySeconds: requestedReleaseDelay } : {}
-      };
+      });
     }
-    if (action === "fail") {
-      const failure = requestedFailure;
-      await persistFailedQueueJob(reserved, failure);
-      await driver.delete(reserved);
-      await queueRuntimeInternals.executeRegisteredQueueJobFailedHook(envelope, failure, {
-        maxAttempts
+  } else if (outcome.kind === "failed") {
+    await queueRuntimeInternals.getQueueRuntimeState().failedJobStore?.persistFailedJob(reserved, outcome.error);
+    await driver.delete(reserved);
+    await queueRuntimeInternals.executeRegisteredQueueJobFailedHook(envelope, outcome.error, { maxAttempts });
+    if (options.onJobFailed) {
+      await runWorkerHook(envelope.name, "onJobFailed", async () => {
+        await options.onJobFailed?.({ ...event, error: outcome.error });
       });
-      if (options.onJobFailed) {
-        await runWorkerHook(envelope.name, "onJobFailed", async () => {
-          await options.onJobFailed?.({
-            ...event,
-            error: failure
-          });
-        });
-      }
-      return {
-        kind: "failed",
-        error: failure
-      };
     }
+  } else {
     await driver.acknowledge(reserved);
     if (options.onJobProcessed) {
       await runWorkerHook(envelope.name, "onJobProcessed", async () => {
         await options.onJobProcessed?.(event);
       });
     }
-    return { kind: "processed" };
-  } catch (error) {
-    const resolvedError = error instanceof Error ? error : new Error(String(error));
-    const failure = resolvedError instanceof QueueWorkerTimeoutError ? resolvedError : requestedFailure ?? resolvedError;
-    if (resolvedError instanceof QueueWorkerTimeoutError) {
-      await persistFailedQueueJob(reserved, failure);
-      await driver.delete(reserved);
-      await queueRuntimeInternals.executeRegisteredQueueJobFailedHook(envelope, failure, {
-        maxAttempts
-      });
-      if (options.onJobFailed) {
-        await runWorkerHook(envelope.name, "onJobFailed", async () => {
-          await options.onJobFailed?.({
-            ...event,
-            error: failure
-          });
-        });
-      }
-      return {
-        kind: "failed",
-        error: failure
-      };
-    }
-    if (action === "release") {
-      await driver.release(reserved, typeof requestedReleaseDelay === "number" ? { delaySeconds: requestedReleaseDelay } : void 0);
-      if (options.onJobReleased) {
-        await runWorkerHook(envelope.name, "onJobReleased", async () => {
-          await options.onJobReleased?.({
-            ...event,
-            ...typeof requestedReleaseDelay === "number" ? { delaySeconds: requestedReleaseDelay } : {},
-            error: failure
-          });
-        });
-      }
-      return {
-        kind: "released",
-        ...typeof requestedReleaseDelay === "number" ? { delaySeconds: requestedReleaseDelay } : {},
-        error: failure
-      };
-    }
-    if (action === "fail" || event.attempt >= maxAttempts) {
-      await persistFailedQueueJob(reserved, failure);
-      await driver.delete(reserved);
-      await queueRuntimeInternals.executeRegisteredQueueJobFailedHook(envelope, failure, {
-        maxAttempts
-      });
-      if (options.onJobFailed) {
-        await runWorkerHook(envelope.name, "onJobFailed", async () => {
-          await options.onJobFailed?.({
-            ...event,
-            error: failure
-          });
-        });
-      }
-      return {
-        kind: "failed",
-        error: failure
-      };
-    }
-    const delaySeconds = resolveRetryDelaySeconds(definition, event.attempt);
-    await driver.release(reserved, typeof delaySeconds === "number" ? { delaySeconds } : void 0);
-    if (options.onJobReleased) {
-      await runWorkerHook(envelope.name, "onJobReleased", async () => {
-        await options.onJobReleased?.({
-          ...event,
-          ...typeof delaySeconds === "number" ? { delaySeconds } : {},
-          error: failure
-        });
-      });
-    }
-    return {
-      kind: "released",
-      ...typeof delaySeconds === "number" ? { delaySeconds } : {},
-      error: failure
-    };
   }
+  return outcome;
 }
 function resolveWorkerStopReason(options, state) {
   const now = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/queue",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "description": "Holo-JS Framework - queue contracts and config helpers",
   "type": "module",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "test": "vitest --run"
   },
   "dependencies": {
-    "@holo-js/config": "^0.3.16",
-    "@holo-js/kernel": "^0.3.16"
+    "@holo-js/config": "^0.3.17",
+    "@holo-js/kernel": "^0.3.17"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",