@elie-laloum/outpost 11.1.2 → 11.2.0

package/dist/infrastructure/reservation-ledger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reservation-ledger.js","sourceRoot":"","sources":["../../src/infrastructure/reservation-ledger.ts"],"names":[],"mappings":"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","sourcesContent":["import { invariant } from \"../domain/errors.ts\";\nimport { reservationIdPattern } from \"./transport-reservations.constants.ts\";\nimport type {\n  ReservationLedger,\n  StorageReservationRecord,\n} from \"./transport-reservations.types.ts\";\n\nfunction record(value: unknown): StorageReservationRecord {\n  invariant(\n    value &&\n      typeof value === \"object\" &&\n      \"bytes\" in value &&\n      typeof value.bytes === \"number\" &&\n      Number.isSafeInteger(value.bytes) &&\n      value.bytes >= 0,\n    \"Invalid reservation entry\",\n  );\n  if (!(\"owner\" in value)) return { bytes: value.bytes };\n  const owner = value.owner;\n  invariant(\n    owner &&\n      typeof owner === \"object\" &&\n      \"id\" in owner &&\n      typeof owner.id === \"string\" &&\n      reservationIdPattern.test(owner.id) &&\n      \"host\" in owner &&\n      typeof owner.host === \"string\" &&\n      owner.host.length > 0 &&\n      \"pid\" in owner &&\n      typeof owner.pid === \"number\" &&\n      Number.isSafeInteger(owner.pid) &&\n      owner.pid > 0 &&\n      \"createdAt\" in owner &&\n      typeof owner.createdAt === \"string\" &&\n      Number.isFinite(Date.parse(owner.createdAt)) &&\n      \"repository\" in owner &&\n      typeof owner.repository === \"string\",\n    \"Invalid reservation owner\",\n  );\n  let identity;\n  if (\"identity\" in owner) {\n    const value = owner.identity;\n    invariant(\n      value &&\n        typeof value === \"object\" &&\n        \"host\" in value &&\n        typeof value.host === \"string\" &&\n        value.host.length > 0 &&\n        \"boot\" in value &&\n        typeof value.boot === \"string\" &&\n        value.boot.length > 0 &&\n        \"namespace\" in value &&\n        typeof value.namespace === \"string\" &&\n        value.namespace.length > 0 &&\n        \"started\" in value &&\n        typeof value.started === \"string\" &&\n        /^\\d+$/.test(value.started),\n      \"Invalid reservation identity\",\n    );\n    identity = {\n      host: value.host,\n      boot: value.boot,\n      namespace: value.namespace,\n      started: value.started,\n    };\n  }\n  return {\n    bytes: value.bytes,\n    owner: {\n      id: owner.id,\n      host: owner.host,\n      pid: owner.pid,\n      createdAt: owner.createdAt,\n      repository: owner.repository,\n      ...(identity ? { identity } : {}),\n    },\n  };\n}\n\nexport function reservationLedger(value: unknown): ReservationLedger {\n  if (value === undefined) return { format: 2, reservations: {} };\n  invariant(\n    value &&\n      typeof value === \"object\" &&\n      \"format\" in value &&\n      (value.format === 1 || value.format === 2) &&\n      \"reservations\" in value &&\n      value.reservations &&\n      typeof value.reservations === \"object\" &&\n      !Array.isArray(value.reservations),\n    \"Invalid reservation ledger\",\n  );\n  const legacy = value.format === 1;\n  const entries = Object.entries(value.reservations).map(([id, entry]) => {\n    invariant(reservationIdPattern.test(id), \"Invalid reservation identifier\");\n    return [id, record(legacy ? { bytes: entry } : entry)];\n  });\n  return { format: 2, reservations: Object.fromEntries(entries) };\n}\n"]}

package/dist/infrastructure/reservation-recovery.d.ts

@@ -0,0 +1,4 @@
+import type { Transport } from "../domain/transport.types.ts";
+import type { StorageReservationInspection, StorageReservationRecoveryOptions } from "./transport-reservations.types.ts";
+export declare function inspectStorageReservations(transporter: Transport): Promise<StorageReservationInspection>;
+export declare function recoverStorageReservation(transporter: Transport, options: StorageReservationRecoveryOptions): Promise<void>;

package/dist/infrastructure/reservation-recovery.js

@@ -0,0 +1,28 @@
+import { invariant } from "../domain/errors.js";
+import { TransportConflict } from "../domain/transport.js";
+import { jsonBytes, jsonObject } from "./transport-json.js";
+import { reservationLedger } from "./reservation-ledger.js";
+import { reservationLedgerKey, reservationIdPattern, } from "./transport-reservations.constants.js";
+export async function inspectStorageReservations(transporter) {
+    const current = await transporter.read(reservationLedgerKey);
+    const ledger = reservationLedger(jsonObject(current));
+    return {
+        ...(current ? { revision: current.revision } : {}),
+        reservations: ledger.reservations,
+    };
+}
+export async function recoverStorageReservation(transporter, options) {
+    invariant(options.processesStopped === true, "Reservation recovery requires explicit stopped-owner authorization");
+    invariant(reservationIdPattern.test(options.id) &&
+        typeof options.revision === "string" &&
+        options.revision.length > 0, "Reservation recovery requires an identifier and inspected revision");
+    const current = await transporter.read(reservationLedgerKey);
+    if (!current || current.revision !== options.revision)
+        throw new TransportConflict(reservationLedgerKey);
+    const ledger = reservationLedger(jsonObject(current));
+    invariant(Object.hasOwn(ledger.reservations, options.id), "Reservation no longer exists");
+    const reservations = { ...ledger.reservations };
+    delete reservations[options.id];
+    await transporter.write(reservationLedgerKey, jsonBytes({ format: 2, reservations }), { ifRevision: current.revision });
+}
+//# sourceMappingURL=reservation-recovery.js.map

package/dist/infrastructure/reservation-recovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reservation-recovery.js","sourceRoot":"","sources":["../../src/infrastructure/reservation-recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EACL,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,uCAAuC,CAAC;AAM/C,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,WAAsB;IAEtB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,WAAsB,EACtB,OAA0C;IAE1C,SAAS,CACP,OAAO,CAAC,gBAAgB,KAAK,IAAI,EACjC,oEAAoE,CACrE,CAAC;IACF,SAAS,CACP,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACnC,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ;QACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAC7B,oEAAoE,CACrE,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ;QACnD,MAAM,IAAI,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,SAAS,CACP,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC,EAC9C,8BAA8B,CAC/B,CAAC;IACF,MAAM,YAAY,GAAG,EAAE,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;IAChD,OAAO,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAChC,MAAM,WAAW,CAAC,KAAK,CACrB,oBAAoB,EACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EACtC,EAAE,UAAU,EAAE,OAAO,CAAC,QAAQ,EAAE,CACjC,CAAC;AACJ,CAAC","sourcesContent":["import { invariant } from \"../domain/errors.ts\";\nimport { TransportConflict } from \"../domain/transport.ts\";\nimport type { Transport } from \"../domain/transport.types.ts\";\nimport { jsonBytes, jsonObject } from \"./transport-json.ts\";\nimport { reservationLedger } from \"./reservation-ledger.ts\";\nimport {\n  reservationLedgerKey,\n  reservationIdPattern,\n} from \"./transport-reservations.constants.ts\";\nimport type {\n  StorageReservationInspection,\n  StorageReservationRecoveryOptions,\n} from \"./transport-reservations.types.ts\";\n\nexport async function inspectStorageReservations(\n  transporter: Transport,\n): Promise<StorageReservationInspection> {\n  const current = await transporter.read(reservationLedgerKey);\n  const ledger = reservationLedger(jsonObject(current));\n  return {\n    ...(current ? { revision: current.revision } : {}),\n    reservations: ledger.reservations,\n  };\n}\n\nexport async function recoverStorageReservation(\n  transporter: Transport,\n  options: StorageReservationRecoveryOptions,\n): Promise<void> {\n  invariant(\n    options.processesStopped === true,\n    \"Reservation recovery requires explicit stopped-owner authorization\",\n  );\n  invariant(\n    reservationIdPattern.test(options.id) &&\n      typeof options.revision === \"string\" &&\n      options.revision.length > 0,\n    \"Reservation recovery requires an identifier and inspected revision\",\n  );\n  const current = await transporter.read(reservationLedgerKey);\n  if (!current || current.revision !== options.revision)\n    throw new TransportConflict(reservationLedgerKey);\n  const ledger = reservationLedger(jsonObject(current));\n  invariant(\n    Object.hasOwn(ledger.reservations, options.id),\n    \"Reservation no longer exists\",\n  );\n  const reservations = { ...ledger.reservations };\n  delete reservations[options.id];\n  await transporter.write(\n    reservationLedgerKey,\n    jsonBytes({ format: 2, reservations }),\n    { ifRevision: current.revision },\n  );\n}\n"]}

package/dist/infrastructure/s3-tombstones.d.ts

@@ -0,0 +1,3 @@
+import type { S3TombstonePruneOptions } from "./s3-tombstones.types.ts";
+/** Remove tombstones only while every writer using the selected prefix is stopped. */
+export declare function pruneS3Tombstones(options: S3TombstonePruneOptions): Promise<number>;

package/dist/infrastructure/s3-tombstones.js

@@ -0,0 +1,46 @@
+import { transportDefaults } from "./transport.constants.js";
+import { DeleteObjectCommand, HeadObjectCommand, ListObjectsV2Command, } from "@aws-sdk/client-s3";
+import { invariant } from "../domain/errors.js";
+import { transportKey } from "../domain/transport.js";
+import { s3TombstoneMetadata } from "./s3-transport.constants.js";
+/** Remove tombstones only while every writer using the selected prefix is stopped. */
+export async function pruneS3Tombstones(options) {
+    invariant(options.writersStopped === true, "S3 tombstone pruning requires writersStopped: true");
+    invariant(options.bucket.trim(), "S3 bucket must not be empty");
+    const prefix = `${transportKey(options.prefix.replace(/\/$/, ""))}/`;
+    const settings = options.signal ? { abortSignal: options.signal } : {};
+    let removed = 0;
+    let cursor;
+    const seen = new Set();
+    const keys = [];
+    do {
+        options.signal?.throwIfAborted();
+        const page = await options.client.send(new ListObjectsV2Command({
+            Bucket: options.bucket,
+            Prefix: prefix,
+            ...(cursor ? { ContinuationToken: cursor } : {}),
+        }), settings);
+        for (const item of page.Contents ?? []) {
+            options.signal?.throwIfAborted();
+            invariant(typeof item.Key === "string" && item.Key.startsWith(prefix), "Invalid S3 listing entry");
+            invariant(keys.length < transportDefaults.maxEntries, "Too many objects for offline pruning; select a narrower prefix");
+            keys.push(item.Key);
+        }
+        cursor = page.IsTruncated ? page.NextContinuationToken : undefined;
+        invariant(!page.IsTruncated || (cursor && !seen.has(cursor)), "Invalid S3 pagination cursor");
+        if (cursor)
+            seen.add(cursor);
+    } while (cursor);
+    for (const key of keys) {
+        options.signal?.throwIfAborted();
+        const target = { Bucket: options.bucket, Key: key };
+        const current = await options.client.send(new HeadObjectCommand(target), settings);
+        if (current.Metadata?.[s3TombstoneMetadata] !== "true")
+            continue;
+        // Quiescence is required because compatible stores may ignore conditional deletes.
+        await options.client.send(new DeleteObjectCommand(target), settings);
+        removed++;
+    }
+    return removed;
+}
+//# sourceMappingURL=s3-tombstones.js.map

package/dist/infrastructure/s3-tombstones.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3-tombstones.js","sourceRoot":"","sources":["../../src/infrastructure/s3-tombstones.ts"],"names":[],"mappings":"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","sourcesContent":["import { transportDefaults } from \"./transport.constants.ts\";\nimport {\n  DeleteObjectCommand,\n  HeadObjectCommand,\n  ListObjectsV2Command,\n} from \"@aws-sdk/client-s3\";\nimport { invariant } from \"../domain/errors.ts\";\nimport { transportKey } from \"../domain/transport.ts\";\nimport { s3TombstoneMetadata } from \"./s3-transport.constants.ts\";\nimport type { S3TombstonePruneOptions } from \"./s3-tombstones.types.ts\";\n\n/** Remove tombstones only while every writer using the selected prefix is stopped. */\nexport async function pruneS3Tombstones(\n  options: S3TombstonePruneOptions,\n): Promise<number> {\n  invariant(\n    options.writersStopped === true,\n    \"S3 tombstone pruning requires writersStopped: true\",\n  );\n  invariant(options.bucket.trim(), \"S3 bucket must not be empty\");\n  const prefix = `${transportKey(options.prefix.replace(/\\/$/, \"\"))}/`;\n  const settings = options.signal ? { abortSignal: options.signal } : {};\n  let removed = 0;\n  let cursor: string | undefined;\n  const seen = new Set<string>();\n  const keys: string[] = [];\n  do {\n    options.signal?.throwIfAborted();\n    const page = await options.client.send(\n      new ListObjectsV2Command({\n        Bucket: options.bucket,\n        Prefix: prefix,\n        ...(cursor ? { ContinuationToken: cursor } : {}),\n      }),\n      settings,\n    );\n    for (const item of page.Contents ?? []) {\n      options.signal?.throwIfAborted();\n      invariant(\n        typeof item.Key === \"string\" && item.Key.startsWith(prefix),\n        \"Invalid S3 listing entry\",\n      );\n      invariant(\n        keys.length < transportDefaults.maxEntries,\n        \"Too many objects for offline pruning; select a narrower prefix\",\n      );\n      keys.push(item.Key);\n    }\n    cursor = page.IsTruncated ? page.NextContinuationToken : undefined;\n    invariant(\n      !page.IsTruncated || (cursor && !seen.has(cursor)),\n      \"Invalid S3 pagination cursor\",\n    );\n    if (cursor) seen.add(cursor);\n  } while (cursor);\n  for (const key of keys) {\n    options.signal?.throwIfAborted();\n    const target = { Bucket: options.bucket, Key: key };\n    const current = await options.client.send(\n      new HeadObjectCommand(target),\n      settings,\n    );\n    if (current.Metadata?.[s3TombstoneMetadata] !== \"true\") continue;\n    // Quiescence is required because compatible stores may ignore conditional deletes.\n    await options.client.send(new DeleteObjectCommand(target), settings);\n    removed++;\n  }\n  return removed;\n}\n"]}

package/dist/infrastructure/s3-tombstones.types.d.ts

@@ -0,0 +1,6 @@
+import type { S3TransportOptions } from "./s3-transport.types.ts";
+export interface S3TombstonePruneOptions extends Pick<S3TransportOptions, "client" | "bucket"> {
+    readonly prefix: string;
+    readonly writersStopped: true;
+    readonly signal?: AbortSignal;
+}

package/dist/infrastructure/s3-tombstones.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=s3-tombstones.types.js.map

package/dist/infrastructure/s3-tombstones.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3-tombstones.types.js","sourceRoot":"","sources":["../../src/infrastructure/s3-tombstones.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { S3TransportOptions } from \"./s3-transport.types.ts\";\n\nexport interface S3TombstonePruneOptions extends Pick<\n  S3TransportOptions,\n  \"client\" | \"bucket\"\n> {\n  readonly prefix: string;\n  readonly writersStopped: true;\n  readonly signal?: AbortSignal;\n}\n"]}

package/dist/infrastructure/s3-transport.d.ts

@@ -2,3 +2,5 @@ import type { Transport } from "../domain/transport.types.ts";
 import type { S3TransportOptions } from "./s3-transport.types.ts";
 export type { S3TransportOptions } from "./s3-transport.types.ts";
 export declare function createS3Transport(options: S3TransportOptions): Transport;
+export { pruneS3Tombstones } from "./s3-tombstones.ts";
+export type { S3TombstonePruneOptions } from "./s3-tombstones.types.ts";

package/dist/infrastructure/s3-transport.js

@@ -87,7 +87,7 @@ export function createS3Transport(options) {
             settings.signal?.throwIfAborted();
             const { entry, data } = encodeObject(key, bytes);
             let revision = settings.ifRevision;
-            if (deleteMode === "tombstone" && revision === null) {
+            if (revision === null) {
                 const current = await head(key, settings.signal);
                 if (current?.Metadata?.[s3TombstoneMetadata] === "true") {
                     if (!current.ETag)
@@ -162,7 +162,8 @@ export function createS3Transport(options) {
                         item.Size < transportDefaults.headerBytes)
                         throw new Error("Invalid S3 listing entry");
                     const key = transportKey(item.Key.slice(prefix.length));
-                    if (deleteMode === "tombstone") {
+                    if (deleteMode === "tombstone" ||
+                        item.Size === transportDefaults.headerBytes) {
                         const current = await head(key, settings.signal);
                         if (!current || current.Metadata?.[s3TombstoneMetadata] === "true")
                             continue;
@@ -195,4 +196,5 @@ export function createS3Transport(options) {
         },
     };
 }
+export { pruneS3Tombstones } from "./s3-tombstones.js";
 //# sourceMappingURL=s3-transport.js.map

package/dist/infrastructure/s3-transport.js.map

@@ -1 +1 @@
-{"version":3,"file":"s3-transport.js","sourceRoot":"","sources":["../../src/infrastructure/s3-transport.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  GetObjectCommand,\n  HeadObjectCommand,\n  PutObjectCommand,\n  DeleteObjectCommand,\n  ListObjectsV2Command,\n} from \"@aws-sdk/client-s3\";\nimport {\n  TransportConflict,\n  transportKey,\n  transportCondition,\n} from \"../domain/transport.ts\";\nimport type { Transport } from \"../domain/transport.types.ts\";\nimport type { S3TransportOptions } from \"./s3-transport.types.ts\";\nimport { decodeObject, encodeObject, readLimit } from \"./transport-envelope.ts\";\nimport { transportDefaults } from \"./transport.constants.ts\";\nimport { s3DeleteMode, s3TombstoneMetadata } from \"./s3-transport.constants.ts\";\n\nexport type { S3TransportOptions } from \"./s3-transport.types.ts\";\n\nfunction status(error: unknown): number | undefined {\n  if (!error || typeof error !== \"object\" || !(\"$metadata\" in error))\n    return undefined;\n  const meta = error.$metadata;\n  return meta &&\n    typeof meta === \"object\" &&\n    \"httpStatusCode\" in meta &&\n    typeof meta.httpStatusCode === \"number\"\n    ? meta.httpStatusCode\n    : undefined;\n}\n\nexport function createS3Transport(options: S3TransportOptions): Transport {\n  if (!options.bucket.trim()) throw new Error(\"S3 bucket must not be empty\");\n  const deleteMode = options.deleteMode ?? s3DeleteMode;\n  if (deleteMode !== \"conditional\" && deleteMode !== \"tombstone\")\n    throw new Error(\"Invalid S3 delete mode\");\n  const prefix = options.prefix\n    ? `${transportKey(options.prefix.replace(/\\/$/, \"\"))}/`\n    : \"\";\n  const target = (key: string) => ({\n    Bucket: options.bucket,\n    Key: `${prefix}${transportKey(key)}`,\n  });\n  async function head(key: string, signal?: AbortSignal) {\n    try {\n      return await options.client.send(\n        new HeadObjectCommand(target(key)),\n        signal ? { abortSignal: signal } : {},\n      );\n    } catch (error) {\n      if (status(error) === 404) return undefined;\n      throw error;\n    }\n  }\n  return {\n    name: \"s3\",\n    async read(key, settings = {}) {\n      settings.signal?.throwIfAborted();\n      const maxBytes = readLimit(settings.maxBytes);\n      try {\n        const value = await options.client.send(\n          new GetObjectCommand(target(key)),\n          settings.signal ? { abortSignal: settings.signal } : {},\n        );\n        if (!value.Body) throw new Error(\"Missing S3 object body\");\n        const reader = value.Body.transformToWebStream().getReader();\n        try {\n          if (value.Metadata?.[s3TombstoneMetadata] === \"true\")\n            return undefined;\n          if (\n            !value.ETag ||\n            (value.ContentLength ?? Infinity) >\n              maxBytes + transportDefaults.headerBytes\n          )\n            throw new Error(\"Invalid or oversized S3 object\");\n          const chunks: Uint8Array[] = [];\n          let size = 0;\n          for (;;) {\n            settings.signal?.throwIfAborted();\n            const chunk = await reader.read();\n            if (chunk.done) break;\n            size += chunk.value.byteLength;\n            if (size > maxBytes + transportDefaults.headerBytes)\n              throw new Error(\"S3 object exceeds byte limit\");\n            chunks.push(chunk.value);\n          }\n          return {\n            ...decodeObject(Buffer.concat(chunks), key, maxBytes),\n            revision: value.ETag,\n          };\n        } finally {\n          await reader.cancel().catch(() => {});\n          reader.releaseLock();\n        }\n      } catch (error) {\n        if (status(error) === 404) return undefined;\n        throw error;\n      }\n    },\n    async write(key, bytes, settings) {\n      transportCondition(settings.ifRevision);\n      settings.signal?.throwIfAborted();\n      const { entry, data } = encodeObject(key, bytes);\n      let revision = settings.ifRevision;\n      if (deleteMode === \"tombstone\" && revision === null) {\n        const current = await head(key, settings.signal);\n        if (current?.Metadata?.[s3TombstoneMetadata] === \"true\") {\n          if (!current.ETag) throw new Error(\"Missing S3 tombstone revision\");\n          revision = current.ETag;\n        }\n      }\n      try {\n        const value = await options.client.send(\n          new PutObjectCommand({\n            ...target(key),\n            Body: data,\n            ...(revision === null\n              ? { IfNoneMatch: \"*\" }\n              : { IfMatch: revision }),\n          }),\n          settings.signal ? { abortSignal: settings.signal } : {},\n        );\n        if (!value.ETag) throw new Error(\"Missing S3 revision after write\");\n        return { ...entry, revision: value.ETag };\n      } catch (error) {\n        if ([409, 412].includes(status(error) ?? 0))\n          throw new TransportConflict(key);\n        throw error;\n      }\n    },\n    async remove(key, settings) {\n      transportCondition(settings.ifRevision);\n      settings.signal?.throwIfAborted();\n      if (settings.ifRevision === null)\n        throw new Error(\"S3 removal requires an existing revision\");\n      try {\n        if (deleteMode === \"tombstone\") {\n          const { data } = encodeObject(key, new Uint8Array());\n          const value = await options.client.send(\n            new PutObjectCommand({\n              ...target(key),\n              IfMatch: settings.ifRevision,\n              Body: data,\n              Metadata: { [s3TombstoneMetadata]: \"true\" },\n            }),\n            settings.signal ? { abortSignal: settings.signal } : {},\n          );\n          if (!value.ETag) throw new Error(\"Missing S3 revision after removal\");\n          return;\n        }\n        await options.client.send(\n          new DeleteObjectCommand({\n            ...target(key),\n            IfMatch: settings.ifRevision,\n          }),\n          settings.signal ? { abortSignal: settings.signal } : {},\n        );\n      } catch (error) {\n        if ([404, 409, 412].includes(status(error) ?? 0))\n          throw new TransportConflict(key);\n        throw error;\n      }\n    },\n    async *list(filter = \"\", settings = {}) {\n      if (filter) transportKey(filter.replace(/\\/$/, \"\"));\n      let cursor: string | undefined;\n      const seen = new Set<string>();\n      do {\n        settings.signal?.throwIfAborted();\n        const page = await options.client.send(\n          new ListObjectsV2Command({\n            Bucket: options.bucket,\n            Prefix: prefix + filter,\n            ...(cursor ? { ContinuationToken: cursor } : {}),\n          }),\n          settings.signal ? { abortSignal: settings.signal } : {},\n        );\n        for (const item of page.Contents ?? []) {\n          if (\n            !item.Key?.startsWith(prefix + filter) ||\n            !item.ETag ||\n            !item.LastModified ||\n            item.Size === undefined ||\n            item.Size < transportDefaults.headerBytes\n          )\n            throw new Error(\"Invalid S3 listing entry\");\n          const key = transportKey(item.Key.slice(prefix.length));\n          if (deleteMode === \"tombstone\") {\n            const current = await head(key, settings.signal);\n            if (!current || current.Metadata?.[s3TombstoneMetadata] === \"true\")\n              continue;\n            if (\n              !current.ETag ||\n              !current.LastModified ||\n              current.ContentLength === undefined ||\n              current.ContentLength < transportDefaults.headerBytes\n            )\n              throw new Error(\"Invalid S3 listing object\");\n            yield {\n              key,\n              revision: current.ETag,\n              size: current.ContentLength - transportDefaults.headerBytes,\n              modifiedAt: current.LastModified.toISOString(),\n            };\n            continue;\n          }\n          yield {\n            key,\n            revision: item.ETag,\n            size: item.Size - transportDefaults.headerBytes,\n            modifiedAt: item.LastModified.toISOString(),\n          };\n        }\n        cursor = page.IsTruncated ? page.NextContinuationToken : undefined;\n        if (page.IsTruncated && (!cursor || seen.has(cursor)))\n          throw new Error(\"Invalid S3 pagination cursor\");\n        if (cursor) seen.add(cursor);\n      } while (cursor);\n    },\n  };\n}\n"]}
+{"version":3,"file":"s3-transport.js","sourceRoot":"","sources":["../../src/infrastructure/s3-transport.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  GetObjectCommand,\n  HeadObjectCommand,\n  PutObjectCommand,\n  DeleteObjectCommand,\n  ListObjectsV2Command,\n} from \"@aws-sdk/client-s3\";\nimport {\n  TransportConflict,\n  transportKey,\n  transportCondition,\n} from \"../domain/transport.ts\";\nimport type { Transport } from \"../domain/transport.types.ts\";\nimport type { S3TransportOptions } from \"./s3-transport.types.ts\";\nimport { decodeObject, encodeObject, readLimit } from \"./transport-envelope.ts\";\nimport { transportDefaults } from \"./transport.constants.ts\";\nimport { s3DeleteMode, s3TombstoneMetadata } from \"./s3-transport.constants.ts\";\n\nexport type { S3TransportOptions } from \"./s3-transport.types.ts\";\n\nfunction status(error: unknown): number | undefined {\n  if (!error || typeof error !== \"object\" || !(\"$metadata\" in error))\n    return undefined;\n  const meta = error.$metadata;\n  return meta &&\n    typeof meta === \"object\" &&\n    \"httpStatusCode\" in meta &&\n    typeof meta.httpStatusCode === \"number\"\n    ? meta.httpStatusCode\n    : undefined;\n}\n\nexport function createS3Transport(options: S3TransportOptions): Transport {\n  if (!options.bucket.trim()) throw new Error(\"S3 bucket must not be empty\");\n  const deleteMode = options.deleteMode ?? s3DeleteMode;\n  if (deleteMode !== \"conditional\" && deleteMode !== \"tombstone\")\n    throw new Error(\"Invalid S3 delete mode\");\n  const prefix = options.prefix\n    ? `${transportKey(options.prefix.replace(/\\/$/, \"\"))}/`\n    : \"\";\n  const target = (key: string) => ({\n    Bucket: options.bucket,\n    Key: `${prefix}${transportKey(key)}`,\n  });\n  async function head(key: string, signal?: AbortSignal) {\n    try {\n      return await options.client.send(\n        new HeadObjectCommand(target(key)),\n        signal ? { abortSignal: signal } : {},\n      );\n    } catch (error) {\n      if (status(error) === 404) return undefined;\n      throw error;\n    }\n  }\n  return {\n    name: \"s3\",\n    async read(key, settings = {}) {\n      settings.signal?.throwIfAborted();\n      const maxBytes = readLimit(settings.maxBytes);\n      try {\n        const value = await options.client.send(\n          new GetObjectCommand(target(key)),\n          settings.signal ? { abortSignal: settings.signal } : {},\n        );\n        if (!value.Body) throw new Error(\"Missing S3 object body\");\n        const reader = value.Body.transformToWebStream().getReader();\n        try {\n          if (value.Metadata?.[s3TombstoneMetadata] === \"true\")\n            return undefined;\n          if (\n            !value.ETag ||\n            (value.ContentLength ?? Infinity) >\n              maxBytes + transportDefaults.headerBytes\n          )\n            throw new Error(\"Invalid or oversized S3 object\");\n          const chunks: Uint8Array[] = [];\n          let size = 0;\n          for (;;) {\n            settings.signal?.throwIfAborted();\n            const chunk = await reader.read();\n            if (chunk.done) break;\n            size += chunk.value.byteLength;\n            if (size > maxBytes + transportDefaults.headerBytes)\n              throw new Error(\"S3 object exceeds byte limit\");\n            chunks.push(chunk.value);\n          }\n          return {\n            ...decodeObject(Buffer.concat(chunks), key, maxBytes),\n            revision: value.ETag,\n          };\n        } finally {\n          await reader.cancel().catch(() => {});\n          reader.releaseLock();\n        }\n      } catch (error) {\n        if (status(error) === 404) return undefined;\n        throw error;\n      }\n    },\n    async write(key, bytes, settings) {\n      transportCondition(settings.ifRevision);\n      settings.signal?.throwIfAborted();\n      const { entry, data } = encodeObject(key, bytes);\n      let revision = settings.ifRevision;\n      if (revision === null) {\n        const current = await head(key, settings.signal);\n        if (current?.Metadata?.[s3TombstoneMetadata] === \"true\") {\n          if (!current.ETag) throw new Error(\"Missing S3 tombstone revision\");\n          revision = current.ETag;\n        }\n      }\n      try {\n        const value = await options.client.send(\n          new PutObjectCommand({\n            ...target(key),\n            Body: data,\n            ...(revision === null\n              ? { IfNoneMatch: \"*\" }\n              : { IfMatch: revision }),\n          }),\n          settings.signal ? { abortSignal: settings.signal } : {},\n        );\n        if (!value.ETag) throw new Error(\"Missing S3 revision after write\");\n        return { ...entry, revision: value.ETag };\n      } catch (error) {\n        if ([409, 412].includes(status(error) ?? 0))\n          throw new TransportConflict(key);\n        throw error;\n      }\n    },\n    async remove(key, settings) {\n      transportCondition(settings.ifRevision);\n      settings.signal?.throwIfAborted();\n      if (settings.ifRevision === null)\n        throw new Error(\"S3 removal requires an existing revision\");\n      try {\n        if (deleteMode === \"tombstone\") {\n          const { data } = encodeObject(key, new Uint8Array());\n          const value = await options.client.send(\n            new PutObjectCommand({\n              ...target(key),\n              IfMatch: settings.ifRevision,\n              Body: data,\n              Metadata: { [s3TombstoneMetadata]: \"true\" },\n            }),\n            settings.signal ? { abortSignal: settings.signal } : {},\n          );\n          if (!value.ETag) throw new Error(\"Missing S3 revision after removal\");\n          return;\n        }\n        await options.client.send(\n          new DeleteObjectCommand({\n            ...target(key),\n            IfMatch: settings.ifRevision,\n          }),\n          settings.signal ? { abortSignal: settings.signal } : {},\n        );\n      } catch (error) {\n        if ([404, 409, 412].includes(status(error) ?? 0))\n          throw new TransportConflict(key);\n        throw error;\n      }\n    },\n    async *list(filter = \"\", settings = {}) {\n      if (filter) transportKey(filter.replace(/\\/$/, \"\"));\n      let cursor: string | undefined;\n      const seen = new Set<string>();\n      do {\n        settings.signal?.throwIfAborted();\n        const page = await options.client.send(\n          new ListObjectsV2Command({\n            Bucket: options.bucket,\n            Prefix: prefix + filter,\n            ...(cursor ? { ContinuationToken: cursor } : {}),\n          }),\n          settings.signal ? { abortSignal: settings.signal } : {},\n        );\n        for (const item of page.Contents ?? []) {\n          if (\n            !item.Key?.startsWith(prefix + filter) ||\n            !item.ETag ||\n            !item.LastModified ||\n            item.Size === undefined ||\n            item.Size < transportDefaults.headerBytes\n          )\n            throw new Error(\"Invalid S3 listing entry\");\n          const key = transportKey(item.Key.slice(prefix.length));\n          if (\n            deleteMode === \"tombstone\" ||\n            item.Size === transportDefaults.headerBytes\n          ) {\n            const current = await head(key, settings.signal);\n            if (!current || current.Metadata?.[s3TombstoneMetadata] === \"true\")\n              continue;\n            if (\n              !current.ETag ||\n              !current.LastModified ||\n              current.ContentLength === undefined ||\n              current.ContentLength < transportDefaults.headerBytes\n            )\n              throw new Error(\"Invalid S3 listing object\");\n            yield {\n              key,\n              revision: current.ETag,\n              size: current.ContentLength - transportDefaults.headerBytes,\n              modifiedAt: current.LastModified.toISOString(),\n            };\n            continue;\n          }\n          yield {\n            key,\n            revision: item.ETag,\n            size: item.Size - transportDefaults.headerBytes,\n            modifiedAt: item.LastModified.toISOString(),\n          };\n        }\n        cursor = page.IsTruncated ? page.NextContinuationToken : undefined;\n        if (page.IsTruncated && (!cursor || seen.has(cursor)))\n          throw new Error(\"Invalid S3 pagination cursor\");\n        if (cursor) seen.add(cursor);\n      } while (cursor);\n    },\n  };\n}\n\nexport { pruneS3Tombstones } from \"./s3-tombstones.ts\";\nexport type { S3TombstonePruneOptions } from \"./s3-tombstones.types.ts\";\n"]}

package/dist/infrastructure/sse.js

@@ -18,7 +18,6 @@ export async function* serverSentEvents(body, maxBytes, onChunk = () => undefine
         for (;;) {
             const { done, value } = await reader.read();
             if (!done) {
-                onChunk();
                 size += value.byteLength;
                 if (size > maxBytes)
                     throw new OutpostError("response", "Model response exceeds maxResponseBytes");
@@ -33,8 +32,10 @@ export async function* serverSentEvents(body, maxBytes, onChunk = () => undefine
             for (const line of lines) {
                 if (line === "") {
                     const complete = dispatch();
-                    if (complete)
+                    if (complete) {
+                        onChunk();
                         yield complete;
+                    }
                     continue;
                 }
                 if (line.startsWith(":"))
@@ -51,8 +52,10 @@ export async function* serverSentEvents(body, maxBytes, onChunk = () => undefine
             if (!done)
                 continue;
             const complete = dispatch();
-            if (complete)
+            if (complete) {
+                onChunk();
                 yield complete;
+            }
             return;
         }
     }

package/dist/infrastructure/sse.js.map

@@ -1 +1 @@
-{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../src/infrastructure/sse.ts"],"names":[],"mappings":"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","sourcesContent":["import { OutpostError } from \"../domain/errors.ts\";\nimport type { ServerSentEvent } from \"./sse.types.ts\";\n\nexport async function* serverSentEvents(\n  body: ReadableStream<Uint8Array>,\n  maxBytes: number,\n  onChunk: () => void = () => undefined,\n): AsyncGenerator<ServerSentEvent> {\n  const decoder = new TextDecoder();\n  const reader = body.getReader();\n  let buffer = \"\";\n  let size = 0;\n  let event: string | undefined;\n  let data: string[] = [];\n  const dispatch = (): ServerSentEvent | undefined => {\n    const complete = data.length\n      ? { ...(event ? { event } : {}), data: data.join(\"\\n\") }\n      : undefined;\n    event = undefined;\n    data = [];\n    return complete;\n  };\n  try {\n    for (;;) {\n      const { done, value } = await reader.read();\n      if (!done) {\n        onChunk();\n        size += value.byteLength;\n        if (size > maxBytes)\n          throw new OutpostError(\n            \"response\",\n            \"Model response exceeds maxResponseBytes\",\n          );\n      }\n      buffer += done\n        ? decoder.decode()\n        : decoder.decode(value, { stream: true });\n      // A CR at the end of a chunk may be the first half of a CRLF terminator.\n      const carriage = !done && buffer.endsWith(\"\\r\");\n      const lines = (carriage ? buffer.slice(0, -1) : buffer).split(\n        /\\r\\n|\\r|\\n/,\n      );\n      buffer = done ? \"\" : `${lines.pop()!}${carriage ? \"\\r\" : \"\"}`;\n      for (const line of lines) {\n        if (line === \"\") {\n          const complete = dispatch();\n          if (complete) yield complete;\n          continue;\n        }\n        if (line.startsWith(\":\")) continue;\n        const colon = line.indexOf(\":\");\n        const field = colon < 0 ? line : line.slice(0, colon);\n        const raw = colon < 0 ? \"\" : line.slice(colon + 1);\n        const value = raw.startsWith(\" \") ? raw.slice(1) : raw;\n        if (field === \"event\") event = value;\n        if (field === \"data\") data.push(value);\n      }\n      if (!done) continue;\n      const complete = dispatch();\n      if (complete) yield complete;\n      return;\n    }\n  } finally {\n    await reader.cancel().catch(() => undefined);\n    reader.releaseLock();\n  }\n}\n"]}
+{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../src/infrastructure/sse.ts"],"names":[],"mappings":"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","sourcesContent":["import { OutpostError } from \"../domain/errors.ts\";\nimport type { ServerSentEvent } from \"./sse.types.ts\";\n\nexport async function* serverSentEvents(\n  body: ReadableStream<Uint8Array>,\n  maxBytes: number,\n  onChunk: () => void = () => undefined,\n): AsyncGenerator<ServerSentEvent> {\n  const decoder = new TextDecoder();\n  const reader = body.getReader();\n  let buffer = \"\";\n  let size = 0;\n  let event: string | undefined;\n  let data: string[] = [];\n  const dispatch = (): ServerSentEvent | undefined => {\n    const complete = data.length\n      ? { ...(event ? { event } : {}), data: data.join(\"\\n\") }\n      : undefined;\n    event = undefined;\n    data = [];\n    return complete;\n  };\n  try {\n    for (;;) {\n      const { done, value } = await reader.read();\n      if (!done) {\n        size += value.byteLength;\n        if (size > maxBytes)\n          throw new OutpostError(\n            \"response\",\n            \"Model response exceeds maxResponseBytes\",\n          );\n      }\n      buffer += done\n        ? decoder.decode()\n        : decoder.decode(value, { stream: true });\n      // A CR at the end of a chunk may be the first half of a CRLF terminator.\n      const carriage = !done && buffer.endsWith(\"\\r\");\n      const lines = (carriage ? buffer.slice(0, -1) : buffer).split(\n        /\\r\\n|\\r|\\n/,\n      );\n      buffer = done ? \"\" : `${lines.pop()!}${carriage ? \"\\r\" : \"\"}`;\n      for (const line of lines) {\n        if (line === \"\") {\n          const complete = dispatch();\n          if (complete) {\n            onChunk();\n            yield complete;\n          }\n          continue;\n        }\n        if (line.startsWith(\":\")) continue;\n        const colon = line.indexOf(\":\");\n        const field = colon < 0 ? line : line.slice(0, colon);\n        const raw = colon < 0 ? \"\" : line.slice(colon + 1);\n        const value = raw.startsWith(\" \") ? raw.slice(1) : raw;\n        if (field === \"event\") event = value;\n        if (field === \"data\") data.push(value);\n      }\n      if (!done) continue;\n      const complete = dispatch();\n      if (complete) {\n        onChunk();\n        yield complete;\n      }\n      return;\n    }\n  } finally {\n    await reader.cancel().catch(() => undefined);\n    reader.releaseLock();\n  }\n}\n"]}

package/dist/infrastructure/task-queue-bullmq-connection.d.ts

@@ -0,0 +1,3 @@
+import type { BullMQTaskQueueOptions } from "./task-queue-bullmq.types.ts";
+import type { BullMQConnection } from "./task-queue-bullmq-connection.types.ts";
+export declare function createBullMQConnection(options: BullMQTaskQueueOptions["connection"]): BullMQConnection;

package/dist/infrastructure/task-queue-bullmq-connection.js

@@ -0,0 +1,32 @@
+import { bullMQConnectionTimeoutMs, bullMQConnectionRetries, bullMQRetryDelayMs, bullMQMaxRetryDelayMs, } from "./task-queue-bullmq.constants.js";
+export function createBullMQConnection(options) {
+    let ready = false;
+    let closed = false;
+    const retry = options.retryStrategy === undefined
+        ? (attempt) => {
+            if (!ready && attempt > bullMQConnectionRetries)
+                return null;
+            return Math.min(attempt * bullMQRetryDelayMs, bullMQMaxRetryDelayMs);
+        }
+        : options.retryStrategy;
+    return {
+        options: {
+            connectTimeout: bullMQConnectionTimeoutMs,
+            commandTimeout: bullMQConnectionTimeoutMs,
+            ...options,
+            retryStrategy: (attempt) => {
+                if (closed || !retry)
+                    return null;
+                return retry(attempt);
+            },
+            maxRetriesPerRequest: 1,
+        },
+        connected() {
+            ready = true;
+        },
+        close() {
+            closed = true;
+        },
+    };
+}
+//# sourceMappingURL=task-queue-bullmq-connection.js.map

package/dist/infrastructure/task-queue-bullmq-connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-queue-bullmq-connection.js","sourceRoot":"","sources":["../../src/infrastructure/task-queue-bullmq-connection.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,kCAAkC,CAAC;AAE1C,MAAM,UAAU,sBAAsB,CACpC,OAA6C;IAE7C,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GACT,OAAO,CAAC,aAAa,KAAK,SAAS;QACjC,CAAC,CAAC,CAAC,OAAe,EAAE,EAAE;YAClB,IAAI,CAAC,KAAK,IAAI,OAAO,GAAG,uBAAuB;gBAAE,OAAO,IAAI,CAAC;YAC7D,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;QACvE,CAAC;QACH,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;IAC5B,OAAO;QACL,OAAO,EAAE;YACP,cAAc,EAAE,yBAAyB;YACzC,cAAc,EAAE,yBAAyB;YACzC,GAAG,OAAO;YACV,aAAa,EAAE,CAAC,OAAe,EAAE,EAAE;gBACjC,IAAI,MAAM,IAAI,CAAC,KAAK;oBAAE,OAAO,IAAI,CAAC;gBAClC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;YACD,oBAAoB,EAAE,CAAC;SACxB;QACD,SAAS;YACP,KAAK,GAAG,IAAI,CAAC;QACf,CAAC;QACD,KAAK;YACH,MAAM,GAAG,IAAI,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { BullMQTaskQueueOptions } from \"./task-queue-bullmq.types.ts\";\nimport type { BullMQConnection } from \"./task-queue-bullmq-connection.types.ts\";\nimport {\n  bullMQConnectionTimeoutMs,\n  bullMQConnectionRetries,\n  bullMQRetryDelayMs,\n  bullMQMaxRetryDelayMs,\n} from \"./task-queue-bullmq.constants.ts\";\n\nexport function createBullMQConnection(\n  options: BullMQTaskQueueOptions[\"connection\"],\n): BullMQConnection {\n  let ready = false;\n  let closed = false;\n  const retry =\n    options.retryStrategy === undefined\n      ? (attempt: number) => {\n          if (!ready && attempt > bullMQConnectionRetries) return null;\n          return Math.min(attempt * bullMQRetryDelayMs, bullMQMaxRetryDelayMs);\n        }\n      : options.retryStrategy;\n  return {\n    options: {\n      connectTimeout: bullMQConnectionTimeoutMs,\n      commandTimeout: bullMQConnectionTimeoutMs,\n      ...options,\n      retryStrategy: (attempt: number) => {\n        if (closed || !retry) return null;\n        return retry(attempt);\n      },\n      maxRetriesPerRequest: 1,\n    },\n    connected() {\n      ready = true;\n    },\n    close() {\n      closed = true;\n    },\n  };\n}\n"]}

package/dist/infrastructure/task-queue-bullmq-connection.types.d.ts

@@ -0,0 +1,8 @@
+import type { RedisOptions } from "bullmq";
+export interface BullMQConnection {
+    readonly options: RedisOptions & {
+        readonly retryStrategy: NonNullable<RedisOptions["retryStrategy"]>;
+    };
+    connected(): void;
+    close(): void;
+}

package/dist/infrastructure/task-queue-bullmq-connection.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=task-queue-bullmq-connection.types.js.map

package/dist/infrastructure/task-queue-bullmq-connection.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-queue-bullmq-connection.types.js","sourceRoot":"","sources":["../../src/infrastructure/task-queue-bullmq-connection.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { RedisOptions } from \"bullmq\";\n\nexport interface BullMQConnection {\n  readonly options: RedisOptions & {\n    readonly retryStrategy: NonNullable<RedisOptions[\"retryStrategy\"]>;\n  };\n  connected(): void;\n  close(): void;\n}\n"]}

package/dist/infrastructure/task-queue-bullmq-resources.js

@@ -1,7 +1,8 @@
 import { Queue, Worker } from "bullmq";
 import { queueNumber, queueString } from "../domain/task-queue.js";
 import { bullMQKey } from "./task-queue-bullmq-state.js";
-import { bullMQConnectionTimeoutMs, bullMQConnectionRetries, bullMQRetryDelayMs, bullMQDefaultPrefix, bullMQDefaultStalledIntervalMs, } from "./task-queue-bullmq.constants.js";
+import { createBullMQConnection } from "./task-queue-bullmq-connection.js";
+import { bullMQDefaultPrefix, bullMQDefaultStalledIntervalMs, } from "./task-queue-bullmq.constants.js";
 export async function openBullMQResources(options) {
     const name = bullMQKey(queueString(options.name));
     const prefix = queueString(options.prefix ?? bullMQDefaultPrefix);
@@ -10,15 +11,10 @@ export async function openBullMQResources(options) {
         throw new Error("BullMQ stalled interval must be positive");
     if (options.connection.keyPrefix)
         throw new Error("Use the BullMQ queue prefix instead of connection.keyPrefix");
-    const connection = {
-        connectTimeout: bullMQConnectionTimeoutMs,
-        commandTimeout: bullMQConnectionTimeoutMs,
-        retryStrategy: (attempt) => attempt <= bullMQConnectionRetries ? attempt * bullMQRetryDelayMs : null,
-        ...options.connection,
-        maxRetriesPerRequest: 1,
-    };
+    const connection = createBullMQConnection(options.connection);
+    const connections = new Set([connection]);
     const root = new Queue(name, {
-        connection,
+        connection: connection.options,
         prefix,
     });
     const handlers = new Map();
@@ -33,11 +29,13 @@ export async function openBullMQResources(options) {
     root.on("error", report);
     try {
         await root.waitUntilReady();
+        connection.connected();
         const memory = await (await root.client).info();
         if (!/^maxmemory_policy:noeviction\r?$/m.test(memory))
             throw new Error("Redis maxmemory-policy must be noeviction; change the database Data eviction policy in your Redis service settings");
     }
     catch (error) {
+        connection.close();
         await root.close();
         throw error;
     }
@@ -52,12 +50,14 @@ export async function openBullMQResources(options) {
         if (existing)
             return existing;
         const created = (async () => {
+            const connection = createBullMQConnection(options.connection);
+            connections.add(connection);
             const queue = new Queue(nativeName(handler), {
-                connection,
+                connection: connection.options,
                 prefix,
             });
             const worker = new Worker(nativeName(handler), null, {
-                connection: { ...connection, maxRetriesPerRequest: null },
+                connection: { ...connection.options, maxRetriesPerRequest: null },
                 prefix,
                 autorun: false,
                 skipLockRenewal: true,
@@ -68,10 +68,13 @@ export async function openBullMQResources(options) {
             worker.on("error", report);
             try {
                 await Promise.all([queue.waitUntilReady(), worker.waitUntilReady()]);
+                connection.connected();
                 await worker.startStalledCheckTimer();
                 return { queue, worker };
             }
             catch (error) {
+                connection.close();
+                connections.delete(connection);
                 await Promise.all([queue.close(), worker.close(true)]);
                 throw error;
             }
@@ -103,10 +106,13 @@ export async function openBullMQResources(options) {
             closing ??= (async () => {
                 await Promise.allSettled([...pending]);
                 const opened = await Promise.allSettled([...handlers.values()]);
-                const resources = opened.flatMap((entry) => entry.status === "fulfilled"
-                    ? [entry.value.worker, entry.value.queue]
-                    : []);
-                const results = await Promise.allSettled(resources.map((resource) => resource.close()));
+                for (const connection of connections)
+                    connection.close();
+                const resources = opened.flatMap((entry) => entry.status === "fulfilled" ? [entry.value] : []);
+                const results = await Promise.allSettled(resources.flatMap(({ worker, queue }) => [
+                    worker.close(true),
+                    queue.close(),
+                ]));
                 await root.close();
                 const errors = results
                     .filter((entry) => entry.status === "rejected")

package/dist/infrastructure/task-queue-bullmq-resources.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-queue-bullmq-resources.js","sourceRoot":"","sources":["../../src/infrastructure/task-queue-bullmq-resources.ts"],"names":[],"mappings":"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","sourcesContent":["import { Queue, Worker } from \"bullmq\";\nimport { queueNumber, queueString } from \"../domain/task-queue.ts\";\nimport type { QueueRequest, QueueResult } from \"../domain/task-queue.types.ts\";\nimport type {\n  BullMQTaskQueueOptions,\n  BullMQHandlerQueue,\n} from \"./task-queue-bullmq.types.ts\";\nimport { bullMQKey } from \"./task-queue-bullmq-state.ts\";\nimport {\n  bullMQConnectionTimeoutMs,\n  bullMQConnectionRetries,\n  bullMQRetryDelayMs,\n  bullMQDefaultPrefix,\n  bullMQDefaultStalledIntervalMs,\n} from \"./task-queue-bullmq.constants.ts\";\n\nexport async function openBullMQResources(options: BullMQTaskQueueOptions) {\n  const name = bullMQKey(queueString(options.name));\n  const prefix = queueString(options.prefix ?? bullMQDefaultPrefix);\n  const stalledInterval = queueNumber(\n    options.stalledIntervalMs ?? bullMQDefaultStalledIntervalMs,\n  );\n  if (!stalledInterval)\n    throw new Error(\"BullMQ stalled interval must be positive\");\n  if (options.connection.keyPrefix)\n    throw new Error(\n      \"Use the BullMQ queue prefix instead of connection.keyPrefix\",\n    );\n  const connection = {\n    connectTimeout: bullMQConnectionTimeoutMs,\n    commandTimeout: bullMQConnectionTimeoutMs,\n    retryStrategy: (attempt: number) =>\n      attempt <= bullMQConnectionRetries ? attempt * bullMQRetryDelayMs : null,\n    ...options.connection,\n    maxRetriesPerRequest: 1,\n  };\n  const root = new Queue<QueueRequest, QueueResult>(name, {\n    connection,\n    prefix,\n  });\n  const handlers = new Map<string, Promise<BullMQHandlerQueue>>();\n  const pending = new Set<Promise<unknown>>();\n  let closing: Promise<void> | undefined;\n  function report(error: unknown) {\n    try {\n      options.onError?.(\n        error instanceof Error ? error : new Error(String(error)),\n      );\n    } catch {}\n  }\n  root.on(\"error\", report);\n  try {\n    await root.waitUntilReady();\n    const memory = await (await root.client).info();\n    if (!/^maxmemory_policy:noeviction\\r?$/m.test(memory))\n      throw new Error(\n        \"Redis maxmemory-policy must be noeviction; change the database Data eviction policy in your Redis service settings\",\n      );\n  } catch (error) {\n    await root.close();\n    throw error;\n  }\n  function nativeName(handler: string) {\n    return `${name}-${bullMQKey(handler)}`;\n  }\n  function nativeKey(handler: string, id: string) {\n    return `${prefix}:${nativeName(handler)}:${bullMQKey(id)}`;\n  }\n  function handlerQueue(handler: string) {\n    const existing = handlers.get(handler);\n    if (existing) return existing;\n    const created = (async () => {\n      const queue = new Queue<QueueRequest, QueueResult>(nativeName(handler), {\n        connection,\n        prefix,\n      });\n      const worker = new Worker<QueueRequest, QueueResult>(\n        nativeName(handler),\n        null,\n        {\n          connection: { ...connection, maxRetriesPerRequest: null },\n          prefix,\n          autorun: false,\n          skipLockRenewal: true,\n          stalledInterval,\n          maxStalledCount: Number.MAX_SAFE_INTEGER,\n        },\n      );\n      queue.on(\"error\", report);\n      worker.on(\"error\", report);\n      try {\n        await Promise.all([queue.waitUntilReady(), worker.waitUntilReady()]);\n        await worker.startStalledCheckTimer();\n        return { queue, worker };\n      } catch (error) {\n        await Promise.all([queue.close(), worker.close(true)]);\n        throw error;\n      }\n    })();\n    handlers.set(handler, created);\n    void created.catch(() => {\n      if (handlers.get(handler) === created) handlers.delete(handler);\n    });\n    return created;\n  }\n  function perform<T>(operation: () => Promise<T>): Promise<T> {\n    if (closing)\n      return Promise.reject(new Error(\"BullMQ task queue is closed\"));\n    const promise = operation();\n    pending.add(promise);\n    void promise.then(\n      () => pending.delete(promise),\n      () => pending.delete(promise),\n    );\n    return promise;\n  }\n  return {\n    root,\n    prefix,\n    nativeName,\n    nativeKey,\n    handlerQueue,\n    perform,\n    report,\n    close() {\n      closing ??= (async () => {\n        await Promise.allSettled([...pending]);\n        const opened = await Promise.allSettled([...handlers.values()]);\n        const resources = opened.flatMap((entry) =>\n          entry.status === \"fulfilled\"\n            ? [entry.value.worker, entry.value.queue]\n            : [],\n        );\n        const results = await Promise.allSettled(\n          resources.map((resource) => resource.close()),\n        );\n        await root.close();\n        const errors = results\n          .filter((entry) => entry.status === \"rejected\")\n          .map((entry) => entry.reason);\n        if (errors.length)\n          throw new AggregateError(errors, \"Failed to close BullMQ task queue\");\n      })();\n      return closing;\n    },\n  };\n}\n"]}
+{"version":3,"file":"task-queue-bullmq-resources.js","sourceRoot":"","sources":["../../src/infrastructure/task-queue-bullmq-resources.ts"],"names":[],"mappings":"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","sourcesContent":["import { Queue, Worker } from \"bullmq\";\nimport { queueNumber, queueString } from \"../domain/task-queue.ts\";\nimport type { QueueRequest, QueueResult } from \"../domain/task-queue.types.ts\";\nimport type {\n  BullMQTaskQueueOptions,\n  BullMQHandlerQueue,\n} from \"./task-queue-bullmq.types.ts\";\nimport { bullMQKey } from \"./task-queue-bullmq-state.ts\";\nimport { createBullMQConnection } from \"./task-queue-bullmq-connection.ts\";\nimport {\n  bullMQDefaultPrefix,\n  bullMQDefaultStalledIntervalMs,\n} from \"./task-queue-bullmq.constants.ts\";\n\nexport async function openBullMQResources(options: BullMQTaskQueueOptions) {\n  const name = bullMQKey(queueString(options.name));\n  const prefix = queueString(options.prefix ?? bullMQDefaultPrefix);\n  const stalledInterval = queueNumber(\n    options.stalledIntervalMs ?? bullMQDefaultStalledIntervalMs,\n  );\n  if (!stalledInterval)\n    throw new Error(\"BullMQ stalled interval must be positive\");\n  if (options.connection.keyPrefix)\n    throw new Error(\n      \"Use the BullMQ queue prefix instead of connection.keyPrefix\",\n    );\n  const connection = createBullMQConnection(options.connection);\n  const connections = new Set([connection]);\n  const root = new Queue<QueueRequest, QueueResult>(name, {\n    connection: connection.options,\n    prefix,\n  });\n  const handlers = new Map<string, Promise<BullMQHandlerQueue>>();\n  const pending = new Set<Promise<unknown>>();\n  let closing: Promise<void> | undefined;\n  function report(error: unknown) {\n    try {\n      options.onError?.(\n        error instanceof Error ? error : new Error(String(error)),\n      );\n    } catch {}\n  }\n  root.on(\"error\", report);\n  try {\n    await root.waitUntilReady();\n    connection.connected();\n    const memory = await (await root.client).info();\n    if (!/^maxmemory_policy:noeviction\\r?$/m.test(memory))\n      throw new Error(\n        \"Redis maxmemory-policy must be noeviction; change the database Data eviction policy in your Redis service settings\",\n      );\n  } catch (error) {\n    connection.close();\n    await root.close();\n    throw error;\n  }\n  function nativeName(handler: string) {\n    return `${name}-${bullMQKey(handler)}`;\n  }\n  function nativeKey(handler: string, id: string) {\n    return `${prefix}:${nativeName(handler)}:${bullMQKey(id)}`;\n  }\n  function handlerQueue(handler: string) {\n    const existing = handlers.get(handler);\n    if (existing) return existing;\n    const created = (async () => {\n      const connection = createBullMQConnection(options.connection);\n      connections.add(connection);\n      const queue = new Queue<QueueRequest, QueueResult>(nativeName(handler), {\n        connection: connection.options,\n        prefix,\n      });\n      const worker = new Worker<QueueRequest, QueueResult>(\n        nativeName(handler),\n        null,\n        {\n          connection: { ...connection.options, maxRetriesPerRequest: null },\n          prefix,\n          autorun: false,\n          skipLockRenewal: true,\n          stalledInterval,\n          maxStalledCount: Number.MAX_SAFE_INTEGER,\n        },\n      );\n      queue.on(\"error\", report);\n      worker.on(\"error\", report);\n      try {\n        await Promise.all([queue.waitUntilReady(), worker.waitUntilReady()]);\n        connection.connected();\n        await worker.startStalledCheckTimer();\n        return { queue, worker };\n      } catch (error) {\n        connection.close();\n        connections.delete(connection);\n        await Promise.all([queue.close(), worker.close(true)]);\n        throw error;\n      }\n    })();\n    handlers.set(handler, created);\n    void created.catch(() => {\n      if (handlers.get(handler) === created) handlers.delete(handler);\n    });\n    return created;\n  }\n  function perform<T>(operation: () => Promise<T>): Promise<T> {\n    if (closing)\n      return Promise.reject(new Error(\"BullMQ task queue is closed\"));\n    const promise = operation();\n    pending.add(promise);\n    void promise.then(\n      () => pending.delete(promise),\n      () => pending.delete(promise),\n    );\n    return promise;\n  }\n  return {\n    root,\n    prefix,\n    nativeName,\n    nativeKey,\n    handlerQueue,\n    perform,\n    report,\n    close() {\n      closing ??= (async () => {\n        await Promise.allSettled([...pending]);\n        const opened = await Promise.allSettled([...handlers.values()]);\n        for (const connection of connections) connection.close();\n        const resources = opened.flatMap((entry) =>\n          entry.status === \"fulfilled\" ? [entry.value] : [],\n        );\n        const results = await Promise.allSettled(\n          resources.flatMap(({ worker, queue }) => [\n            worker.close(true),\n            queue.close(),\n          ]),\n        );\n        await root.close();\n        const errors = results\n          .filter((entry) => entry.status === \"rejected\")\n          .map((entry) => entry.reason);\n        if (errors.length)\n          throw new AggregateError(errors, \"Failed to close BullMQ task queue\");\n      })();\n      return closing;\n    },\n  };\n}\n"]}

package/dist/infrastructure/task-queue-bullmq-state.d.ts

@@ -1,5 +1,6 @@
 export declare function bullMQKey(value: string): string;
 export declare function bullMQState(value: unknown): {
+    request: string;
     job: import("../index.ts").QueueJob;
     token: string | undefined;
 } | undefined;

package/dist/infrastructure/task-queue-bullmq-state.js

@@ -15,6 +15,7 @@ export function bullMQState(value) {
         throw new Error("Invalid BullMQ queue state");
     const meta = queueObject(JSON.parse(metadata));
     return {
+        request,
         job: queueJob({
             ...queueObject(JSON.parse(request)),
             ...meta,

package/dist/infrastructure/task-queue-bullmq-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-queue-bullmq-state.js","sourceRoot":"","sources":["../../src/infrastructure/task-queue-bullmq-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE7E,MAAM,UAAU,SAAS,CAAC,KAAa;IACrC,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAc;IACxC,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACrC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAc,KAAK,CAAC;IACrD,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,QAAQ,KAAK,QAAQ;QAC5B,OAAO,MAAM,KAAK,QAAQ;QAE1B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,OAAO;QACL,GAAG,EAAE,QAAQ,CAAC;YACZ,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,GAAG,IAAI;YACP,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClD,CAAC;QACF,KAAK,EAAE,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;KACtE,CAAC;AACJ,CAAC","sourcesContent":["import { createHash } from \"node:crypto\";\nimport { queueJob, queueObject, queueString } from \"../domain/task-queue.ts\";\n\nexport function bullMQKey(value: string): string {\n  return createHash(\"sha256\").update(value).digest(\"hex\");\n}\n\nexport function bullMQState(value: unknown) {\n  if (value === null) return undefined;\n  if (!Array.isArray(value) || value.length !== 3)\n    throw new Error(\"Invalid BullMQ queue state\");\n  const [request, metadata, result]: unknown[] = value;\n  if (\n    typeof request !== \"string\" ||\n    typeof metadata !== \"string\" ||\n    typeof result !== \"string\"\n  )\n    throw new Error(\"Invalid BullMQ queue state\");\n  const meta = queueObject(JSON.parse(metadata));\n  return {\n    job: queueJob({\n      ...queueObject(JSON.parse(request)),\n      ...meta,\n      ...(result ? { result: JSON.parse(result) } : {}),\n    }),\n    token: meta.token === undefined ? undefined : queueString(meta.token),\n  };\n}\n"]}
+{"version":3,"file":"task-queue-bullmq-state.js","sourceRoot":"","sources":["../../src/infrastructure/task-queue-bullmq-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE7E,MAAM,UAAU,SAAS,CAAC,KAAa;IACrC,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAc;IACxC,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACrC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAc,KAAK,CAAC;IACrD,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,QAAQ,KAAK,QAAQ;QAC5B,OAAO,MAAM,KAAK,QAAQ;QAE1B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,OAAO;QACL,OAAO;QACP,GAAG,EAAE,QAAQ,CAAC;YACZ,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,GAAG,IAAI;YACP,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClD,CAAC;QACF,KAAK,EAAE,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;KACtE,CAAC;AACJ,CAAC","sourcesContent":["import { createHash } from \"node:crypto\";\nimport { queueJob, queueObject, queueString } from \"../domain/task-queue.ts\";\n\nexport function bullMQKey(value: string): string {\n  return createHash(\"sha256\").update(value).digest(\"hex\");\n}\n\nexport function bullMQState(value: unknown) {\n  if (value === null) return undefined;\n  if (!Array.isArray(value) || value.length !== 3)\n    throw new Error(\"Invalid BullMQ queue state\");\n  const [request, metadata, result]: unknown[] = value;\n  if (\n    typeof request !== \"string\" ||\n    typeof metadata !== \"string\" ||\n    typeof result !== \"string\"\n  )\n    throw new Error(\"Invalid BullMQ queue state\");\n  const meta = queueObject(JSON.parse(metadata));\n  return {\n    request,\n    job: queueJob({\n      ...queueObject(JSON.parse(request)),\n      ...meta,\n      ...(result ? { result: JSON.parse(result) } : {}),\n    }),\n    token: meta.token === undefined ? undefined : queueString(meta.token),\n  };\n}\n"]}

package/dist/infrastructure/task-queue-bullmq.constants.d.ts

@@ -4,4 +4,5 @@ export declare const bullMQClaimBatchSize = 100;
 export declare const bullMQConnectionTimeoutMs = 10000;
 export declare const bullMQConnectionRetries = 3;
 export declare const bullMQRetryDelayMs = 100;
-export declare const bullMQStateScript = "\nlocal operation = ARGV[1]\nlocal request = redis.call('HGET', KEYS[1], 'request')\nif operation == 'enqueue' then\n  if request and request ~= ARGV[2] then\n    return redis.error_reply('Queue identity already has a different request')\n  end\n  if not request then\n    request = ARGV[2]\n    redis.call('HSET', KEYS[1], 'request', request, 'deadline', ARGV[3], 'meta', '{\"status\":\"pending\",\"fence\":0}')\n  end\nend\nif not request then\n  if operation == 'get' then return nil end\n  return redis.error_reply('Queue job does not exist')\nend\nlocal meta = cjson.decode(redis.call('HGET', KEYS[1], 'meta'))\nlocal clock = redis.call('TIME')\nlocal now = tonumber(clock[1]) * 1000 + math.floor(tonumber(clock[2]) / 1000)\nlocal deadline = tonumber(redis.call('HGET', KEYS[1], 'deadline'))\nlocal function live()\n  return meta.status == 'pending' or meta.status == 'active'\nend\nlocal function save()\n  redis.call('HSET', KEYS[1], 'meta', cjson.encode(meta))\nend\nif live() and deadline and deadline <= now then\n  meta.status = 'cancelled'\n  meta.fence = meta.fence + 1\n  save()\nend\nlocal function owned()\n  return meta.status == 'active' and meta.worker == ARGV[2]\n    and meta.fence == tonumber(ARGV[3]) and meta.expires > now\n    and redis.call('GET', KEYS[2]) == meta.token\nend\nlocal function extend(duration)\n  meta.expires = now + duration\n  if deadline then meta.expires = math.min(meta.expires, deadline) end\n  redis.call('PEXPIRE', KEYS[2], meta.expires - now)\n  redis.call('SREM', KEYS[3], ARGV[5])\nend\nif operation == 'claim' and live() then\n  if redis.call('GET', KEYS[2]) ~= ARGV[3] then\n    return redis.error_reply('Stale queue lease')\n  end\n  meta.status = 'active'\n  meta.worker = ARGV[2]\n  meta.token = ARGV[3]\n  meta.fence = meta.fence + 1\n  extend(tonumber(ARGV[4]))\n  save()\nend\nif operation == 'renew' or operation == 'complete' then\n  if not owned() then return redis.error_reply('Stale queue lease') end\n  if operation == 'renew' then extend(tonumber(ARGV[4])) end\n  if operation == 'complete' then\n    meta.status = ARGV[5]\n    redis.call('HSET', KEYS[1], 'result', ARGV[4])\n  end\n  save()\nend\nif operation == 'cancel' then\n  if meta.fence ~= tonumber(ARGV[2]) then return redis.error_reply('Stale queue fence') end\n  if live() then\n    meta.status = 'cancelled'\n    meta.fence = meta.fence + 1\n    save()\n  end\nend\nreturn {request, cjson.encode(meta), redis.call('HGET', KEYS[1], 'result') or ''}\n";
+export declare const bullMQMaxRetryDelayMs = 1000;
+export declare const bullMQStateScript = "\nlocal operation = ARGV[1]\nlocal request = redis.call('HGET', KEYS[1], 'request')\nif operation == 'enqueue' then\n  if request and request ~= ARGV[2] and request ~= ARGV[4] then\n    return redis.error_reply('Queue identity already has a different request')\n  end\n  if not request then\n    request = ARGV[2]\n    redis.call('HSET', KEYS[1], 'request', request, 'deadline', ARGV[3], 'meta', '{\"status\":\"pending\",\"fence\":0}')\n  end\nend\nif not request then\n  if operation == 'get' then return nil end\n  return redis.error_reply('Queue job does not exist')\nend\nlocal meta = cjson.decode(redis.call('HGET', KEYS[1], 'meta'))\nlocal clock = redis.call('TIME')\nlocal now = tonumber(clock[1]) * 1000 + math.floor(tonumber(clock[2]) / 1000)\nlocal deadline = tonumber(redis.call('HGET', KEYS[1], 'deadline'))\nlocal function live()\n  return meta.status == 'pending' or meta.status == 'active'\nend\nlocal function save()\n  redis.call('HSET', KEYS[1], 'meta', cjson.encode(meta))\nend\nif live() and deadline and deadline <= now then\n  meta.status = 'cancelled'\n  meta.fence = meta.fence + 1\n  save()\nend\nlocal function owned()\n  return meta.status == 'active' and meta.worker == ARGV[2]\n    and meta.fence == tonumber(ARGV[3]) and meta.expires > now\n    and redis.call('GET', KEYS[2]) == meta.token\nend\nlocal function extend(duration)\n  meta.expires = now + duration\n  if deadline then meta.expires = math.min(meta.expires, deadline) end\n  redis.call('PEXPIRE', KEYS[2], meta.expires - now)\n  redis.call('SREM', KEYS[3], ARGV[5])\nend\nif operation == 'claim' and live() then\n  if redis.call('GET', KEYS[2]) ~= ARGV[3] then\n    return redis.error_reply('Stale queue lease')\n  end\n  meta.status = 'active'\n  meta.worker = ARGV[2]\n  meta.token = ARGV[3]\n  meta.fence = meta.fence + 1\n  extend(tonumber(ARGV[4]))\n  save()\nend\nif operation == 'renew' or operation == 'complete' then\n  if not owned() then return redis.error_reply('Stale queue lease') end\n  if operation == 'renew' then extend(tonumber(ARGV[4])) end\n  if operation == 'complete' then\n    meta.status = ARGV[5]\n    redis.call('HSET', KEYS[1], 'result', ARGV[4])\n  end\n  save()\nend\nif operation == 'cancel' then\n  if meta.fence ~= tonumber(ARGV[2]) then return redis.error_reply('Stale queue fence') end\n  if live() then\n    meta.status = 'cancelled'\n    meta.fence = meta.fence + 1\n    save()\n  end\nend\nreturn {request, cjson.encode(meta), redis.call('HGET', KEYS[1], 'result') or ''}\n";

package/dist/infrastructure/task-queue-bullmq.constants.js

@@ -4,11 +4,12 @@ export const bullMQClaimBatchSize = 100;
 export const bullMQConnectionTimeoutMs = 10_000;
 export const bullMQConnectionRetries = 3;
 export const bullMQRetryDelayMs = 100;
+export const bullMQMaxRetryDelayMs = 1000;
 export const bullMQStateScript = `
 local operation = ARGV[1]
 local request = redis.call('HGET', KEYS[1], 'request')
 if operation == 'enqueue' then
-  if request and request ~= ARGV[2] then
+  if request and request ~= ARGV[2] and request ~= ARGV[4] then
     return redis.error_reply('Queue identity already has a different request')
   end
   if not request then