@unchainedshop/plugins 4.8.13 → 4.8.15

package/lib/payment/paypal-checkout.js

@@ -58,19 +58,31 @@ const PaypalCheckout = {
                     throw new Error('You have to provide orderID in paymentContext');
                 }
                 try {
-                    const request = new checkoutNodeJssdk.orders.OrdersGetRequest(orderID);
                     const client = new checkoutNodeJssdk.core.PayPalHttpClient(environment());
-                    const paypalOrder = await client.execute(request);
+                    const getRequest = new checkoutNodeJssdk.orders.OrdersGetRequest(orderID);
+                    let paypalResult = (await client.execute(getRequest)).result;
+                    if (paypalResult.status === 'APPROVED') {
+                        const captureRequest = new checkoutNodeJssdk.orders.OrdersCaptureRequest(orderID);
+                        captureRequest.requestBody({});
+                        paypalResult = (await client.execute(captureRequest)).result;
+                    }
+                    if (paypalResult.status !== 'COMPLETED') {
+                        throw new Error(`PayPal order not completed (status: ${paypalResult.status})`);
+                    }
+                    const capture = paypalResult.purchase_units?.[0]?.payments?.captures?.find((c) => c.status === 'COMPLETED');
+                    if (!capture) {
+                        throw new Error('PayPal order has no completed capture');
+                    }
                     const pricing = OrderPricingSheet({
                         calculation: order.calculation,
                         currencyCode: order.currencyCode,
                     });
                     const ourTotal = roundToDecimals(pricing.total({ useNetPrice: false }).amount / 100, 2);
-                    const paypalTotal = roundToDecimals(paypalOrder.result.purchase_units[0].amount.value, 2);
-                    if (ourTotal === paypalTotal) {
+                    const paidTotal = roundToDecimals(capture.amount.value, 2);
+                    if (ourTotal === paidTotal && capture.amount.currency_code === order.currencyCode) {
                         return order;
                     }
-                    logger.warn('Missmatch PAYPAL ORDER', JSON.stringify(paypalOrder.result, null, 2));
+                    logger.warn('Missmatch PAYPAL ORDER', JSON.stringify(paypalResult, null, 2));
                     logger.debug('OUR ORDER', order);
                     logger.debug('OUR PRICE', pricing);
                     throw new Error(`Payment mismatch`);

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-04-22.dahlia',
+            apiVersion: '2026-05-27.dahlia',
         });
     }
     catch {

package/lib/presets/base.d.ts

@@ -14,6 +14,7 @@ import '../enrollments/licensed.ts';
 import '../events/node-event-emitter.ts';
 import '../worker/bulk-import.ts';
 import '../worker/zombie-killer.ts';
+import '../worker/gc-guests.ts';
 import '../worker/message.ts';
 import '../worker/external.ts';
 import '../worker/http-request.ts';

package/lib/presets/base.js

@@ -14,6 +14,7 @@ import "../enrollments/licensed.js";
 import "../events/node-event-emitter.js";
 import "../worker/bulk-import.js";
 import "../worker/zombie-killer.js";
+import "../worker/gc-guests.js";
 import "../worker/message.js";
 import "../worker/external.js";
 import "../worker/http-request.js";

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

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

package/lib/worker/gc-guests.js

@@ -0,0 +1,60 @@
+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 candidateIds = await modules.users.findGuestUserIds({ before });
+            const recentCarts = candidateIds.length
+                ? await modules.orders.findCarts({ userIds: candidateIds }, { projection: { userId: 1, updated: 1 } })
+                : [];
+            const userIdsWithRecentCart = new Set(recentCarts.filter((cart) => cart.updated && cart.updated >= before).map((c) => c.userId));
+            const userIdsToDelete = candidateIds.filter((id) => !userIdsWithRecentCart.has(id));
+            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: candidateIds.length,
+                    deletedGuestCount,
+                },
+            };
+        }
+        catch (err) {
+            return {
+                success: false,
+                error: {
+                    name: err.name,
+                    message: err.message,
+                    stack: err.stack,
+                },
+            };
+        }
+    },
+};
+export default GCGuestsWorker;
+WorkerDirector.registerAdapter(GCGuestsWorker);
+WorkerDirector.configureAutoscheduling({
+    type: GCGuestsWorker.type,
+    schedule: everyDayAtHalfPastTwo,
+    retries: 2,
+});

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

@@ -9,5 +9,6 @@ export declare const ZombieKillerWorker: IWorkerAdapter<{
     deletedProductTextsCount: number;
     deletedProductVariationsCount: number;
     deletedAssortmentTextsCount: number;
+    deletedCartsCount: number;
 }>;
 export default ZombieKillerWorker;

package/lib/worker/zombie-killer.js

@@ -1,12 +1,14 @@
-import { WorkerAdapter, WorkerDirector } 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 {
@@ -89,3 +105,8 @@ export const ZombieKillerWorker = {
 };
 export default ZombieKillerWorker;
 WorkerDirector.registerAdapter(ZombieKillerWorker);
+WorkerDirector.configureAutoscheduling({
+    type: ZombieKillerWorker.type,
+    schedule: everyDayAtTwo,
+    retries: 2,
+});

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.13",
+  "version": "4.8.15",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {
@@ -43,6 +43,7 @@
     "@unchainedshop/core-orders": "^4.8.12",
     "@unchainedshop/core-payment": "^4.8.12",
     "@unchainedshop/core-products": "^4.8.12",
+    "@unchainedshop/core-users": "^4.8.12",
     "@unchainedshop/core-warehousing": "^4.8.12",
     "@unchainedshop/core-worker": "^4.8.12",
     "@unchainedshop/events": "^4.8.12",
@@ -53,7 +54,7 @@
   "peerDependencies": {
     "@aws-sdk/client-eventbridge": ">= 3.714 < 4",
     "@paypal/checkout-server-sdk": "1.x",
-    "@redis/client": ">= 1 < 6",
+    "@redis/client": ">= 1 < 7",
     "@scure/bip32": ">= 2",
     "@scure/btc-signer": ">= 2",
     "mime": ">= 4 < 5",
@@ -61,7 +62,7 @@
     "express": ">= 5 < 6",
     "fastify": ">= 5.2 < 6",
     "minio": "8.x",
-    "nodemailer": ">= 6.9 < 9",
+    "nodemailer": ">= 6.9 < 10",
     "p-memoize": "8.x",
     "stripe": ">= 19 < 23",
     "web-push": ">= 3.6 <4",
@@ -113,7 +114,7 @@
   },
   "devDependencies": {
     "@paypal/checkout-server-sdk": "^1.0.3",
-    "@redis/client": "^5.6.0",
+    "@redis/client": "^6.0.0",
     "@scure/bip32": "^2.0.0",
     "@scure/btc-signer": "^2.0.0",
     "@types/express": "^5.0.3",
@@ -122,7 +123,7 @@
     "express": "^5.1.0",
     "fastify": "^5.4.0",
     "minio": "^8.0.5",
-    "nodemailer": "^8.0.2",
+    "nodemailer": "^9.0.0",
     "p-memoize": "^8.0.0",
     "stripe": "^22.0.2",
     "typescript": "^5.8.3",