@unchainedshop/core-worker 3.0.0-alpha7 → 3.0.0-rc2

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import type { TimestampFields } from '@unchainedshop/mongodb';
+import { TimestampFields } from '@unchainedshop/mongodb';
 export type Work = {
     _id?: string;
     priority: number;

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,MAAM,IAAI,GAAG;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,eAAe,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,IAAI,GAAG;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,eAAe,CAAC"}

package/lib/worker-index.d.ts

@@ -1,11 +1,3 @@
-export * from './types.js';
+export * from './db/WorkQueueCollection.js';
 export * from './module/configureWorkerModule.js';
-export * from './director/WorkerDirector.js';
-export * from './director/WorkerAdapter.js';
-export { WorkStatus } from './director/WorkStatus.js';
-export { WorkerEventTypes } from './director/WorkerEventTypes.js';
-export * from './schedulers/FailedRescheduler.js';
-export * from './workers/BaseWorker.js';
-export * from './workers/EventListenerWorker.js';
-export * from './workers/IntervalWorker.js';
 //# sourceMappingURL=worker-index.d.ts.map

package/lib/worker-index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-index.d.ts","sourceRoot":"","sources":["../src/worker-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAE3B,cAAc,mCAAmC,CAAC;AAClD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAElE,cAAc,mCAAmC,CAAC;AAClD,cAAc,yBAAyB,CAAC;AACxC,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"worker-index.d.ts","sourceRoot":"","sources":["../src/worker-index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAE5C,cAAc,mCAAmC,CAAC"}

package/lib/worker-index.js

@@ -1,11 +1,3 @@
-export * from './types.js';
+export * from './db/WorkQueueCollection.js';
 export * from './module/configureWorkerModule.js';
-export * from './director/WorkerDirector.js';
-export * from './director/WorkerAdapter.js';
-export { WorkStatus } from './director/WorkStatus.js';
-export { WorkerEventTypes } from './director/WorkerEventTypes.js';
-export * from './schedulers/FailedRescheduler.js';
-export * from './workers/BaseWorker.js';
-export * from './workers/EventListenerWorker.js';
-export * from './workers/IntervalWorker.js';
 //# sourceMappingURL=worker-index.js.map

package/lib/worker-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-index.js","sourceRoot":"","sources":["../src/worker-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAE3B,cAAc,mCAAmC,CAAC;AAClD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAElE,cAAc,mCAAmC,CAAC;AAClD,cAAc,yBAAyB,CAAC;AACxC,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"worker-index.js","sourceRoot":"","sources":["../src/worker-index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAE5C,cAAc,mCAAmC,CAAC"}

package/lib/workers/BaseWorker.d.ts

@@ -1,4 +1,3 @@
-import { UnchainedCore } from '@unchainedshop/core';
 import { Work } from '../types.js';
 export type WorkData = Pick<Partial<Work>, 'input' | 'originalWorkId' | 'priority' | 'retries' | 'timeout' | 'scheduled' | 'worker' | 'scheduleId'> & {
     type: string;
@@ -12,7 +11,7 @@ export type IWorker<P extends {
     type: string;
     external: boolean;
     getFloorDate: (date?: Date) => Date;
-    actions: (params: P, unchainedAPI: UnchainedCore) => {
+    actions: (params: P, unchainedAPI: any) => {
         autorescheduleTypes: (options: {
             referenceDate: Date;
         }) => Promise<Array<Work | null>>;

package/lib/workers/BaseWorker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseWorker.d.ts","sourceRoot":"","sources":["../../src/workers/BaseWorker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,MAAM,MAAM,QAAQ,GAAG,IAAI,CACzB,OAAO,CAAC,IAAI,CAAC,EACb,OAAO,GAAG,gBAAgB,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,YAAY,CACxG,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAErB,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,IAAI;IACrD,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAElB,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,KAAK,IAAI,CAAC;IAEpC,OAAO,EAAE,CACP,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,aAAa,KACxB;QACH,mBAAmB,EAAE,CAAC,OAAO,EAAE;YAAE,aAAa,EAAE,IAAI,CAAA;SAAE,KAAK,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;QACvF,OAAO,EAAE,CAAC,OAAO,EAAE;YAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;YAAC,aAAa,CAAC,EAAE,IAAI,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACzF,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3B,KAAK,EAAE,MAAM,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,IAAI,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;CACtB;AAED,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,YAAY,CAuF5C,CAAC"}
+{"version":3,"file":"BaseWorker.d.ts","sourceRoot":"","sources":["../../src/workers/BaseWorker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,MAAM,MAAM,QAAQ,GAAG,IAAI,CACzB,OAAO,CAAC,IAAI,CAAC,EACb,OAAO,GAAG,gBAAgB,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,YAAY,CACxG,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAErB,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,IAAI;IACrD,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAElB,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,KAAK,IAAI,CAAC;IAEpC,OAAO,EAAE,CACP,MAAM,EAAE,CAAC,EACT,YAAY,KAAA,KACT;QACH,mBAAmB,EAAE,CAAC,OAAO,EAAE;YAAE,aAAa,EAAE,IAAI,CAAA;SAAE,KAAK,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;QACvF,OAAO,EAAE,CAAC,OAAO,EAAE;YAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;YAAC,aAAa,CAAC,EAAE,IAAI,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACzF,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3B,KAAK,EAAE,MAAM,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,IAAI,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;CACtB;AAED,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,YAAY,CAuF5C,CAAC"}

package/lib/workers/BaseWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseWorker.js","sourceRoot":"","sources":["../../src/workers/BaseWorker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseWorker.js","sourceRoot":"","sources":["../../src/workers/BaseWorker.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,16 +1,13 @@
 {
   "name": "@unchainedshop/core-worker",
-  "version": "3.0.0-alpha7",
+  "version": "3.0.0-rc2",
   "main": "lib/worker-index.js",
-  "exports": {
-    ".": "./lib/worker-index.js",
-    "./*": "./lib/*"
-  },
   "types": "lib/worker-index.d.ts",
   "type": "module",
   "scripts": {
-    "clean": "rm -rf lib",
-    "prepublishOnly": "npm run clean && tsc",
+    "clean": "tsc -b --clean",
+    "build": "tsc -b",
+    "prepublishOnly": "npm run clean && npm run build",
     "watch": "tsc -w",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --forceExit",
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --detectOpenHandles --forceExit"
@@ -31,14 +28,14 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@breejs/later": "^4.2.0",
-    "@unchainedshop/logger": "^3.0.0-alpha4",
-    "@unchainedshop/utils": "^3.0.0-alpha4"
+    "@unchainedshop/logger": "^3.0.0-rc2",
+    "@unchainedshop/utils": "^3.0.0-rc2"
   },
   "devDependencies": {
-    "@types/node": "^22.8.1",
+    "@types/breejs__later": "^4.1.5",
+    "@types/node": "^22.10.2",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   }
 }

package/src/db/WorkQueueCollection.ts

@@ -1,8 +1,35 @@
+import { TimestampFields } from '@unchainedshop/mongodb';
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { Work } from '../types.js';
 
 const ONE_DAY_IN_SECONDS = 86400;
 
+export enum WorkStatus {
+  NEW = 'NEW',
+  ALLOCATED = 'ALLOCATED',
+  SUCCESS = 'SUCCESS',
+  FAILED = 'FAILED',
+  DELETED = 'DELETED',
+}
+
+export type Work = {
+  _id?: string;
+  priority: number;
+  retries: number;
+  scheduled: Date;
+  type: string;
+  input: Record<string, any>;
+  error?: any;
+  finished?: Date;
+  originalWorkId?: string;
+  result?: any;
+  started?: Date;
+  success?: boolean;
+  timeout?: number;
+  worker?: string;
+  autoscheduled?: boolean;
+  scheduleId?: string;
+} & TimestampFields;
+
 export const WorkQueueCollection = async (db: mongodb.Db) => {
   const WorkQueue = db.collection<Work>('work_queue');
 

package/src/module/configureWorkerModule.ts

@@ -1,6 +1,3 @@
-import type { WorkData, WorkResult } from '../worker-index.js';
-import type { UnchainedCore } from '@unchainedshop/core';
-
 import os from 'os';
 import { createLogger } from '@unchainedshop/logger';
 import {
@@ -11,18 +8,40 @@ import {
   ModuleInput,
 } from '@unchainedshop/mongodb';
 import { emit, registerEvents } from '@unchainedshop/events';
-import { buildObfuscatedFieldsFilter, SortDirection, SortOption } from '@unchainedshop/utils';
-import { WorkQueueCollection } from '../db/WorkQueueCollection.js';
-import { DIRECTOR_MARKED_FAILED_ERROR, WorkerDirector } from '../director/WorkerDirector.js';
-import { WorkerEventTypes } from '../director/WorkerEventTypes.js';
-import { WorkStatus } from '../director/WorkStatus.js';
-import { Work } from '../types.js';
+import {
+  buildObfuscatedFieldsFilter,
+  DateFilterInput,
+  SortDirection,
+  SortOption,
+} from '@unchainedshop/utils';
+import { Work, WorkQueueCollection, WorkStatus } from '../db/WorkQueueCollection.js';
 import addMigrations from './migrations/addMigrations.js';
 
 const { UNCHAINED_WORKER_ID = os.hostname() } = process.env;
 
+export const DIRECTOR_MARKED_FAILED_ERROR = 'DIRECTOR_MARKED_FAILED';
+
 const logger = createLogger('unchained:core-worker');
 
+export type WorkData = Pick<
+  Partial<Work>,
+  'input' | 'originalWorkId' | 'priority' | 'retries' | 'timeout' | 'scheduled' | 'worker' | 'scheduleId'
+> & { type: string };
+
+export interface WorkResult<Result = unknown> {
+  success: boolean;
+  result?: Result;
+  error?: any;
+}
+
+export enum WorkerEventTypes {
+  ADDED = 'WORK_ADDED',
+  ALLOCATED = 'WORK_ALLOCATED',
+  FINISHED = 'WORK_FINISHED',
+  DELETED = 'WORK_DELETED',
+  RESCHEDULED = 'WORK_RESCHEDULED',
+}
+
 export interface WorkerSettingsOptions {
   blacklistedVariables?: string[];
 }
@@ -44,57 +63,6 @@ export type WorkQueueQuery = {
   scheduled?: { end?: Date; start?: Date };
 };
 
-export type WorkerModule = {
-  activeWorkTypes: () => Promise<Array<string>>;
-  findWork: (query: { workId?: string; originalWorkId?: string }) => Promise<Work>;
-  findWorkQueue: (
-    query: WorkQueueQuery & {
-      sort?: Array<SortOption>;
-      limit?: number;
-      skip?: number;
-    },
-  ) => Promise<Array<Work>>;
-  count: (query: WorkQueueQuery) => Promise<number>;
-  workExists: (query: { workId?: string; originalWorkId?: string }) => Promise<boolean>;
-
-  // Transformations
-  status: (work: Work) => WorkStatus;
-
-  type: (work: Work) => string;
-
-  // Mutations
-  addWork: (data: WorkData) => Promise<Work>;
-
-  allocateWork: (doc: { types: Array<string>; worker: string }) => Promise<Work>;
-
-  processNextWork: (unchainedAPI: UnchainedCore, workerId?: string) => Promise<Work>;
-
-  rescheduleWork: (work: Work, scheduled: Date, unchainedAPI: UnchainedCore) => Promise<Work>;
-
-  ensureOneWork: (work: WorkData) => Promise<Work>;
-
-  ensureNoWork: (work: { priority: number; type: string; scheduleId: string }) => Promise<void>;
-
-  finishWork: (
-    _id: string,
-    data: WorkResult<any> & {
-      finished?: Date;
-      started?: Date;
-      worker?: string;
-    },
-  ) => Promise<Work | null>;
-
-  deleteWork: (_id: string) => Promise<Work | null>;
-
-  markOldWorkAsFailed: (params: {
-    types: Array<string>;
-    worker: string;
-    referenceDate: Date;
-  }) => Promise<Array<Work>>;
-
-  getReport: (params?: { types?: string[]; from?: Date; to?: Date }) => Promise<WorkerReport[]>;
-};
-
 const WORK_STATUS_FILTER_MAP = {
   [WorkStatus.DELETED]: { deleted: { $exists: true } },
   [WorkStatus.NEW]: {
@@ -224,7 +192,7 @@ export const configureWorkerModule = async ({
   db,
   migrationRepository,
   options,
-}: ModuleInput<WorkerSettingsOptions>): Promise<WorkerModule> => {
+}: ModuleInput<WorkerSettingsOptions>) => {
   addMigrations(migrationRepository);
 
   registerEvents(Object.values(WorkerEventTypes));
@@ -233,7 +201,13 @@ export const configureWorkerModule = async ({
 
   const removePrivateFields = buildObfuscatedFieldsFilter(options?.blacklistedVariables);
 
-  const allocateWork: WorkerModule['allocateWork'] = async ({ types, worker = UNCHAINED_WORKER_ID }) => {
+  const allocateWork = async ({
+    types,
+    worker = UNCHAINED_WORKER_ID,
+  }: {
+    types: Array<string>;
+    worker: string;
+  }): Promise<Work> => {
     // Find a work item that is scheduled for now and is not started.
     // Also:
     // - Restrict by types and worker if provided
@@ -259,8 +233,8 @@ export const configureWorkerModule = async ({
     return result;
   };
 
-  const finishWork: WorkerModule['finishWork'] = async (
-    workId,
+  const finishWork = async (
+    workId: string,
     {
       error,
       finished = new Date(),
@@ -268,8 +242,12 @@ export const configureWorkerModule = async ({
       started = new Date(),
       success,
       worker = UNCHAINED_WORKER_ID,
+    }: WorkResult<any> & {
+      finished?: Date;
+      started?: Date;
+      worker?: string;
     },
-  ) => {
+  ): Promise<Work> => {
     const workBeforeUpdate = await WorkQueue.findOne(
       buildQuerySelector({ workId, status: [WorkStatus.ALLOCATED] }),
     );
@@ -310,88 +288,35 @@ export const configureWorkerModule = async ({
     return work;
   };
 
-  const processNextWork: WorkerModule['processNextWork'] = async (unchainedAPI, workerId) => {
-    const adapters = WorkerDirector.getAdapters();
-
-    const alreadyAllocatedWork = await WorkQueue.aggregate(
-      [
-        {
-          $match: {
-            started: {
-              $exists: true,
-            },
-            finished: {
-              $exists: false,
-            },
-            deleted: {
-              $exists: false,
-            },
-          },
-        },
-        {
-          $group: {
-            _id: '$type',
-            count: {
-              $sum: 1,
-            },
-          },
-        },
-      ],
-      {
-        allowDiskUse: false,
-      },
-    ).toArray();
-
-    const allocationMap = Object.fromEntries(alreadyAllocatedWork.map((w) => [w._id, w.count]));
-
-    const types = adapters
-      .filter((adapter) => {
-        // Filter out the external
-        if (adapter.external) return false;
-        if (
-          adapter.maxParallelAllocations &&
-          adapter.maxParallelAllocations <= allocationMap[adapter.type]
-        )
-          return false;
-        return true;
-      })
-      .map((adapter) => adapter.type);
-
-    const worker = workerId ?? UNCHAINED_WORKER_ID;
-    const work = await allocateWork({
-      types,
-      worker,
-    });
-
-    if (work) {
-      const output = await WorkerDirector.doWork(work, unchainedAPI);
-
-      return finishWork(work._id, {
-        ...output,
-        finished: work.finished || new Date(),
-        started: work.started,
-        worker,
-      });
-    }
-
-    return null;
-  };
-
   return {
     // Queries
-    activeWorkTypes: async () => {
+
+    workerId: UNCHAINED_WORKER_ID,
+
+    activeWorkTypes: async (): Promise<Array<string>> => {
       const typeList = await WorkQueue.aggregate([{ $group: { _id: '$type' } }]).toArray();
-      return typeList
-        .map((t) => t._id as string)
-        .filter((type) => {
-          return WorkerDirector.getActivePluginTypes().includes(type);
-        });
+      return typeList.map((t) => t._id as string);
     },
 
-    findWork: async ({ workId, originalWorkId }) =>
+    findWork: async ({
+      workId,
+      originalWorkId,
+    }: {
+      workId?: string;
+      originalWorkId?: string;
+    }): Promise<Work> =>
       WorkQueue.findOne(workId ? generateDbFilterById(workId) : { originalWorkId }, {}),
 
-    findWorkQueue: async ({ limit, skip, sort, ...selectorOptions }) => {
+    findWorkQueue: async ({
+      limit,
+      skip,
+      sort,
+      ...selectorOptions
+    }: WorkQueueQuery & {
+      sort?: Array<SortOption>;
+      limit?: number;
+      skip?: number;
+    }): Promise<Array<Work>> => {
       const selector = buildQuerySelector(selectorOptions);
       return WorkQueue.find(selector, {
         skip,
@@ -400,11 +325,51 @@ export const configureWorkerModule = async ({
       }).toArray();
     },
 
-    count: async (query) => {
+    count: async (query: WorkQueueQuery) => {
       return WorkQueue.countDocuments(buildQuerySelector(query));
     },
 
-    workExists: async ({ workId, originalWorkId }) => {
+    allocationMap: async (): Promise<Record<string, number>> => {
+      const alreadyAllocatedWork = await WorkQueue.aggregate(
+        [
+          {
+            $match: {
+              started: {
+                $exists: true,
+              },
+              finished: {
+                $exists: false,
+              },
+              deleted: {
+                $exists: false,
+              },
+            },
+          },
+          {
+            $group: {
+              _id: '$type',
+              count: {
+                $sum: 1,
+              },
+            },
+          },
+        ],
+        {
+          allowDiskUse: false,
+        },
+      ).toArray();
+
+      const allocationMap = Object.fromEntries(alreadyAllocatedWork.map((w) => [w._id, w.count]));
+      return allocationMap;
+    },
+
+    workExists: async ({
+      workId,
+      originalWorkId,
+    }: {
+      workId?: string;
+      originalWorkId?: string;
+    }): Promise<boolean> => {
       const queueCount = await WorkQueue.countDocuments(
         workId ? generateDbFilterById(workId) : { originalWorkId },
         { limit: 1 },
@@ -412,16 +377,7 @@ export const configureWorkerModule = async ({
       return !!queueCount;
     },
 
-    // Transformations
-
-    type: (work) => {
-      if (WorkerDirector.getActivePluginTypes().includes(work.type)) {
-        return work.type;
-      }
-      return 'UNKNOWN';
-    },
-
-    status: (work) => {
+    status: (work: Work): WorkStatus => {
       if (work.deleted) {
         return WorkStatus.DELETED;
       }
@@ -452,11 +408,7 @@ export const configureWorkerModule = async ({
       originalWorkId,
       worker = null,
       retries = 20,
-    }) => {
-      if (!WorkerDirector.getAdapterByType(type)) {
-        throw new Error(`No plugin registered for type ${type}`);
-      }
-
+    }: WorkData): Promise<Work> => {
       const created = new Date();
       const { insertedId: workId } = await WorkQueue.insertOne({
         _id: generateDbObjectId(),
@@ -480,7 +432,7 @@ export const configureWorkerModule = async ({
       return work;
     },
 
-    rescheduleWork: async (currentWork, scheduled) => {
+    rescheduleWork: async (currentWork: Work, scheduled: Date): Promise<Work> => {
       const work = await WorkQueue.findOneAndUpdate(
         generateDbFilterById(currentWork._id),
         {
@@ -502,7 +454,15 @@ export const configureWorkerModule = async ({
 
     allocateWork,
 
-    ensureNoWork: async ({ type, priority = 0, scheduleId }) => {
+    ensureNoWork: async ({
+      type,
+      priority = 0,
+      scheduleId,
+    }: {
+      priority: number;
+      type: string;
+      scheduleId: string;
+    }): Promise<void> => {
       const query = buildQuerySelector({
         type,
         status: [WorkStatus.NEW],
@@ -527,7 +487,7 @@ export const configureWorkerModule = async ({
       originalWorkId,
       retries = 20,
       scheduleId,
-    }) => {
+    }: WorkData): Promise<Work> => {
       const workId = `${scheduleId}:${scheduled.getTime()}`;
 
       const created = new Date();
@@ -588,11 +548,9 @@ export const configureWorkerModule = async ({
       }
     },
 
-    processNextWork,
-
     finishWork,
 
-    deleteWork: async (workId) => {
+    deleteWork: async (workId: string): Promise<Work> => {
       const workBeforeRemoval = await WorkQueue.findOne(
         buildQuerySelector({
           workId,
@@ -616,7 +574,15 @@ export const configureWorkerModule = async ({
       return work;
     },
 
-    markOldWorkAsFailed: async ({ types, worker = UNCHAINED_WORKER_ID, referenceDate }) => {
+    markOldWorkAsFailed: async ({
+      types,
+      worker = UNCHAINED_WORKER_ID,
+      referenceDate,
+    }: {
+      types: Array<string>;
+      worker: string;
+      referenceDate: Date;
+    }): Promise<Array<Work>> => {
       const workQueue = await WorkQueue.find(
         buildQuerySelector({
           status: [WorkStatus.ALLOCATED],
@@ -644,22 +610,28 @@ export const configureWorkerModule = async ({
       );
     },
 
-    getReport: async ({ types, from, to } = { types: null, from: null, to: null }) => {
+    getReport: async ({
+      types,
+      dateRange,
+    }: {
+      types?: Array<string>;
+      dateRange?: DateFilterInput;
+    }): Promise<WorkerReport[]> => {
       const pipeline = [];
       const matchConditions = [];
       // build date filter based on provided values it can be a range if both to and from is supplied
       // a upper or lowe limit if either from or to is provided
       // or all if none is provided
-      if (from || to) {
+      if (dateRange?.start || dateRange?.end) {
         const dateConditions = [];
-        if (from) {
-          const fromDate = new Date(from);
+        if (dateRange?.start) {
+          const fromDate = new Date(dateRange?.start);
           dateConditions.push({
             $or: [{ created: { $gte: fromDate } }, { updated: { $gte: fromDate } }],
           });
         }
-        if (to) {
-          const toDate = new Date(to);
+        if (dateRange?.end) {
+          const toDate = new Date(dateRange?.end);
           dateConditions.push({
             $or: [{ created: { $lte: toDate } }, { updated: { $lte: toDate } }],
           });
@@ -724,3 +696,5 @@ export const configureWorkerModule = async ({
     },
   };
 };
+
+export type WorkerModule = Awaited<ReturnType<typeof configureWorkerModule>>;

package/src/worker-index.ts

@@ -1,12 +1,3 @@
-export * from './types.js';
+export * from './db/WorkQueueCollection.js';
 
 export * from './module/configureWorkerModule.js';
-export * from './director/WorkerDirector.js';
-export * from './director/WorkerAdapter.js';
-export { WorkStatus } from './director/WorkStatus.js';
-export { WorkerEventTypes } from './director/WorkerEventTypes.js';
-
-export * from './schedulers/FailedRescheduler.js';
-export * from './workers/BaseWorker.js';
-export * from './workers/EventListenerWorker.js';
-export * from './workers/IntervalWorker.js';

package/tsconfig.json

@@ -1,11 +1,9 @@
 {
   "extends": "../shared/base.tsconfig.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "lib",
+    "declarationDir": "./lib",
+    "rootDir": "./src",
+    "outDir": "./lib"
   },
-  "exclude": ["**/*.test.ts", "**/*.test.js", "tests"],
-  "include": [
-    "./src"
-  ]
-}
+  "exclude": ["**/*.test.ts", "**/*.test.js", "tests", "lib"]
+}

package/src/director/WorkStatus.ts

@@ -1,7 +0,0 @@
-export enum WorkStatus {
-  NEW = 'NEW',
-  ALLOCATED = 'ALLOCATED',
-  SUCCESS = 'SUCCESS',
-  FAILED = 'FAILED',
-  DELETED = 'DELETED',
-}