@unchainedshop/plugins 4.0.0-rc.16 → 4.0.0-rc.18

package/lib/worker/FailedRescheduler.d.ts

@@ -0,0 +1,15 @@
+import { WorkData } from '@unchainedshop/core-worker';
+export interface FailedReschedulerParams {
+    retryInput?: (workData: WorkData, priorInput: Record<string, any>) => Promise<Record<string, any> | null>;
+}
+export type IScheduler<P> = {
+    key: string;
+    label: string;
+    version: string;
+    actions: (params: P, unchainedAPI: any) => {
+        start: () => void;
+        stop: () => void;
+    };
+};
+export declare const FailedRescheduler: IScheduler<FailedReschedulerParams>;
+//# sourceMappingURL=FailedRescheduler.d.ts.map

package/lib/worker/FailedRescheduler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FailedRescheduler.d.ts","sourceRoot":"","sources":["../../src/worker/FailedRescheduler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,QAAQ,EAAoB,MAAM,4BAA4B,CAAC;AAE9E,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,CACX,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;CAC1C;AAED,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,CACP,MAAM,EAAE,CAAC,EACT,YAAY,KAAA,KACT;QACH,KAAK,EAAE,MAAM,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,IAAI,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAAU,CAAC,uBAAuB,CAsDjE,CAAC"}

package/lib/worker/FailedRescheduler.js

@@ -0,0 +1,45 @@
+import { defaultLogger } from '@unchainedshop/logger';
+import { subscribe } from '@unchainedshop/events';
+import { WorkerEventTypes } from '@unchainedshop/core-worker';
+export const FailedRescheduler = {
+    key: 'shop.unchained.scheduler.failed',
+    label: 'Reschedule failed works',
+    version: '1.0.0',
+    actions: ({ retryInput }, unchainedAPI) => {
+        const handleFinishedWork = async ({ payload: work }) => {
+            if (!work.success && work.retries > 0) {
+                const now = new Date();
+                const workDelayMs = work.scheduled.getTime() - work.created.getTime();
+                // In short: Double the delay of the old work or delay for 5 seconds
+                const scheduled = workDelayMs > 1000
+                    ? new Date(now.getTime() + workDelayMs * 2)
+                    : new Date(now.setSeconds(now.getSeconds() + 5));
+                defaultLogger.error(`${FailedRescheduler.key} -> Reschedule failed work ${work._id} ${work.type} for ${scheduled.toISOString()} (in ${Math.round(workDelayMs / 1000)}). Remaining retries: ${work.retries}`);
+                const workData = {
+                    type: work.type,
+                    priority: work.priority,
+                    originalWorkId: work.originalWorkId || work._id,
+                    retries: work.retries - 1,
+                    timeout: work.timeout,
+                    scheduled,
+                };
+                if (retryInput) {
+                    workData.input = await retryInput(workData, work.input);
+                }
+                else {
+                    workData.input = work.input;
+                }
+                unchainedAPI.modules.worker.addWork(workData);
+            }
+        };
+        return {
+            start() {
+                subscribe(WorkerEventTypes.FINISHED, handleFinishedWork);
+            },
+            stop() {
+                /* */
+            },
+        };
+    },
+};
+//# sourceMappingURL=FailedRescheduler.js.map

package/lib/worker/FailedRescheduler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FailedRescheduler.js","sourceRoot":"","sources":["../../src/worker/FailedRescheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAkB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAuB9E,MAAM,CAAC,MAAM,iBAAiB,GAAwC;IACpE,GAAG,EAAE,iCAAiC;IACtC,KAAK,EAAE,yBAAyB;IAChC,OAAO,EAAE,OAAO;IAEhB,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,YAAY,EAAE,EAAE;QACxC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAqB,EAAE,EAAE;YACxE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;gBACtC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBAEtE,oEAAoE;gBACpE,MAAM,SAAS,GACb,WAAW,GAAG,IAAI;oBAChB,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,WAAW,GAAG,CAAC,CAAC;oBAC3C,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;gBAErD,aAAa,CAAC,KAAK,CACjB,GAAG,iBAAiB,CAAC,GAAG,8BAA8B,IAAI,CAAC,GAAG,IAC5D,IAAI,CAAC,IACP,QAAQ,SAAS,CAAC,WAAW,EAAE,QAAQ,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,yBACnE,IAAI,CAAC,OACP,EAAE,CACH,CAAC;gBAEF,MAAM,QAAQ,GAAa;oBACzB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,GAAG;oBAC/C,OAAO,EAAE,IAAI,CAAC,OAAO,GAAG,CAAC;oBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,SAAS;iBACV,CAAC;gBAEF,IAAI,UAAU,EAAE,CAAC;oBACf,QAAQ,CAAC,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC1D,CAAC;qBAAM,CAAC;oBACN,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC9B,CAAC;gBAED,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAChD,CAAC;QACH,CAAC,CAAC;QAEF,OAAO;YACL,KAAK;gBACH,SAAS,CAAO,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;YACjE,CAAC;YAED,IAAI;gBACF,KAAK;YACP,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/worker/IntervalWorker.d.ts

@@ -0,0 +1,10 @@
+import { ScheduleData } from '@breejs/later';
+import { IWorker } from './BaseWorker.js';
+export interface IntervalWorkerParams {
+    workerId?: string;
+    batchCount?: number;
+    schedule?: ScheduleData;
+}
+export declare const scheduleToInterval: (schedule: ScheduleData) => number;
+export declare const IntervalWorker: IWorker<IntervalWorkerParams>;
+//# sourceMappingURL=IntervalWorker.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"IntervalWorker.d.ts","sourceRoot":"","sources":["../../src/worker/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"}

package/lib/worker/IntervalWorker.js

@@ -0,0 +1,37 @@
+import later from '@breejs/later';
+import { BaseWorker } from './BaseWorker.js';
+const { NODE_ENV } = process.env;
+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 diff = new Date(two).getTime() - new Date(one).getTime();
+    return Math.min(1000 * 60 * 60, diff); // at least once every hour!
+};
+export const IntervalWorker = {
+    ...BaseWorker,
+    key: 'shop.unchained.worker.cron',
+    label: 'Allocates work on fixed intervals with native node setInterval',
+    version: '1.0.0',
+    type: 'CRON',
+    actions: ({ workerId, batchCount = 0, schedule = defaultSchedule }, unchainedAPI) => {
+        const baseWorkerActions = BaseWorker.actions({ workerId, worker: IntervalWorker }, unchainedAPI);
+        const intervalDelay = scheduleToInterval(schedule);
+        let intervalHandle;
+        return {
+            ...baseWorkerActions,
+            start() {
+                intervalHandle = setInterval(() => {
+                    baseWorkerActions.process({
+                        maxWorkItemCount: batchCount,
+                        referenceDate: IntervalWorker.getFloorDate(),
+                    });
+                }, intervalDelay);
+            },
+            stop() {
+                clearInterval(intervalHandle);
+            },
+        };
+    },
+};
+//# sourceMappingURL=IntervalWorker.js.map

package/lib/worker/IntervalWorker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IntervalWorker.js","sourceRoot":"","sources":["../../src/worker/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"}

package/lib/worker/bulk-import.d.ts

@@ -1,3 +1,3 @@
 import { IWorkerAdapter } from '@unchainedshop/core';
-export declare const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>>;
+export declare const BulkImportWorker: IWorkerAdapter<any, Record<string, any>>;
 //# sourceMappingURL=bulk-import.d.ts.map

package/lib/worker/bulk-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-import.d.ts","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKpF,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsEzE,CAAC"}
+{"version":3,"file":"bulk-import.d.ts","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKpF,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAqErE,CAAC"}

package/lib/worker/bulk-import.js

@@ -1,6 +1,6 @@
 import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core';
 import { createLogger } from '@unchainedshop/logger';
-const logger = createLogger('unchained:worker:bulk-import');
+const logger = createLogger('unchained:bulk-import');
 export const BulkImportWorker = {
     ...WorkerAdapter,
     key: 'shop.unchained.worker-plugin.bulk-import',
@@ -22,7 +22,7 @@ export const BulkImportWorker = {
                     fileId: rawPayload.payloadId,
                 });
                 if (!readStream) {
-                    throw new Error('The current file adapter does not support streams when downloading required for streamed events. Please use a different file adapter.');
+                    throw new Error('Could not create download stream from uploaded file');
                 }
                 await unchainedAPI.bulkImporter.pipeEventStream(readStream, bulkImporter, unchainedAPI);
             }
@@ -32,6 +32,7 @@ export const BulkImportWorker = {
                     throw new Error('No events submitted');
                 await events.reduce(async (currentEventPromise, nextEvent) => {
                     await currentEventPromise;
+                    await bulkImporter.validate(nextEvent);
                     return bulkImporter.prepare(nextEvent, unchainedAPI);
                 }, Promise.resolve());
             }
@@ -40,13 +41,13 @@ export const BulkImportWorker = {
             if (error) {
                 return {
                     success: false,
-                    result,
+                    result: result,
                     error,
                 };
             }
             return {
                 success: true,
-                result,
+                result: result,
             };
         }
         catch (err) {

package/lib/worker/bulk-import.js.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,8BAA8B,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,gBAAgB,GAAiD;IAC5E,GAAG,aAAa;IAEhB,GAAG,EAAE,0CAA0C;IAC/C,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,aAAa;IACnB,sBAAsB,EAAE,CAAC,EAAE,6CAA6C;IAExE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE;QACzC,IAAI,CAAC;YACH,MAAM,EACJ,4BAA4B,GAAG,KAAK,EACpC,qBAAqB,GAAG,KAAK,EAC7B,+BAA+B,GAAG,KAAK,GACxC,GAAG,UAAU,CAAC;YAEf,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,kBAAkB,CAAC;gBAChE,4BAA4B;gBAC5B,+BAA+B;gBAC/B,qBAAqB;aACtB,CAAC,CAAC;YAEH,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gBACzB,6BAA6B;gBAC7B,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC;oBACxE,MAAM,EAAE,UAAU,CAAC,SAAS;iBAC7B,CAAC,CAAC;gBACH,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CACb,uIAAuI,CACxI,CAAC;gBACJ,CAAC;gBACD,MAAM,YAAY,CAAC,YAAY,CAAC,eAAe,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;YAC1F,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;gBAC9B,IAAI,CAAC,MAAM,EAAE,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBAE5D,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,EAAE;oBAC3D,MAAM,mBAAmB,CAAC;oBAC1B,OAAO,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACvD,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACxB,CAAC;YAED,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;YACrD,MAAM,YAAY,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAElD,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM;oBACN,KAAK;iBACN,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM;aACP,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,CAAC,MAAM,gBAAgB,GAA6C;IACxE,GAAG,aAAa;IAEhB,GAAG,EAAE,0CAA0C;IAC/C,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,aAAa;IACnB,sBAAsB,EAAE,CAAC,EAAE,6CAA6C;IAExE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE;QACzC,IAAI,CAAC;YACH,MAAM,EACJ,4BAA4B,GAAG,KAAK,EACpC,qBAAqB,GAAG,KAAK,EAC7B,+BAA+B,GAAG,KAAK,GACxC,GAAG,UAAU,CAAC;YAEf,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,kBAAkB,CAAC;gBAChE,4BAA4B;gBAC5B,+BAA+B;gBAC/B,qBAAqB;aACtB,CAAC,CAAC;YAEH,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gBACzB,6BAA6B;gBAC7B,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC;oBACxE,MAAM,EAAE,UAAU,CAAC,SAAS;iBAC7B,CAAC,CAAC;gBACH,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBACzE,CAAC;gBACD,MAAM,YAAY,CAAC,YAAY,CAAC,eAAe,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;YAC1F,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;gBAC9B,IAAI,CAAC,MAAM,EAAE,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBAE5D,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,EAAE;oBAC3D,MAAM,mBAAmB,CAAC;oBAC1B,MAAM,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;oBACvC,OAAO,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACvD,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACxB,CAAC;YAED,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;YACrD,MAAM,YAAY,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAElD,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,MAAO;oBACf,KAAK;iBACN,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,MAAO;aAChB,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC"}

package/lib/worker/enrollment-order-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment-order-generator.d.ts","sourceRoot":"","sources":["../../src/worker/enrollment-order-generator.ts"],"names":[],"mappings":"AA+IA,eAAO,MAAM,oCAAoC,YAQhD,CAAC"}
+{"version":3,"file":"enrollment-order-generator.d.ts","sourceRoot":"","sources":["../../src/worker/enrollment-order-generator.ts"],"names":[],"mappings":"AAqFA,eAAO,MAAM,oCAAoC,YAQhD,CAAC"}

package/lib/worker/enrollment-order-generator.js

@@ -1,49 +1,5 @@
 import { enrollmentsSettings, EnrollmentStatus } from '@unchainedshop/core-enrollments';
-import { EnrollmentDirector, WorkerDirector, WorkerAdapter, } from '@unchainedshop/core';
-const generateOrder = async (enrollment, params, unchainedAPI) => {
-    if (!enrollment.payment || !enrollment.delivery)
-        return null;
-    const { modules, services } = unchainedAPI;
-    const { orderPositions, ...configuration } = params;
-    let order = await modules.orders.create({
-        userId: enrollment.userId,
-        currencyCode: enrollment.currencyCode,
-        countryCode: enrollment.countryCode,
-        contact: enrollment.contact,
-        billingAddress: enrollment.billingAddress,
-        originEnrollmentId: enrollment._id,
-        ...configuration,
-    });
-    const orderId = order._id;
-    if (orderPositions) {
-        await Promise.all(orderPositions.map((orderPosition) => modules.orders.positions.addProductItem(orderPosition)));
-    }
-    else {
-        const product = await modules.products.findProduct({
-            productId: enrollment.productId,
-        });
-        await modules.orders.positions.addProductItem({
-            quantity: 1,
-            productId: product._id,
-            originalProductId: product._id,
-            orderId: order._id,
-        });
-    }
-    const { paymentProviderId, context: paymentContext } = enrollment.payment;
-    if (paymentProviderId) {
-        await modules.orders.setPaymentProvider(orderId, paymentProviderId);
-    }
-    const { deliveryProviderId, context: deliveryContext } = enrollment.delivery;
-    if (deliveryProviderId) {
-        await modules.orders.setDeliveryProvider(orderId, deliveryProviderId);
-    }
-    await services.orders.updateCalculation(orderId);
-    order = await services.orders.checkoutOrder(order._id, {
-        paymentContext,
-        deliveryContext,
-    });
-    return order;
-};
+import { EnrollmentDirector, WorkerDirector, WorkerAdapter } from '@unchainedshop/core';
 const GenerateOrderWorker = {
     ...WorkerAdapter,
     key: 'shop.unchained.worker-plugin.generate-enrollment-orders',
@@ -51,13 +7,16 @@ const GenerateOrderWorker = {
     version: '1.0.0',
     type: 'ENROLLMENT_ORDER_GENERATOR',
     doWork: async (input, unchainedAPI) => {
-        const { modules } = unchainedAPI;
+        const { modules, services } = unchainedAPI;
         const enrollments = await modules.enrollments.findEnrollments({
             status: [EnrollmentStatus.ACTIVE, EnrollmentStatus.PAUSED],
         });
         const errors = (await Promise.all(enrollments.map(async (enrollment) => {
             try {
-                const director = await EnrollmentDirector.actions({ enrollment }, unchainedAPI);
+                const product = await unchainedAPI.modules.products.findProduct({
+                    productId: enrollment.productId,
+                });
+                const director = await EnrollmentDirector.actions({ enrollment, product: product }, unchainedAPI);
                 const period = await director.nextPeriod();
                 if (period) {
                     if (period.isTrial) {
@@ -67,11 +26,10 @@ const GenerateOrderWorker = {
                         return null;
                     }
                     const configuration = await director.configurationForOrder({
-                        ...input,
                         period,
                     });
                     if (configuration) {
-                        const order = await generateOrder(enrollment, configuration, unchainedAPI);
+                        const order = await services.enrollments.generateOrderFromEnrollment(enrollment, configuration);
                         if (order) {
                             await modules.enrollments.addEnrollmentPeriod(enrollment._id, {
                                 ...period,

package/lib/worker/enrollment-order-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment-order-generator.js","sourceRoot":"","sources":["../../src/worker/enrollment-order-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"enrollment-order-generator.js","sourceRoot":"","sources":["../../src/worker/enrollment-order-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AAExG,MAAM,mBAAmB,GAA+B;IACtD,GAAG,aAAa;IAEhB,GAAG,EAAE,yDAAyD;IAC9D,KAAK,EAAE,uCAAuC;IAC9C,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,4BAA4B;IAElC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;QACpC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;QAE3C,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC;YAC5D,MAAM,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC;SAC3D,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CACb,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YACnC,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;oBAC9D,SAAS,EAAE,UAAU,CAAC,SAAS;iBAChC,CAAC,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAC/C,EAAE,UAAU,EAAE,OAAO,EAAE,OAAQ,EAAE,EACjC,YAAY,CACb,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAC3C,IAAI,MAAM,EAAE,CAAC;oBACX,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;wBACnB,MAAM,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,CAAC,GAAG,EAAE;4BAC5D,GAAG,MAAM;yBACV,CAAC,CAAC;wBACH,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,qBAAqB,CAAC;wBACzD,MAAM;qBACP,CAAC,CAAC;oBACH,IAAI,aAAa,EAAE,CAAC;wBAClB,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,2BAA2B,CAClE,UAAU,EACV,aAAa,CACd,CAAC;wBACF,IAAI,KAAK,EAAE,CAAC;4BACV,MAAM,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,CAAC,GAAG,EAAE;gCAC5D,GAAG,MAAM;gCACT,OAAO,EAAE,KAAK,CAAC,GAAG;6BACnB,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO;oBACL,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,OAAO,EAAE,CAAC,CAAC,OAAO;oBAClB,KAAK,EAAE,CAAC,CAAC,KAAK;iBACf,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CACH,CACF,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAElB,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,oCAAoC;oBAC1C,OAAO,EAAE,wDAAwD;oBACjE,IAAI,EAAE,MAAM;iBACb;gBACD,MAAM,EAAE,EAAE;aACX,CAAC;QACJ,CAAC;QACD,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,KAAK;SACd,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;AAEpD,MAAM,CAAC,MAAM,oCAAoC,GAAG,GAAG,EAAE;IACvD,IAAI,mBAAmB,CAAC,sBAAsB,EAAE,CAAC;QAC/C,cAAc,CAAC,uBAAuB,CAAC;YACrC,IAAI,EAAE,mBAAmB,CAAC,IAAI;YAC9B,QAAQ,EAAE,mBAAmB,CAAC,sBAAsB;YACpD,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}

package/lib/worker/error-notifications.js

@@ -9,7 +9,7 @@ export const ErrorNotifications = {
     version: '1.0',
     type: 'ERROR_NOTIFICATIONS',
     doWork: async (args, context, workId) => {
-        const work = await context.modules.worker.findWork({ workId });
+        const work = (await context.modules.worker.findWork({ workId }));
         const secondsPassed = args?.secondsPassed || 60;
         const to = new Date();
         const from = new Date(new Date(work.scheduled).getTime() - secondsPassed * 1000);

package/lib/worker/error-notifications.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-notifications.js","sourceRoot":"","sources":["../../src/worker/error-notifications.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAkB,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,KAAK,MAAM,eAAe,CAAC;AAUlC,MAAM,wBAAwB,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAE/D,MAAM,CAAC,MAAM,kBAAkB,GAAgC;IAC7D,GAAG,aAAa;IAEhB,GAAG,EAAE,2CAA2C;IAChD,KAAK,EAAE,wEAAwE;IAC/E,OAAO,EAAE,KAAK;IAEd,IAAI,EAAE,qBAAqB;IAE3B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/D,MAAM,aAAa,GAAG,IAAI,EAAE,aAAa,IAAI,EAAE,CAAC;QAChD,MAAM,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC;QAEjF,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,CAChB,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;gBACzC,SAAS,EAAE;oBACT,GAAG,EAAE,EAAE;oBACP,KAAK,EAAE,IAAI;iBACZ;gBACD,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;aAC5B,CAAC,CACH,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,kBAAkB,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;YAE5F,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;gBACtB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YACvC,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;gBACnD,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE;oBACL,SAAS;oBACT,QAAQ,EAAE,cAAc;iBACzB;gBACD,cAAc,EAAE,MAAM;aACvB,CAAC,CAAC;YAEH,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE;aAChC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;AAEnD,eAAe,kBAAkB,CAAC;AAElC,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AACxC,cAAc,CAAC,uBAAuB,CAAC;IACrC,IAAI,EAAE,kBAAkB,CAAC,IAAI;IAC7B,QAAQ,EAAE,wBAAwB;IAClC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IAC1D,OAAO,EAAE,CAAC;CACX,CAAC,CAAC"}
+{"version":3,"file":"error-notifications.js","sourceRoot":"","sources":["../../src/worker/error-notifications.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAkB,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,KAAK,MAAM,eAAe,CAAC;AAUlC,MAAM,wBAAwB,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAE/D,MAAM,CAAC,MAAM,kBAAkB,GAAgC;IAC7D,GAAG,aAAa;IAEhB,GAAG,EAAE,2CAA2C;IAChD,KAAK,EAAE,wEAAwE;IAC/E,OAAO,EAAE,KAAK;IAEd,IAAI,EAAE,qBAAqB;IAE3B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAS,CAAC;QACzE,MAAM,aAAa,GAAG,IAAI,EAAE,aAAa,IAAI,EAAE,CAAC;QAChD,MAAM,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC;QAEjF,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,CAChB,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;gBACzC,SAAS,EAAE;oBACT,GAAG,EAAE,EAAE;oBACP,KAAK,EAAE,IAAI;iBACZ;gBACD,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;aAC5B,CAAC,CACH,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,kBAAkB,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;YAE5F,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;gBACtB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YACvC,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;gBACnD,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE;oBACL,SAAS;oBACT,QAAQ,EAAE,cAAc;iBACzB;gBACD,cAAc,EAAE,MAAM;aACvB,CAAC,CAAC;YAEH,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE;aAChC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;AAEnD,eAAe,kBAAkB,CAAC;AAElC,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AACxC,cAAc,CAAC,uBAAuB,CAAC;IACrC,IAAI,EAAE,kBAAkB,CAAC,IAAI;IAC7B,QAAQ,EAAE,wBAAwB;IAClC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IAC1D,OAAO,EAAE,CAAC;CACX,CAAC,CAAC"}

package/lib/worker/export-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export-token.d.ts","sourceRoot":"","sources":["../../src/worker/export-token.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAiC,MAAM,qBAAqB,CAAC;AAGnG,eAAO,MAAM,iBAAiB,EAAE,cAAc,CAAC,IAAI,EAAE,IAAI,CAYxD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,cAAc,aAAa,SAU/D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"export-token.d.ts","sourceRoot":"","sources":["../../src/worker/export-token.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAiC,MAAM,qBAAqB,CAAC;AAGnG,eAAO,MAAM,iBAAiB,EAAE,cAAc,CAAC,IAAI,EAAE,IAAI,CAYxD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,cAAc,aAAa,SAS/D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/lib/worker/export-token.js

@@ -17,7 +17,6 @@ export const configureExportToken = (unchainedAPI) => {
         if (work.type === 'EXPORT_TOKEN' && work.success) {
             await unchainedAPI.modules.warehousing.updateTokenOwnership({
                 tokenId: work.input.token._id,
-                userId: null,
                 walletAddress: work.input.recipientWalletAddress,
             });
         }

package/lib/worker/export-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"export-token.js","sourceRoot":"","sources":["../../src/worker/export-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAQ,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAiC,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,CAAC,MAAM,iBAAiB,GAA+B;IAC3D,GAAG,aAAa;IAEhB,GAAG,EAAE,2CAA2C;IAChD,KAAK,EAAE,2EAA2E;IAClF,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,IAAI;IAEd,KAAK,CAAC,MAAM;QACV,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,YAA2B,EAAE,EAAE;IAClE,SAAS,CAAO,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACrE,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjD,MAAM,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC;gBAC1D,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG;gBAC7B,MAAM,EAAE,IAAI;gBACZ,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,sBAAsB;aACjD,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC;AAEpC,cAAc,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"export-token.js","sourceRoot":"","sources":["../../src/worker/export-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAQ,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAiC,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,CAAC,MAAM,iBAAiB,GAA+B;IAC3D,GAAG,aAAa;IAEhB,GAAG,EAAE,2CAA2C;IAChD,KAAK,EAAE,2EAA2E;IAClF,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,IAAI;IAEd,KAAK,CAAC,MAAM;QACV,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,YAA2B,EAAE,EAAE;IAClE,SAAS,CAAO,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACrE,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjD,MAAM,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC;gBAC1D,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG;gBAC7B,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,sBAAsB;aACjD,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC;AAEpC,cAAc,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC"}

package/lib/worker/message.d.ts

@@ -2,7 +2,7 @@ import { IWorkerAdapter } from '@unchainedshop/core';
 import { Work } from '@unchainedshop/core-worker';
 export declare const MessageWorker: IWorkerAdapter<{
     template: string;
-    _id?: string;
+    _id: string;
     [x: string]: any;
 }, {
     info?: string;

package/lib/worker/message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../src/worker/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,cAAc,EAAiC,MAAM,qBAAqB,CAAC;AACvG,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,eAAO,MAAM,aAAa,EAAE,cAAc,CACxC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EACpD;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAA;CAAE,CA8CnC,CAAC"}
+{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../src/worker/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,cAAc,EAAiC,MAAM,qBAAqB,CAAC;AACvG,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,eAAO,MAAM,aAAa,EAAE,cAAc,CACxC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EACnD;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAA;CAAE,CAgDnC,CAAC"}

package/lib/worker/message.js

@@ -8,6 +8,8 @@ export const MessageWorker = {
     doWork: async ({ template, ...payload }, unchainedAPI, workId) => {
         try {
             const templateResolver = MessagingDirector.getTemplate(template);
+            if (!templateResolver)
+                throw new Error(`No template resolver found for template ${template}`);
             const workConfigurations = await templateResolver({
                 template,
                 ...payload,
@@ -18,12 +20,12 @@ export const MessageWorker = {
                         ...workConfiguration,
                         originalWorkId: workId,
                     });
-                    delete work.input;
+                    delete work.input; // Remove input from returned work for privacy
                     return work;
                 }));
                 return { success: true, result: { forked } };
             }
-            return { success: true, result: { info: 'Skipped Message' } };
+            return { success: true, result: { forked: [] } };
         }
         catch (err) {
             return {

package/lib/worker/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/worker/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAkB,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGvG,MAAM,CAAC,MAAM,aAAa,GAGtB;IACF,GAAG,aAAa;IAEhB,GAAG,EAAE,sCAAsC;IAC3C,KAAK,EAAE,2EAA2E;IAClF,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,SAAS;IAEf,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE;QAC/D,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEjE,MAAM,kBAAkB,GAAG,MAAM,gBAAgB,CAC/C;gBACE,QAAQ;gBACR,GAAG,OAAO;aACX,EACD,YAAY,CACb,CAAC;YAEF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAsB,EAAE,EAAE;oBACtD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;wBACrD,GAAG,iBAAiB;wBACpB,cAAc,EAAE,MAAM;qBACvB,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC,KAAK,CAAC;oBAClB,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CACH,CAAC;gBACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;YAC/C,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,CAAC;QAChE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/worker/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAkB,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGvG,MAAM,CAAC,MAAM,aAAa,GAGtB;IACF,GAAG,aAAa;IAEhB,GAAG,EAAE,sCAAsC;IAC3C,KAAK,EAAE,2EAA2E;IAClF,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,SAAS;IAEf,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE;QAC/D,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEjE,IAAI,CAAC,gBAAgB;gBAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,QAAQ,EAAE,CAAC,CAAC;YAE9F,MAAM,kBAAkB,GAAG,MAAM,gBAAgB,CAC/C;gBACE,QAAQ;gBACR,GAAG,OAAO;aACX,EACD,YAAY,CACb,CAAC;YAEF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAsB,EAAE,EAAE;oBACtD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;wBACrD,GAAG,iBAAiB;wBACpB,cAAc,EAAE,MAAM;qBACvB,CAAC,CAAC;oBACH,OAAQ,IAAY,CAAC,KAAK,CAAC,CAAC,8CAA8C;oBAC1E,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CACH,CAAC;gBACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;YAC/C,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;QACnD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC"}

package/lib/worker/sms.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=sms.d.ts.map

package/lib/worker/sms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sms.d.ts","sourceRoot":"","sources":["../../src/worker/sms.ts"],"names":[],"mappings":""}

package/lib/worker/sms.js

@@ -0,0 +1,73 @@
+import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
+import Twilio from 'twilio';
+const { TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN, TWILIO_SMS_FROM } = process.env;
+/* Potential: no need for twilio npm
+curl -X POST "https://api.twilio.com/2010-04-01/Accounts/$TWILIO_ACCOUNT_SID/Messages.json" \
+--data-urlencode "From=+15017122661" \
+--data-urlencode "Body=Hi there" \
+--data-urlencode "To=+15558675310" \
+-u $TWILIO_ACCOUNT_SID:$TWILIO_AUTH_TOKEN
+*/
+const SmsWorkerPlugin = {
+    ...WorkerAdapter,
+    key: 'shop.unchained.worker-plugin.sms',
+    label: 'Send a SMS through Twilio',
+    version: '1.0.0',
+    type: 'SMS',
+    doWork: async ({ from, to, text }) => {
+        if (!TWILIO_SMS_FROM && !from) {
+            return {
+                success: false,
+                error: {
+                    name: 'SENDER_REQUIRED',
+                    message: 'SMS requires a from, TWILIO_SMS_FROM not set',
+                },
+            };
+        }
+        if (!to) {
+            return {
+                success: false,
+                error: {
+                    name: 'RECIPIENT_REQUIRED',
+                    message: 'SMS requires a to',
+                },
+            };
+        }
+        try {
+            const client = Twilio(TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN);
+            const { sid, errorMessage } = await client.messages.create({
+                body: text,
+                from: from || TWILIO_SMS_FROM,
+                to,
+            });
+            if (errorMessage) {
+                return {
+                    success: false,
+                    error: {
+                        name: 'TWILIO_ERROR',
+                        message: errorMessage.toString(),
+                    },
+                };
+            }
+            return {
+                success: true,
+                result: {
+                    sid,
+                },
+                error: null,
+            };
+        }
+        catch (err) {
+            return {
+                success: false,
+                error: {
+                    name: err.name,
+                    message: err.message,
+                    stack: err.stack,
+                },
+            };
+        }
+    },
+};
+WorkerDirector.registerAdapter(SmsWorkerPlugin);
+//# sourceMappingURL=sms.js.map

package/lib/worker/sms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sms.js","sourceRoot":"","sources":["../../src/worker/sms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE/E;;;;;;EAME;AAEF,MAAM,eAAe,GAOjB;IACF,GAAG,aAAa;IAEhB,GAAG,EAAE,kCAAkC;IACvC,KAAK,EAAE,2BAA2B;IAClC,OAAO,EAAE,OAAO;IAEhB,IAAI,EAAE,KAAK;IAEX,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QACnC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,8CAA8C;iBACxD;aACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,oBAAoB;oBAC1B,OAAO,EAAE,mBAAmB;iBAC7B;aACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;YAC7D,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACzD,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAI,IAAI,eAAe;gBAC7B,EAAE;aACH,CAAC,CAAC;YACH,IAAI,YAAY,EAAE,CAAC;gBACjB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE;wBACL,IAAI,EAAE,cAAc;wBACpB,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE;qBACjC;iBACF,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE;oBACN,GAAG;iBACJ;gBACD,KAAK,EAAE,IAAI;aACZ,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC"}

package/lib/worker/twilio.js

@@ -8,6 +8,10 @@ const SmsWorkerPlugin = {
     type: 'TWILIO',
     doWork: async ({ from, to, text, ...params }) => {
         try {
+            if (!TWILIO_SMS_FROM && !from)
+                throw new Error('Missing Twilio "from" number. Set TWILIO_SMS_FROM env var or provide "from" in input');
+            if (!to)
+                throw new Error('Missing "to" in input');
             const url = `https://api.twilio.com/2010-04-01/Accounts/${TWILIO_ACCOUNT_SID}/Messages.json`;
             const response = await fetch(url, {
                 method: 'POST',

package/lib/worker/twilio.js.map

@@ -1 +1 @@
-{"version":3,"file":"twilio.js","sourceRoot":"","sources":["../../src/worker/twilio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEpF,MAAM,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE/E,MAAM,eAAe,GAQjB;IACF,GAAG,aAAa;IAEhB,GAAG,EAAE,qCAAqC;IAC1C,KAAK,EAAE,8BAA8B;IACrC,OAAO,EAAE,OAAO;IAEhB,IAAI,EAAE,QAAQ;IAEd,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE;QAC9C,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,8CAA8C,kBAAkB,gBAAgB,CAAC;YAC7F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,IAAI,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtG,cAAc,EAAE,mCAAmC;iBACpD;gBACD,IAAI,EAAE,IAAI,eAAe,CAAC;oBACxB,IAAI,EAAE,IAAI,IAAI,EAAE;oBAChB,IAAI,EAAE,IAAI,IAAI,eAAe;oBAC7B,EAAE,EAAE,EAAE;oBACN,GAAG,MAAM,EAAE,2CAA2C;iBACvD,CAAC;aACH,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEnC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE;wBACL,IAAI,EAAE,cAAc;wBACpB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,oBAAoB;qBAC9C;iBACF,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI,CAAC,GAAG;iBACd;gBACD,KAAK,EAAE,IAAI;aACZ,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC"}
+{"version":3,"file":"twilio.js","sourceRoot":"","sources":["../../src/worker/twilio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEpF,MAAM,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE/E,MAAM,eAAe,GAQjB;IACF,GAAG,aAAa;IAEhB,GAAG,EAAE,qCAAqC;IAC1C,KAAK,EAAE,8BAA8B;IACrC,OAAO,EAAE,OAAO;IAEhB,IAAI,EAAE,QAAQ;IAEd,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE;QAC9C,IAAI,CAAC;YACH,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI;gBAC3B,MAAM,IAAI,KAAK,CACb,sFAAsF,CACvF,CAAC;YAEJ,IAAI,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAElD,MAAM,GAAG,GAAG,8CAA8C,kBAAkB,gBAAgB,CAAC;YAC7F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,IAAI,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtG,cAAc,EAAE,mCAAmC;iBACpD;gBACD,IAAI,EAAE,IAAI,eAAe,CAAC;oBACxB,IAAI,EAAE,IAAI,IAAI,EAAE;oBAChB,IAAI,EAAE,IAAI,IAAI,eAAgB;oBAC9B,EAAE,EAAE,EAAE;oBACN,GAAG,MAAM,EAAE,2CAA2C;iBACvD,CAAC;aACH,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEnC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE;wBACL,IAAI,EAAE,cAAc;wBACpB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,oBAAoB;qBAC9C;iBACF,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI,CAAC,GAAG;iBACd;gBACD,KAAK,EAAE,IAAI;aACZ,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/plugins",
-  "version": "4.0.0-rc.16",
+  "version": "4.0.0-rc.18",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {
@@ -34,18 +34,18 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/api": "^4.0.0-rc.15",
-    "@unchainedshop/core-delivery": "^4.0.0-rc.15",
-    "@unchainedshop/core-enrollments": "^4.0.0-rc.15",
-    "@unchainedshop/core-orders": "^4.0.0-rc.15",
-    "@unchainedshop/core-payment": "^4.0.0-rc.15",
-    "@unchainedshop/core-products": "^4.0.0-rc.15",
-    "@unchainedshop/core-warehousing": "^4.0.0-rc.15",
-    "@unchainedshop/core-worker": "^4.0.0-rc.15",
-    "@unchainedshop/events": "^4.0.0-rc.15",
-    "@unchainedshop/file-upload": "^4.0.0-rc.15",
-    "@unchainedshop/logger": "^4.0.0-rc.15",
-    "@unchainedshop/utils": "^4.0.0-rc.15"
+    "@unchainedshop/api": "^4.0.0-rc.18",
+    "@unchainedshop/core-delivery": "^4.0.0-rc.18",
+    "@unchainedshop/core-enrollments": "^4.0.0-rc.18",
+    "@unchainedshop/core-orders": "^4.0.0-rc.18",
+    "@unchainedshop/core-payment": "^4.0.0-rc.18",
+    "@unchainedshop/core-products": "^4.0.0-rc.18",
+    "@unchainedshop/core-warehousing": "^4.0.0-rc.18",
+    "@unchainedshop/core-worker": "^4.0.0-rc.18",
+    "@unchainedshop/events": "^4.0.0-rc.18",
+    "@unchainedshop/file-upload": "^4.0.0-rc.18",
+    "@unchainedshop/logger": "^4.0.0-rc.18",
+    "@unchainedshop/utils": "^4.0.0-rc.18"
   },
   "peerDependencies": {
     "@aws-sdk/client-eventbridge": ">= 3.714 < 4",
@@ -62,7 +62,7 @@
     "nodemailer": ">= 6.9 < 8",
     "open": "10.x",
     "p-memoize": "8.x",
-    "stripe": ">= 17 < 19",
+    "stripe": ">= 19 < 20",
     "web-push": ">= 3.6 <4",
     "xml-js": ">= 1.6 < 2"
   },
@@ -136,7 +136,7 @@
     "nodemailer": "^7.0.5",
     "open": "^10.1.2",
     "p-memoize": "^8.0.0",
-    "stripe": "^18.3.0",
+    "stripe": "^19.1.0",
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",
     "web-push": "^3.6.7",

package/src/delivery/send-message.ts

@@ -38,7 +38,7 @@ const SendMessage: IDeliveryAdapter = {
           retries: 0,
           input: {
             template: 'DELIVERY',
-            orderId: order._id,
+            orderId: order!._id,
             config,
           },
         });

package/src/enrollments/licensed.ts

@@ -21,11 +21,12 @@ const LicensedEnrollments: IEnrollmentAdapter = {
   },
 
   actions: (params) => {
+    const { enrollment } = params;
     return {
       ...EnrollmentAdapter.actions(params),
 
       isValidForActivation: async () => {
-        const periods = params.enrollment?.periods || [];
+        const periods = enrollment?.periods || [];
         return periods.findIndex(rangeMatcher()) !== -1;
       },
 
@@ -36,8 +37,20 @@ const LicensedEnrollments: IEnrollmentAdapter = {
       configurationForOrder: async (context) => {
         const { period } = context;
         const beginningOfPeriod = period.start.getTime() <= new Date().getTime();
+
+        if (!enrollment) throw new Error('Enrollment missing in context');
         if (beginningOfPeriod) {
-          return context;
+          return {
+            period,
+            orderContext: {},
+            orderPositionTemplates: [
+              {
+                quantity: 1,
+                productId: enrollment.productId,
+                originalProductId: enrollment.productId,
+              },
+            ],
+          };
         }
         return null;
       },

package/src/files/gridfs/adapter.ts

@@ -36,7 +36,7 @@ export const GridFSAdapter: IFileAdapter<
   ...FileAdapter,
   async createDownloadURL(file, expiry) {
     // If public, just return the stored path from the db
-    if (!file?.meta?.isPrivate) return file?.url;
+    if (!file?.meta?.isPrivate) return file?.url || null;
 
     const expiryTimestamp =
       expiry ||