@unchainedshop/plugins 4.2.0 → 4.2.1

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/sms.js

@@ -1,13 +1,5 @@
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
-import Twilio from 'twilio';
+import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 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',
@@ -34,25 +26,33 @@ const SmsWorkerPlugin = {
             };
         }
         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,
+            const url = `https://api.twilio.com/2010-04-01/Accounts/${TWILIO_ACCOUNT_SID}/Messages.json`;
+            const response = await fetch(url, {
+                method: 'POST',
+                headers: {
+                    Authorization: `Basic ${Buffer.from(`${TWILIO_ACCOUNT_SID}:${TWILIO_AUTH_TOKEN}`).toString('base64')}`,
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                },
+                body: new URLSearchParams({
+                    Body: text || '',
+                    From: from || TWILIO_SMS_FROM,
+                    To: to,
+                }),
             });
-            if (errorMessage) {
+            const data = await response.json();
+            if (!response.ok) {
                 return {
                     success: false,
                     error: {
                         name: 'TWILIO_ERROR',
-                        message: errorMessage.toString(),
+                        message: data.message || 'Failed to send SMS',
                     },
                 };
             }
             return {
                 success: true,
                 result: {
-                    sid,
+                    sid: data.sid,
                 },
                 error: null,
             };

package/lib/worker/sms.js.map

@@ -1 +1 @@
-{"version":3,"file":"sms.js","sourceRoot":"","sources":["../../src/worker/sms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3E,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"}
+{"version":3,"file":"sms.js","sourceRoot":"","sources":["../../src/worker/sms.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,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,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;iBACP,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.2.0",
+  "version": "4.2.1",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {

package/src/files/gridfs/adapter.ts

@@ -14,6 +14,8 @@ import { filesSettings } from '@unchainedshop/core-files';
 import { UnchainedCore } from '@unchainedshop/core';
 import { GridFSFileUploadsModule } from './index.js';
 
+const { GRIDFS_PUT_SERVER_PATH = '/gridfs' } = process.env;
+
 const { ROOT_URL } = process.env;
 
 const bufferToStream = (buffer: any) => {
@@ -51,12 +53,12 @@ export const GridFSAdapter: IFileAdapter<
     const signature = await sign(directoryName, hashedFilename, expiryDate.getTime());
 
     const putURL = new URL(
-      `/gridfs/${directoryName}/${encodeURIComponent(
+      `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${encodeURIComponent(
         fileName,
       )}?e=${expiryDate.getTime()}&s=${signature}`,
       ROOT_URL,
     ).href;
-    const url = `/gridfs/${directoryName}/${hashedFilename}`;
+    const url = `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${hashedFilename}`;
 
     return {
       _id: hashedFilename,
@@ -72,13 +74,16 @@ export const GridFSAdapter: IFileAdapter<
   async uploadFileFromStream(directoryName: string, rawFile: any, { modules }, options = {}) {
     let stream: Readable;
     let fileName;
+    let fileId;
     if (rawFile instanceof Promise) {
-      const { filename: f, createReadStream } = await rawFile;
+      const { filename: f, createReadStream, fileId: forcedFileId } = await rawFile;
       fileName = decodeURIComponent(f);
       stream = createReadStream();
+      fileId = forcedFileId;
     } else {
       fileName = decodeURIComponent(rawFile.filename);
       stream = bufferToStream(Buffer.from(rawFile.buffer, 'base64'));
+      fileId = rawFile.fileId;
     }
 
     const expiryDate = resolveExpirationDate();
@@ -87,7 +92,7 @@ export const GridFSAdapter: IFileAdapter<
 
     const writeStream = await modules.gridfsFileUploads.createWriteStream(
       directoryName,
-      hashedFilename,
+      fileId || hashedFilename,
       fileName,
       {
         metadata: { 'content-type': type },
@@ -105,10 +110,10 @@ export const GridFSAdapter: IFileAdapter<
     await finished(writeStream, { readable: false });
 
     const { length } = writeStream;
-    const url = `/gridfs/${directoryName}/${encodeURIComponent(hashedFilename)}`;
+    const url = `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${encodeURIComponent(hashedFilename)}`;
 
     return {
-      _id: hashedFilename,
+      _id: fileId || hashedFilename,
       directoryName,
       expiryDate: null,
       fileName,
@@ -135,7 +140,7 @@ export const GridFSAdapter: IFileAdapter<
 
     const writeStream = await modules.gridfsFileUploads.createWriteStream(
       directoryName,
-      hashedFilename,
+      fileId || hashedFilename,
       fileName,
       {
         metadata: { 'content-type': type },
@@ -143,7 +148,7 @@ export const GridFSAdapter: IFileAdapter<
     );
     await pipeline(response.body as unknown as Readable, new PassThrough(), writeStream);
     const { length } = writeStream;
-    const url = `/gridfs/${directoryName}/${encodeURIComponent(hashedFilename)}`;
+    const url = `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${encodeURIComponent(hashedFilename)}`;
 
     return {
       _id: fileId || hashedFilename,

package/src/files/gridfs/handler-express.ts

@@ -8,7 +8,7 @@ import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { getFileAdapter } from '@unchainedshop/core-files';
 
-const { ROOT_URL } = process.env;
+const { ROOT_URL, GRIDFS_PUT_SERVER_PATH = '/gridfs' } = process.env;
 
 const logger = createLogger('unchained:gridfs');
 
@@ -89,10 +89,10 @@ const gridfsHandler = async (
     }
 
     if (req.method === 'GET') {
-      const fileId = fileName;
       const { s: signature, e: expiryTimestamp } = req.query;
-      const file = await modules.gridfsFileUploads.getFileInfo(directoryName, fileId);
-      const fileDocument = await modules.files.findFile({ fileId });
+      const fileDocument = await modules.files.findFile({
+        url: `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${fileName}`,
+      });
       if (fileDocument?.meta?.isPrivate) {
         const expiry = parseInt(expiryTimestamp as string, 10);
         if (expiry <= Date.now()) {
@@ -111,6 +111,9 @@ const gridfsHandler = async (
         res.status(404).end();
         return;
       }
+
+      const file = await modules.gridfsFileUploads.getFileInfo(directoryName, fileDocument._id);
+
       if (file?.metadata?.['content-type']) {
         res.setHeader('Content-Type', file.metadata['content-type']);
       }
@@ -118,7 +121,10 @@ const gridfsHandler = async (
         res.setHeader('Content-Length', file?.length.toString());
       }
 
-      const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
+      const readStream = await modules.gridfsFileUploads.createReadStream(
+        directoryName,
+        fileDocument._id,
+      );
       readStream.pipe(res, { end: false });
       await finished(readStream);
       res.status(200).end();

package/src/files/gridfs/handler-fastify.ts

@@ -10,6 +10,8 @@ import { getFileAdapter } from '@unchainedshop/core-files';
 
 const logger = createLogger('unchained:gridfs');
 
+const { GRIDFS_PUT_SERVER_PATH = '/gridfs' } = process.env;
+
 const gridfsHandler: RouteHandlerMethod = async (
   req: FastifyRequest & {
     unchainedContext: Context & {
@@ -105,14 +107,14 @@ const gridfsHandler: RouteHandlerMethod = async (
     }
 
     if (req.method === 'GET') {
-      const fileId = fileName;
       const { s: signature, e: expiryTimestamp } = req.query as Record<string, string>;
-      const file = await modules.gridfsFileUploads.getFileInfo(directoryName, fileId);
-      const fileDocument = await modules.files.findFile({ fileId });
+      const fileDocument = await modules.files.findFile({
+        url: `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${fileName}`,
+      });
       if (fileDocument?.meta?.isPrivate) {
         const expiry = parseInt(expiryTimestamp as string, 10);
         if (expiry <= Date.now()) {
-          logger.error('URL Expired', { fileId, expiry });
+          logger.error('URL Expired', { fileName, expiry });
           reply.status(403);
           return reply.send({
             success: false,
@@ -126,7 +128,7 @@ const gridfsHandler: RouteHandlerMethod = async (
 
         if (!signedUrl || new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
           reply.status(403);
-          logger.error('Invalid signature', { fileId, expiry });
+          logger.error('Invalid signature', { fileName, expiry });
           return reply.send({
             success: false,
             message: 'Access restricted: Invalid signature.',
@@ -134,11 +136,13 @@ const gridfsHandler: RouteHandlerMethod = async (
           });
         }
       } else if (!fileDocument) {
-        logger.error('File not found', { fileId });
+        logger.error('File not found', { fileName });
         reply.status(404);
         return reply.send();
       }
 
+      const file = await modules.gridfsFileUploads.getFileInfo(directoryName, fileDocument._id);
+
       if (file?.metadata?.['content-type']) {
         reply.header('content-type', file.metadata['content-type']);
       }
@@ -146,7 +150,10 @@ const gridfsHandler: RouteHandlerMethod = async (
         reply.header('content-length', file?.length.toString());
       }
 
-      const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
+      const readStream = await modules.gridfsFileUploads.createReadStream(
+        directoryName,
+        fileDocument._id,
+      );
 
       reply.status(200);
       return reply.send(readStream);

package/src/payment/payrexx/index.ts

@@ -80,7 +80,7 @@ const Payrexx: IPaymentAdapter = {
           mapUserToGatewayObject({
             userId,
             emailAddress,
-            currencyCode: 'CHF',
+            currencyCode: order?.currencyCode,
           }),
         );
         return JSON.stringify(gateway);

package/src/presets/base-fastify.ts

@@ -1,7 +1,7 @@
 import { FastifyInstance } from 'fastify';
 import handler from '../files/gridfs/handler-fastify.js';
 
-const { GRIDFS_PUT_SERVER_PATH = '/gridfs/:directoryName/:fileName' } = process.env;
+const { GRIDFS_PUT_SERVER_PATH = '/gridfs' } = process.env;
 
 export default (fastify: FastifyInstance) => {
   fastify.register((s, opts, registered) => {
@@ -11,7 +11,7 @@ export default (fastify: FastifyInstance) => {
       done(null);
     });
     s.route({
-      url: GRIDFS_PUT_SERVER_PATH,
+      url: GRIDFS_PUT_SERVER_PATH + '/:directoryName/:fileName',
       method: ['GET', 'PUT', 'OPTIONS'],
       handler,
     });

package/lib/accounts/google-oauth.d.ts

@@ -1,4 +0,0 @@
-import { IOAuth2Adapter } from '@unchainedshop/types/accounts.js';
-declare const GoogleOAuth2Adapter: IOAuth2Adapter;
-export default GoogleOAuth2Adapter;
-//# sourceMappingURL=google-oauth.d.ts.map

package/lib/accounts/google-oauth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"google-oauth.d.ts","sourceRoot":"","sources":["../../src/accounts/google-oauth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAmFlE,QAAA,MAAM,mBAAmB,EAAE,cA4F1B,CAAC;AAIF,eAAe,mBAAmB,CAAC"}

package/lib/accounts/google-oauth.js

@@ -1,145 +0,0 @@
-import { OAuth2Director, OAuth2Adapter } from '@unchainedshop/core-accountsjs';
-const { GOOGLE_OAUTH_CLIENT_ID, GOOGLE_OAUTH_CLIENT_SECRET } = process.env;
-const getGoggleAuthorizationCode = async ({ code, redirectUri, clientId, clientSecret, }) => {
-    const response = await fetch('https://oauth2.googleapis.com/token', {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-        },
-        // eslint-disable-next-line
-        // @ts-ignore
-        duplex: 'half',
-        body: JSON.stringify({
-            code,
-            client_id: clientId,
-            grant_type: 'authorization_code',
-            client_secret: clientSecret,
-            redirect_uri: redirectUri,
-            access_type: 'offline',
-        }),
-    });
-    return response.json();
-};
-const normalizeProfileData = (data) => {
-    const { names = [], genders = [], addresses = [], emailAddresses = [], phoneNumbers = [], birthdays = [], photos = [], } = data;
-    const [name] = names;
-    const [gender] = genders;
-    const [email] = emailAddresses;
-    const [birthday] = birthdays;
-    const [phone] = phoneNumbers;
-    const [address] = addresses;
-    const [photo] = photos;
-    return {
-        id: data.sub,
-        firstName: name?.givenName,
-        lastName: name?.familyName,
-        displayName: name?.displayName,
-        gender: gender?.value,
-        email: email?.value,
-        birthDate: birthday?.date
-            ? new Date(birthday?.date?.year ?? 0, birthdays?.date?.month ?? 0, birthday?.date?.day ?? 0)
-            : undefined,
-        phoneNumber: phone?.canonicalForm,
-        address: address?.formattedValue,
-        avatarUrl: photo?.url,
-    };
-};
-const parseGoogleIdToken = (idToken) => {
-    const [, base64UserInfo] = idToken.split('.');
-    const buff = Buffer.from(base64UserInfo, 'base64');
-    const data = JSON.parse(buff.toString());
-    return {
-        id: data.sub,
-        email: data?.email,
-        firstName: data?.given_name,
-        lastName: data?.family_name,
-        avatarUrl: data?.picture,
-        fullName: data?.name,
-        exp: data?.exp,
-        ...data,
-    };
-};
-const GoogleOAuth2Adapter = {
-    ...OAuth2Adapter,
-    key: 'google-oauth2',
-    label: 'Google Oauth',
-    version: '1',
-    provider: 'google',
-    config: {
-        clientId: GOOGLE_OAUTH_CLIENT_ID,
-        scopes: [
-            'genders',
-            'emailAddresses',
-            'phoneNumbers',
-            'addresses',
-            'birthdays',
-            'metadata',
-            'names',
-            'photos',
-            'locations',
-        ],
-    },
-    actions: () => {
-        return {
-            ...OAuth2Adapter.actions(null),
-            configurationError: () => {
-                return '';
-            },
-            isActive: () => {
-                return Boolean(GOOGLE_OAUTH_CLIENT_ID && GOOGLE_OAUTH_CLIENT_SECRET);
-            },
-            getAuthorizationToken: async (authorizationCode, redirectUrl) => {
-                return getGoggleAuthorizationCode({
-                    code: authorizationCode,
-                    clientId: GoogleOAuth2Adapter.config.clientId,
-                    redirectUri: redirectUrl,
-                    clientSecret: GOOGLE_OAUTH_CLIENT_SECRET,
-                });
-            },
-            getAccountData: async ({ access_token, id_token }) => {
-                const response = await fetch(`https://people.googleapis.com/v1/people/me?personFields=${GoogleOAuth2Adapter.config.scopes.join(',')}`, {
-                    headers: {
-                        Authorization: `Bearer ${access_token}`,
-                    },
-                });
-                if (response.status === 403)
-                    return parseGoogleIdToken(id_token);
-                const profileInfoJSON = await response.json();
-                if (profileInfoJSON?.error)
-                    throw new Error(profileInfoJSON?.error.message);
-                return normalizeProfileData(profileInfoJSON);
-            },
-            isTokenValid: async (accessToken) => {
-                const response = await fetch(`https://oauth2.googleapis.com/tokeninfo?id_token=${accessToken?.id_token}`);
-                const tokenInfo = await response.json();
-                if (tokenInfo.error) {
-                    return false;
-                }
-                return true;
-            },
-            refreshToken: async ({ refresh_token }) => {
-                const response = await fetch('https://oauth2.googleapis.com/token', {
-                    method: 'POST',
-                    // eslint-disable-next-line
-                    // @ts-ignore
-                    duplex: 'half',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify({
-                        client_id: GoogleOAuth2Adapter.config.clientId,
-                        grant_type: 'refresh_token',
-                        client_secret: GOOGLE_OAUTH_CLIENT_SECRET,
-                        refresh_token,
-                        access_type: 'offline',
-                    }),
-                });
-                const refreshedAccessToken = await response.json();
-                return refreshedAccessToken;
-            },
-        };
-    },
-};
-OAuth2Director.registerAdapter(GoogleOAuth2Adapter);
-export default GoogleOAuth2Adapter;
-//# sourceMappingURL=google-oauth.js.map

package/lib/accounts/google-oauth.js.map

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

package/lib/accounts/linkedin-oauth.d.ts

@@ -1,4 +0,0 @@
-import { IOAuth2Adapter } from '@unchainedshop/types/accounts.js';
-declare const LinkedInOAuthAdapter: IOAuth2Adapter;
-export default LinkedInOAuthAdapter;
-//# sourceMappingURL=linkedin-oauth.d.ts.map

package/lib/accounts/linkedin-oauth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"linkedin-oauth.d.ts","sourceRoot":"","sources":["../../src/accounts/linkedin-oauth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AA2ClE,QAAA,MAAM,oBAAoB,EAAE,cAsD3B,CAAC;AAIF,eAAe,oBAAoB,CAAC"}