@unchainedshop/plugins 3.0.0-alpha7 → 3.0.0-rc2

package/src/worker/bulk-import.ts

@@ -1,19 +1,19 @@
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
-import { createLogger, LogLevel } from '@unchainedshop/logger';
+import { WorkerDirector, WorkerAdapter, IWorkerAdapter } from '@unchainedshop/core';
+import { createLogger } from '@unchainedshop/logger';
 import JSONStream from 'JSONStream';
 import { EventIterator } from 'event-iterator';
 import { UnchainedCore } from '@unchainedshop/core';
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
 
-const logger = createLogger('unchained:platform:bulk-import');
+const logger = createLogger('unchained:worker:bulk-import');
 
-const streamPayloadToBulkImporter = async (bulkImporter, payloadId, unchainedAPI: UnchainedCore) => {
-  logger.profile(`parseAsync`, { level: LogLevel.Verbose, message: 'parseAsync' });
+const streamPayloadToBulkImporter = async (
+  bulkImporter,
+  payloadId,
+  unchainedAPI: Pick<UnchainedCore, 'bulkImporter' | 'modules' | 'services'>,
+) => {
+  logger.trace(`parseAsync start`);
 
-  const readStream = await unchainedAPI.services.files.createDownloadStream(
-    { fileId: payloadId },
-    unchainedAPI,
-  );
+  const readStream = await unchainedAPI.services.files.createDownloadStream({ fileId: payloadId });
 
   if (!readStream) {
     throw new Error(
@@ -48,7 +48,7 @@ const streamPayloadToBulkImporter = async (bulkImporter, payloadId, unchainedAPI
     await bulkImporter.prepare(event, unchainedAPI);
   }
 
-  logger.profile(`parseAsync`, { level: LogLevel.Verbose, message: 'parseAsync' });
+  logger.trace(`parseAsync done`);
 };
 
 export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
@@ -69,7 +69,6 @@ export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
       } = rawPayload;
 
       const bulkImporter = unchainedAPI.bulkImporter.createBulkImporter({
-        logger,
         createShouldUpsertIfIDExists,
         updateShouldUpsertIfIDNotExists,
         skipCacheInvalidation,
@@ -103,7 +102,7 @@ export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
         result,
       };
     } catch (err) {
-      logger.error(err.message, err);
+      logger.error(err);
       return {
         success: false,
         error: {

package/src/worker/email.ts

@@ -1,14 +1,10 @@
 import { mkdtemp, writeFile } from 'fs/promises';
 import { join, isAbsolute } from 'path';
 import { tmpdir } from 'os';
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
-import { createLogger } from '@unchainedshop/logger';
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
+import { WorkerDirector, WorkerAdapter, IWorkerAdapter } from '@unchainedshop/core';
 import open from 'open';
 import nodemailer from 'nodemailer';
 
-const logger = createLogger('unchained:plugins:worker:email');
-
 export const checkEmailInterceptionEnabled = () => {
   return process.env.NODE_ENV !== 'production' && !process.env.UNCHAINED_DISABLE_EMAIL_INTERCEPTION;
 };
@@ -73,8 +69,6 @@ const EmailWorkerPlugin: IWorkerAdapter<
   type: 'EMAIL',
 
   doWork: async ({ from, to, subject, ...rest }) => {
-    logger.debug(`${EmailWorkerPlugin.key} -> doWork: ${from} -> ${to} (${subject})`);
-
     if (!to) {
       return {
         success: false,
@@ -93,7 +87,6 @@ const EmailWorkerPlugin: IWorkerAdapter<
         ...rest,
       };
       if (checkEmailInterceptionEnabled()) {
-        logger.verbose('unchained:platform -> Mailman detected an outgoing email');
         await openInBrowser(sendMailOptions);
         return { success: true, result: { intercepted: true } };
       }

package/src/worker/enrollment-order-generator.ts

@@ -1,26 +1,25 @@
 import { Enrollment } from '@unchainedshop/core-enrollments';
 import { OrderPosition } from '@unchainedshop/core-orders';
-import { Product } from '@unchainedshop/core-products';
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
+import { enrollmentsSettings, EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import {
   EnrollmentDirector,
-  enrollmentsSettings,
-  EnrollmentStatus,
-} from '@unchainedshop/core-enrollments';
-import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core-worker';
-import { UnchainedCore } from '@unchainedshop/core';
+  UnchainedCore,
+  WorkerDirector,
+  WorkerAdapter,
+  IWorkerAdapter,
+} from '@unchainedshop/core';
 
 const generateOrder = async (
   enrollment: Enrollment,
   params: {
-    orderProducts: Array<{ orderPosition: OrderPosition; product: Product }>;
+    orderPositions: Array<OrderPosition>;
   } & { [x: string]: any },
-  unchainedAPI: UnchainedCore,
+  unchainedAPI: Pick<UnchainedCore, 'modules' | 'services'>,
 ) => {
   if (!enrollment.payment || !enrollment.delivery) return null;
 
-  const { modules } = unchainedAPI;
-  const { orderProducts, ...configuration } = params;
+  const { modules, services } = unchainedAPI;
+  const { orderPositions, ...configuration } = params;
   let order = await modules.orders.create({
     userId: enrollment.userId,
     currency: enrollment.currencyCode,
@@ -32,46 +31,38 @@ const generateOrder = async (
   });
   const orderId = order._id;
 
-  if (orderProducts) {
+  if (orderPositions) {
     await Promise.all(
-      orderProducts.map(({ orderPosition, product }) =>
-        modules.orders.positions.addProductItem(orderPosition, { order, product }, unchainedAPI),
-      ),
+      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 },
-      {
-        order,
-        product,
-      },
-      unchainedAPI,
-    );
+    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, unchainedAPI);
+    await modules.orders.setPaymentProvider(orderId, paymentProviderId);
   }
 
   const { deliveryProviderId, context: deliveryContext } = enrollment.delivery;
   if (deliveryProviderId) {
-    await modules.orders.setDeliveryProvider(orderId, deliveryProviderId, unchainedAPI);
+    await modules.orders.setDeliveryProvider(orderId, deliveryProviderId);
   }
 
-  await modules.orders.updateCalculation(orderId, unchainedAPI);
+  await services.orders.updateCalculation(orderId);
 
-  order = await modules.orders.checkout(
-    order._id,
-    {
-      paymentContext,
-      deliveryContext,
-    },
-    unchainedAPI,
-  );
+  order = await services.orders.checkoutOrder(order._id, {
+    paymentContext,
+    deliveryContext,
+  });
 
   return order;
 };

package/src/worker/error-notifications.ts

@@ -1,5 +1,5 @@
-import { IWorkerAdapter, WorkStatus } from '@unchainedshop/core-worker';
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
+import { WorkStatus } from '@unchainedshop/core-worker';
+import { IWorkerAdapter, WorkerDirector, WorkerAdapter } from '@unchainedshop/core';
 import later from '@breejs/later';
 
 type Arg = {

package/src/worker/export-token.ts

@@ -1,11 +1,5 @@
-import {
-  WorkerDirector,
-  WorkerAdapter,
-  WorkerEventTypes,
-  Work,
-  IWorkerAdapter,
-} from '@unchainedshop/core-worker';
-import { UnchainedCore } from '@unchainedshop/core';
+import { WorkerEventTypes, Work } from '@unchainedshop/core-worker';
+import { IWorkerAdapter, UnchainedCore, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 import { subscribe } from '@unchainedshop/events';
 
 export const ExportTokenWorker: IWorkerAdapter<void, void> = {

package/src/worker/external.ts

@@ -1,5 +1,4 @@
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
+import { IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 
 export const ExternalWorkerPlugin: IWorkerAdapter<void, void> = {
   ...WorkerAdapter,

package/src/worker/heartbeat.ts

@@ -1,5 +1,4 @@
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
+import { IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 
 const wait = async (time: number) => {
   return new Promise((resolve) => {

package/src/worker/http-request.ts

@@ -1,7 +1,4 @@
-/// <reference lib="dom" />
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
-import { log, LogLevel } from '@unchainedshop/logger';
+import { IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 
 const postFetch = async (url, { data, headers }) => {
   return fetch(url, {
@@ -33,10 +30,6 @@ const HttpRequestWorkerPlugin: IWorkerAdapter<
   type: 'HTTP_REQUEST',
 
   async doWork({ url, data = {}, headers, method = 'POST' } = { method: 'POST' }) {
-    log(`${this.key} -> doWork: ${method} ${url} ${data}`, {
-      level: LogLevel.Debug,
-    });
-
     if (!url) {
       return {
         success: false,

package/src/worker/message.ts

@@ -1,8 +1,5 @@
-import { MessagingDirector } from '@unchainedshop/core-messaging';
-import { WorkerAdapter, WorkerDirector, IWorkerAdapter, Work } from '@unchainedshop/core-worker';
-import { createLogger } from '@unchainedshop/logger';
-
-export const messagingLogger = createLogger('unchained:core-messaging');
+import { MessagingDirector, IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
+import { Work } from '@unchainedshop/core-worker';
 
 export const MessageWorker: IWorkerAdapter<
   { template: string; _id?: string; [x: string]: any },
@@ -42,7 +39,6 @@ export const MessageWorker: IWorkerAdapter<
       }
       return { success: true, result: { info: 'Skipped Message' } };
     } catch (err) {
-      messagingLogger.warn(err.stack);
       return {
         success: false,
         error: {

package/src/worker/push-notification.ts

@@ -1,12 +1,8 @@
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
-import { createLogger } from '@unchainedshop/logger';
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
+import { IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 import webPush from 'web-push';
 
 const { PUSH_NOTIFICATION_PUBLIC_KEY, PUSH_NOTIFICATION_PRIVATE_KEY } = process.env;
 
-const logger = createLogger('unchained:plugins:worker:push-notification');
-
 type NotificationOptions = {
   vapidDetails: {
     subject: string;
@@ -38,7 +34,6 @@ const PushNotificationWorkerPlugin: IWorkerAdapter<
   type: 'PUSH',
 
   doWork: async ({ subscription, subject, payload, urgency = null, topic = null }) => {
-    logger.debug(`${PushNotificationWorkerPlugin.key} -> doWork: Push -> ${subject}`);
     if (!PUSH_NOTIFICATION_PUBLIC_KEY)
       return {
         success: false,

package/src/worker/sms.ts

@@ -1,12 +1,8 @@
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
-import { createLogger } from '@unchainedshop/logger';
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
+import { IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 import Twilio from 'twilio';
 
 const { TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN, TWILIO_SMS_FROM } = process.env;
 
-const logger = createLogger('unchained:plugins:worker:sms');
-
 /* 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" \
@@ -32,8 +28,6 @@ const SmsWorkerPlugin: IWorkerAdapter<
   type: 'SMS',
 
   doWork: async ({ from, to, text }) => {
-    logger.debug(`${SmsWorkerPlugin.key} -> doWork: ${from} -> ${to}`);
-
     if (!TWILIO_SMS_FROM && !from) {
       return {
         success: false,

package/src/worker/update-coinbase-rates.ts

@@ -1,6 +1,4 @@
-/// <reference lib="dom" />
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
-import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core-worker';
+import { IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 import later from '@breejs/later';
 import { ProductPriceRate } from '@unchainedshop/core-products';
 import { resolveBestCurrency } from '@unchainedshop/utils';

package/src/worker/update-ecb-rates.ts

@@ -1,6 +1,4 @@
-/// <reference lib="dom" />
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
-import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core-worker';
+import { IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 import later from '@breejs/later';
 import { xml2json } from 'xml-js';
 import { ProductPriceRate } from '@unchainedshop/core-products';

package/src/worker/update-token-ownership.ts

@@ -1,5 +1,4 @@
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
+import { IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 import later from '@breejs/later';
 
 const everyMinute = later.parse.cron('* * * * *');

package/src/worker/zombie-killer.ts

@@ -1,15 +1,15 @@
-import { IWorkerAdapter } from '@unchainedshop/core-worker';
-import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
-import { createLogger } from '@unchainedshop/logger';
-
-const logger = createLogger('unchained:platform:zombie-killer');
+import { IWorkerAdapter, WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
 
 export const ZombieKillerWorker: IWorkerAdapter<
-  never,
+  { bulkImportMaxAgeInDays: number },
   {
     deletedProductMediaCount: number;
     deletedAssortmentMediaCount: number;
     deletedFilesCount: number;
+    deletedFilterTextsCount: number;
+    deletedProductTextsCount: number;
+    deletedProductVariationsCount: number;
+    deletedAssortmentTextsCount: number;
   }
 > = {
   ...WorkerAdapter,
@@ -19,7 +19,7 @@ export const ZombieKillerWorker: IWorkerAdapter<
   version: '1.0.0',
   type: 'ZOMBIE_KILLER',
 
-  doWork: async (_, unchainedAPI) => {
+  doWork: async ({ bulkImportMaxAgeInDays } = { bulkImportMaxAgeInDays: 5 }, unchainedAPI) => {
     const { modules, services } = unchainedAPI;
 
     try {
@@ -49,11 +49,7 @@ export const ZombieKillerWorker: IWorkerAdapter<
       });
 
       // Remove unreferenced product entities
-      const products = await modules.products.findProducts(
-        { includeDrafts: true },
-        { projection: { _id: 1 } },
-      );
-      const productIds = products.map((a) => a._id);
+      const productIds = await modules.products.findProductIds({ includeDrafts: true });
       const deletedProductTextsCount = await modules.products.texts.deleteMany({
         excludedProductIds: productIds,
       });
@@ -82,20 +78,25 @@ export const ZombieKillerWorker: IWorkerAdapter<
         )
       ).map((a) => a._id);
 
-      const fileIdsToRemove = allFileIdsRelevant.filter((fileId) => {
-        return !allFileIdsLinked.includes(fileId);
-      });
+      const fileIdsToRemove =
+        allFileIdsRelevant.filter((fileId) => {
+          return !allFileIdsLinked.includes(fileId);
+        }) || [];
 
-      logger.verbose(`File Id's to remove: ${fileIdsToRemove.join(', ')}`);
+      // Remove bulk import streams older than X days
+      const bulkImportMedia = await await modules.files.findFiles({
+        path: 'bulk-import-streams',
+        created: { $lt: new Date(Date.now() - 1000 * 60 * 60 * 24 * bulkImportMaxAgeInDays) },
+      });
+      bulkImportMedia.forEach(async (media) => {
+        fileIdsToRemove.push(media._id);
+      });
 
       const deletedFilesCount =
         fileIdsToRemove.length > 0
-          ? await services.files.removeFiles(
-              {
-                fileIds: fileIdsToRemove,
-              },
-              unchainedAPI,
-            )
+          ? await services.files.removeFiles({
+              fileIds: fileIdsToRemove,
+            })
           : 0;
 
       // Return delete count
@@ -121,7 +122,6 @@ export const ZombieKillerWorker: IWorkerAdapter<
         result,
       };
     } catch (err) {
-      logger.error(err.message, err);
       return {
         success: false,
         error: {

package/tsconfig.json

@@ -1,10 +1,9 @@
 {
   "extends": "../shared/base.tsconfig.json",
   "compilerOptions": {
-    "skipLibCheck": true,
-    "rootDir": "src",
-    "outDir": "lib"
+    "declarationDir": "./lib",
+    "rootDir": "./src",
+    "outDir": "./lib"
   },
-  "exclude": ["**/*.test.ts", "**/*.test.js", "tests"],
-  "include": ["./src"]
+  "exclude": ["**/*.test.ts", "**/*.test.js", "tests", "lib"]
 }