@unchainedshop/plugins 2.5.12 → 2.6.1

package/src/worker/bulk-import.ts

@@ -1,4 +1,3 @@
-import fs from 'fs';
 import { IWorkerAdapter } from '@unchainedshop/types/worker.js';
 import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
 import { createLogger, LogLevel } from '@unchainedshop/logger';
@@ -8,16 +7,22 @@ import { UnchainedCore } from '@unchainedshop/types/core.js';
 
 const logger = createLogger('unchained:platform:bulk-import');
 
-const streamPayloadToBulkImporter = async (
-  bulkImporter,
-  createReadStream,
-  unchainedAPI: UnchainedCore,
-) => {
+const streamPayloadToBulkImporter = async (bulkImporter, payloadId, unchainedAPI: UnchainedCore) => {
   logger.profile(`parseAsync`, { level: LogLevel.Verbose, message: 'parseAsync' });
 
+  const readStream = await unchainedAPI.services.files.createDownloadStream(
+    { fileId: payloadId },
+    unchainedAPI,
+  );
+
+  if (!readStream) {
+    throw new Error(
+      'The current file adapter does not support streams when downloading required for streamed events. Please use a different file adapter.',
+    );
+  }
+
   const eventIterator = new EventIterator(
     (queue) => {
-      const readStream = createReadStream();
       const jsonStream = JSONStream.parse('events.*'); // rows, ANYTHING, doc
       jsonStream.on('data', queue.push);
       jsonStream.on('close', queue.stop);
@@ -65,20 +70,9 @@ export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
         skipCacheInvalidation,
       });
 
-      if (rawPayload.payloadFilePath) {
-        // stream payload from file system
-        await streamPayloadToBulkImporter(
-          bulkImporter,
-          () => fs.createReadStream(rawPayload.payloadFilePath),
-          unchainedAPI,
-        );
-      } else if (rawPayload.payloadId) {
+      if (rawPayload.payloadId) {
         // stream payload from gridfs
-        await streamPayloadToBulkImporter(
-          bulkImporter,
-          () => unchainedAPI.bulkImporter.BulkImportPayloads.openDownloadStream(rawPayload.payloadId),
-          unchainedAPI,
-        );
+        await streamPayloadToBulkImporter(bulkImporter, rawPayload.payloadId, unchainedAPI);
       } else {
         const { events } = rawPayload;
         if (!events?.length) throw new Error('No events submitted');

package/src/worker/export-token.ts

@@ -1,6 +1,7 @@
-import { IWorkerAdapter } from '@unchainedshop/types/worker.js';
+import { IWorkerAdapter, Work } from '@unchainedshop/types/worker.js';
 import { WorkerDirector, WorkerAdapter, WorkerEventTypes } from '@unchainedshop/core-worker';
 import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { subscribe } from '@unchainedshop/events';
 
 export const ExportTokenWorker: IWorkerAdapter<void, void> = {
   ...WorkerAdapter,
@@ -17,7 +18,7 @@ export const ExportTokenWorker: IWorkerAdapter<void, void> = {
 };
 
 export const configureExportToken = (unchainedAPI: UnchainedCore) => {
-  WorkerDirector.events.on(WorkerEventTypes.FINISHED, async ({ work }) => {
+  subscribe<Work>(WorkerEventTypes.FINISHED, async ({ payload: work }) => {
     if (work.type === 'EXPORT_TOKEN' && work.success) {
       await unchainedAPI.modules.warehousing.updateTokenOwnership({
         tokenId: work.input.token._id,

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

@@ -84,5 +84,4 @@ WorkerDirector.registerAdapter(UpdateCoinbaseRates);
 
 WorkerDirector.configureAutoscheduling(UpdateCoinbaseRates, {
   schedule: everyMinute,
-  retries: 0,
 });

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

@@ -11,11 +11,10 @@ const getExchangeRates = async () => {
   })
     .then((res) => res.text())
     .then((text) => JSON.parse(xmlJs.xml2json(text)))
-    .then(
-      (json) =>
-        json.elements?.[0]?.elements
-          .filter((e) => e.name.toLowerCase() === 'cube')[0]
-          ?.elements[0]?.elements.map((element) => element.attributes),
+    .then((json) =>
+      json.elements?.[0]?.elements
+        .filter((e) => e.name.toLowerCase() === 'cube')[0]
+        ?.elements[0]?.elements.map((element) => element.attributes),
     );
 };
 

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

@@ -2,6 +2,7 @@ import { IWorkerAdapter, Work } from '@unchainedshop/types/worker.js';
 import { WorkerDirector, WorkerAdapter, WorkerEventTypes } from '@unchainedshop/core-worker';
 import { UnchainedCore } from '@unchainedshop/types/core.js';
 import later from '@breejs/later';
+import { subscribe } from '@unchainedshop/events';
 
 const everyMinute = later.parse.cron('* * * * *');
 
@@ -63,7 +64,7 @@ export const RefreshTokens: IWorkerAdapter<void, any> = {
 };
 
 export const configureUpdateTokenOwnership = (unchainedAPI: UnchainedCore) => {
-  WorkerDirector.events.on(WorkerEventTypes.FINISHED, async ({ work }: { work: Work }) => {
+  subscribe<Work>(WorkerEventTypes.FINISHED, async ({ payload: work }) => {
     if (work.type === 'UPDATE_TOKEN_OWNERSHIP' && work.success) {
       await Promise.all(
         (work.result?.tokens || []).map(unchainedAPI.modules.warehousing.updateTokenOwnership),

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

@@ -1,12 +0,0 @@
-import { IProductPricingAdapter } from '@unchainedshop/types/products.pricing.js';
-interface PriceRoundSettings {
-    configurations: Record<string, number>;
-    defaultPrecision: number;
-    skip: Array<string>;
-}
-export declare const ProductPriceRoundSettings: PriceRoundSettings;
-export declare const configureProductPriceRounding: ({ configurations, defaultPrecision, skip, }: PriceRoundSettings) => void;
-export declare const ProductPriceRound: IProductPricingAdapter & {
-    configure: (params: PriceRoundSettings) => void;
-};
-export {};

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

@@ -1,53 +0,0 @@
-import { ProductPricingAdapter, ProductPricingDirector } from '@unchainedshop/core-products';
-import { calculation as calcUtils } from '@unchainedshop/utils';
-export const ProductPriceRoundSettings = {
-    configurations: {},
-    defaultPrecision: 50,
-    skip: [],
-};
-export const configureProductPriceRounding = ({ configurations, defaultPrecision, skip, }) => {
-    if (defaultPrecision)
-        ProductPriceRoundSettings.defaultPrecision = defaultPrecision;
-    if (configurations)
-        ProductPriceRoundSettings.configurations = configurations;
-    if (skip?.length)
-        ProductPriceRoundSettings.skip = skip;
-};
-export const ProductPriceRound = {
-    ...ProductPricingAdapter,
-    key: 'shop.unchained.pricing.price-round',
-    version: '1.0.0',
-    label: 'Round product price to the next precision number',
-    orderIndex: 2,
-    isActivatedFor: () => {
-        return true;
-    },
-    configure: configureProductPriceRounding,
-    actions: (params) => {
-        const pricingAdapter = ProductPricingAdapter.actions(params);
-        return {
-            ...pricingAdapter,
-            calculate: async () => {
-                const { currency, quantity } = params.context;
-                const { configurations, skip, defaultPrecision } = ProductPriceRoundSettings;
-                const { calculation = [] } = params.calculationSheet;
-                if (skip?.indexOf(currency) !== -1)
-                    return pricingAdapter.calculate();
-                const roundPrecision = configurations?.[currency] || defaultPrecision;
-                if (calculation?.length && roundPrecision) {
-                    const [productPrice] = calculation;
-                    pricingAdapter.resultSheet().resetCalculation(params.calculationSheet);
-                    pricingAdapter.resultSheet().addItem({
-                        amount: calcUtils.roundToNext(productPrice.amount, roundPrecision) * quantity,
-                        isTaxable: productPrice.isTaxable,
-                        isNetPrice: productPrice.isNetPrice,
-                        meta: { adapter: ProductPriceRound.key },
-                    });
-                }
-                return pricingAdapter.calculate();
-            },
-        };
-    },
-};
-ProductPricingDirector.registerAdapter(ProductPriceRound);
-//# sourceMappingURL=product-price-round.js.map

package/lib/pricing/product-price-round.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"product-price-round.js","sourceRoot":"","sources":["../../src/pricing/product-price-round.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,WAAW,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAQhE,MAAM,CAAC,MAAM,yBAAyB,GAAuB;IAC3D,cAAc,EAAE,EAAE;IAClB,gBAAgB,EAAE,EAAE;IACpB,IAAI,EAAE,EAAE;CACT,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,EAC5C,cAAc,EACd,gBAAgB,EAChB,IAAI,GACe,EAAE,EAAE;IACvB,IAAI,gBAAgB;QAAE,yBAAyB,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IACpF,IAAI,cAAc;QAAE,yBAAyB,CAAC,cAAc,GAAG,cAAc,CAAC;IAC9E,IAAI,IAAI,EAAE,MAAM;QAAE,yBAAyB,CAAC,IAAI,GAAG,IAAI,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAE1B;IACF,GAAG,qBAAqB;IAExB,GAAG,EAAE,oCAAoC;IACzC,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,kDAAkD;IACzD,UAAU,EAAE,CAAC;IAEb,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,EAAE,6BAA6B;IAExC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE7D,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;gBAC9C,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,yBAAyB,CAAC;gBAC7E,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC,gBAAgB,CAAC;gBAErD,IAAI,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAAE,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;gBAEtE,MAAM,cAAc,GAAG,cAAc,EAAE,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC;gBAEtE,IAAI,WAAW,EAAE,MAAM,IAAI,cAAc,EAAE,CAAC;oBAC1C,MAAM,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC;oBACnC,cAAc,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;oBACvE,cAAc,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC;wBACnC,MAAM,EAAE,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,QAAQ;wBAC7E,SAAS,EAAE,YAAY,CAAC,SAAS;wBACjC,UAAU,EAAE,YAAY,CAAC,UAAU;wBACnC,IAAI,EAAE,EAAE,OAAO,EAAE,iBAAiB,CAAC,GAAG,EAAE;qBACzC,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,sBAAsB,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC"}

package/src/pricing/configureProductPriceRounding.test.ts

@@ -1,42 +0,0 @@
-import {configureProductPriceRounding, ProductPriceRoundSettings } from './product-price-round.js'
-
-describe('configureProductPriceRounding', () => {
-  beforeEach(() => {
-    ProductPriceRoundSettings.configurations = {};
-    ProductPriceRoundSettings.defaultPrecision = 50;
-    ProductPriceRoundSettings.skip = [];
-  });
-
-  it('updates the default precision correctly', () => {
-    configureProductPriceRounding({ defaultPrecision: 100 } as any);
-    expect(ProductPriceRoundSettings.defaultPrecision).toBe(100);
-  });
-
-  it('updates the configurations correctly', () => {
-    configureProductPriceRounding({ configurations: { 'product1': 25 } } as any);
-    expect(ProductPriceRoundSettings.configurations).toEqual({ 'product1': 25 });
-  });
-
-  it('updates the skip list correctly', () => {
-    configureProductPriceRounding({ skip: ['product1'] } as any);
-    expect(ProductPriceRoundSettings.skip).toEqual(['product1']);
-  });
-
-  it('updates multiple properties correctly', () => {
-    configureProductPriceRounding({
-      configurations: { 'product1': 25 },
-      defaultPrecision: 100,
-      skip: ['product1']
-    });
-    expect(ProductPriceRoundSettings.configurations).toEqual({ 'product1': 25 });
-    expect(ProductPriceRoundSettings.defaultPrecision).toBe(100);
-    expect(ProductPriceRoundSettings.skip).toEqual(['product1']);
-  });
-
-  it('does not update any properties when no arguments are passed', () => {
-    configureProductPriceRounding({} as any);
-    expect(ProductPriceRoundSettings.configurations).toEqual({});
-    expect(ProductPriceRoundSettings.defaultPrecision).toBe(50);
-    expect(ProductPriceRoundSettings.skip).toEqual([]);
-  });
-});

package/src/pricing/product-price-round.ts

@@ -1,75 +0,0 @@
-import { IProductPricingAdapter } from '@unchainedshop/types/products.pricing.js';
-import { ProductPricingAdapter, ProductPricingDirector } from '@unchainedshop/core-products';
-import { calculation as calcUtils } from '@unchainedshop/utils';
-
-interface PriceRoundSettings {
-  configurations: Record<string, number>;
-  defaultPrecision: number;
-  skip: Array<string>;
-}
-
-export const ProductPriceRoundSettings: PriceRoundSettings = {
-  configurations: {},
-  defaultPrecision: 50,
-  skip: [],
-};
-
-export const configureProductPriceRounding = ({
-  configurations,
-  defaultPrecision,
-  skip,
-}: PriceRoundSettings) => {
-  if (defaultPrecision) ProductPriceRoundSettings.defaultPrecision = defaultPrecision;
-  if (configurations) ProductPriceRoundSettings.configurations = configurations;
-  if (skip?.length) ProductPriceRoundSettings.skip = skip;
-};
-
-export const ProductPriceRound: IProductPricingAdapter & {
-  configure: (params: PriceRoundSettings) => void;
-} = {
-  ...ProductPricingAdapter,
-
-  key: 'shop.unchained.pricing.price-round',
-  version: '1.0.0',
-  label: 'Round product price to the next precision number',
-  orderIndex: 2,
-
-  isActivatedFor: () => {
-    return true;
-  },
-
-  configure: configureProductPriceRounding,
-
-  actions: (params) => {
-    const pricingAdapter = ProductPricingAdapter.actions(params);
-
-    return {
-      ...pricingAdapter,
-
-      calculate: async () => {
-        const { currency, quantity } = params.context;
-        const { configurations, skip, defaultPrecision } = ProductPriceRoundSettings;
-        const { calculation = [] } = params.calculationSheet;
-
-        if (skip?.indexOf(currency) !== -1) return pricingAdapter.calculate();
-
-        const roundPrecision = configurations?.[currency] || defaultPrecision;
-
-        if (calculation?.length && roundPrecision) {
-          const [productPrice] = calculation;
-          pricingAdapter.resultSheet().resetCalculation(params.calculationSheet);
-          pricingAdapter.resultSheet().addItem({
-            amount: calcUtils.roundToNext(productPrice.amount, roundPrecision) * quantity,
-            isTaxable: productPrice.isTaxable,
-            isNetPrice: productPrice.isNetPrice,
-            meta: { adapter: ProductPriceRound.key },
-          });
-        }
-
-        return pricingAdapter.calculate();
-      },
-    };
-  },
-};
-
-ProductPricingDirector.registerAdapter(ProductPriceRound);