@unchainedshop/plugins 4.8.15 → 4.8.17

package/lib/presets/base.d.ts

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

package/lib/presets/base.js

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

package/lib/worker/gc-guests.js

@@ -15,12 +15,7 @@ export const GCGuestsWorker = {
         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));
+            const userIdsToDelete = await modules.users.findGuestUserIds({ before });
             let deletedGuestCount = 0;
             await Array.fromAsync(userIdsToDelete, async (userId) => {
                 try {
@@ -34,7 +29,7 @@ export const GCGuestsWorker = {
             return {
                 success: true,
                 result: {
-                    scannedGuestCount: candidateIds.length,
+                    scannedGuestCount: userIdsToDelete.length,
                     deletedGuestCount,
                 },
             };
@@ -56,5 +51,5 @@ WorkerDirector.registerAdapter(GCGuestsWorker);
 WorkerDirector.configureAutoscheduling({
     type: GCGuestsWorker.type,
     schedule: everyDayAtHalfPastTwo,
-    retries: 2,
+    retries: 0,
 });

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

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

package/lib/worker/invalidate-carts.js

@@ -0,0 +1,51 @@
+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;
+WorkerDirector.registerAdapter(InvalidateCartsWorker);
+WorkerDirector.configureAutoscheduling({
+    type: InvalidateCartsWorker.type,
+    schedule: firstOfMonthAtLocalMidnight,
+    retries: 0,
+});

package/lib/worker/zombie-killer.js

@@ -108,5 +108,5 @@ WorkerDirector.registerAdapter(ZombieKillerWorker);
 WorkerDirector.configureAutoscheduling({
     type: ZombieKillerWorker.type,
     schedule: everyDayAtTwo,
-    retries: 2,
+    retries: 0,
 });

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.15",
+  "version": "4.8.17",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {