@unchainedshop/plugins 3.0.0-rc1 → 3.0.0-rc11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/plugins",
-  "version": "3.0.0-rc1",
+  "version": "3.0.0-rc11",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {
@@ -25,54 +25,137 @@
     "ecommerce",
     "core"
   ],
-  "author": "Joël Meiller",
+  "authors": [
+    "Joël Meiller",
+    "Pascal Kaufmann"
+  ],
   "license": "EUPL-1.2",
   "bugs": {
     "url": "https://github.com/unchainedshop/unchained/issues"
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/api": "^3.0.0-rc1",
-    "@unchainedshop/core-delivery": "^3.0.0-rc1",
-    "@unchainedshop/core-enrollments": "^3.0.0-rc1",
-    "@unchainedshop/core-orders": "^3.0.0-rc1",
-    "@unchainedshop/core-payment": "^3.0.0-rc1",
-    "@unchainedshop/core-products": "^3.0.0-rc1",
-    "@unchainedshop/core-warehousing": "^3.0.0-rc1",
-    "@unchainedshop/core-worker": "^3.0.0-rc1",
-    "@unchainedshop/events": "^3.0.0-rc1",
-    "@unchainedshop/file-upload": "^3.0.0-rc1",
-    "@unchainedshop/logger": "^3.0.0-rc1",
-    "@unchainedshop/utils": "^3.0.0-rc1"
+    "@breejs/later": "^4.2.0",
+    "@unchainedshop/api": "^3.0.0-rc11",
+    "@unchainedshop/core-delivery": "^3.0.0-rc11",
+    "@unchainedshop/core-enrollments": "^3.0.0-rc11",
+    "@unchainedshop/core-orders": "^3.0.0-rc11",
+    "@unchainedshop/core-payment": "^3.0.0-rc11",
+    "@unchainedshop/core-products": "^3.0.0-rc11",
+    "@unchainedshop/core-warehousing": "^3.0.0-rc11",
+    "@unchainedshop/core-worker": "^3.0.0-rc11",
+    "@unchainedshop/events": "^3.0.0-rc11",
+    "@unchainedshop/file-upload": "^3.0.0-rc11",
+    "@unchainedshop/logger": "^3.0.0-rc11",
+    "@unchainedshop/utils": "^3.0.0-rc11",
+    "event-iterator": "^2.0.0",
+    "JSONStream": "^1.3.5"
+  },
+  "peerDependencies": {
+    "@aws-sdk/client-eventbridge": ">= 3.714 < 4",
+    "@paypal/checkout-server-sdk": "1.x",
+    "@redis/client": "1.x",
+    "bip32": "4.x",
+    "bitcoinjs-lib": ">= 6.1 <7",
+    "ethers": ">= 6.13 < 7",
+    "expiry-map": "2.x",
+    "express": "5.x",
+    "mime-types": "2.x",
+    "minio": "8.x",
+    "nodemailer": ">= 6.9 < 7",
+    "open": "10.x",
+    "p-memoize": "7.x",
+    "postfinancecheckout": ">= 4.5.0",
+    "stripe": "^17.4.0",
+    "tiny-secp256k1": "2.x",
+    "twilio": "5.x",
+    "web-push": ">= 3.6 <4",
+    "xml-js": ">= 1.6 < 2"
   },
-  "optionalDependencies": {
-    "@aws-sdk/client-eventbridge": "^3.713.0",
+  "peerDependenciesMeta": {
+    "@aws-sdk/client-eventbridge": {
+      "optional": true
+    },
+    "@paypal/checkout-server-sdk": {
+      "optional": true
+    },
+    "@redis/client": {
+      "optional": true
+    },
+    "bip32": {
+      "optional": true
+    },
+    "bitcoinjs-lib": {
+      "optional": true
+    },
+    "ethers": {
+      "optional": true
+    },
+    "expiry-map": {
+      "optional": true
+    },
+    "express": {
+      "optional": true
+    },
+    "mime-types": {
+      "optional": true
+    },
+    "minio": {
+      "optional": true
+    },
+    "nodemailer": {
+      "optional": true
+    },
+    "open": {
+      "optional": true
+    },
+    "p-memoize": {
+      "optional": true
+    },
+    "postfinancecheckout": {
+      "optional": true
+    },
+    "stripe": {
+      "optional": true
+    },
+    "tiny-secp256k1": {
+      "optional": true
+    },
+    "twilio": {
+      "optional": true
+    },
+    "web-push": {
+      "optional": true
+    },
+    "xml-js": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@aws-sdk/client-eventbridge": "^3.716.0",
     "@breejs/later": "^4.2.0",
     "@paypal/checkout-server-sdk": "^1.0.3",
     "@redis/client": "^1.6.0",
+    "@types/express": "^5.0.0",
+    "@types/node": "^22.10.2",
     "bip32": "^4.0.0",
     "bitcoinjs-lib": "^6.1.7",
     "ethers": "^6.13.4",
-    "event-iterator": "^2.0.0",
     "expiry-map": "^2.0.0",
-    "express": "^4.21.2",
-    "JSONStream": "^1.3.5",
+    "express": "^5.0.1",
+    "jest": "^29.7.0",
     "mime-types": "^2.1.35",
-    "minio": "^8.0.2",
+    "minio": "^8.0.3",
     "nodemailer": "^6.9.16",
     "open": "^10.1.0",
     "p-memoize": "^7.1.1",
     "postfinancecheckout": "^4.5.0",
-    "stripe": "^17.4.0",
+    "stripe": "^17.5.0",
     "tiny-secp256k1": "^2.2.3",
+    "ts-jest": "^29.2.5",
     "twilio": "^5.4.0",
+    "typescript": "^5.7.2",
     "web-push": "^3.6.7",
     "xml-js": "^1.6.11"
-  },
-  "devDependencies": {
-    "@types/node": "^22.10.2",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.7.2"
   }
 }

package/src/events/node-event-emitter.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 import { setEmitAdapter, EmitAdapter } from '@unchainedshop/events';
 
 const NodeEventEmitter = (): EmitAdapter => {

package/src/files/gridfs/gridfs-adapter.ts

@@ -1,6 +1,5 @@
-import { URL } from 'url';
-import { Readable, PassThrough } from 'stream';
-import { pipeline } from 'stream/promises';
+import { Readable, PassThrough } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import mimeType from 'mime-types';
 import {
   FileAdapter,
@@ -12,6 +11,8 @@ import {
 import { UploadFileData } from '@unchainedshop/file-upload';
 import sign from './sign.js';
 import { filesSettings } from '@unchainedshop/core-files';
+import { UnchainedCore } from '@unchainedshop/core';
+import { GridFSFileUploadsModule } from './index.js';
 
 const { ROOT_URL } = process.env;
 
@@ -23,7 +24,13 @@ const bufferToStream = (buffer: any) => {
   return stream;
 };
 
-export const GridFSAdapter: IFileAdapter = {
+export const GridFSAdapter: IFileAdapter<
+  UnchainedCore & {
+    modules: {
+      gridfsFileUploads: GridFSFileUploadsModule;
+    };
+  }
+> = {
   key: 'shop.unchained.file-upload-plugin.gridfs',
   label: 'Uploads files to Database using GridFS',
   version: '1.0.0',
@@ -64,8 +71,8 @@ export const GridFSAdapter: IFileAdapter = {
     } as UploadFileData & { putURL: string };
   },
 
-  async uploadFileFromStream(directoryName: string, rawFile: any, { modules }: any) {
-    let stream;
+  async uploadFileFromStream(directoryName: string, rawFile: any, { modules }) {
+    let stream: Readable;
     let fileName;
     if (rawFile instanceof Promise) {
       const { filename: f, createReadStream } = await rawFile;
@@ -104,7 +111,7 @@ export const GridFSAdapter: IFileAdapter = {
   async uploadFileFromURL(
     directoryName: string,
     { fileLink, fileName: fname, fileId, headers }: any,
-    { modules }: any,
+    { modules },
   ) {
     const { href } = new URL(fileLink);
     const fileName = decodeURIComponent(fname || href.split('/').pop());

package/src/files/gridfs/gridfs-webhook.ts

@@ -1,5 +1,5 @@
-import { pipeline, finished } from 'stream/promises';
-import { PassThrough } from 'stream';
+import { pipeline, finished } from 'node:stream/promises';
+import { PassThrough } from 'node:stream';
 import { buildHashedFilename } from '@unchainedshop/file-upload';
 import express from 'express';
 import sign from './sign.js';

package/src/files/gridfs/index.ts

@@ -27,3 +27,5 @@ export const configureGridFSFileUploadModule = ({ db }) => {
     },
   };
 };
+
+export type GridFSFileUploadsModule = ReturnType<typeof configureGridFSFileUploadModule>;

package/src/files/minio/minio-adapter.ts

@@ -1,7 +1,5 @@
-import https from 'https';
-import http, { OutgoingHttpHeaders } from 'http';
-import { Readable } from 'stream';
-import { URL } from 'url';
+import { Readable } from 'node:stream';
+import type { ReadableStream } from 'node:stream/web';
 import { UploadFileData } from '@unchainedshop/file-upload';
 import {
   FileAdapter,
@@ -85,24 +83,6 @@ connectToMinio().then(function setClient(c) {
   client = c;
 });
 
-const createHttpDownloadStream = async (
-  fileUrl: string,
-  headers: OutgoingHttpHeaders,
-): Promise<http.IncomingMessage> => {
-  const { href, protocol } = new URL(fileUrl);
-  return new Promise((resolve, reject) => {
-    try {
-      if (protocol === 'http:') {
-        http.get(href, { headers }, resolve);
-      } else {
-        https.get(href, { headers }, resolve);
-      }
-    } catch (e) {
-      reject(e);
-    }
-  });
-};
-
 const getObjectStats = async (fileName: string) => {
   if (!client) throw new Error('Minio not connected, check env variables');
 
@@ -211,9 +191,10 @@ export const MinioAdapter: IFileAdapter = {
     const fileName = fname || href.split('/').pop();
     const hashedFilename = await buildHashedFilename(directoryName, fileName, new Date());
 
-    const stream = await createHttpDownloadStream(fileLink, headers);
-    const type = mimeType.lookup(fileName) || stream.headers['content-type'];
-
+    const url = new URL(fileLink);
+    const response = await fetch(url, { headers });
+    const type = mimeType.lookup(fileName) || response.headers['content-type'];
+    const readable = Readable.fromWeb(response.body as ReadableStream<Uint8Array<ArrayBufferLike>>);
     const metaData = {
       'Content-Type': type,
     };
@@ -221,7 +202,7 @@ export const MinioAdapter: IFileAdapter = {
     await client.putObject(
       MINIO_BUCKET_NAME,
       generateMinioPath(directoryName, hashedFilename),
-      stream,
+      readable,
       undefined,
       metaData,
     );

package/src/payment/apple-iap/adapter.ts

@@ -63,7 +63,7 @@ const fixPeriods = async (
         orderId: transaction.transaction_id === transactionId ? orderId : null,
       };
     })
-    .sort((left, right) => {
+    .toSorted((left, right) => {
       return left.end.getTime() - right.end.getTime();
     });
 

package/src/payment/datatrans-v2/api/makeFetcher.ts

@@ -1,11 +1,5 @@
-import fs from 'fs';
-import util from 'util';
-import { resolve } from 'path';
 import { createLogger } from '@unchainedshop/logger';
-
-const readFile = util.promisify(fs.readFile);
-
-const { DATATRANS_API_MOCKS_PATH } = process.env;
+const { MOCK_APIS } = process.env;
 
 const logger = createLogger('unchained:datatrans');
 
@@ -14,12 +8,15 @@ export default (
   merchantId: string,
   secret: string,
 ): ((path: string, body: unknown) => Promise<Response>) => {
-  if (DATATRANS_API_MOCKS_PATH) {
+  if (MOCK_APIS) {
     return async (path): Promise<Response> => {
       try {
-        const filePath = resolve(process.env.PWD, DATATRANS_API_MOCKS_PATH, `.${path}.json`);
-        const content = await readFile(filePath);
-        const json = JSON.parse(content.toString());
+        const { default: json } = await import(
+          `${import.meta.dirname}/../../../../tests/mock/datatrans/${path}.json`,
+          {
+            with: { type: 'json' },
+          }
+        );
         return {
           json: async () => json,
           status: json?.error ? 500 : 204,

package/src/payment/paypal-checkout.ts

@@ -9,6 +9,8 @@ import { createLogger } from '@unchainedshop/logger';
 
 let checkoutNodeJssdk;
 try {
+  // eslint-disable-next-line
+  // @ts-ignore
   checkoutNodeJssdk = await import('@paypal/checkout-server-sdk');
 } catch {
   /* */

package/src/payment/payrexx/api/makeFetcher.ts

@@ -1,11 +1,6 @@
-import fs from 'fs';
-import util from 'util';
-import { resolve } from 'path';
 import { createLogger } from '@unchainedshop/logger';
 
-const readFile = util.promisify(fs.readFile);
-
-const { PAYREXX_API_MOCKS_PATH } = process.env;
+const { MOCK_APIS } = process.env;
 
 const logger = createLogger('unchained:payrexx');
 
@@ -14,17 +9,19 @@ export default (
   instance: string = null,
   secret: string = null,
 ): ((path: string, method: 'GET' | 'DELETE' | 'PUT' | 'POST', data?: any) => Promise<Response>) => {
-  if (PAYREXX_API_MOCKS_PATH) {
+  if (MOCK_APIS) {
     return async (path): Promise<Response> => {
       try {
-        const filePath = resolve(process.env.PWD, PAYREXX_API_MOCKS_PATH, `${path}.json`);
-        const content = await readFile(filePath);
-        const textData = content.toString();
-        const jsonData = JSON.parse(textData);
+        const { default: jsonData } = await import(
+          `${import.meta.dirname}/../../../../tests/mock/payrexx/${path}.json`,
+          {
+            with: { type: 'json' },
+          }
+        );
         return {
           json: async () => jsonData,
-          text: async () => textData,
-          ok: !jsonData?.error,
+          text: async () => JSON.stringify(jsonData?.error),
+          ok: true,
           status: jsonData?.error ? 500 : 204,
         } as any;
       } catch (error) {

package/src/payment/stripe/stripe.ts

@@ -14,9 +14,11 @@ export const initStripeClient = async (): Promise<StripeType> => {
     logger.warn('STRIPE_SECRET is not set, skipping initialization');
     return null;
   }
+  // eslint-disable-next-line
+  // @ts-ignore
   const { default: Stripe } = await import('stripe');
   stripe = new Stripe(STRIPE_SECRET, {
-    apiVersion: '2024-11-20.acacia',
+    apiVersion: '2024-12-18.acacia',
   });
   return stripe;
 };

package/src/pricing/discount-100-off.ts

@@ -2,11 +2,10 @@ import {
   OrderDiscountDirector,
   OrderDiscountAdapter,
   OrderDiscountConfiguration,
-  UnchainedCore,
   IDiscountAdapter,
 } from '@unchainedshop/core';
 
-export const HundredOff: IDiscountAdapter<OrderDiscountConfiguration, UnchainedCore> = {
+export const HundredOff: IDiscountAdapter<OrderDiscountConfiguration> = {
   ...OrderDiscountAdapter,
 
   key: 'shop.unchained.discount.100-off',

package/src/pricing/discount-half-price-manual.ts

@@ -2,11 +2,10 @@ import {
   OrderDiscountDirector,
   OrderDiscountAdapter,
   ProductDiscountConfiguration,
-  UnchainedCore,
   IDiscountAdapter,
 } from '@unchainedshop/core';
 
-export const HalfPriceManual: IDiscountAdapter<ProductDiscountConfiguration, UnchainedCore> = {
+export const HalfPriceManual: IDiscountAdapter<ProductDiscountConfiguration> = {
   ...OrderDiscountAdapter,
 
   key: 'shop.unchained.discount.half-price-manual',

package/src/pricing/discount-half-price.ts

@@ -3,10 +3,9 @@ import {
   OrderDiscountAdapter,
   ProductDiscountConfiguration,
   IDiscountAdapter,
-  UnchainedCore,
 } from '@unchainedshop/core';
 
-export const HalfPrice: IDiscountAdapter<ProductDiscountConfiguration, UnchainedCore> = {
+export const HalfPrice: IDiscountAdapter<ProductDiscountConfiguration> = {
   ...OrderDiscountAdapter,
 
   key: 'shop.unchained.discount.half-price',

package/src/worker/email.ts

@@ -1,17 +1,13 @@
-import { mkdtemp, writeFile } from 'fs/promises';
-import { join, isAbsolute } from 'path';
-import { tmpdir } from 'os';
 import { WorkerDirector, WorkerAdapter, IWorkerAdapter } from '@unchainedshop/core';
-import open from 'open';
 import nodemailer from 'nodemailer';
 
 export const checkEmailInterceptionEnabled = () => {
   return process.env.NODE_ENV !== 'production' && !process.env.UNCHAINED_DISABLE_EMAIL_INTERCEPTION;
 };
 
-const buildLink = ({ filename, content, href, contentType, encoding, path }) => {
+const buildLink = async ({ filename, content, href, contentType, encoding, path }) => {
   if (path) {
-    return `<a href="${isAbsolute(path) ? path : join(process.cwd(), path)}">${filename}</a>`;
+    return `<a href="file:/${path.startsWith('/') ? path : `${process.cwd()}/${path}`}">${filename}</a>`;
   }
   if (href) {
     return `<a href="${href}">${filename}</a>`;
@@ -23,8 +19,12 @@ const buildLink = ({ filename, content, href, contentType, encoding, path }) =>
 };
 
 const openInBrowser = async (options) => {
-  const filename = `${Date.now()}.html`;
+  // eslint-disable-next-line
+  // @ts-ignore
+  const { default: open, apps } = await import('open');
+
   const messageBody = options.html || options.text.replace(/(\r\n|\n|\r)/gm, '<br/>');
+  const attachmentLinks = await Promise.all((options.attachments || []).map(buildLink));
   const content = `
 <!DOCTYPE html>
 <html lang="en" xmlns="https://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office">
@@ -40,16 +40,17 @@ const openInBrowser = async (options) => {
     <b>Reply-To:&nbsp;</b>${options.replyTo}<br/>
     <br/>
     <b>subject:&nbsp;</b>${options.subject}<br/>
-    <b>attachments:&nbsp;</b>${(options.attachments || []).map(buildLink).join(',&nbsp;')}<br/>
+    <b>attachments:&nbsp;</b>${attachmentLinks.join(',&nbsp;')}<br/>
     <hr/>
     ${messageBody}
   </body>
 </html>`;
 
-  const folder = await mkdtemp(join(tmpdir(), 'email-'));
-  const fileName = `${folder}/${filename}`;
-  await writeFile(fileName, content);
-  return open(fileName);
+  const base64 = Buffer.from(content).toString('base64');
+  const dataUri = `data:text/html;base64,${base64}`;
+
+  await open(dataUri, { app: [{ name: apps.chrome }, { name: apps.firefox }, { name: apps.browser }] });
+  return true;
 };
 
 const EmailWorkerPlugin: IWorkerAdapter<
@@ -87,8 +88,12 @@ const EmailWorkerPlugin: IWorkerAdapter<
         ...rest,
       };
       if (checkEmailInterceptionEnabled()) {
-        await openInBrowser(sendMailOptions);
-        return { success: true, result: { intercepted: true } };
+        const opened = await openInBrowser(sendMailOptions);
+        return {
+          success: opened,
+          result: opened ? { intercepted: true } : undefined,
+          error: !opened ? { message: "Interception failed due to missing package 'open'" } : undefined,
+        };
       }
       if (!process.env.MAIL_URL) {
         return {

package/tests/mock/datatrans/v1/secure-fields.json

@@ -0,0 +1,4 @@
+{
+  "location": "https://pay.sandbox.datatrans.com/v1/start/new-transaction-secure-fields",
+  "transactionId": "new-transaction-secure-fields"
+}

package/tests/mock/datatrans/v1/transactions/authorize.json

@@ -0,0 +1,48 @@
+{
+  "transactionId": "payment_alias_authorized",
+  "type": "payment",
+  "status": "authorized",
+  "currency": "CHF",
+  "refno": "MTExMTExMjIyMjI=",
+  "refno2": "user",
+  "paymentMethod": "VIS",
+  "detail": {
+    "authorize": {
+      "amount": 30000,
+      "acquirerAuthorizationCode": "131704"
+    }
+  },
+  "language": "de",
+  "card": {
+    "alias": "70119122433810042",
+    "masked": "424242xxxxxx4242",
+    "expiryMonth": "12",
+    "expiryYear": "21",
+    "info": {
+      "brand": "VISA CREDIT",
+      "type": "credit",
+      "usage": "consumer",
+      "country": "GB",
+      "issuer": "DATATRANS"
+    },
+    "3D": {
+      "authenticationResponse": "D"
+    }
+  },
+  "history": [
+    {
+      "action": "init",
+      "source": "api",
+      "date": "2021-09-03T11:16:50Z",
+      "success": true,
+      "ip": "212.232.234.26"
+    },
+    {
+      "action": "authorize",
+      "source": "redirect",
+      "date": "2021-09-03T11:17:04Z",
+      "success": true,
+      "ip": "212.232.234.26"
+    }
+  ]
+}

package/tests/mock/datatrans/v1/transactions/card_check_authorized.json

@@ -0,0 +1,47 @@
+{
+  "transactionId": "card_check_authorized",
+  "type": "card_check",
+  "status": "authorized",
+  "currency": "CHF",
+  "refno": "ZDRkNGQ0ZDRkNA==",
+  "refno2": "user",
+  "paymentMethod": "VIS",
+  "detail": {
+    "authorize": {
+      "acquirerAuthorizationCode": "131704"
+    }
+  },
+  "language": "de",
+  "card": {
+    "alias": "70119122433810042",
+    "masked": "424242xxxxxx4242",
+    "expiryMonth": "12",
+    "expiryYear": "21",
+    "info": {
+      "brand": "VISA CREDIT",
+      "type": "credit",
+      "usage": "consumer",
+      "country": "GB",
+      "issuer": "DATATRANS"
+    },
+    "3D": {
+      "authenticationResponse": "D"
+    }
+  },
+  "history": [
+    {
+      "action": "init",
+      "source": "api",
+      "date": "2021-09-03T11:16:50Z",
+      "success": true,
+      "ip": "212.232.234.26"
+    },
+    {
+      "action": "authorize",
+      "source": "redirect",
+      "date": "2021-09-03T11:17:04Z",
+      "success": true,
+      "ip": "212.232.234.26"
+    }
+  ]
+}

package/tests/mock/datatrans/v1/transactions/payment_alias_authorized/settle.json

@@ -0,0 +1 @@
+{}