@unchainedshop/core 4.0.0-rc.2 → 4.0.0-rc.3

package/lib/directors/BaseWorker.d.ts

@@ -16,9 +16,9 @@ export interface IWorker<P extends {
             maxWorkItemCount?: number;
             referenceDate?: Date;
         }) => Promise<void>;
-        reset: () => Promise<void>;
-        start: () => void;
-        stop: () => void;
+        reset: () => Promise<void> | void;
+        start: () => Promise<void> | void;
+        stop: () => Promise<void> | void;
     };
 }
 interface WorkerParams {

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

@@ -1 +1 @@
-{"version":3,"file":"BaseWorker.d.ts","sourceRoot":"","sources":["../../src/directors/BaseWorker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,4BAA4B,CAAC;AAG5D,MAAM,WAAW,OAAO,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE;IACtD,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,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QACpF,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;AAED,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,CAqF5C,CAAC"}
+{"version":3,"file":"BaseWorker.d.ts","sourceRoot":"","sources":["../../src/directors/BaseWorker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,4BAA4B,CAAC;AAG5D,MAAM,WAAW,OAAO,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE;IACtD,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,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QACpF,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,GAAG,IAAI,CAAC;QAClC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAClC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;KAClC,CAAC;CACH;AAED,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,CAsF5C,CAAC"}

package/lib/directors/BaseWorker.js

@@ -12,10 +12,10 @@ export const BaseWorker = {
     },
     actions: ({ workerId }, unchainedAPI) => {
         const workerActions = {
-            start() {
+            async start() {
                 throw new Error(`Not implemented on ${this.constructor.key}`);
             },
-            stop() {
+            async stop() {
                 throw new Error(`Not implemented on ${this.constructor.key}`);
             },
             reset: async (referenceDate = new Date()) => {
@@ -57,19 +57,19 @@ export const BaseWorker = {
                     return unchainedAPI.modules.worker.ensureOneWork(workData);
                 }));
             },
-            process: async ({ maxWorkItemCount, referenceDate }) => {
+            process: async ({ maxWorkItemCount = 10, referenceDate }) => {
                 await workerActions.autorescheduleTypes({
                     referenceDate,
                 });
-                const processRecursively = async (recursionCounter = 0) => {
-                    if (maxWorkItemCount && maxWorkItemCount < recursionCounter)
-                        return null;
+                let processedCount = 0;
+                while (true) {
+                    if (maxWorkItemCount && maxWorkItemCount <= processedCount)
+                        break;
                     const doneWork = await WorkerDirector.processNextWork(unchainedAPI, workerId);
-                    if (doneWork)
-                        return processRecursively(recursionCounter + 1);
-                    return null;
-                };
-                await processRecursively();
+                    if (!doneWork)
+                        break;
+                    processedCount++;
+                }
             },
         };
         workerActions.reset();

package/lib/directors/BaseWorker.js.map

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

package/lib/directors/EventListenerWorker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventListenerWorker.d.ts","sourceRoot":"","sources":["../../src/directors/EventListenerWorker.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,OAAO,EAAE,MAAM,iBAAiB,CAAC;AActD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,yBAAyB,CAyClE,CAAC"}
+{"version":3,"file":"EventListenerWorker.d.ts","sourceRoot":"","sources":["../../src/directors/EventListenerWorker.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAkDtD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,yBAAyB,CA6ClE,CAAC"}

package/lib/directors/EventListenerWorker.js

@@ -1,15 +1,42 @@
 import { subscribe } from '@unchainedshop/events';
 import { BaseWorker } from './BaseWorker.js';
 import { WorkerEventTypes } from '@unchainedshop/core-worker';
+import { setTimeout } from 'node:timers/promises';
+import { createLogger } from '@unchainedshop/logger';
+const logger = createLogger('unchained:worker');
 function debounce(func, wait) {
-    let timeout;
-    return (...args) => {
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            timeout = null;
-            func(...args);
-        }, wait);
+    let abortController = null;
+    const debounced = (async (...args) => {
+        // Cancel any pending execution
+        if (abortController) {
+            abortController.abort();
+        }
+        // Create new abort controller for this execution
+        abortController = new AbortController();
+        try {
+            // Wait for the debounce period
+            await setTimeout(wait, undefined, { signal: abortController.signal });
+            // If we reach here, the timeout completed without being aborted
+            const result = await func(...args);
+            abortController = null;
+            return result;
+        }
+        catch (error) {
+            // If the operation was aborted, don't execute the function
+            if (error.name === 'AbortError') {
+                return;
+            }
+            // Re-throw any other errors
+            throw error;
+        }
+    });
+    debounced.cancel = () => {
+        if (abortController) {
+            abortController.abort();
+            abortController = null;
+        }
     };
+    return debounced;
 }
 export const EventListenerWorker = {
     ...BaseWorker,
@@ -21,24 +48,29 @@ export const EventListenerWorker = {
         const baseWorkerActions = BaseWorker.actions({ workerId, worker: EventListenerWorker }, unchainedAPI);
         // Debounce in the event of many work queue events conflicting with each other
         const processWorkQueue = debounce(async () => {
-            await baseWorkerActions.process({
-                maxWorkItemCount: 1, // only one work item at a time, else we could end up in a loop
-                referenceDate: EventListenerWorker.getFloorDate(),
-            });
+            try {
+                await baseWorkerActions.process({
+                    maxWorkItemCount: 1, // only one work item at a time, else we could end up in a loop
+                    referenceDate: EventListenerWorker.getFloorDate(),
+                });
+            }
+            catch (error) {
+                // Log error but don't crash the worker
+                logger.error(error);
+            }
         }, 300);
         return {
             ...baseWorkerActions,
-            start() {
+            async start() {
                 subscribe(WorkerEventTypes.ADDED, processWorkQueue);
                 subscribe(WorkerEventTypes.FINISHED, processWorkQueue);
-                setTimeout(async () => {
-                    await baseWorkerActions.autorescheduleTypes({
-                        referenceDate: EventListenerWorker.getFloorDate(),
-                    });
-                }, 300);
+                await setTimeout(300);
+                await baseWorkerActions.autorescheduleTypes({
+                    referenceDate: EventListenerWorker.getFloorDate(),
+                });
             },
             stop() {
-                /* */
+                processWorkQueue.cancel();
             },
         };
     },

package/lib/directors/EventListenerWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventListenerWorker.js","sourceRoot":"","sources":["../../src/directors/EventListenerWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,SAAS,QAAQ,CAAkC,IAAO,EAAE,IAAI;IAC9D,IAAI,OAAO,CAAC;IACZ,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE;QACjB,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YACxB,OAAO,GAAG,IAAI,CAAC;YACf,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;QAChB,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC,CAAC;AACJ,CAAC;AAMD,MAAM,CAAC,MAAM,mBAAmB,GAAuC;IACrE,GAAG,UAAU;IAEb,GAAG,EAAE,sCAAsC;IAC3C,KAAK,EAAE,mFAAmF;IAC1F,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,gBAAgB;IAEtB,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,EAAE;QACtC,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAC1C,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,EACzC,YAAY,CACb,CAAC;QAEF,8EAA8E;QAC9E,MAAM,gBAAgB,GAAG,QAAQ,CAAsB,KAAK,IAAI,EAAE;YAChE,MAAM,iBAAiB,CAAC,OAAO,CAAC;gBAC9B,gBAAgB,EAAE,CAAC,EAAE,+DAA+D;gBACpF,aAAa,EAAE,mBAAmB,CAAC,YAAY,EAAE;aAClD,CAAC,CAAC;QACL,CAAC,EAAE,GAAG,CAAC,CAAC;QAER,OAAO;YACL,GAAG,iBAAiB;YAEpB,KAAK;gBACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;gBACpD,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBAEvD,UAAU,CAAC,KAAK,IAAI,EAAE;oBACpB,MAAM,iBAAiB,CAAC,mBAAmB,CAAC;wBAC1C,aAAa,EAAE,mBAAmB,CAAC,YAAY,EAAE;qBAClD,CAAC,CAAC;gBACL,CAAC,EAAE,GAAG,CAAC,CAAC;YACV,CAAC;YAED,IAAI;gBACF,KAAK;YACP,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"EventListenerWorker.js","sourceRoot":"","sources":["../../src/directors/EventListenerWorker.ts"],"names":[],"mappings":"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"}

package/lib/directors/FilterAdapter.d.ts

@@ -26,7 +26,7 @@ export interface FilterAdapterActions {
         locale: Intl.Locale;
     }) => Promise<string[]>;
     searchProducts: (params: {
-        productIds: string[];
+        productIds?: string[];
     }, options: {
         filterSelector: mongodb.Filter<Filter>;
         productSelector: mongodb.Filter<Product>;

package/lib/directors/FilterAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterAdapter.d.ts","sourceRoot":"","sources":["../../src/directors/FilterAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAe,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACnC,mBAAmB,EAAE,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,MAAM,EAAE,CAAC;IAEpE,iBAAiB,EAAE,CACjB,MAAM,EAAE;QACN,aAAa,EAAE,MAAM,EAAE,CAAC;KACzB,EACD,OAAO,EAAE;QACP,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC/C,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;KACrB,KACE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEvB,cAAc,EAAE,CACd,MAAM,EAAE;QACN,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB,EACD,OAAO,EAAE;QACP,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;KACrB,KACE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEvB,uBAAuB,EAAE,CACvB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAC7B,OAAO,CAAC,EAAE,GAAG,KACV,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACrC,wBAAwB,EAAE,CACxB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAE,KACpC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IACtC,kBAAkB,EAAE,CAClB,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,EACjC,OAAO,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAE,KACnC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;CAC3C;AAED,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG;IAC1C,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE,CAAC,MAAM,EAAE,aAAa,GAAG;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,KAAK,oBAAoB,CAAC;CACjF,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO,GAAG,SAAS,CAmC3E,CAAC"}
+{"version":3,"file":"FilterAdapter.d.ts","sourceRoot":"","sources":["../../src/directors/FilterAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAe,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACnC,mBAAmB,EAAE,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,MAAM,EAAE,CAAC;IAEpE,iBAAiB,EAAE,CACjB,MAAM,EAAE;QACN,aAAa,EAAE,MAAM,EAAE,CAAC;KACzB,EACD,OAAO,EAAE;QACP,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC/C,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;KACrB,KACE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEvB,cAAc,EAAE,CACd,MAAM,EAAE;QACN,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB,EACD,OAAO,EAAE;QACP,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;KACrB,KACE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEvB,uBAAuB,EAAE,CACvB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAC7B,OAAO,CAAC,EAAE,GAAG,KACV,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACrC,wBAAwB,EAAE,CACxB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAE,KACpC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IACtC,kBAAkB,EAAE,CAClB,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,EACjC,OAAO,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAE,KACnC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;CAC3C;AAED,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG;IAC1C,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE,CAAC,MAAM,EAAE,aAAa,GAAG;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,KAAK,oBAAoB,CAAC;CACjF,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO,GAAG,SAAS,CAmC3E,CAAC"}

package/lib/directors/IntervalWorker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IntervalWorker.d.ts","sourceRoot":"","sources":["../../src/directors/IntervalWorker.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAc,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAItD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAMD,eAAO,MAAM,kBAAkB,GAAI,UAAU,YAAY,WAKxD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,OAAO,CAAC,oBAAoB,CA+BxD,CAAC"}
+{"version":3,"file":"IntervalWorker.d.ts","sourceRoot":"","sources":["../../src/directors/IntervalWorker.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAc,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAOtD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAMD,eAAO,MAAM,kBAAkB,GAAI,UAAU,YAAY,WAWxD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,OAAO,CAAC,oBAAoB,CA2CxD,CAAC"}

package/lib/directors/IntervalWorker.js

@@ -1,10 +1,16 @@
 import later from '@breejs/later';
 import { BaseWorker } from './BaseWorker.js';
+import { createLogger } from '@unchainedshop/logger';
 const { NODE_ENV } = process.env;
+const logger = createLogger('unchained:worker');
 const defaultSchedule = later.parse.text(NODE_ENV !== 'production' ? 'every 2 seconds' : 'every 30 seconds');
 export const scheduleToInterval = (schedule) => {
     const referenceDate = new Date(1000);
-    const [one, two] = later.schedule(schedule).next(2, referenceDate);
+    const nextDates = later.schedule(schedule).next(2, referenceDate);
+    if (!nextDates || nextDates.length < 2) {
+        throw new Error('Schedule must produce at least 2 consecutive dates');
+    }
+    const [one, two] = nextDates;
     const diff = new Date(two).getTime() - new Date(one).getTime();
     return Math.min(1000 * 60 * 60, diff); // at least once every hour!
 };
@@ -14,22 +20,34 @@ export const IntervalWorker = {
     label: 'Allocates work on fixed intervals with native node setInterval',
     version: '1.0.0',
     type: 'CRON',
-    actions: ({ workerId, batchCount = 0, schedule = defaultSchedule }, unchainedAPI) => {
+    actions: ({ workerId, batchCount = 10, schedule = defaultSchedule }, unchainedAPI) => {
         const baseWorkerActions = BaseWorker.actions({ workerId, worker: IntervalWorker }, unchainedAPI);
         const intervalDelay = scheduleToInterval(schedule);
-        let intervalHandle;
+        let intervalHandle = null;
         return {
             ...baseWorkerActions,
             start() {
-                intervalHandle = setInterval(() => {
-                    baseWorkerActions.process({
-                        maxWorkItemCount: batchCount,
-                        referenceDate: IntervalWorker.getFloorDate(),
-                    });
+                // Prevent multiple intervals from running
+                if (intervalHandle) {
+                    return;
+                }
+                intervalHandle = setInterval(async () => {
+                    try {
+                        await baseWorkerActions.process({
+                            maxWorkItemCount: batchCount,
+                            referenceDate: IntervalWorker.getFloorDate(),
+                        });
+                    }
+                    catch (error) {
+                        logger.error(error);
+                    }
                 }, intervalDelay);
             },
             stop() {
-                clearInterval(intervalHandle);
+                if (intervalHandle) {
+                    clearInterval(intervalHandle);
+                    intervalHandle = null;
+                }
             },
         };
     },

package/lib/directors/IntervalWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"IntervalWorker.js","sourceRoot":"","sources":["../../src/directors/IntervalWorker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAuB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AAEtD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAQjC,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CACtC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CACnE,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAsB,EAAE,EAAE;IAC3D,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,aAAa,CAAW,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,4BAA4B;AACrE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAkC;IAC3D,GAAG,UAAU;IAEb,GAAG,EAAE,4BAA4B;IACjC,KAAK,EAAE,gEAAgE;IACvE,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM;IAEZ,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,GAAG,CAAC,EAAE,QAAQ,GAAG,eAAe,EAAE,EAAE,YAAY,EAAE,EAAE;QAClF,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,YAAY,CAAC,CAAC;QAEjG,MAAM,aAAa,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,cAA8B,CAAC;QAEnC,OAAO;YACL,GAAG,iBAAiB;YAEpB,KAAK;gBACH,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;oBAChC,iBAAiB,CAAC,OAAO,CAAC;wBACxB,gBAAgB,EAAE,UAAU;wBAC5B,aAAa,EAAE,cAAc,CAAC,YAAY,EAAE;qBAC7C,CAAC,CAAC;gBACL,CAAC,EAAE,aAAa,CAAC,CAAC;YACpB,CAAC;YAED,IAAI;gBACF,aAAa,CAAC,cAAc,CAAC,CAAC;YAChC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"IntervalWorker.js","sourceRoot":"","sources":["../../src/directors/IntervalWorker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAuB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjC,MAAM,MAAM,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;AAQhD,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CACtC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CACnE,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAsB,EAAE,EAAE;IAC3D,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,aAAa,CAAW,CAAC;IAE5E,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;IAC7B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,4BAA4B;AACrE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAkC;IAC3D,GAAG,UAAU;IAEb,GAAG,EAAE,4BAA4B;IACjC,KAAK,EAAE,gEAAgE;IACvE,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM;IAEZ,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,GAAG,EAAE,EAAE,QAAQ,GAAG,eAAe,EAAE,EAAE,YAAY,EAAE,EAAE;QACnF,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,YAAY,CAAC,CAAC;QAEjG,MAAM,aAAa,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,cAAc,GAA0B,IAAI,CAAC;QAEjD,OAAO;YACL,GAAG,iBAAiB;YAEpB,KAAK;gBACH,0CAA0C;gBAC1C,IAAI,cAAc,EAAE,CAAC;oBACnB,OAAO;gBACT,CAAC;gBAED,cAAc,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;oBACtC,IAAI,CAAC;wBACH,MAAM,iBAAiB,CAAC,OAAO,CAAC;4BAC9B,gBAAgB,EAAE,UAAU;4BAC5B,aAAa,EAAE,cAAc,CAAC,YAAY,EAAE;yBAC7C,CAAC,CAAC;oBACL,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACtB,CAAC;gBACH,CAAC,EAAE,aAAa,CAAC,CAAC;YACpB,CAAC;YAED,IAAI;gBACF,IAAI,cAAc,EAAE,CAAC;oBACnB,aAAa,CAAC,cAAc,CAAC,CAAC;oBAC9B,cAAc,GAAG,IAAI,CAAC;gBACxB,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/services/searchProducts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"searchProducts.d.ts","sourceRoot":"","sources":["../../src/services/searchProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,mBAAmB,EACnB,WAAW,EACZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,WAAW,0BAA2B,SAAQ,mBAAmB;IACrE,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;CAC1C;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,WAAW,EACxB,EAAE,mBAAmB,EAAE,MAAM,EAAE,EAAE;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CAAE;;;;;GAuDxF"}
+{"version":3,"file":"searchProducts.d.ts","sourceRoot":"","sources":["../../src/services/searchProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,mBAAmB,EACnB,WAAW,EACZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,WAAW,0BAA2B,SAAQ,mBAAmB;IACrE,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;CAC1C;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,WAAW,EACxB,EAAE,mBAAmB,EAAE,MAAM,EAAE,EAAE;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CAAE;;;;;GAqDxF"}

package/lib/services/searchProducts.js

@@ -23,8 +23,7 @@ export async function searchProductsService(searchQuery, { forceLiveCollection,
             totalProductIds: [],
         };
     }
-    const productIds = await searchQuery.productIds;
-    const totalProductIds = (await filterActions.searchProducts({ productIds }, searchConfiguration)) || [];
+    const totalProductIds = (await filterActions.searchProducts(searchQuery, searchConfiguration)) || [];
     const filteredProductIds = await FilterDirector.productFacetedSearch(totalProductIds, searchConfiguration, { modules: this });
     const aggregatedTotalProductIds = filterActions.aggregateProductIds({
         productIds: totalProductIds,

package/lib/services/searchProducts.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchProducts.js","sourceRoot":"","sources":["../../src/services/searchProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,gBAAgB,GAGjB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAKvD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAEzC,WAAwB,EACxB,EAAE,mBAAmB,EAAE,MAAM,EAA0D;IAEvF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvF,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC;IACvG,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,wBAAwB,CAClE,sBAAsB,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EACtD,EAAE,CACH,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;IAExF,MAAM,mBAAmB,GAA+B;QACtD,WAAW;QACX,cAAc;QACd,eAAe;QACf,SAAS;QACT,mBAAmB;QACnB,MAAM;KACP,CAAC;IAEF,IAAI,WAAW,CAAC,UAAU,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,2CAA2C;QAC3C,sCAAsC;QACtC,OAAO;YACL,mBAAmB;YACnB,yBAAyB,EAAE,EAAE;YAC7B,4BAA4B,EAAE,EAAE;YAChC,eAAe,EAAE,EAAE;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC;IAChD,MAAM,eAAe,GACnB,CAAC,MAAM,aAAa,CAAC,cAAc,CAAC,EAAE,UAAU,EAAE,EAAE,mBAAmB,CAAC,CAAC,IAAI,EAAE,CAAC;IAElF,MAAM,kBAAkB,GAAG,MAAM,cAAc,CAAC,oBAAoB,CAClE,eAAe,EACf,mBAAmB,EACnB,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;IAEF,MAAM,yBAAyB,GAAG,aAAa,CAAC,mBAAmB,CAAC;QAClE,UAAU,EAAE,eAAe;KAC5B,CAAC,CAAC;IAEH,MAAM,4BAA4B,GAAG,aAAa,CAAC,mBAAmB,CAAC;QACrE,UAAU,EAAE,kBAAkB;KAC/B,CAAC,CAAC;IAEH,OAAO;QACL,mBAAmB;QACnB,eAAe;QACf,yBAAyB;QACzB,4BAA4B;KAC7B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"searchProducts.js","sourceRoot":"","sources":["../../src/services/searchProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,gBAAgB,GAGjB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAKvD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAEzC,WAAwB,EACxB,EAAE,mBAAmB,EAAE,MAAM,EAA0D;IAEvF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvF,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC;IACvG,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,wBAAwB,CAClE,sBAAsB,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EACtD,EAAE,CACH,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;IAExF,MAAM,mBAAmB,GAA+B;QACtD,WAAW;QACX,cAAc;QACd,eAAe;QACf,SAAS;QACT,mBAAmB;QACnB,MAAM;KACP,CAAC;IAEF,IAAI,WAAW,CAAC,UAAU,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,2CAA2C;QAC3C,sCAAsC;QACtC,OAAO;YACL,mBAAmB;YACnB,yBAAyB,EAAE,EAAE;YAC7B,4BAA4B,EAAE,EAAE;YAChC,eAAe,EAAE,EAAE;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,eAAe,GAAG,CAAC,MAAM,aAAa,CAAC,cAAc,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,IAAI,EAAE,CAAC;IAErG,MAAM,kBAAkB,GAAG,MAAM,cAAc,CAAC,oBAAoB,CAClE,eAAe,EACf,mBAAmB,EACnB,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;IAEF,MAAM,yBAAyB,GAAG,aAAa,CAAC,mBAAmB,CAAC;QAClE,UAAU,EAAE,eAAe;KAC5B,CAAC,CAAC;IAEH,MAAM,4BAA4B,GAAG,aAAa,CAAC,mBAAmB,CAAC;QACrE,UAAU,EAAE,kBAAkB;KAC/B,CAAC,CAAC;IAEH,OAAO;QACL,mBAAmB;QACnB,eAAe;QACf,yBAAyB;QACzB,4BAA4B;KAC7B,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.3",
   "main": "lib/core-index.js",
   "types": "lib/core-index.d.ts",
   "type": "module",
@@ -32,30 +32,30 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@breejs/later": "^4.2.0",
-    "@unchainedshop/core-assortments": "^4.0.0-rc.2",
-    "@unchainedshop/core-bookmarks": "^4.0.0-rc.2",
-    "@unchainedshop/core-countries": "^4.0.0-rc.2",
-    "@unchainedshop/core-currencies": "^4.0.0-rc.2",
-    "@unchainedshop/core-delivery": "^4.0.0-rc.2",
-    "@unchainedshop/core-enrollments": "^4.0.0-rc.2",
-    "@unchainedshop/core-events": "^4.0.0-rc.2",
-    "@unchainedshop/core-files": "^4.0.0-rc.2",
-    "@unchainedshop/core-filters": "^4.0.0-rc.2",
-    "@unchainedshop/core-languages": "^4.0.0-rc.2",
-    "@unchainedshop/core-orders": "^4.0.0-rc.2",
-    "@unchainedshop/core-payment": "^4.0.0-rc.2",
-    "@unchainedshop/core-products": "^4.0.0-rc.2",
-    "@unchainedshop/core-quotations": "^4.0.0-rc.2",
-    "@unchainedshop/core-users": "^4.0.0-rc.2",
-    "@unchainedshop/core-warehousing": "^4.0.0-rc.2",
-    "@unchainedshop/core-worker": "^4.0.0-rc.2",
-    "@unchainedshop/logger": "^4.0.0-rc.2",
-    "@unchainedshop/utils": "^4.0.0-rc.2"
+    "@unchainedshop/core-assortments": "^4.0.0-rc.3",
+    "@unchainedshop/core-bookmarks": "^4.0.0-rc.3",
+    "@unchainedshop/core-countries": "^4.0.0-rc.3",
+    "@unchainedshop/core-currencies": "^4.0.0-rc.3",
+    "@unchainedshop/core-delivery": "^4.0.0-rc.3",
+    "@unchainedshop/core-enrollments": "^4.0.0-rc.3",
+    "@unchainedshop/core-events": "^4.0.0-rc.3",
+    "@unchainedshop/core-files": "^4.0.0-rc.3",
+    "@unchainedshop/core-filters": "^4.0.0-rc.3",
+    "@unchainedshop/core-languages": "^4.0.0-rc.3",
+    "@unchainedshop/core-orders": "^4.0.0-rc.3",
+    "@unchainedshop/core-payment": "^4.0.0-rc.3",
+    "@unchainedshop/core-products": "^4.0.0-rc.3",
+    "@unchainedshop/core-quotations": "^4.0.0-rc.3",
+    "@unchainedshop/core-users": "^4.0.0-rc.3",
+    "@unchainedshop/core-warehousing": "^4.0.0-rc.3",
+    "@unchainedshop/core-worker": "^4.0.0-rc.3",
+    "@unchainedshop/logger": "^4.0.0-rc.3",
+    "@unchainedshop/utils": "^4.0.0-rc.3"
   },
   "devDependencies": {
     "@types/breejs__later": "^4.1.5",
-    "@types/node": "^22.15.3",
-    "tsx": "^4.19.4",
+    "@types/node": "^24.0.4",
+    "tsx": "^4.20.3",
     "typescript": "^5.8.3"
   }
 }

package/src/directors/BaseWorker.ts

@@ -17,9 +17,9 @@ export interface IWorker<P extends { workerId?: string }> {
   ) => {
     autorescheduleTypes: (options: { referenceDate: Date }) => Promise<(Work | null)[]>;
     process: (options: { maxWorkItemCount?: number; referenceDate?: Date }) => Promise<void>;
-    reset: () => Promise<void>;
-    start: () => void;
-    stop: () => void;
+    reset: () => Promise<void> | void;
+    start: () => Promise<void> | void;
+    stop: () => Promise<void> | void;
   };
 }
 
@@ -42,11 +42,11 @@ export const BaseWorker: IWorker<WorkerParams> = {
 
   actions: ({ workerId }: WorkerParams, unchainedAPI) => {
     const workerActions = {
-      start() {
+      async start() {
         throw new Error(`Not implemented on ${this.constructor.key}`);
       },
 
-      stop() {
+      async stop() {
         throw new Error(`Not implemented on ${this.constructor.key}`);
       },
 
@@ -93,19 +93,20 @@ export const BaseWorker: IWorker<WorkerParams> = {
         );
       },
 
-      process: async ({ maxWorkItemCount, referenceDate }) => {
+      process: async ({ maxWorkItemCount = 10, referenceDate }) => {
         await workerActions.autorescheduleTypes({
           referenceDate,
         });
 
-        const processRecursively = async (recursionCounter = 0) => {
-          if (maxWorkItemCount && maxWorkItemCount < recursionCounter) return null;
+        let processedCount = 0;
+        while (true) {
+          if (maxWorkItemCount && maxWorkItemCount <= processedCount) break;
+
           const doneWork = await WorkerDirector.processNextWork(unchainedAPI, workerId);
-          if (doneWork) return processRecursively(recursionCounter + 1);
-          return null;
-        };
+          if (!doneWork) break;
 
-        await processRecursively();
+          processedCount++;
+        }
       },
     };
 

package/src/directors/EventListenerWorker.ts

@@ -1,16 +1,52 @@
 import { subscribe } from '@unchainedshop/events';
 import { BaseWorker, IWorker } from './BaseWorker.js';
 import { WorkerEventTypes } from '@unchainedshop/core-worker';
+import { setTimeout } from 'node:timers/promises';
+import { createLogger } from '@unchainedshop/logger';
 
-function debounce<T extends (...args: any) => any>(func: T, wait) {
-  let timeout;
-  return (...args) => {
-    clearTimeout(timeout);
-    timeout = setTimeout(() => {
-      timeout = null;
-      func(...args);
-    }, wait);
+const logger = createLogger('unchained:worker');
+
+function debounce<T extends (...args: any[]) => Promise<any>>(
+  func: T,
+  wait: number,
+): T & { cancel: () => void } {
+  let abortController: AbortController | null = null;
+
+  const debounced = (async (...args: Parameters<T>) => {
+    // Cancel any pending execution
+    if (abortController) {
+      abortController.abort();
+    }
+
+    // Create new abort controller for this execution
+    abortController = new AbortController();
+
+    try {
+      // Wait for the debounce period
+      await setTimeout(wait, undefined, { signal: abortController.signal });
+
+      // If we reach here, the timeout completed without being aborted
+      const result = await func(...args);
+      abortController = null;
+      return result;
+    } catch (error) {
+      // If the operation was aborted, don't execute the function
+      if (error.name === 'AbortError') {
+        return;
+      }
+      // Re-throw any other errors
+      throw error;
+    }
+  }) as T & { cancel: () => void };
+
+  debounced.cancel = () => {
+    if (abortController) {
+      abortController.abort();
+      abortController = null;
+    }
   };
+
+  return debounced;
 }
 
 export interface EventListenerWorkerParams {
@@ -33,28 +69,32 @@ export const EventListenerWorker: IWorker<EventListenerWorkerParams> = {
 
     // Debounce in the event of many work queue events conflicting with each other
     const processWorkQueue = debounce<() => Promise<void>>(async () => {
-      await baseWorkerActions.process({
-        maxWorkItemCount: 1, // only one work item at a time, else we could end up in a loop
-        referenceDate: EventListenerWorker.getFloorDate(),
-      });
+      try {
+        await baseWorkerActions.process({
+          maxWorkItemCount: 1, // only one work item at a time, else we could end up in a loop
+          referenceDate: EventListenerWorker.getFloorDate(),
+        });
+      } catch (error) {
+        // Log error but don't crash the worker
+        logger.error(error);
+      }
     }, 300);
 
     return {
       ...baseWorkerActions,
 
-      start() {
+      async start() {
         subscribe(WorkerEventTypes.ADDED, processWorkQueue);
         subscribe(WorkerEventTypes.FINISHED, processWorkQueue);
 
-        setTimeout(async () => {
-          await baseWorkerActions.autorescheduleTypes({
-            referenceDate: EventListenerWorker.getFloorDate(),
-          });
-        }, 300);
+        await setTimeout(300);
+        await baseWorkerActions.autorescheduleTypes({
+          referenceDate: EventListenerWorker.getFloorDate(),
+        });
       },
 
       stop() {
-        /* */
+        processWorkQueue.cancel();
       },
     };
   },

package/src/directors/FilterAdapter.ts

@@ -33,7 +33,7 @@ export interface FilterAdapterActions {
 
   searchProducts: (
     params: {
-      productIds: string[];
+      productIds?: string[];
     },
     options: {
       filterSelector: mongodb.Filter<Filter>;

package/src/directors/IntervalWorker.ts

@@ -1,8 +1,11 @@
 import later, { ScheduleData } from '@breejs/later';
 import { BaseWorker, IWorker } from './BaseWorker.js';
+import { createLogger } from '@unchainedshop/logger';
 
 const { NODE_ENV } = process.env;
 
+const logger = createLogger('unchained:worker');
+
 export interface IntervalWorkerParams {
   workerId?: string;
   batchCount?: number;
@@ -15,7 +18,13 @@ const defaultSchedule = later.parse.text(
 
 export const scheduleToInterval = (schedule: ScheduleData) => {
   const referenceDate = new Date(1000);
-  const [one, two] = later.schedule(schedule).next(2, referenceDate) as Date[];
+  const nextDates = later.schedule(schedule).next(2, referenceDate) as Date[];
+
+  if (!nextDates || nextDates.length < 2) {
+    throw new Error('Schedule must produce at least 2 consecutive dates');
+  }
+
+  const [one, two] = nextDates;
   const diff = new Date(two).getTime() - new Date(one).getTime();
   return Math.min(1000 * 60 * 60, diff); // at least once every hour!
 };
@@ -28,26 +37,38 @@ export const IntervalWorker: IWorker<IntervalWorkerParams> = {
   version: '1.0.0',
   type: 'CRON',
 
-  actions: ({ workerId, batchCount = 0, schedule = defaultSchedule }, unchainedAPI) => {
+  actions: ({ workerId, batchCount = 10, schedule = defaultSchedule }, unchainedAPI) => {
     const baseWorkerActions = BaseWorker.actions({ workerId, worker: IntervalWorker }, unchainedAPI);
 
     const intervalDelay = scheduleToInterval(schedule);
-    let intervalHandle: NodeJS.Timeout;
+    let intervalHandle: NodeJS.Timeout | null = null;
 
     return {
       ...baseWorkerActions,
 
       start() {
-        intervalHandle = setInterval(() => {
-          baseWorkerActions.process({
-            maxWorkItemCount: batchCount,
-            referenceDate: IntervalWorker.getFloorDate(),
-          });
+        // Prevent multiple intervals from running
+        if (intervalHandle) {
+          return;
+        }
+
+        intervalHandle = setInterval(async () => {
+          try {
+            await baseWorkerActions.process({
+              maxWorkItemCount: batchCount,
+              referenceDate: IntervalWorker.getFloorDate(),
+            });
+          } catch (error) {
+            logger.error(error);
+          }
         }, intervalDelay);
       },
 
       stop() {
-        clearInterval(intervalHandle);
+        if (intervalHandle) {
+          clearInterval(intervalHandle);
+          intervalHandle = null;
+        }
       },
     };
   },

package/src/services/searchProducts.ts

@@ -47,9 +47,7 @@ export async function searchProductsService(
     };
   }
 
-  const productIds = await searchQuery.productIds;
-  const totalProductIds =
-    (await filterActions.searchProducts({ productIds }, searchConfiguration)) || [];
+  const totalProductIds = (await filterActions.searchProducts(searchQuery, searchConfiguration)) || [];
 
   const filteredProductIds = await FilterDirector.productFacetedSearch(
     totalProductIds,