@message-queue-toolkit/core 23.2.0 → 24.2.0

package/dist/payload-store/offloadedPayloadMessageSchemas.d.ts

@@ -1,11 +1,32 @@
 import { z } from 'zod/v4';
+/**
+ * Multi-store payload reference schema.
+ * Contains information about where and how the payload was stored.
+ */
+export declare const PAYLOAD_REF_SCHEMA: z.ZodObject<{
+    id: z.ZodString;
+    store: z.ZodString;
+    size: z.ZodNumber;
+}, z.core.$strip>;
+export type PayloadRef = z.output<typeof PAYLOAD_REF_SCHEMA>;
 /**
  * When the payload is too large to be sent in a single message, it is offloaded to a storage service and a pointer to the offloaded payload is sent instead.
- * This schema represents the payload that is sent in place of the original payload.
+ * This schema represents the reference to the payload that is sent in place of the original payload.
+ *
+ * The schema supports two formats:
+ * 1. New format, payloadRef object with id, store, and size
+ * 2. Old format, offloadedPayloadPointer and offloadedPayloadSize (for backward compatibility)
+ *
+ * At least one format must be present in the message.
  */
 export declare const OFFLOADED_PAYLOAD_POINTER_PAYLOAD_SCHEMA: z.ZodObject<{
-    offloadedPayloadPointer: z.ZodString;
-    offloadedPayloadSize: z.ZodNumber;
+    payloadRef: z.ZodOptional<z.ZodObject<{
+        id: z.ZodString;
+        store: z.ZodString;
+        size: z.ZodNumber;
+    }, z.core.$strip>>;
+    offloadedPayloadPointer: z.ZodOptional<z.ZodString>;
+    offloadedPayloadSize: z.ZodOptional<z.ZodNumber>;
 }, z.core.$loose>;
 export type OffloadedPayloadPointerPayload = z.output<typeof OFFLOADED_PAYLOAD_POINTER_PAYLOAD_SCHEMA>;
 export declare function isOffloadedPayloadPointerPayload(value: unknown): value is OffloadedPayloadPointerPayload;

package/dist/payload-store/offloadedPayloadMessageSchemas.js

@@ -1,16 +1,50 @@
 import { z } from 'zod/v4';
+/**
+ * Multi-store payload reference schema.
+ * Contains information about where and how the payload was stored.
+ */
+export const PAYLOAD_REF_SCHEMA = z.object({
+    /** Unique identifier for the stored payload */
+    id: z.string().min(1),
+    /** Name/identifier of the store where the payload is stored */
+    store: z.string().min(1),
+    /** Size of the payload in bytes */
+    size: z.number().int().positive(),
+});
 /**
  * When the payload is too large to be sent in a single message, it is offloaded to a storage service and a pointer to the offloaded payload is sent instead.
- * This schema represents the payload that is sent in place of the original payload.
+ * This schema represents the reference to the payload that is sent in place of the original payload.
+ *
+ * The schema supports two formats:
+ * 1. New format, payloadRef object with id, store, and size
+ * 2. Old format, offloadedPayloadPointer and offloadedPayloadSize (for backward compatibility)
+ *
+ * At least one format must be present in the message.
  */
 export const OFFLOADED_PAYLOAD_POINTER_PAYLOAD_SCHEMA = z
     .object({
-    offloadedPayloadPointer: z.string().min(1),
-    offloadedPayloadSize: z.number().int().positive(),
+    // New, extended payload reference (supports multi-store functionality).
+    payloadRef: PAYLOAD_REF_SCHEMA.optional(),
+    // Legacy payload reference, preserved for backward compatibility.
+    offloadedPayloadPointer: z.string().min(1).optional(),
+    offloadedPayloadSize: z.number().int().positive().optional(),
 })
     // Pass-through allows to pass message ID, type, timestamp and message-deduplication-related fields that are using dynamic keys.
-    .passthrough();
+    .passthrough()
+    .refine((data) => {
+    // At least one format must be present
+    // For the legacy format, both offloadedPayloadPointer and offloadedPayloadSize are required
+    return (data.payloadRef !== undefined ||
+        (data.offloadedPayloadPointer !== undefined && data.offloadedPayloadSize !== undefined));
+}, {
+    message: 'Either payloadRef or both offloadedPayloadPointer and offloadedPayloadSize must be present',
+});
 export function isOffloadedPayloadPointerPayload(value) {
-    return value.offloadedPayloadPointer !== undefined;
+    if (typeof value !== 'object' || value === null) {
+        return false;
+    }
+    const payload = value;
+    return (payload.payloadRef !== undefined ||
+        (payload.offloadedPayloadPointer !== undefined && payload.offloadedPayloadSize !== undefined));
 }
 //# sourceMappingURL=offloadedPayloadMessageSchemas.js.map

package/dist/payload-store/offloadedPayloadMessageSchemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"offloadedPayloadMessageSchemas.js","sourceRoot":"","sources":["../../lib/payload-store/offloadedPayloadMessageSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAA;AAE1B;;;GAGG;AACH,MAAM,CAAC,MAAM,wCAAwC,GAAG,CAAC;KACtD,MAAM,CAAC;IACN,uBAAuB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,oBAAoB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;CAClD,CAAC;IACF,gIAAgI;KAC/H,WAAW,EAAE,CAAA;AAMhB,MAAM,UAAU,gCAAgC,CAC9C,KAAc;IAEd,OAAQ,KAAwC,CAAC,uBAAuB,KAAK,SAAS,CAAA;AACxF,CAAC"}
+{"version":3,"file":"offloadedPayloadMessageSchemas.js","sourceRoot":"","sources":["../../lib/payload-store/offloadedPayloadMessageSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAA;AAE1B;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,+CAA+C;IAC/C,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACrB,+DAA+D;IAC/D,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,mCAAmC;IACnC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAA;AAIF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,wCAAwC,GAAG,CAAC;KACtD,MAAM,CAAC;IACN,wEAAwE;IACxE,UAAU,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACzC,kEAAkE;IAClE,uBAAuB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrD,oBAAoB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CAC7D,CAAC;IACF,gIAAgI;KAC/H,WAAW,EAAE;KACb,MAAM,CACL,CAAC,IAAI,EAAE,EAAE;IACP,sCAAsC;IACtC,4FAA4F;IAC5F,OAAO,CACL,IAAI,CAAC,UAAU,KAAK,SAAS;QAC7B,CAAC,IAAI,CAAC,uBAAuB,KAAK,SAAS,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,CAAC,CACxF,CAAA;AACH,CAAC,EACD;IACE,OAAO,EACL,4FAA4F;CAC/F,CACF,CAAA;AAMH,MAAM,UAAU,gCAAgC,CAC9C,KAAc;IAEd,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAA;IACd,CAAC;IACD,MAAM,OAAO,GAAG,KAAuC,CAAA;IACvD,OAAO,CACL,OAAO,CAAC,UAAU,KAAK,SAAS;QAChC,CAAC,OAAO,CAAC,uBAAuB,KAAK,SAAS,IAAI,OAAO,CAAC,oBAAoB,KAAK,SAAS,CAAC,CAC9F,CAAA;AACH,CAAC"}

package/dist/payload-store/payloadStoreTypes.d.ts

@@ -1,5 +1,5 @@
 import type { Readable } from 'node:stream';
-export interface PayloadStoreTypes {
+export interface PayloadStore {
     /** Store the payload and return a key that can be used to retrieve it later. */
     storePayload(payload: SerializedPayload): Promise<string>;
     /** Retrieve the previously stored payload. */
@@ -16,11 +16,71 @@ export declare function isDestroyable(value: unknown): value is Destroyable<unkn
 export interface PayloadSerializer {
     serialize(payload: unknown): Promise<SerializedPayload | Destroyable<SerializedPayload>>;
 }
-export type PayloadStoreConfig = {
+/**
+ * Single-store configuration (simple mode).
+ * Use this when you have only one payload store.
+ */
+export type SinglePayloadStoreConfig = {
     /** Threshold in bytes after which the payload should be stored in the store. */
     messageSizeThreshold: number;
     /** The store to use for storing the payload. */
-    store: PayloadStoreTypes;
+    store: PayloadStore;
+    /**
+     * Identifier for this store (used in offloaded payload messages).
+     * This name is embedded in the message payload to identify which store holds the data.
+     */
+    storeName: string;
     /** The serializer to use for serializing the payload. */
     serializer?: PayloadSerializer;
 };
+/**
+ * Multi-store configuration (advanced mode).
+ * Use this when you need to support multiple payload stores (e.g., for migration).
+ */
+export type MultiPayloadStoreConfig<StoreNames extends string = string> = {
+    /** Threshold in bytes after which the payload should be stored in the store. */
+    messageSizeThreshold: number;
+    /** Map of store identifiers to store instances. */
+    stores: Record<StoreNames, PayloadStore>;
+    /**
+     * Store identifier to use for outgoing messages.
+     * Must be a key from the stores map (enforced at compile time).
+     */
+    outgoingStore: NoInfer<StoreNames>;
+    /**
+     * Optional: Default store identifier to use when retrieving messages that only have
+     * the legacy offloadedPayloadPointer field (without payloadRef).
+     * If not specified, will throw an error when encountering legacy format.
+     * Must be a key from the stores map if provided (enforced at compile time).
+     */
+    defaultIncomingStore?: NoInfer<StoreNames>;
+    /** The serializer to use for serializing the payload. */
+    serializer?: PayloadSerializer;
+};
+/**
+ * Payload store configuration - supports both single-store and multi-store modes.
+ */
+export type PayloadStoreConfig = SinglePayloadStoreConfig | MultiPayloadStoreConfig;
+/**
+ * Type guard to check if config is multi-store configuration.
+ */
+export declare function isMultiPayloadStoreConfig(config: PayloadStoreConfig): config is MultiPayloadStoreConfig<string>;
+/**
+ * Helper function to create a multi-store config with compile-time validation.
+ * TypeScript will infer store names from the `stores` object and ensure
+ * `outgoingStore` and `defaultIncomingStore` are valid keys.
+ *
+ * @example
+ * ```typescript
+ * const config = createMultiStoreConfig({
+ *   messageSizeThreshold: 256 * 1024,
+ *   stores: {
+ *     'store-a': storeA,
+ *     'store-b': storeB,
+ *   },
+ *   outgoingStore: 'store-a', // Valid
+ *   // outgoingStore: 'store-c', // Compile error
+ * })
+ * ```
+ */
+export declare function createMultiStoreConfig<StoreNames extends string>(config: MultiPayloadStoreConfig<StoreNames>): MultiPayloadStoreConfig<StoreNames>;

package/dist/payload-store/payloadStoreTypes.js

@@ -1,4 +1,31 @@
 export function isDestroyable(value) {
     return typeof value === 'object' && value !== null && 'destroy' in value;
 }
+/**
+ * Type guard to check if config is multi-store configuration.
+ */
+export function isMultiPayloadStoreConfig(config) {
+    return 'stores' in config && 'outgoingStore' in config;
+}
+/**
+ * Helper function to create a multi-store config with compile-time validation.
+ * TypeScript will infer store names from the `stores` object and ensure
+ * `outgoingStore` and `defaultIncomingStore` are valid keys.
+ *
+ * @example
+ * ```typescript
+ * const config = createMultiStoreConfig({
+ *   messageSizeThreshold: 256 * 1024,
+ *   stores: {
+ *     'store-a': storeA,
+ *     'store-b': storeB,
+ *   },
+ *   outgoingStore: 'store-a', // Valid
+ *   // outgoingStore: 'store-c', // Compile error
+ * })
+ * ```
+ */
+export function createMultiStoreConfig(config) {
+    return config;
+}
 //# sourceMappingURL=payloadStoreTypes.js.map

package/dist/payload-store/payloadStoreTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"payloadStoreTypes.js","sourceRoot":"","sources":["../../lib/payload-store/payloadStoreTypes.ts"],"names":[],"mappings":"AAmBA,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,SAAS,IAAI,KAAK,CAAA;AAC1E,CAAC"}
+{"version":3,"file":"payloadStoreTypes.js","sourceRoot":"","sources":["../../lib/payload-store/payloadStoreTypes.ts"],"names":[],"mappings":"AAmBA,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,SAAS,IAAI,KAAK,CAAA;AAC1E,CAAC;AA6DD;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,MAA0B;IAE1B,OAAO,QAAQ,IAAI,MAAM,IAAI,eAAe,IAAI,MAAM,CAAA;AACxD,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,sBAAsB,CACpC,MAA2C;IAE3C,OAAO,MAAM,CAAA;AACf,CAAC"}

package/dist/queues/AbstractPublisherManager.d.ts

@@ -1,6 +1,6 @@
 import type { z } from 'zod/v4';
-import type { EventRegistry } from '../events/EventRegistry.ts';
 import type { PublisherBaseEventType } from '../events/baseEventSchemas.ts';
+import type { EventRegistry } from '../events/EventRegistry.ts';
 import type { CommonEventDefinition } from '../events/eventTypes.ts';
 import type { MetadataFiller } from '../messages/MetadataFiller.ts';
 import type { AsyncPublisher, SyncPublisher } from '../types/MessageQueueTypes.ts';

package/dist/queues/AbstractPublisherManager.js

@@ -103,18 +103,18 @@ export class AbstractPublisherManager {
     }
     resolveMessage(messageDefinition, message, precedingEventMetadata) {
         const producedMetadata = this.metadataFiller.produceMetadata(message, 
-        // @ts-ignore
+        // @ts-expect-error
         messageDefinition, precedingEventMetadata);
-        // @ts-ignore
+        // @ts-expect-error
         const resolvedMetadata = message[this.metadataField]
             ? {
                 ...producedMetadata,
-                // @ts-ignore
+                // @ts-expect-error
                 ...message[this.metadataField],
             }
             : // @ts-ignore
                 producedMetadata;
-        // @ts-ignore
+        // @ts-expect-error
         return {
             id: this.metadataFiller.produceId(),
             timestamp: this.metadataFiller.produceTimestamp(),

package/dist/queues/AbstractPublisherManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPublisherManager.js","sourceRoot":"","sources":["../../lib/queues/AbstractPublisherManager.ts"],"names":[],"mappings":"AA6BA,MAAM,OAAgB,wBAAwB;IAgB3B,gBAAgB,CAOhC;IAEkB,mBAAmB,CAAa;IAEhC,cAAc,CAGhC;IACkB,aAAa,CAAQ;IAExC,qFAAqF;IAClE,gBAAgB,GAAgD,EAGlF,CAAA;IACkB,OAAO,CAAS;IACzB,oBAAoB,GAAwC,EAGrE,CAAA;IACgB,qBAAqB,CAAkB;IAExD,YAAsB,EACpB,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,cAAc,EACd,aAAa,EACb,aAAa,EACb,OAAO,GAmBR;QACC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;QAElD,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAA;QAClD,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC3B,CAAC;IAIS,+BAA+B,CAAC,YAAoB;QAC5D,OAAO,EAAE,CAAA;IACX,CAAC;IAEO,cAAc,CAAC,MAAiC;QACtD,KAAK,MAAM,cAAc,IAAI,MAAM,EAAE,CAAC;YACpC,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;YAE3D,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,SAAQ;YACV,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAA;YACzC,CAAC;YAED,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACzD,CAAC;IACH,CAAC;IAEO,kBAAkB;QACxB,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAChD,IAAI,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC3C,SAAQ;YACV,CAAC;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtE,OAAO,KAAK,CAAC,cAAc,CAAA;YAC7B,CAAC,CAAC,CAAA;YACF,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;YAC9D,MAAM,eAAe,GAAG,IAAI,CAAC,+BAA+B,CAAC,WAAW,CAAC,CAAA;YAEzE,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAC3E,IAAI,CAAC,qBAAqB,EAC1B;gBACE,GAAG,IAAI,CAAC,mBAAmB;gBAC3B,cAAc;gBACd,cAAc;gBACd,GAAG,eAAe;aACnB,CACF,CAAA;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,gBAAiC;QAC9D,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,MAAM,WAAW,IAAI,gBAAgB,EAAE,CAAC;gBAC3C,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;gBAChE,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,WAAW,EAAE,CAAC,CAAA;gBACzD,CAAC;gBACD,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAChC,CAAC;YACD,OAAM;QACR,CAAC;QAED,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACpD,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAA;QACrD,CAAC;IACH,CAAC;IAEM,eAAe,CAAC,WAAyB,EAAE,SAAwB;QACxE,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,GAAG,SAAS,CAAA;IACpD,CAAC;IAEM,qBAAqB,CAAC,eAAoC;QAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;QAC5D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;QACpE,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAA;QACzC,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,WAAyB,EACzB,OAA8D,EAC9D,sBAA8C,EAC9C,cAAmC;QAEnC,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QACxD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,2BAA2B,WAAW,8EAA8E,CACrH,CAAA;QACH,CAAC;QACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAC7E,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,iCAAiC,WAAW,eAAe,OAAO,CAAC,IAAI,8BAA8B,CACtG,CAAA;QACH,CAAC;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAA;QAE/F,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAO,SAA6C,CAAC,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC,CAAA;QAC/F,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC,CAAA;QACpD,CAAC;QAED,OAAO,eAAe,CAAA;IACxB,CAAC;IAES,wBAAwB,CAChC,WAAyB,EACzB,OAA8D;QAE9D,2BAA2B;QAC3B,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,IAAI,CAC5C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,CAAC,IAAI,CAClE,CAAA;IACH,CAAC;IAES,cAAc,CACtB,iBAAkD,EAClD,OAA8D,EAC9D,sBAA8C;QAE9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,CAC1D,OAAO;QACP,aAAa;QACb,iBAAiB,EACjB,sBAAsB,CACvB,CAAA;QAED,aAAa;QACb,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC;YAClD,CAAC,CAAC;gBACE,GAAG,gBAAgB;gBACnB,aAAa;gBACb,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC;aAC/B;YACH,CAAC,CAAC,aAAa;gBACb,gBAAgB,CAAA;QAEpB,aAAa;QACb,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;YACnC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE;YACjD,GAAG,OAAO;YACV,QAAQ,EAAE,gBAAgB;SAC3B,CAAA;IACH,CAAC;IAEM,iBAAiB;QACtB,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;YACnC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE;SAClD,CAAA;IACH,CAAC;IAED;;OAEG;IACI,UAAU,CAAC,WAAyB;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAExD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,2BAA2B,WAAW,8EAA8E,CACrH,CAAA;QACH,CAAC;QAED,OAAO,SAAS,CAAC,UAAU,CAAA;IAC7B,CAAC;CACF"}
+{"version":3,"file":"AbstractPublisherManager.js","sourceRoot":"","sources":["../../lib/queues/AbstractPublisherManager.ts"],"names":[],"mappings":"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"}

package/dist/queues/AbstractQueueService.d.ts

@@ -1,10 +1,11 @@
 import { type CommonLogger, type Either, type ErrorReporter, type ErrorResolver } from '@lokalise/node-core';
+import type { MakeRequired } from '@lokalise/universal-ts-utils/node';
 import type { ZodSchema, ZodType } from 'zod/v4';
 import type { MessageInvalidFormatError, MessageValidationError } from '../errors/Errors.ts';
-import { type AcquireLockTimeoutError } from '../message-deduplication/AcquireLockTimeoutError.js';
+import { type AcquireLockTimeoutError } from '../message-deduplication/AcquireLockTimeoutError.ts';
 import { type DeduplicationRequester, type MessageDeduplicationConfig, type ReleasableLock } from '../message-deduplication/messageDeduplicationTypes.ts';
 import { type OffloadedPayloadPointerPayload } from '../payload-store/offloadedPayloadMessageSchemas.ts';
-import type { PayloadStoreConfig } from '../payload-store/payloadStoreTypes.ts';
+import type { MultiPayloadStoreConfig, SinglePayloadStoreConfig } from '../payload-store/payloadStoreTypes.ts';
 import type { MessageProcessingResult } from '../types/MessageQueueTypes.ts';
 import type { DeletionConfig, MessageMetricsManager, QueueDependencies, QueueOptions } from '../types/queueOptionsTypes.ts';
 import type { BarrierCallback, BarrierResult, MessageHandlerConfig, PreHandlingOutputs, Prehandler, PrehandlerResult } from './HandlerContainer.ts';
@@ -45,7 +46,7 @@ export declare abstract class AbstractQueueService<MessagePayloadSchemas extends
     protected readonly creationConfig?: QueueConfiguration;
     protected readonly locatorConfig?: QueueLocatorType;
     protected readonly deletionConfig?: DeletionConfig;
-    protected readonly payloadStoreConfig?: Omit<PayloadStoreConfig, 'serializer'> & Required<Pick<PayloadStoreConfig, 'serializer'>>;
+    protected readonly payloadStoreConfig?: MakeRequired<SinglePayloadStoreConfig, 'serializer'> | MakeRequired<MultiPayloadStoreConfig, 'serializer'>;
     protected readonly messageDeduplicationConfig?: MessageDeduplicationConfig;
     protected readonly messageMetricsManager?: MessageMetricsManager<MessagePayloadSchemas>;
     protected readonly _handlerSpy?: HandlerSpy<MessagePayloadSchemas>;
@@ -92,15 +93,44 @@ export declare abstract class AbstractQueueService<MessagePayloadSchemas extends
     protected abstract preHandlerBarrier<BarrierOutput>(message: MessagePayloadSchemas, messageType: string, preHandlerOutput: PrehandlerOutput): Promise<BarrierResult<BarrierOutput>>;
     protected abstract processMessage(message: MessagePayloadSchemas, messageType: string, preHandlingOutputs: PreHandlingOutputs<PrehandlerOutput, any>): Promise<Either<'retryLater', 'success'>>;
     abstract close(): Promise<unknown>;
+    /**
+     * Resolves the store and store name for outgoing (publishing) messages.
+     * For multi-store: uses outgoingStore from config.
+     * For single-store: uses the configured store and storeName.
+     * @throws Error if payloadStoreConfig is not configured or the named store is not found.
+     */
+    private resolveOutgoingStore;
+    /**
+     * Resolves store from payloadRef (new format).
+     */
+    private resolveStoreFromPayloadRef;
+    /**
+     * Resolves store from legacy pointer (old format).
+     */
+    private resolveStoreFromLegacyPointer;
+    /**
+     * Resolves the store for incoming (consuming) messages based on payload reference.
+     * For multi-store with payloadRef: uses the store specified in payloadRef.
+     * For multi-store with legacy format: uses defaultIncomingStore.
+     * For single-store: always uses the configured store.
+     */
+    private resolveIncomingStore;
     /**
      * Offload message payload to an external store if it exceeds the threshold.
      * Returns a special type that contains a pointer to the offloaded payload or the original payload if it was not offloaded.
      * Requires message size as only the implementation knows how to calculate it.
+     *
+     * For multi-store configuration, uses the configured outgoingStore.
+     * For single-store configuration, uses the single store.
+     *
+     * The returned payload includes both the new payloadRef format and legacy fields for backward compatibility.
      */
     protected offloadMessagePayloadIfNeeded(message: MessagePayloadSchemas, messageSizeFn: () => number): Promise<MessagePayloadSchemas | OffloadedPayloadPointerPayload>;
     /**
      * Retrieve previously offloaded message payload using provided pointer payload.
      * Returns the original payload or an error if the payload was not found or could not be parsed.
+     *
+     * Supports both new multi-store format (payloadRef) and legacy format (offloadedPayloadPointer).
      */
     protected retrieveOffloadedMessagePayload(maybeOffloadedPayloadPointerPayload: unknown): Promise<Either<Error, unknown>>;
     /**

package/dist/queues/AbstractQueueService.js

@@ -1,12 +1,11 @@
 import { types } from 'node:util';
-import { stringValueSerializer, } from '@lokalise/node-core';
-import { resolveGlobalErrorLogObject } from '@lokalise/node-core';
+import { resolveGlobalErrorLogObject, stringValueSerializer, } from '@lokalise/node-core';
 import { MESSAGE_DEDUPLICATION_OPTIONS_SCHEMA, } from '@message-queue-toolkit/schemas';
-import { isAcquireLockTimeoutError, } from '../message-deduplication/AcquireLockTimeoutError.js';
+import { isAcquireLockTimeoutError, } from "../message-deduplication/AcquireLockTimeoutError.js";
 import { DEFAULT_MESSAGE_DEDUPLICATION_OPTIONS, DeduplicationRequesterEnum, noopReleasableLock, } from "../message-deduplication/messageDeduplicationTypes.js";
 import { jsonStreamStringifySerializer } from "../payload-store/JsonStreamStringifySerializer.js";
 import { OFFLOADED_PAYLOAD_POINTER_PAYLOAD_SCHEMA, } from "../payload-store/offloadedPayloadMessageSchemas.js";
-import { isDestroyable } from "../payload-store/payloadStoreTypes.js";
+import { isDestroyable, isMultiPayloadStoreConfig } from "../payload-store/payloadStoreTypes.js";
 import { isRetryDateExceeded } from "../utils/dateUtils.js";
 import { streamWithKnownSizeToString } from "../utils/streamUtils.js";
 import { toDatePreprocessor } from "../utils/toDateProcessor.js";
@@ -134,7 +133,7 @@ export class AbstractQueueService {
         }
     }
     resolveProcessedMessageMetadata(message, processingResult, messageProcessingStartTimestamp, messageProcessingEndTimestamp, queueName, messageId) {
-        // @ts-ignore
+        // @ts-expect-error
         const resolvedMessageId = message?.[this.messageIdField] ?? messageId;
         const messageTimestamp = message ? this.tryToExtractTimestamp(message)?.getTime() : undefined;
         const messageType = message && this.messageTypeField in message
@@ -174,13 +173,12 @@ export class AbstractQueueService {
     }
     async preHandlerBarrierInternal(barrier, message, executionContext, preHandlerOutput) {
         if (!barrier) {
-            // @ts-ignore
+            // @ts-expect-error
             return {
                 isPassing: true,
                 output: undefined,
             };
         }
-        // @ts-ignore
         return await barrier(message, executionContext, preHandlerOutput);
     }
     shouldBeRetried(message, maxRetryDuration) {
@@ -201,7 +199,7 @@ export class AbstractQueueService {
          * will be used to prevent infinite retries on the same message
          */
         if (!this.tryToExtractTimestamp(message)) {
-            // @ts-ignore
+            // @ts-expect-error
             messageCopy[this.messageTimestampField] = new Date().toISOString();
             this.logger.warn(`${this.messageTimestampField} not defined, adding it automatically`);
         }
@@ -209,15 +207,14 @@ export class AbstractQueueService {
          * add/increment the number of retries performed to exponential message delay
          */
         const numberOfRetries = this.tryToExtractNumberOfRetries(message);
-        // @ts-ignore
+        // @ts-expect-error
         messageCopy[this.messageRetryLaterCountField] =
             numberOfRetries !== undefined ? numberOfRetries + 1 : 0;
         return messageCopy;
     }
     tryToExtractTimestamp(message) {
-        // @ts-ignore
         if (this.messageTimestampField in message) {
-            // @ts-ignore
+            // @ts-expect-error
             const res = toDatePreprocessor(message[this.messageTimestampField]);
             if (!(res instanceof Date)) {
                 throw new Error(`${this.messageTimestampField} invalid type`);
@@ -229,7 +226,7 @@ export class AbstractQueueService {
     tryToExtractNumberOfRetries(message) {
         if (this.messageRetryLaterCountField in message &&
             typeof message[this.messageRetryLaterCountField] === 'number') {
-            // @ts-ignore
+            // @ts-expect-error
             return message[this.messageRetryLaterCountField];
         }
         return undefined;
@@ -243,51 +240,149 @@ export class AbstractQueueService {
                 resolve(preHandlerOutput);
             }
             else {
-                // biome-ignore lint/style/noNonNullAssertion: <explanation>
-                preHandlers[index](message, executionContext, 
-                // @ts-ignore
-                preHandlerOutput, this.resolveNextPreHandlerFunctionInternal(preHandlers, executionContext, message, index + 1, preHandlerOutput, resolve, reject));
+                // biome-ignore lint/style/noNonNullAssertion: It's ok
+                preHandlers[index](message, executionContext, preHandlerOutput, this.resolveNextPreHandlerFunctionInternal(preHandlers, executionContext, message, index + 1, preHandlerOutput, resolve, reject));
             }
         };
     }
+    /**
+     * Resolves the store and store name for outgoing (publishing) messages.
+     * For multi-store: uses outgoingStore from config.
+     * For single-store: uses the configured store and storeName.
+     * @throws Error if payloadStoreConfig is not configured or the named store is not found.
+     */
+    resolveOutgoingStore() {
+        if (!this.payloadStoreConfig) {
+            throw new Error('Payload store is not configured');
+        }
+        if (isMultiPayloadStoreConfig(this.payloadStoreConfig)) {
+            const storeName = this.payloadStoreConfig.outgoingStore;
+            const store = this.payloadStoreConfig.stores[storeName];
+            if (!store) {
+                throw new Error(`Outgoing store "${storeName}" not found in stores configuration. Available stores: ${Object.keys(this.payloadStoreConfig.stores).join(', ')}`);
+            }
+            return { store, storeName };
+        }
+        // Single-store configuration
+        return { store: this.payloadStoreConfig.store, storeName: this.payloadStoreConfig.storeName };
+    }
+    /**
+     * Resolves store from payloadRef (new format).
+     */
+    resolveStoreFromPayloadRef(config, payloadRef) {
+        if (isMultiPayloadStoreConfig(config)) {
+            const store = config.stores[payloadRef.store];
+            if (!store) {
+                return {
+                    error: new Error(`Store "${payloadRef.store}" specified in payloadRef not found in stores configuration. Available stores: ${Object.keys(config.stores).join(', ')}`),
+                };
+            }
+            return { result: { store, payloadId: payloadRef.id } };
+        }
+        // Single-store config - validate that payloadRef.store matches configured store name
+        if (payloadRef.store !== config.storeName) {
+            return {
+                error: new Error(`Store "${payloadRef.store}" specified in payloadRef does not match configured store name "${config.storeName}". ` +
+                    'This may indicate a misconfiguration or that the message was published by a different system. ' +
+                    'If you need to consume messages from multiple stores, consider using MultiPayloadStoreConfig.'),
+            };
+        }
+        return { result: { store: config.store, payloadId: payloadRef.id } };
+    }
+    /**
+     * Resolves store from legacy pointer (old format).
+     */
+    resolveStoreFromLegacyPointer(config, legacyPointer) {
+        if (isMultiPayloadStoreConfig(config)) {
+            if (!config.defaultIncomingStore) {
+                return {
+                    error: new Error('Message contains legacy offloadedPayloadPointer format, but no defaultIncomingStore is configured in multi-store setup. Please configure defaultIncomingStore or migrate messages to use payloadRef format.'),
+                };
+            }
+            const store = config.stores[config.defaultIncomingStore];
+            if (!store) {
+                return {
+                    error: new Error(`Default incoming store "${config.defaultIncomingStore}" not found in stores configuration. Available stores: ${Object.keys(config.stores).join(', ')}`),
+                };
+            }
+            return { result: { store, payloadId: legacyPointer } };
+        }
+        return { result: { store: config.store, payloadId: legacyPointer } };
+    }
+    /**
+     * Resolves the store for incoming (consuming) messages based on payload reference.
+     * For multi-store with payloadRef: uses the store specified in payloadRef.
+     * For multi-store with legacy format: uses defaultIncomingStore.
+     * For single-store: always uses the configured store.
+     */
+    resolveIncomingStore(payloadRef, legacyPointer) {
+        if (!this.payloadStoreConfig) {
+            return { error: new Error('Payload store is not configured') };
+        }
+        if (payloadRef) {
+            return this.resolveStoreFromPayloadRef(this.payloadStoreConfig, payloadRef);
+        }
+        if (legacyPointer) {
+            return this.resolveStoreFromLegacyPointer(this.payloadStoreConfig, legacyPointer);
+        }
+        return {
+            error: new Error('Invalid offloaded payload: neither payloadRef nor offloadedPayloadPointer is present'),
+        };
+    }
     /**
      * Offload message payload to an external store if it exceeds the threshold.
      * Returns a special type that contains a pointer to the offloaded payload or the original payload if it was not offloaded.
      * Requires message size as only the implementation knows how to calculate it.
+     *
+     * For multi-store configuration, uses the configured outgoingStore.
+     * For single-store configuration, uses the single store.
+     *
+     * The returned payload includes both the new payloadRef format and legacy fields for backward compatibility.
      */
     async offloadMessagePayloadIfNeeded(message, messageSizeFn) {
         if (!this.payloadStoreConfig ||
             messageSizeFn() <= this.payloadStoreConfig.messageSizeThreshold) {
             return message;
         }
-        let offloadedPayloadPointer;
+        const { store, storeName } = this.resolveOutgoingStore();
         const serializedPayload = await this.payloadStoreConfig.serializer.serialize(message);
+        let payloadId;
         try {
-            offloadedPayloadPointer = await this.payloadStoreConfig.store.storePayload(serializedPayload);
+            payloadId = await store.storePayload(serializedPayload);
         }
         finally {
             if (isDestroyable(serializedPayload)) {
                 await serializedPayload.destroy();
             }
         }
+        // Return message with both new and legacy formats for backward compatibility
         return {
-            offloadedPayloadPointer,
+            // Extended payload reference format
+            payloadRef: {
+                id: payloadId,
+                store: storeName,
+                size: serializedPayload.size,
+            },
+            // Legacy format for backward compatibility
+            offloadedPayloadPointer: payloadId,
             offloadedPayloadSize: serializedPayload.size,
-            // @ts-ignore
+            // @ts-expect-error
             [this.messageIdField]: message[this.messageIdField],
-            // @ts-ignore
+            // @ts-expect-error
             [this.messageTypeField]: message[this.messageTypeField],
-            // @ts-ignore
+            // @ts-expect-error
             [this.messageTimestampField]: message[this.messageTimestampField],
-            // @ts-ignore
+            // @ts-expect-error
             [this.messageDeduplicationIdField]: message[this.messageDeduplicationIdField],
-            // @ts-ignore
+            // @ts-expect-error
             [this.messageDeduplicationOptionsField]: message[this.messageDeduplicationOptionsField],
         };
     }
     /**
      * Retrieve previously offloaded message payload using provided pointer payload.
      * Returns the original payload or an error if the payload was not found or could not be parsed.
+     *
+     * Supports both new multi-store format (payloadRef) and legacy format (offloadedPayloadPointer).
      */
     async retrieveOffloadedMessagePayload(maybeOffloadedPayloadPointerPayload) {
         if (!this.payloadStoreConfig) {
@@ -303,13 +398,27 @@ export class AbstractQueueService {
                 }),
             };
         }
-        const serializedOffloadedPayloadReadable = await this.payloadStoreConfig.store.retrievePayload(pointerPayloadParseResult.data.offloadedPayloadPointer);
+        const parsedPayload = pointerPayloadParseResult.data;
+        // Resolve which store to use
+        const storeResult = this.resolveIncomingStore(parsedPayload.payloadRef, parsedPayload.offloadedPayloadPointer);
+        if (storeResult.error) {
+            return storeResult;
+        }
+        const { store, payloadId } = storeResult.result;
+        const payloadSize = parsedPayload.payloadRef?.size ?? parsedPayload.offloadedPayloadSize;
+        if (payloadSize === undefined) {
+            return {
+                error: new Error('Invalid offloaded payload: payload size is missing from both payloadRef and offloadedPayloadSize'),
+            };
+        }
+        // Retrieve the payload from the resolved store
+        const serializedOffloadedPayloadReadable = await store.retrievePayload(payloadId);
         if (serializedOffloadedPayloadReadable === null) {
             return {
-                error: new Error(`Payload with key ${pointerPayloadParseResult.data.offloadedPayloadPointer} was not found in the store`),
+                error: new Error(`Payload with key ${payloadId} was not found in the store`),
             };
         }
-        const serializedOffloadedPayloadString = await streamWithKnownSizeToString(serializedOffloadedPayloadReadable, pointerPayloadParseResult.data.offloadedPayloadSize);
+        const serializedOffloadedPayloadString = await streamWithKnownSizeToString(serializedOffloadedPayloadReadable, payloadSize);
         try {
             return { result: JSON.parse(serializedOffloadedPayloadString) };
         }
@@ -384,7 +493,7 @@ export class AbstractQueueService {
         return !!this.messageDeduplicationConfig && !!this.getMessageDeduplicationId(message);
     }
     getMessageDeduplicationId(message) {
-        // @ts-ignore
+        // @ts-expect-error
         return message[this.messageDeduplicationIdField];
     }
     getParsedMessageDeduplicationOptions(message) {