@unchainedshop/plugins 4.8.18 → 4.8.20

package/lib/files/gridfs/api.js

@@ -87,7 +87,7 @@ export const gridfsRouteHandler = async (request, context) => {
             const signature = url.searchParams.get('s');
             const expiryTimestamp = url.searchParams.get('e');
             const fileDocument = await modules.files.findFile({
-                url: `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${fileName}`,
+                url: `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${encodeURIComponent(fileName)}`,
             });
             if (!fileDocument) {
                 logger.error('File not found', { fileName });

package/lib/payment/datatrans-v2/adapter.js

@@ -2,6 +2,7 @@ import { createLogger } from '@unchainedshop/logger';
 import createDatatransAPI from "./api/index.js";
 import parseRegistrationData from "./parseRegistrationData.js";
 import roundedAmountFromOrder from "./roundedAmountFromOrder.js";
+import build3DSCardholder, { withCardCardholder, withSecureFieldsCardholder, } from "./build3DSCardholder.js";
 import { PaymentAdapter, PaymentError, PaymentPricingRowCategory, PaymentPricingSheet, OrderPricingSheet, } from '@unchainedshop/core';
 const logger = createLogger('unchained:datatrans');
 const { DATATRANS_SECRET, DATATRANS_SIGN_KEY, DATATRANS_API_ENDPOINT = 'https://api.sandbox.datatrans.com', DATATRANS_MERCHANT_ID, } = process.env;
@@ -221,22 +222,18 @@ export const Datatrans = {
                 const price = order
                     ? roundedAmountFromOrder(order)
                     : {};
+                const cardholder = build3DSCardholder(order);
                 if (useSecureFields) {
                     const result = await api().secureFields({
-                        ...arbitraryFields,
+                        ...withSecureFieldsCardholder(arbitraryFields, cardholder),
                         currency: price.currencyCode || 'CHF',
-                        refno,
-                        refno2,
-                        customer: {
-                            id: userId,
-                        },
                         amount: price.amount,
                     });
                     throwIfResponseError(result);
                     return JSON.stringify(result);
                 }
                 const result = await api().init({
-                    ...arbitraryFields,
+                    ...withCardCardholder(arbitraryFields, cardholder),
                     currency: price.currencyCode || 'CHF',
                     refno,
                     refno2,
@@ -349,11 +346,17 @@ export const Datatrans = {
                 if (status === 'authenticated') {
                     if (authorizeAuthenticated) {
                         checkIfTransactionAmountValid(transactionId, transaction);
+                        const { orderPayment, order } = context;
+                        const userId = order?.userId || context?.userId;
+                        const refno = orderPayment
+                            ? Buffer.from(orderPayment._id, 'hex').toString('base64')
+                            : transaction.refno;
+                        const refno2 = userId || transaction.refno2;
                         await authorizeAuth({
                             ...(authorizeAuthenticated || {}),
                             transactionId,
-                            refno: transaction.refno,
-                            refno2: transaction.refno2,
+                            refno,
+                            refno2,
                         });
                         status = 'authorized';
                     }

package/lib/payment/stripe/stripe.js

@@ -10,7 +10,7 @@ else {
     try {
         const { default: Stripe } = await import('stripe');
         stripe = new Stripe(STRIPE_SECRET, {
-            apiVersion: '2026-06-24.dahlia',
+            apiVersion: '2026-07-29.dahlia',
         });
     }
     catch {

package/lib/pricing/product-quotation-price.d.ts

@@ -0,0 +1,2 @@
+import { type IProductPricingAdapter } from '@unchainedshop/core';
+export declare const ProductQuotationPrice: IProductPricingAdapter;

package/lib/pricing/product-quotation-price.js

@@ -0,0 +1,40 @@
+import { ProductPricingDirector, ProductPricingAdapter, } from '@unchainedshop/core';
+export const ProductQuotationPrice = {
+    ...ProductPricingAdapter,
+    key: 'shop.unchained.pricing.quotation-price',
+    version: '1.0.0',
+    label: 'Apply negotiated quotation price',
+    orderIndex: 20,
+    isActivatedFor: (context) => {
+        return Boolean(context.quotationId);
+    },
+    actions: (params) => {
+        const pricingAdapter = ProductPricingAdapter.actions(params);
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                const { quotationId, currencyCode, quantity, modules } = params.context;
+                const quotation = await modules.quotations.findQuotation({ quotationId: quotationId });
+                const isApplicable = quotation &&
+                    quotation.price != null &&
+                    quotation.currencyCode === currencyCode &&
+                    (modules.quotations.isProposalValid(quotation) ||
+                        modules.quotations.normalizedStatus(quotation) === 'FULFILLED');
+                if (isApplicable) {
+                    const negotiatedTotal = Math.round(quotation.price) * quantity;
+                    const correction = negotiatedTotal - params.calculationSheet.sum();
+                    if (correction !== 0) {
+                        pricingAdapter.resultSheet().addItem({
+                            amount: correction,
+                            isTaxable: false,
+                            isNetPrice: false,
+                            meta: { adapter: ProductQuotationPrice.key, quotationId: quotation._id },
+                        });
+                    }
+                }
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+ProductPricingDirector.registerAdapter(ProductQuotationPrice);

package/lib/quotations/manual/adapter.js

@@ -10,8 +10,13 @@ export const ManualOffering = {
         return {
             ...QuotationAdapter.actions(params),
             quote: async () => {
+                const { quotation } = params;
+                const price = Number(quotation?.context?.price);
                 return {
-                    expires: new Date(new Date().getTime() + 3600 * 1000),
+                    expires: quotation?.context?.expires
+                        ? new Date(quotation.context.expires)
+                        : new Date(new Date().getTime() + 3600 * 1000),
+                    price: Number.isFinite(price) && price > 0 ? Math.round(price) : undefined,
                 };
             },
         };

package/lib/quotations/manual.js

@@ -10,8 +10,13 @@ const ManualOffering = {
         return {
             ...QuotationAdapter.actions(params),
             quote: async () => {
+                const { quotation } = params;
+                const price = Number(quotation?.context?.price);
                 return {
-                    expires: new Date(new Date().getTime() + 3600 * 1000),
+                    expires: quotation?.context?.expires
+                        ? new Date(quotation.context.expires)
+                        : new Date(new Date().getTime() + 3600 * 1000),
+                    price: Number.isFinite(price) && price > 0 ? Math.round(price) : undefined,
                 };
             },
         };

package/lib/worker/gc-guests/adapter.d.ts

@@ -0,0 +1,9 @@
+import { type IWorkerAdapter } from '@unchainedshop/core';
+export declare const GCGuestsWorker: IWorkerAdapter<{
+    guestUserMaxAgeInDays?: number;
+}, {
+    scannedGuestCount: number;
+    deletedGuestCount: number;
+}>;
+export default GCGuestsWorker;
+export declare const configureGCGuestsAutoscheduling: () => void;

package/lib/worker/gc-guests/adapter.js

@@ -0,0 +1,56 @@
+import { WorkerAdapter, WorkerDirector, schedule } from '@unchainedshop/core';
+import { userSettings } from '@unchainedshop/core-users';
+import { createLogger } from '@unchainedshop/logger';
+const logger = createLogger('unchained:worker:gc-guests');
+const ONE_DAY_IN_MILLISECONDS = 86400000;
+const everyDayAtHalfPastTwo = schedule.parse.cron('30 2 * * *');
+export const GCGuestsWorker = {
+    ...WorkerAdapter,
+    key: 'shop.unchained.worker-plugin.gc-guests',
+    label: 'Garbage Collect Guests',
+    version: '1.0.0',
+    type: 'GC_GUESTS',
+    doWork: async ({ guestUserMaxAgeInDays } = {}, unchainedAPI) => {
+        const { modules, services } = unchainedAPI;
+        try {
+            const maxAgeInDays = guestUserMaxAgeInDays ?? userSettings.guestUserMaxAgeInDays;
+            const before = new Date(Date.now() - maxAgeInDays * ONE_DAY_IN_MILLISECONDS);
+            const userIdsToDelete = await modules.users.findGuestUserIds({ before });
+            let deletedGuestCount = 0;
+            await Array.fromAsync(userIdsToDelete, async (userId) => {
+                try {
+                    await services.users.deleteUser({ userId });
+                    deletedGuestCount += 1;
+                }
+                catch (err) {
+                    logger.warn(`Failed to garbage-collect guest ${userId}: ${err.message}`);
+                }
+            });
+            return {
+                success: true,
+                result: {
+                    scannedGuestCount: userIdsToDelete.length,
+                    deletedGuestCount,
+                },
+            };
+        }
+        catch (err) {
+            return {
+                success: false,
+                error: {
+                    name: err.name,
+                    message: err.message,
+                    stack: err.stack,
+                },
+            };
+        }
+    },
+};
+export default GCGuestsWorker;
+export const configureGCGuestsAutoscheduling = () => {
+    WorkerDirector.configureAutoscheduling({
+        type: GCGuestsWorker.type,
+        schedule: everyDayAtHalfPastTwo,
+        retries: 0,
+    });
+};

package/lib/worker/gc-guests/index.d.ts

@@ -0,0 +1,4 @@
+import { type IPlugin } from '@unchainedshop/core';
+export declare const GCGuestsPlugin: IPlugin;
+export default GCGuestsPlugin;
+export * from './adapter.ts';

package/lib/worker/gc-guests/index.js

@@ -0,0 +1,13 @@
+import {} from '@unchainedshop/core';
+import { GCGuestsWorker, configureGCGuestsAutoscheduling } from "./adapter.js";
+export const GCGuestsPlugin = {
+    key: 'shop.unchained.worker-plugin.gc-guests',
+    label: 'Garbage Collect Guests Worker Plugin',
+    version: '1.0.0',
+    adapters: [GCGuestsWorker],
+    onRegister: () => {
+        configureGCGuestsAutoscheduling();
+    },
+};
+export default GCGuestsPlugin;
+export * from "./adapter.js";

package/lib/worker/invalidate-carts/adapter.d.ts

@@ -0,0 +1,9 @@
+import { type IWorkerAdapter } from '@unchainedshop/core';
+export declare const InvalidateCartsWorker: IWorkerAdapter<{
+    maxAgeDays?: number;
+}, {
+    scannedCartCount: number;
+    recalculatedCartCount: number;
+}>;
+export default InvalidateCartsWorker;
+export declare const configureInvalidateCartsAutoscheduling: () => void;

package/lib/worker/invalidate-carts/adapter.js

@@ -0,0 +1,52 @@
+import { WorkerAdapter, WorkerDirector, schedule } from '@unchainedshop/core';
+import { createLogger } from '@unchainedshop/logger';
+const logger = createLogger('unchained:worker:invalidate-carts');
+const firstOfMonthAtLocalMidnight = schedule.parse.cron('0 0 1 * *');
+export const InvalidateCartsWorker = {
+    ...WorkerAdapter,
+    key: 'shop.unchained.worker-plugin.invalidate-carts',
+    label: 'Invalidate Carts',
+    version: '1.0.0',
+    type: 'INVALIDATE_CARTS',
+    doWork: async ({ maxAgeDays } = {}, unchainedAPI) => {
+        const { modules, services } = unchainedAPI;
+        try {
+            const orderIds = await modules.orders.findCartIdsToInvalidate(maxAgeDays);
+            let recalculatedCartCount = 0;
+            for (const orderId of orderIds) {
+                try {
+                    await services.orders.updateCalculation(orderId);
+                    recalculatedCartCount += 1;
+                }
+                catch (err) {
+                    logger.warn(`Failed to recalculate cart ${orderId}: ${err.message}`);
+                }
+            }
+            return {
+                success: true,
+                result: {
+                    scannedCartCount: orderIds.length,
+                    recalculatedCartCount,
+                },
+            };
+        }
+        catch (err) {
+            return {
+                success: false,
+                error: {
+                    name: err.name,
+                    message: err.message,
+                    stack: err.stack,
+                },
+            };
+        }
+    },
+};
+export default InvalidateCartsWorker;
+export const configureInvalidateCartsAutoscheduling = () => {
+    WorkerDirector.configureAutoscheduling({
+        type: InvalidateCartsWorker.type,
+        schedule: firstOfMonthAtLocalMidnight,
+        retries: 0,
+    });
+};

package/lib/worker/invalidate-carts/index.d.ts

@@ -0,0 +1,4 @@
+import { type IPlugin } from '@unchainedshop/core';
+export declare const InvalidateCartsPlugin: IPlugin;
+export default InvalidateCartsPlugin;
+export * from './adapter.ts';

package/lib/worker/invalidate-carts/index.js

@@ -0,0 +1,13 @@
+import {} from '@unchainedshop/core';
+import { InvalidateCartsWorker, configureInvalidateCartsAutoscheduling } from "./adapter.js";
+export const InvalidateCartsPlugin = {
+    key: 'shop.unchained.worker-plugin.invalidate-carts',
+    label: 'Invalidate Carts Worker Plugin',
+    version: '1.0.0',
+    adapters: [InvalidateCartsWorker],
+    onRegister: () => {
+        configureInvalidateCartsAutoscheduling();
+    },
+};
+export default InvalidateCartsPlugin;
+export * from "./adapter.js";

package/lib/worker/zombie-killer/adapter.d.ts

@@ -9,5 +9,7 @@ export declare const ZombieKillerWorker: IWorkerAdapter<{
     deletedProductTextsCount: number;
     deletedProductVariationsCount: number;
     deletedAssortmentTextsCount: number;
+    deletedCartsCount: number;
 }>;
 export default ZombieKillerWorker;
+export declare const configureZombieKillerAutoscheduling: () => void;

package/lib/worker/zombie-killer/adapter.js

@@ -1,12 +1,14 @@
-import { WorkerAdapter } from '@unchainedshop/core';
+import { WorkerAdapter, WorkerDirector, schedule } from '@unchainedshop/core';
+const everyDayAtTwo = schedule.parse.cron('0 2 * * *');
 export const ZombieKillerWorker = {
     ...WorkerAdapter,
     key: 'shop.unchained.worker-plugin.zombie-killer',
     label: 'Zombie Killer',
     version: '1.0.0',
     type: 'ZOMBIE_KILLER',
-    doWork: async ({ bulkImportMaxAgeInDays } = { bulkImportMaxAgeInDays: 5 }, unchainedAPI) => {
+    doWork: async (input, unchainedAPI) => {
         const { modules, services } = unchainedAPI;
+        const { bulkImportMaxAgeInDays = 5 } = input || {};
         try {
             const error = false;
             const filters = await modules.filters.findFilters({ includeInactive: true }, { projection: { _id: 1 } });
@@ -38,7 +40,9 @@ export const ZombieKillerWorker = {
             const productMedia = await modules.products.media.findProductMedias({}, { projection: { mediaId: 1 } });
             const assortmentMedia = await modules.assortments.media.findAssortmentMedias({}, { projection: { mediaId: 1 } });
             const allFileIdsLinked = [...productMedia, ...assortmentMedia].map((l) => l?.mediaId);
-            const allFileIdsRelevant = (await modules.files.findFiles({ paths: ['product-media', 'assortment-media'] }, { projection: { _id: 1 } })).map((a) => a._id);
+            const allFileIdsRelevant = (await modules.files.findFiles({ paths: ['product-media', 'assortment-media'] }, { projection: { _id: 1, expires: 1 } }))
+                .filter((file) => !file.expires)
+                .map((a) => a._id);
             const fileIdsToRemove = allFileIdsRelevant.filter((fileId) => {
                 return !allFileIdsLinked.includes(fileId);
             }) || [];
@@ -54,6 +58,17 @@ export const ZombieKillerWorker = {
                     fileIds: fileIdsToRemove,
                 })
                 : 0;
+            const cartUserIds = (await modules.orders.findCartUserIds()).filter(Boolean);
+            const existingUserIds = new Set(cartUserIds.length ? await modules.users.findExistingUserIds({ userIds: cartUserIds }) : []);
+            const deadUserIds = cartUserIds.filter((userId) => !existingUserIds.has(userId));
+            const deadCarts = deadUserIds.length
+                ? await modules.orders.findCarts({ userIds: deadUserIds }, { projection: { _id: 1 } })
+                : [];
+            let deletedCartsCount = 0;
+            await Array.fromAsync(deadCarts, async (cart) => {
+                await services.orders.deleteCart(cart._id);
+                deletedCartsCount += 1;
+            });
             const result = {
                 deletedFilterTextsCount,
                 deletedProductMediaCount,
@@ -62,6 +77,7 @@ export const ZombieKillerWorker = {
                 deletedAssortmentMediaCount,
                 deletedAssortmentTextsCount,
                 deletedFilesCount,
+                deletedCartsCount,
             };
             if (error) {
                 return {
@@ -88,3 +104,10 @@ export const ZombieKillerWorker = {
     },
 };
 export default ZombieKillerWorker;
+export const configureZombieKillerAutoscheduling = () => {
+    WorkerDirector.configureAutoscheduling({
+        type: ZombieKillerWorker.type,
+        schedule: everyDayAtTwo,
+        retries: 0,
+    });
+};

package/lib/worker/zombie-killer/index.js

@@ -1,10 +1,13 @@
 import {} from '@unchainedshop/core';
-import { ZombieKillerWorker } from "./adapter.js";
+import { ZombieKillerWorker, configureZombieKillerAutoscheduling } from "./adapter.js";
 export const ZombieKillerPlugin = {
     key: 'shop.unchained.worker-plugin.zombie-killer',
     label: 'Zombie Killer Worker Plugin',
     version: '1.0.0',
     adapters: [ZombieKillerWorker],
+    onRegister: () => {
+        configureZombieKillerAutoscheduling();
+    },
 };
 export default ZombieKillerPlugin;
 export { ZombieKillerWorker } from "./adapter.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/plugins",
   "description": "Official plugin collection for the Unchained Engine with payment, delivery, and pricing adapters",
-  "version": "4.8.18",
+  "version": "4.8.20",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {
@@ -118,10 +118,10 @@
     "@scure/bip32": "^2.0.0",
     "@scure/btc-signer": "^2.0.0",
     "@types/express": "^5.0.3",
-    "@types/node": "^25.0.0",
+    "@types/node": "^26.2.0",
     "expiry-map": "^2.0.0",
     "express": "^5.1.0",
-    "fastify": "^5.4.0",
+    "fastify": "^5.12.1",
     "minio": "^8.0.5",
     "nodemailer": "^9.0.0",
     "p-memoize": "^8.0.0",