@forklaunch/implementation-worker-bullmq 0.3.1 → 0.3.3

package/lib/domain/types/index.d.mts

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

package/lib/domain/types/index.d.ts

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

package/lib/{types → domain/types}/index.js

@@ -1,18 +1,22 @@
-"use strict";
+'use strict';
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
+  if ((from && typeof from === 'object') || typeof from === 'function') {
     for (let key of __getOwnPropNames(from))
       if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+        __defProp(to, key, {
+          get: () => from[key],
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
   }
   return to;
 };
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __toCommonJS = (mod) =>
+  __copyProps(__defProp({}, '__esModule', { value: true }), mod);
 
-// types/index.ts
+// domain/types/index.ts
 var types_exports = {};
 module.exports = __toCommonJS(types_exports);

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

@@ -5,7 +5,7 @@ import {
   WorkerProcessFunction
 } from '@forklaunch/interfaces-worker/types';
 import { Job, Queue, Worker } from 'bullmq';
-import { BullMqWorkerOptions } from '../types/bullMqWorker.types';
+import { BullMqWorkerOptions } from '../domain/types/bullMqWorker.types';
 
 export class BullMqWorkerConsumer<
   EventEntity extends WorkerEventEntity,
@@ -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/{types → domain/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/eject/producers/bullMqWorker.producer.ts

@@ -1,7 +1,7 @@
 import { WorkerProducer } from '@forklaunch/interfaces-worker/interfaces';
 import { WorkerEventEntity } from '@forklaunch/interfaces-worker/types';
 import { Queue } from 'bullmq';
-import { BullMqWorkerOptions } from '../types/bullMqWorker.types';
+import { BullMqWorkerOptions } from '../domain/types/bullMqWorker.types';
 
 export class BullMqWorkerProducer<
   EventEntity extends WorkerEventEntity,
@@ -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/producers/index.d.mts

@@ -1,15 +1,19 @@
 import { WorkerProducer } from '@forklaunch/interfaces-worker/interfaces';
 import { WorkerEventEntity } from '@forklaunch/interfaces-worker/types';
-import { BullMqWorkerOptions } from '../types/index.mjs';
+import { BullMqWorkerOptions } from '../domain/types/index.mjs';
 import 'bullmq';
 
-declare class BullMqWorkerProducer<EventEntity extends WorkerEventEntity, Options extends BullMqWorkerOptions> implements WorkerProducer<EventEntity> {
-    private readonly queueName;
-    private readonly options;
-    private queue;
-    constructor(queueName: string, options: Options);
-    enqueueJob(event: EventEntity): Promise<void>;
-    enqueueBatchJobs(events: EventEntity[]): Promise<void>;
+declare class BullMqWorkerProducer<
+  EventEntity extends WorkerEventEntity,
+  Options extends BullMqWorkerOptions
+> implements WorkerProducer<EventEntity>
+{
+  private readonly queueName;
+  private readonly options;
+  private queue;
+  constructor(queueName: string, options: Options);
+  enqueueJob(event: EventEntity): Promise<void>;
+  enqueueBatchJobs(events: EventEntity[]): Promise<void>;
 }
 
 export { BullMqWorkerProducer };

package/lib/producers/index.d.ts

@@ -1,15 +1,19 @@
 import { WorkerProducer } from '@forklaunch/interfaces-worker/interfaces';
 import { WorkerEventEntity } from '@forklaunch/interfaces-worker/types';
-import { BullMqWorkerOptions } from '../types/index.js';
+import { BullMqWorkerOptions } from '../domain/types/index.js';
 import 'bullmq';
 
-declare class BullMqWorkerProducer<EventEntity extends WorkerEventEntity, Options extends BullMqWorkerOptions> implements WorkerProducer<EventEntity> {
-    private readonly queueName;
-    private readonly options;
-    private queue;
-    constructor(queueName: string, options: Options);
-    enqueueJob(event: EventEntity): Promise<void>;
-    enqueueBatchJobs(events: EventEntity[]): Promise<void>;
+declare class BullMqWorkerProducer<
+  EventEntity extends WorkerEventEntity,
+  Options extends BullMqWorkerOptions
+> implements WorkerProducer<EventEntity>
+{
+  private readonly queueName;
+  private readonly options;
+  private queue;
+  constructor(queueName: string, options: Options);
+  enqueueJob(event: EventEntity): Promise<void>;
+  enqueueBatchJobs(events: EventEntity[]): Promise<void>;
 }
 
 export { BullMqWorkerProducer };

package/lib/producers/index.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -8,14 +8,18 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
+  if ((from && typeof from === 'object') || typeof from === 'function') {
     for (let key of __getOwnPropNames(from))
       if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+        __defProp(to, key, {
+          get: () => from[key],
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
   }
   return to;
 };
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __toCommonJS = (mod) =>
+  __copyProps(__defProp({}, '__esModule', { value: true }), mod);
 
 // producers/index.ts
 var producers_exports = {};
@@ -25,13 +29,13 @@ __export(producers_exports, {
 module.exports = __toCommonJS(producers_exports);
 
 // producers/bullMqWorker.producer.ts
-var import_bullmq = require("bullmq");
+var import_bullmq = require('bullmq');
 var BullMqWorkerProducer = class {
   constructor(queueName, options) {
     this.queueName = queueName;
     this.options = options;
     this.queue = new import_bullmq.Queue(this.queueName, {
-      connection: this.options.connection
+      connection: this.options.queueOptions.connection
     });
   }
   queue;
@@ -61,6 +65,7 @@ var BullMqWorkerProducer = class {
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BullMqWorkerProducer
-});
+0 &&
+  (module.exports = {
+    BullMqWorkerProducer
+  });

package/lib/producers/index.mjs

@@ -1,11 +1,11 @@
 // producers/bullMqWorker.producer.ts
-import { Queue } from "bullmq";
+import { Queue } from 'bullmq';
 var BullMqWorkerProducer = class {
   constructor(queueName, options) {
     this.queueName = queueName;
     this.options = options;
     this.queue = new Queue(this.queueName, {
-      connection: this.options.connection
+      connection: this.options.queueOptions.connection
     });
   }
   queue;
@@ -34,6 +34,4 @@ var BullMqWorkerProducer = class {
     );
   }
 };
-export {
-  BullMqWorkerProducer
-};
+export { BullMqWorkerProducer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/implementation-worker-bullmq",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "BullMQ implementation for forklaunch workers",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -26,38 +26,39 @@
       "default": "./lib/producers/index.js"
     },
     "./schemas": {
-      "types": "./lib/schemas/index.d.ts",
-      "import": "./lib/schemas/index.mjs",
-      "require": "./lib/schemas/index.js",
-      "default": "./lib/schemas/index.js"
+      "types": "./lib/domain/schemas/index.d.ts",
+      "import": "./lib/domain/schemas/index.mjs",
+      "require": "./lib/domain/schemas/index.js",
+      "default": "./lib/domain/schemas/index.js"
     },
     "./types": {
-      "types": "./lib/types/index.d.ts",
-      "import": "./lib/types/index.mjs",
-      "require": "./lib/types/index.js",
-      "default": "./lib/types/index.js"
+      "types": "./lib/domain/types/index.d.ts",
+      "import": "./lib/domain/types/index.mjs",
+      "require": "./lib/domain/types/index.js",
+      "default": "./lib/domain/types/index.js"
     }
   },
   "files": [
     "lib/**"
   ],
   "dependencies": {
-    "@forklaunch/core": "^0.9.15",
-    "@sinclair/typebox": "^0.34.33",
-    "bullmq": "^5.53.2",
-    "zod": "^3.25.63",
-    "@forklaunch/interfaces-worker": "0.2.1"
+    "@forklaunch/core": "^0.9.21",
+    "@forklaunch/internal": "^0.0.7",
+    "@sinclair/typebox": "^0.34.35",
+    "bullmq": "^5.54.3",
+    "zod": "^3.25.67",
+    "@forklaunch/interfaces-worker": "0.2.2"
   },
   "devDependencies": {
-    "@typescript/native-preview": "7.0.0-dev.20250611.1",
+    "@typescript/native-preview": "7.0.0-dev.20250619.1",
     "depcheck": "^1.4.7",
-    "eslint": "^9.28.0",
+    "eslint": "^9.29.0",
     "prettier": "^3.5.3",
     "typedoc": "^0.28.5",
-    "typescript-eslint": "^8.34.0"
+    "typescript-eslint": "^8.34.1"
   },
   "scripts": {
-    "build": "tsc --noEmit && tsup producers/index.ts consumers/index.ts schemas/index.ts types/index.ts --format cjs,esm --no-splitting --dts --tsconfig tsconfig.json --out-dir lib --clean && if [ -f eject-package.bash ]; then pnpm package:eject; fi",
+    "build": "tsc --noEmit && tsup producers/index.ts consumers/index.ts domain/schemas/index.ts domain/types/index.ts --format cjs,esm --no-splitting --dts --tsconfig tsconfig.json --out-dir lib --clean && if [ -f eject-package.bash ]; then pnpm package:eject; fi",
     "clean": "rm -rf lib pnpm.lock.yaml node_modules",
     "docs": "typedoc --out docs *",
     "format": "prettier --ignore-path=.prettierignore --config .prettierrc '**/*.{ts,tsx,json}' --write",