@forklaunch/implementation-worker-bullmq 0.3.1 → 0.3.2

package/lib/consumers/index.js

@@ -33,7 +33,7 @@ var BullMqWorkerConsumer = class {
     this.processEvents = processEvents;
     this.failureHandler = failureHandler;
     this.queue = new import_bullmq.Queue(this.queueName, {
-      connection: this.options.connection
+      connection: this.options.queueOptions.connection
     });
   }
   queue;
@@ -49,7 +49,7 @@ var BullMqWorkerConsumer = class {
         const event = job.data;
         await this.processEvents([event]);
       },
-      this.options
+      this.options.queueOptions
     );
     this.worker.on("failed", (job, error) => {
       if (job) {

package/lib/consumers/index.mjs

@@ -7,7 +7,7 @@ var BullMqWorkerConsumer = class {
     this.processEvents = processEvents;
     this.failureHandler = failureHandler;
     this.queue = new Queue(this.queueName, {
-      connection: this.options.connection
+      connection: this.options.queueOptions.connection
     });
   }
   queue;
@@ -23,7 +23,7 @@ var BullMqWorkerConsumer = class {
         const event = job.data;
         await this.processEvents([event]);
       },
-      this.options
+      this.options.queueOptions
     );
     this.worker.on("failed", (job, error) => {
       if (job) {

package/lib/eject/consumers/bullMqWorker.consumer.ts

@@ -22,7 +22,7 @@ export class BullMqWorkerConsumer<
     protected readonly failureHandler: WorkerFailureHandler<EventEntity>
   ) {
     this.queue = new Queue(this.queueName, {
-      connection: this.options.connection
+      connection: this.options.queueOptions.connection
     });
   }
 
@@ -38,7 +38,7 @@ export class BullMqWorkerConsumer<
         const event = job.data as EventEntity;
         await this.processEvents([event]);
       },
-      this.options
+      this.options.queueOptions
     );
 
     this.worker.on('failed', (job: Job | undefined, error: Error) => {

package/lib/eject/domain/schemas/bullMqWorker.schema.ts

@@ -1,154 +1,8 @@
-import {
-  any,
-  array,
-  boolean,
-  date,
-  enum_,
-  function_,
-  literal,
-  null_,
-  number,
-  optional,
-  promise,
-  record,
-  string,
-  undefined_,
-  union,
-  unknown,
-  void_
-} from '@{{app_name}}/core';
-import { SpanKind } from 'bullmq';
-
-const BullMqWorkerKeepJobsSchema = {
-  age: optional(number),
-  count: optional(number)
-};
-
-const BullMqWorkerBackoffOptionsSchema = {
-  type: union([literal('fixed'), literal('exponential')]),
-  delay: optional(number)
-};
-
-const BullMqWorkerDefaultJobOptionsSchema = {
-  timestamp: optional(number),
-  priority: optional(number),
-  delay: optional(number),
-  attempts: optional(number),
-  backoff: optional(union([number, BullMqWorkerBackoffOptionsSchema])),
-  lifo: optional(boolean),
-  removeOnComplete: optional(
-    union([boolean, number, BullMqWorkerKeepJobsSchema])
-  ),
-  removeOnFail: optional(union([boolean, number, BullMqWorkerKeepJobsSchema])),
-  keepLogs: optional(number),
-  stackTraceLimit: optional(number),
-  sizeLimit: optional(number)
-};
-
-const BullMqDateType = union([date, number, string]);
-
-const BullMqWorkerAdvancedRepeatOptionsSchema = {
-  repeatStrategy: optional(
-    function_(
-      [
-        number,
-        {
-          pattern: optional(string),
-          key: optional(string),
-          limit: optional(number),
-          every: optional(number),
-          immediately: optional(boolean),
-          count: optional(number),
-          offset: optional(number),
-          prevMillis: optional(number),
-          jobId: optional(string),
-          currentDate: optional(BullMqDateType),
-          startDate: optional(BullMqDateType),
-          endDate: optional(BullMqDateType),
-          utc: optional(boolean),
-          tz: optional(string),
-          nthDayOfWeek: optional(number)
-        },
-        optional(string)
-      ],
-      union([number, undefined_, promise(union([number, undefined_]))])
-    )
-  ),
-  repeatKeyHashAlgorithm: optional(string)
-};
-
-const BullMqWorkerTelemetryAttributeValueSchema = union([
-  string,
-  number,
-  boolean,
-  array(union([string, null_, undefined_])),
-  array(union([number, null_, undefined_])),
-  array(union([boolean, null_, undefined_]))
-]);
-
-const BullMqWorkerTelemetryAttributesSchema = record(
-  string,
-  union([BullMqWorkerTelemetryAttributeValueSchema, undefined_])
-);
-
-const BullMqWorkerTelemetrySchema = optional({
-  tracer: {
-    startSpan: function_(
-      [
-        string,
-        optional({
-          kind: optional(enum_(SpanKind))
-        }),
-        optional(unknown)
-      ],
-      {
-        setSpanOnContext: function_([unknown], unknown),
-        setAttribute: function_(
-          [string, BullMqWorkerTelemetryAttributeValueSchema],
-          void_
-        ),
-        setAttributes: function_(
-          [BullMqWorkerTelemetryAttributesSchema],
-          void_
-        ),
-        addEvent: function_(
-          [string, optional(BullMqWorkerTelemetryAttributesSchema)],
-          void_
-        ),
-        recordException: function_([unknown, optional(number)], void_),
-        end: function_([], void_)
-      }
-    )
-  },
-  contextManager: {
-    with: function_([unknown, function_([any], any)], any),
-    active: function_([], unknown),
-    getMetadata: function_([unknown], string),
-    fromMetadata: function_([unknown, string], unknown)
-  }
-});
-
-const BullMqWorkerQueueOptionsSchema = {
-  connection: {
-    skipVersionCheck: optional(boolean),
-    url: optional(string)
-  },
-  blockingConnection: optional(boolean),
-  prefix: optional(string),
-  telemetry: BullMqWorkerTelemetrySchema,
-  skipWaitingForReady: optional(boolean),
-  defaultJobOptions: optional(BullMqWorkerDefaultJobOptionsSchema),
-  streams: optional({
-    events: {
-      maxLen: number
-    }
-  }),
-  skipMetasUpdate: optional(boolean),
-  settings: optional(BullMqWorkerAdvancedRepeatOptionsSchema)
-};
+import { literal, number, type, union } from '@{{app_name}}/core';
+import { QueueOptions } from 'bullmq';
 
 export const BullMqWorkerOptionsSchema = {
-  ...BullMqWorkerQueueOptionsSchema,
+  queueOptions: type<QueueOptions>(),
   backoffType: union([literal('exponential'), literal('fixed')]),
   retries: number,
   interval: number

package/lib/eject/producers/bullMqWorker.producer.ts

@@ -15,7 +15,7 @@ export class BullMqWorkerProducer<
     private readonly options: Options
   ) {
     this.queue = new Queue(this.queueName, {
-      connection: this.options.connection
+      connection: this.options.queueOptions.connection
     });
   }
 

package/lib/eject/types/bullMqWorker.types.ts

@@ -1,6 +1,7 @@
 import { QueueOptions } from 'bullmq';
 
-export type BullMqWorkerOptions = QueueOptions & {
+export type BullMqWorkerOptions = {
+  queueOptions: QueueOptions;
   backoffType: 'exponential' | 'fixed';
   retries: number;
   interval: number;

package/lib/producers/index.js

@@ -31,7 +31,7 @@ var BullMqWorkerProducer = class {
     this.queueName = queueName;
     this.options = options;
     this.queue = new import_bullmq.Queue(this.queueName, {
-      connection: this.options.connection
+      connection: this.options.queueOptions.connection
     });
   }
   queue;

package/lib/producers/index.mjs

@@ -5,7 +5,7 @@ var BullMqWorkerProducer = class {
     this.queueName = queueName;
     this.options = options;
     this.queue = new Queue(this.queueName, {
-      connection: this.options.connection
+      connection: this.options.queueOptions.connection
     });
   }
   queue;