better checking if an error is an abort error

Author: ericallam

internal-packages/run-engine/src/batch-queue/index.ts

@@ -13,6 +13,7 @@ import {
   CallbackFairQueueKeyProducer,
   WorkerQueueManager,
   BatchedSpanManager,
+  isAbortError,
   type FairQueueOptions,
   type StoredMessage,
 } from "@trigger.dev/redis-worker";
@@ -663,7 +664,7 @@ export class BatchQueue {
         }
       }
     } catch (error) {
-      if (error instanceof Error && error.name === "AbortError") {
+      if (isAbortError(error)) {
         this.logger.debug("Worker queue consumer aborted", { loopId });
         this.batchedSpanManager.cleanup(loopId);
         return;

packages/redis-worker/src/fair-queue/index.ts

@@ -7,6 +7,7 @@ import { type z } from "zod";
 import { ConcurrencyManager } from "./concurrency.js";
 import { MasterQueue } from "./masterQueue.js";
 import { type RetryStrategy, ExponentialBackoffRetry } from "./retry.js";
+import { isAbortError } from "../utils.js";
 import {
   FairQueueTelemetry,
   FairQueueAttributes,
@@ -769,7 +770,7 @@ export class FairQueue<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
         });
       }
     } catch (error) {
-      if (error instanceof Error && error.message === "AbortError") {
+      if (isAbortError(error)) {
         this.logger.debug("Master queue consumer aborted", { loopId });
         this.batchedSpanManager.cleanup(loopId);
         return;
@@ -1330,7 +1331,7 @@ export class FairQueue<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
         }
       }
     } catch (error) {
-      if (error instanceof Error && error.name === "AbortError") {
+      if (isAbortError(error)) {
         this.logger.debug("Reclaim loop aborted");
         return;
       }

packages/redis-worker/src/index.ts

@@ -1,5 +1,6 @@
 export * from "./queue.js";
 export * from "./worker.js";
+export * from "./utils.js";
 
 // Fair Queue System
 export * from "./fair-queue/index.js";

packages/redis-worker/src/utils.ts

@@ -0,0 +1,12 @@
+/**
+ * Check if an error is an AbortError.
+ *
+ * This handles both:
+ * - Custom abort errors created with `new Error("AbortError")` (sets .message)
+ * - Native Node.js AbortError from timers/promises (sets .name)
+ */
+export function isAbortError(error: unknown): boolean {
+  return (
+    error instanceof Error && (error.name === "AbortError" || error.message === "AbortError")
+  );
+}