@zintrust/core 0.7.0 → 0.7.3

package/src/templates/project/basic/app/Controllers/AuthController.ts.tpl

@@ -8,15 +8,15 @@ import type { AuthControllerApi, JsonRecord, UserRow } from '@app/Types/controll
 import type { IRequest, IResponse } from '@zintrust/core';
 import {
   Auth,
+  ErrorFactory,
   JwtManager,
+  LoginFlow,
   Logger,
   getString,
   getValidatedBody,
   isUndefinedOrNull,
 } from '@zintrust/core';
 
-
-
 const pickPublicUser = (row: UserRow): { id: unknown; name: string; email: string } => {
   return {
     id: row.id,
@@ -25,75 +25,155 @@ const pickPublicUser = (row: UserRow): { id: unknown; name: string; email: strin
   };
 };
 
-/**
- * Authenticates a user by email and password.
- * Validates credentials against the database and returns a JWT access token on success.
- * Logs all authentication attempts for security auditing.
- * @param req - HTTP request containing email and password
- * @param res - HTTP response to send authentication result
- * @returns Promise that resolves after sending the response
- */
-async function login(req: IRequest, res: IResponse): Promise<void> {
-  const body = getValidatedBody<JsonRecord>(req);
-  if (!body) {
-    Logger.error('AuthController.login: validation middleware did not populate req.validated.body');
-    return res.setStatus(500).json({ error: 'Internal server error' });
+type PasswordLoginContext = {
+  email: string;
+  ipAddress: string;
+  requestId?: string;
+};
+
+const toSubject = (id: unknown): string | undefined => {
+  if (typeof id === 'string' && id.length > 0) return id;
+  if (typeof id === 'number' && Number.isFinite(id)) return String(id);
+  return undefined;
+};
+
+const toDeviceId = (subject: string | undefined): string | undefined => {
+  return isUndefinedOrNull(subject) ? undefined : `dev-${subject}`;
+};
+
+const getClaimString = (claims: unknown, key: string): string | undefined => {
+  if (typeof claims !== 'object' || claims === null) {
+    return undefined;
   }
-  const email = getString(body['email']);
-  const password = getString(body['password']);
-  const ipAddress = req.getRaw().socket.remoteAddress ?? 'unknown';
 
-  try {
-    const existing = await User.where('email', '=', email).limit(1).first<UserRow>();
+  const value = (claims as Record<string, unknown>)[key];
+  return typeof value === 'string' && value.trim() !== '' ? value : undefined;
+};
+
+const getIssuedToken = (issued: unknown): string => {
+  if (typeof issued === 'string' && issued.trim() !== '') {
+    return issued;
+  }
+
+  throw ErrorFactory.createSecurityError('LoginFlow jwt issuer returned an invalid access token');
+};
+
+const isLoginFlowUnauthorizedFailure = (error: unknown): boolean => {
+  if (typeof error !== 'object' || error === null) {
+    return false;
+  }
+
+  const details = (error as { details?: unknown }).details;
+  if (typeof details !== 'object' || details === null) {
+    return false;
+  }
+
+  const nested = (details as Record<string, unknown>)['error'];
+  return (
+    typeof nested === 'object' &&
+    nested !== null &&
+    (nested as { statusCode?: unknown }).statusCode === 401
+  );
+};
+
+const passwordLoginProvider = Object.freeze({
+  async identify(
+    input: { email: string },
+    context: PasswordLoginContext
+  ): Promise<UserRow | null> {
+    const existing = await User.where('email', '=', input.email).first<UserRow>();
 
     if (existing === null) {
       Logger.warn('AuthController.login: failed login attempt', {
-        email,
-        ip: ipAddress,
+        email: context.email,
+        ip: context.ipAddress,
         reason: 'user_not_found',
+        ...(context.requestId ? { requestId: context.requestId } : {}),
         timestamp: new Date().toISOString(),
       });
-      res.setStatus(401).json({ error: 'Invalid credentials' });
-      return;
     }
 
-    const passwordHash = getString(existing.password);
-    const ok = await Auth.compare(password, passwordHash);
+    return existing;
+  },
+
+  async verify(
+    identity: UserRow | null,
+    input: { password: string },
+    context: PasswordLoginContext
+  ) {
+    if (identity === null) {
+      throw ErrorFactory.createUnauthorizedError('Invalid credentials');
+    }
+
+    const passwordHash = getString(identity.password);
+    const ok = await Auth.compare(input.password, passwordHash);
     if (!ok) {
       Logger.warn('AuthController.login: failed login attempt', {
-        email,
-        ip: ipAddress,
+        email: context.email,
+        ip: context.ipAddress,
         reason: 'invalid_password',
+        ...(context.requestId ? { requestId: context.requestId } : {}),
         timestamp: new Date().toISOString(),
       });
-      res.setStatus(401).json({ error: 'Invalid credentials' });
-      return;
+      throw ErrorFactory.createUnauthorizedError('Invalid credentials');
     }
 
-    const user = pickPublicUser(existing);
+    const user = pickPublicUser(identity);
+    const subject = toSubject(user.id);
+    const deviceId = toDeviceId(subject);
+
+    return {
+      user,
+      subject,
+      claims: {
+        sub: subject,
+        email: user.email,
+        ...(isUndefinedOrNull(deviceId) ? {} : { deviceId }),
+      },
+    };
+  },
+});
 
-    const subject = ((): string | undefined => {
-      const id = user.id;
-      if (typeof id === 'string' && id.length > 0) return id;
-      if (typeof id === 'number' && Number.isFinite(id)) return String(id);
-      return undefined;
-    })();
+/**
+ * Authenticates a user by email and password.
+ * Validates credentials against the database and returns a JWT access token on success.
+ * Logs all authentication attempts for security auditing.
+ * @param req - HTTP request containing email and password
+ * @param res - HTTP response to send authentication result
+ * @returns Promise that resolves after sending the response
+ */
+async function login(req: IRequest, res: IResponse): Promise<void> {
+  const body = getValidatedBody<JsonRecord>(req);
+  if (!body) {
+    Logger.error('AuthController.login: validation middleware did not populate req.validated.body');
+    return res.setStatus(500).json({ error: 'Internal server error' });
+  }
+  const email = getString(body['email']);
+  const password = getString(body['password']);
+  const ipAddress = req.getRaw().socket.remoteAddress ?? 'unknown';
+  const requestId = typeof req.getHeader === 'function' ? req.getHeader('x-request-id') : undefined;
 
-    // Bulletproof Auth (device binding) expects a device id header to match a JWT claim.
-    // For the example app, we mint a stable device id derived from the subject.
-    // Production apps should issue a per-device id and manage a per-device signing secret.
-    const deviceId = isUndefinedOrNull(subject) ? undefined : `dev-${subject}`;
+  try {
+    const result = await LoginFlow.create({
+      provider: passwordLoginProvider,
+      context: Object.freeze({ email, ipAddress, requestId }),
+    })
+      .identify({ email })
+      .verify({ password })
+      .issue('jwt')
+      .audit()
+      .run();
 
-    const token = await JwtManager.signAccessToken({
-      sub: subject,
-      email,
-      ...(isUndefinedOrNull(deviceId) ? {} : { deviceId }),
-    });
+    const user = result.verified.user as { id: unknown; name: string; email: string };
+    const subject = getClaimString(result.verified.claims, 'sub');
+    const deviceId = getClaimString(result.verified.claims, 'deviceId');
+    const token = getIssuedToken(result.issued);
 
     Logger.info('AuthController.login: successful login', {
       userId: subject,
       email,
       ip: ipAddress,
+      ...(requestId ? { requestId } : {}),
       timestamp: new Date().toISOString(),
     });
 
@@ -104,9 +184,15 @@ async function login(req: IRequest, res: IResponse): Promise<void> {
       user,
     });
   } catch (error) {
+    if (isLoginFlowUnauthorizedFailure(error)) {
+      res.setStatus(401).json({ error: 'Invalid credentials' });
+      return;
+    }
+
     Logger.error('AuthController.login: unexpected error', {
       email,
       ip: ipAddress,
+      ...(requestId ? { requestId } : {}),
       error: error instanceof Error ? error.message : String(error),
       timestamp: new Date().toISOString(),
     });

package/src/templates/project/basic/package.json.tpl

@@ -22,5 +22,10 @@
     "tsc-alias": "^1.8.16",
     "typescript": "^5.9.3",
     "vitest": "^4.0.16"
+  },
+  "overrides": {
+    "@zintrust/governance": {
+      "@zintrust/core": ">=0.6.0"
+    }
   }
 }

package/src/tools/notification/Composer.d.ts

@@ -0,0 +1,40 @@
+export type NotificationComposePolicy = 'required' | 'best_effort';
+export type NotificationChannelHandler<TPayload = unknown, TContext = unknown> = (payload: TPayload, context: TContext) => Promise<unknown>;
+export type NotificationComposeChannelResult = {
+    channel: string;
+    policy: NotificationComposePolicy;
+    ok: boolean;
+    payload: unknown;
+    result?: unknown;
+    error?: unknown;
+};
+export type NotificationComposeResult = {
+    ok: boolean;
+    results: NotificationComposeChannelResult[];
+};
+export type NotificationComposeError = Error & {
+    results: NotificationComposeChannelResult[];
+};
+export type NotificationComposeOptions<TContext = unknown> = {
+    context?: TContext;
+};
+export type NotificationComposeBuilder<TContext = unknown> = {
+    channel: (name: string, payload: unknown) => NotificationComposeBuilder<TContext>;
+    email: (payload: unknown) => NotificationComposeBuilder<TContext>;
+    push: (payload: unknown) => NotificationComposeBuilder<TContext>;
+    sms: (payload: unknown) => NotificationComposeBuilder<TContext>;
+    webhook: (payload: unknown) => NotificationComposeBuilder<TContext>;
+    required: (channels: string[]) => NotificationComposeBuilder<TContext>;
+    bestEffort: (channels: string[]) => NotificationComposeBuilder<TContext>;
+    send: () => Promise<NotificationComposeResult>;
+};
+export type NotificationComposerNamespace = {
+    compose: <TContext = unknown>(options?: NotificationComposeOptions<TContext>) => NotificationComposeBuilder<TContext>;
+    registerChannel: <TPayload = unknown, TContext = unknown>(name: string, handler: NotificationChannelHandler<TPayload, TContext>) => void;
+    unregisterChannel: (name: string) => void;
+    hasChannel: (name: string) => boolean;
+    listChannels: () => string[];
+    clearChannels: () => void;
+};
+export declare const NotificationComposer: NotificationComposerNamespace;
+//# sourceMappingURL=Composer.d.ts.map

package/src/tools/notification/Composer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Composer.d.ts","sourceRoot":"","sources":["../../../../src/tools/notification/Composer.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,yBAAyB,GAAG,UAAU,GAAG,aAAa,CAAC;AAEnE,MAAM,MAAM,0BAA0B,CAAC,QAAQ,GAAG,OAAO,EAAE,QAAQ,GAAG,OAAO,IAAI,CAC/E,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,KACd,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,MAAM,MAAM,gCAAgC,GAAG;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,yBAAyB,CAAC;IAClC,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,EAAE,gCAAgC,EAAE,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,KAAK,GAAG;IAC7C,OAAO,EAAE,gCAAgC,EAAE,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,0BAA0B,CAAC,QAAQ,GAAG,OAAO,IAAI;IAC3D,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,0BAA0B,CAAC,QAAQ,GAAG,OAAO,IAAI;IAC3D,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAClF,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAClE,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACjE,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAChE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACpE,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACvE,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACzE,IAAI,EAAE,MAAM,OAAO,CAAC,yBAAyB,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,OAAO,EAAE,CAAC,QAAQ,GAAG,OAAO,EAC1B,OAAO,CAAC,EAAE,0BAA0B,CAAC,QAAQ,CAAC,KAC3C,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAC1C,eAAe,EAAE,CAAC,QAAQ,GAAG,OAAO,EAAE,QAAQ,GAAG,OAAO,EACtD,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,CAAC,KACpD,IAAI,CAAC;IACV,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACtC,YAAY,EAAE,MAAM,MAAM,EAAE,CAAC;IAC7B,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAC;AAsMF,eAAO,MAAM,oBAAoB,EAAE,6BAOjC,CAAC"}

package/src/tools/notification/Composer.js

@@ -0,0 +1,140 @@
+import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { isArray, isFunction, isNonEmptyString } from '../../helper/index.js';
+const channelRegistry = new Map();
+const normalizeChannelName = (name) => {
+    const normalized = String(name ?? '')
+        .trim()
+        .toLowerCase();
+    if (!isNonEmptyString(normalized)) {
+        throw ErrorFactory.createValidationError('Notification channel name must be a non-empty string');
+    }
+    return normalized;
+};
+const createComposeError = (message, results) => {
+    return Object.assign(ErrorFactory.createValidationError(message, {
+        results,
+    }), { results });
+};
+const ensureChannelsInput = (channels) => {
+    if (!isArray(channels)) {
+        throw ErrorFactory.createValidationError('Notification compose channel list must be an array');
+    }
+    return channels.map((channel) => normalizeChannelName(channel));
+};
+const ensureHandler = (handler) => {
+    if (!isFunction(handler)) {
+        throw ErrorFactory.createValidationError('Notification channel handler must be a function');
+    }
+};
+const getPolicy = (policies, channel) => {
+    return policies.get(channel) ?? 'required';
+};
+const ensureEntries = (entries) => {
+    if (entries.length === 0) {
+        throw ErrorFactory.createValidationError('Notification compose requires at least one channel before send()');
+    }
+};
+const deliverEntry = async (entry, policy, context) => {
+    const handler = channelRegistry.get(entry.channel);
+    if (!handler) {
+        return {
+            channel: entry.channel,
+            policy,
+            ok: false,
+            payload: entry.payload,
+            error: ErrorFactory.createConfigError(`Notification compose channel not registered: ${entry.channel}`),
+        };
+    }
+    try {
+        const result = await handler(entry.payload, context);
+        SystemTraceBridge.emitNotification(`compose:${entry.channel}`, [entry.channel], undefined, undefined, entry.payload);
+        return {
+            channel: entry.channel,
+            policy,
+            ok: true,
+            payload: entry.payload,
+            result,
+        };
+    }
+    catch (error) {
+        return {
+            channel: entry.channel,
+            policy,
+            ok: false,
+            payload: entry.payload,
+            error,
+        };
+    }
+};
+const hasRequiredFailure = (results) => {
+    return results.some((entry) => !entry.ok && entry.policy === 'required');
+};
+const compose = (options = {}) => {
+    const entries = [];
+    const policies = new Map();
+    const builder = Object.freeze({
+        channel(name, payload) {
+            entries.push({ channel: normalizeChannelName(name), payload });
+            return this;
+        },
+        email(payload) {
+            return this.channel('email', payload);
+        },
+        push(payload) {
+            return this.channel('push', payload);
+        },
+        sms(payload) {
+            return this.channel('sms', payload);
+        },
+        webhook(payload) {
+            return this.channel('webhook', payload);
+        },
+        required(channels) {
+            for (const channel of ensureChannelsInput(channels)) {
+                policies.set(channel, 'required');
+            }
+            return this;
+        },
+        bestEffort(channels) {
+            for (const channel of ensureChannelsInput(channels)) {
+                policies.set(channel, 'best_effort');
+            }
+            return this;
+        },
+        async send() {
+            ensureEntries(entries);
+            const results = await Promise.all(entries.map(async (entry) => deliverEntry(entry, getPolicy(policies, entry.channel), options.context)));
+            if (hasRequiredFailure(results)) {
+                throw createComposeError('Notification compose failed for required channels', results);
+            }
+            return {
+                ok: true,
+                results,
+            };
+        },
+    });
+    return builder;
+};
+const registerChannel = (name, handler) => {
+    ensureHandler(handler);
+    channelRegistry.set(normalizeChannelName(name), handler);
+};
+const unregisterChannel = (name) => {
+    channelRegistry.delete(normalizeChannelName(name));
+};
+const hasChannel = (name) => channelRegistry.has(normalizeChannelName(name));
+const listChannels = () => {
+    return Array.from(channelRegistry.keys()).sort((left, right) => left.localeCompare(right));
+};
+const clearChannels = () => {
+    channelRegistry.clear();
+};
+export const NotificationComposer = Object.freeze({
+    compose,
+    registerChannel,
+    unregisterChannel,
+    hasChannel,
+    listChannels,
+    clearChannels,
+});

package/src/tools/notification/Notification.d.ts

@@ -18,6 +18,12 @@ export declare const Notification: Readonly<{
     channel: (name: string) => Readonly<{
         send: (recipient: string, message: string, options?: Record<string, unknown>) => Promise<unknown>;
     }>;
+    compose: <TContext = unknown>(options?: import("./Composer").NotificationComposeOptions<TContext>) => import("./Composer").NotificationComposeBuilder<TContext>;
+    registerChannel: <TPayload = unknown, TContext = unknown>(name: string, handler: import("./Composer").NotificationChannelHandler<TPayload, TContext>) => void;
+    unregisterChannel: (name: string) => void;
+    hasChannel: (name: string) => boolean;
+    listChannels: () => string[];
+    clearChannels: () => void;
     listDrivers: () => string[];
 }>;
 export default Notification;

package/src/tools/notification/Notification.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Notification.d.ts","sourceRoot":"","sources":["../../../../src/tools/notification/Notification.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,eAAO,MAAM,YAAY;;;2BAQV,MAAM,WACR,MAAM,kBACA,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,iBACxB;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACvD,OAAO,CAAC,MAAM,CAAC;qBAcD,MAAM;iCAGN,MAAM,WACR,MAAM,kBACA,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,iBACxB;YAAE,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE;;oBAM1B,MAAM;0BAEM,MAAM,WAAW,MAAM,YAAY,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;EAItF,CAAC;AAEH,eAAe,YAAY,CAAC"}
+{"version":3,"file":"Notification.d.ts","sourceRoot":"","sources":["../../../../src/tools/notification/Notification.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,eAAO,MAAM,YAAY;;;2BAQV,MAAM,WACR,MAAM,kBACA,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,iBACxB;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACvD,OAAO,CAAC,MAAM,CAAC;qBAcD,MAAM;iCAGN,MAAM,WACR,MAAM,kBACA,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,iBACxB;YAAE,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE;;oBAM1B,MAAM;0BAEM,MAAM,WAAW,MAAM,YAAY,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;;;;;EAUtF,CAAC;AAEH,eAAe,YAAY,CAAC"}

package/src/tools/notification/Notification.js

@@ -4,6 +4,7 @@
  * A small wrapper over NotificationService to provide the expected module name.
  */
 import { NotificationService } from './Service.js';
+import { NotificationComposer } from './Composer.js';
 export const Notification = Object.freeze({
     send: NotificationService.send,
     // Alias for send() - explicit intent for immediate notification
@@ -30,6 +31,12 @@ export const Notification = Object.freeze({
     channel: (name) => Object.freeze({
         send: async (recipient, message, options) => NotificationService.sendVia(name, recipient, message, options),
     }),
+    compose: NotificationComposer.compose,
+    registerChannel: NotificationComposer.registerChannel,
+    unregisterChannel: NotificationComposer.unregisterChannel,
+    hasChannel: NotificationComposer.hasChannel,
+    listChannels: NotificationComposer.listChannels,
+    clearChannels: NotificationComposer.clearChannels,
     listDrivers: NotificationService.listDrivers,
 });
 export default Notification;

package/src/tools/queue/AdvancedQueue.js

@@ -358,6 +358,7 @@ function validateUniqueId(uniqueId) {
 async function handleDeduplication(deduplicationOptions, // DeduplicationOptions - using any to avoid circular import
 lockProvider, queueName) {
     const { id, ttl, replace } = deduplicationOptions;
+    const collisionBehavior = deduplicationOptions.collisionBehavior === 'enqueue' ? 'enqueue' : 'suppress';
     const scopedLockKey = resolveScopedDeduplicationLockKey(queueName, id);
     try {
         // Check if lock already exists
@@ -373,6 +374,13 @@ lockProvider, queueName) {
                     status: ZintrustLang.QUEUED,
                 };
             }
+            else if (collisionBehavior === 'enqueue') {
+                return {
+                    id,
+                    deduplicated: false,
+                    status: ZintrustLang.QUEUED,
+                };
+            }
             else {
                 // Job is deduplicated
                 return {
@@ -384,6 +392,13 @@ lockProvider, queueName) {
         }
         // Acquire new lock
         const lock = await lockProvider.acquire(scopedLockKey, { ttl });
+        if (!lock.acquired && collisionBehavior === 'enqueue') {
+            return {
+                id,
+                deduplicated: false,
+                status: ZintrustLang.QUEUED,
+            };
+        }
         return {
             id,
             deduplicated: false,

package/src/tools/queue/Queue.d.ts

@@ -43,6 +43,7 @@ export interface BullMQPayload {
             condition: string;
             delay: number;
         };
+        collisionBehavior?: 'suppress' | 'enqueue';
     };
     uniqueVia?: string;
     [key: string]: unknown;

package/src/tools/queue/Queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/Queue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/Queue.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,OAAO,IAAI;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAErF,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjE,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC1E,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAE5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE;QACR,IAAI,EAAE,OAAO,GAAG,aAAa,CAAC;QAC9B,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,CAAC;IAGf,aAAa,CAAC,EAAE;QACd,EAAE,EAAE,MAAM,CAAC;QACX,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;QACtE,iBAAiB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;KAC5C,CAAC;IAGF,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAID;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAO,MAOpC,CAAC;AAwFF,eAAO,MAAM,KAAK;mBACD,MAAM,UAAU,YAAY;aAIlC,IAAI;eAIF,MAAM,GAAG,YAAY;mBASX,MAAM,WAAW,aAAa,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YA0E5E,CAAC,mBACN,MAAM,eACA,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;eActB,MAAM,MAAM,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;kBAcpD,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBAc9C,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAa9D,CAAC;AAEH,eAAe,KAAK,CAAC;AAErB,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC"}

package/src/types/Queue.d.ts

@@ -8,6 +8,7 @@ export interface DeduplicationOptions {
     dontRelease?: boolean;
     replace?: boolean;
     releaseAfter?: string | number | ReleaseCondition;
+    collisionBehavior?: 'suppress' | 'enqueue';
 }
 export interface ReleaseCondition {
     condition: string;

package/src/types/Queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../src/types/Queue.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,gBAAgB,CAAC;CACnD;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,IAAI;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,IAAI,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,oBAAoB,CAAC;CACtC;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,QAAQ,GAAG,cAAc,GAAG,QAAQ,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC3C"}
+{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../src/types/Queue.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,gBAAgB,CAAC;IAClD,iBAAiB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CAC5C;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,IAAI;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,IAAI,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,oBAAoB,CAAC;CACtC;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,QAAQ,GAAG,cAAc,GAAG,QAAQ,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC3C"}