@unchainedshop/plugins 4.0.0-rc.2 → 4.0.0-rc.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/plugins",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.21",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {
@@ -34,38 +34,34 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/api": "^4.0.0-rc.2",
-    "@unchainedshop/core-delivery": "^4.0.0-rc.2",
-    "@unchainedshop/core-enrollments": "^4.0.0-rc.2",
-    "@unchainedshop/core-orders": "^4.0.0-rc.2",
-    "@unchainedshop/core-payment": "^4.0.0-rc.2",
-    "@unchainedshop/core-products": "^4.0.0-rc.2",
-    "@unchainedshop/core-warehousing": "^4.0.0-rc.2",
-    "@unchainedshop/core-worker": "^4.0.0-rc.2",
-    "@unchainedshop/events": "^4.0.0-rc.2",
-    "@unchainedshop/file-upload": "^4.0.0-rc.2",
-    "@unchainedshop/logger": "^4.0.0-rc.2",
-    "@unchainedshop/utils": "^4.0.0-rc.2",
-    "event-iterator": "^2.0.0",
-    "JSONStream": "^1.3.5"
+    "@unchainedshop/api": "^4.0.0-rc.21",
+    "@unchainedshop/core-delivery": "^4.0.0-rc.21",
+    "@unchainedshop/core-enrollments": "^4.0.0-rc.21",
+    "@unchainedshop/core-orders": "^4.0.0-rc.21",
+    "@unchainedshop/core-payment": "^4.0.0-rc.21",
+    "@unchainedshop/core-products": "^4.0.0-rc.21",
+    "@unchainedshop/core-warehousing": "^4.0.0-rc.21",
+    "@unchainedshop/core-worker": "^4.0.0-rc.21",
+    "@unchainedshop/events": "^4.0.0-rc.21",
+    "@unchainedshop/file-upload": "^4.0.0-rc.21",
+    "@unchainedshop/logger": "^4.0.0-rc.21",
+    "@unchainedshop/utils": "^4.0.0-rc.21"
   },
   "peerDependencies": {
-    "@breejs/later": "^4.2.0",
     "@aws-sdk/client-eventbridge": ">= 3.714 < 4",
+    "@breejs/later": "^4.2.0",
     "@paypal/checkout-server-sdk": "1.x",
     "@redis/client": ">= 1 < 6",
-    "@scure/bip32": ">= 1.7 < 2",
-    "@scure/btc-signer": ">= 1.8 < 2",
+    "@scure/bip32": ">= 2",
+    "@scure/btc-signer": ">= 2",
+    "mime": ">= 4 < 5",
     "expiry-map": "2.x",
     "express": ">= 5 < 6",
     "fastify": ">= 5.2 < 6",
-    "mime-types": ">= 2 < 4",
     "minio": "8.x",
     "nodemailer": ">= 6.9 < 8",
-    "open": "10.x",
-    "p-memoize": "7.x",
-    "postfinancecheckout": ">= 4.5.0",
-    "stripe": ">= 17 < 19",
+    "p-memoize": "8.x",
+    "stripe": ">= 19 < 20",
     "web-push": ">= 3.6 <4",
     "xml-js": ">= 1.6 < 2"
   },
@@ -97,24 +93,15 @@
     "fastify": {
       "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
     },
@@ -128,23 +115,20 @@
   "devDependencies": {
     "@breejs/later": "^4.2.0",
     "@paypal/checkout-server-sdk": "^1.0.3",
-    "@redis/client": "^5.0.1",
-    "@scure/bip32": "^1.7.0",
-    "@scure/btc-signer": "^1.8.0",
+    "@redis/client": "^5.6.0",
+    "@scure/bip32": "^2.0.0",
+    "@scure/btc-signer": "^2.0.0",
     "@types/breejs__later": "^4.1.5",
-    "@types/express": "^5.0.1",
-    "@types/node": "^22.15.3",
+    "@types/express": "^5.0.3",
+    "@types/node": "^24.0.13",
     "expiry-map": "^2.0.0",
     "express": "^5.1.0",
-    "fastify": "^5.3.2",
-    "mime-types": "^3.0.1",
+    "fastify": "^5.4.0",
     "minio": "^8.0.5",
-    "nodemailer": "^7.0.2",
-    "open": "^10.1.2",
-    "p-memoize": "^7.1.1",
-    "postfinancecheckout": "^4.7.0",
-    "stripe": "^18.1.0",
-    "tsx": "^4.19.4",
+    "nodemailer": "^7.0.5",
+    "p-memoize": "^8.0.0",
+    "stripe": "^19.1.0",
+    "tsx": "^4.20.3",
     "typescript": "^5.8.3",
     "web-push": "^3.6.7",
     "xml-js": "^1.6.11"

package/src/delivery/send-message.ts

@@ -38,7 +38,7 @@ const SendMessage: IDeliveryAdapter = {
           retries: 0,
           input: {
             template: 'DELIVERY',
-            orderId: order._id,
+            orderId: order!._id,
             config,
           },
         });

package/src/enrollments/licensed.ts

@@ -21,11 +21,12 @@ const LicensedEnrollments: IEnrollmentAdapter = {
   },
 
   actions: (params) => {
+    const { enrollment } = params;
     return {
       ...EnrollmentAdapter.actions(params),
 
       isValidForActivation: async () => {
-        const periods = params.enrollment?.periods || [];
+        const periods = enrollment?.periods || [];
         return periods.findIndex(rangeMatcher()) !== -1;
       },
 
@@ -36,8 +37,20 @@ const LicensedEnrollments: IEnrollmentAdapter = {
       configurationForOrder: async (context) => {
         const { period } = context;
         const beginningOfPeriod = period.start.getTime() <= new Date().getTime();
+
+        if (!enrollment) throw new Error('Enrollment missing in context');
         if (beginningOfPeriod) {
-          return context;
+          return {
+            period,
+            orderContext: {},
+            orderPositionTemplates: [
+              {
+                quantity: 1,
+                productId: enrollment.productId,
+                originalProductId: enrollment.productId,
+              },
+            ],
+          };
         }
         return null;
       },

package/src/files/gridfs/adapter.ts

@@ -1,6 +1,6 @@
 import { Readable, PassThrough } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
-import mimeType from 'mime-types';
+import { finished, pipeline } from 'node:stream/promises';
+import mime from 'mime/lite';
 import {
   FileAdapter,
   FileDirector,
@@ -36,7 +36,7 @@ export const GridFSAdapter: IFileAdapter<
   ...FileAdapter,
   async createDownloadURL(file, expiry) {
     // If public, just return the stored path from the db
-    if (!file.meta?.isPrivate) return file?.url;
+    if (!file?.meta?.isPrivate) return file?.url || null;
 
     const expiryTimestamp =
       expiry ||
@@ -63,13 +63,13 @@ export const GridFSAdapter: IFileAdapter<
       directoryName,
       expiryDate,
       fileName,
-      type: mimeType.lookup(fileName),
+      type: mime.getType(fileName),
       putURL,
       url,
     } as UploadFileData & { putURL: string };
   },
 
-  async uploadFileFromStream(directoryName: string, rawFile: any, { modules }) {
+  async uploadFileFromStream(directoryName: string, rawFile: any, { modules }, options = {}) {
     let stream: Readable;
     let fileName;
     if (rawFile instanceof Promise) {
@@ -83,15 +83,27 @@ export const GridFSAdapter: IFileAdapter<
 
     const expiryDate = resolveExpirationDate();
     const hashedFilename = await buildHashedFilename(directoryName, fileName, expiryDate);
-    const type = mimeType.lookup(fileName) || (await Promise.resolve(rawFile)).mimetype;
+    const type = mime.getType(fileName) || (await Promise.resolve(rawFile)).mimetype;
 
     const writeStream = await modules.gridfsFileUploads.createWriteStream(
       directoryName,
       hashedFilename,
       fileName,
-      { 'content-type': type },
+      {
+        metadata: { 'content-type': type },
+        chunkSizeBytes: 1024 * 1024, // 1MB
+        ...options,
+      },
     );
-    await pipeline(stream, new PassThrough({ allowHalfOpen: true }), writeStream);
+
+    await pipeline(
+      stream,
+      new PassThrough({ highWaterMark: 1024 * 1024 * 4 }), // 4MB Buffer
+      writeStream,
+    );
+
+    await finished(writeStream, { readable: false });
+
     const { length } = writeStream;
     const url = `/gridfs/${directoryName}/${encodeURIComponent(hashedFilename)}`;
 
@@ -119,13 +131,15 @@ export const GridFSAdapter: IFileAdapter<
 
     const response = await fetch(href, { headers });
     if (!response.ok) throw new Error(`Unexpected response for ${href}: ${response.statusText}`);
-    const type = mimeType.lookup(fileName) || response.headers.get('content-type');
+    const type = mime.getType(fileName) || response.headers.get('content-type');
 
     const writeStream = await modules.gridfsFileUploads.createWriteStream(
       directoryName,
       hashedFilename,
       fileName,
-      { 'content-type': type },
+      {
+        metadata: { 'content-type': type },
+      },
     );
     await pipeline(response.body as unknown as Readable, new PassThrough(), writeStream);
     const { length } = writeStream;

package/src/files/gridfs/handler-express.ts

@@ -10,7 +10,7 @@ import { getFileAdapter } from '@unchainedshop/core-files';
 
 const { ROOT_URL } = process.env;
 
-const logger = createLogger('unchained:plugins:gridfs');
+const logger = createLogger('unchained:gridfs');
 
 const gridfsHandler = async (
   req: express.Request & {
@@ -34,8 +34,7 @@ const gridfsHandler = async (
     res.setHeader('Access-Control-Allow-Origin', '*');
 
     if (req.method === 'OPTIONS') {
-      res.statusCode = 200;
-      res.end();
+      res.status(200).end();
       return;
     }
 
@@ -45,9 +44,14 @@ const gridfsHandler = async (
       const fileId = await buildHashedFilename(directoryName, fileName, expiryDate);
       if ((await sign(directoryName, fileId, expiryDate.getTime())) === signature) {
         const file = await modules.files.findFile({ fileId });
+
+        if (!file) {
+          res.status(404).send('File not found');
+          return;
+        }
+
         if (file.expires === null) {
-          res.statusCode = 400;
-          res.end('File already linked');
+          res.status(400).send('File already linked');
           return;
         }
         // If the type is octet-stream, prefer mimetype lookup from the filename
@@ -61,19 +65,26 @@ const gridfsHandler = async (
           directoryName,
           fileId,
           fileName,
-          { 'content-type': type },
+          {
+            chunkSizeBytes: 1024 * 1024, // 1MB
+            metadata: { 'content-type': type },
+          },
         );
-        await pipeline(req, new PassThrough(), writeStream);
+        await pipeline(
+          req,
+          new PassThrough({ highWaterMark: 1024 * 1024 * 4 }), // 4MB Buffer
+          writeStream,
+        );
+
+        await finished(writeStream, { readable: false });
 
         const { length } = writeStream;
         await services.files.linkFile({ fileId, size: length, type });
 
-        res.statusCode = 200;
-        res.end();
+        res.status(200).end();
         return;
       }
-      res.statusCode = 403;
-      res.end();
+      res.status(403).end();
       return;
     }
 
@@ -85,19 +96,20 @@ const gridfsHandler = async (
       if (fileDocument?.meta?.isPrivate) {
         const expiry = parseInt(expiryTimestamp as string, 10);
         if (expiry <= Date.now()) {
-          res.statusCode = 403;
-          res.end('Access restricted: Expired.');
+          res.status(403).send('Access restricted: Expired.');
           return;
         }
 
         const fileUploadAdapter = getFileAdapter();
         const signedUrl = await fileUploadAdapter.createDownloadURL(fileDocument, expiry);
 
-        if (new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
-          res.statusCode = 403;
-          res.end('Access restricted: Invalid signature.');
+        if (!signedUrl || new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
+          res.status(403).send('Access restricted: Invalid signature.');
           return;
         }
+      } else if (!fileDocument) {
+        res.status(404).end();
+        return;
       }
       if (file?.metadata?.['content-type']) {
         res.setHeader('Content-Type', file.metadata['content-type']);
@@ -109,21 +121,17 @@ const gridfsHandler = async (
       const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
       readStream.pipe(res, { end: false });
       await finished(readStream);
-      res.statusCode = 200;
-      res.end();
+      res.status(200).end();
       return;
     }
-    res.statusCode = 404;
-    res.end();
+    res.status(404).end();
   } catch (e) {
     if (e.code === 'ENOENT') {
       logger.warn(e);
-      res.statusCode = 404;
-      res.end(e.message);
+      res.status(404).send();
     } else {
       logger.warn(e);
-      res.statusCode = 503;
-      res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+      res.status(503).send({ name: e.name, code: e.code, message: e.message });
     }
   }
 };

package/src/files/gridfs/handler-fastify.ts

@@ -1,4 +1,4 @@
-import { pipeline } from 'node:stream/promises';
+import { finished, pipeline } from 'node:stream/promises';
 import { PassThrough } from 'node:stream';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 import { buildHashedFilename } from '@unchainedshop/file-upload';
@@ -8,7 +8,7 @@ import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { getFileAdapter } from '@unchainedshop/core-files';
 
-const logger = createLogger('unchained:plugins:gridfs');
+const logger = createLogger('unchained:gridfs');
 
 const gridfsHandler: RouteHandlerMethod = async (
   req: FastifyRequest & {
@@ -39,9 +39,25 @@ const gridfsHandler: RouteHandlerMethod = async (
       const fileId = await buildHashedFilename(directoryName, fileName, expiryDate);
       if ((await sign(directoryName, fileId, expiryDate.getTime())) === signature) {
         const file = await modules.files.findFile({ fileId });
+
+        if (!file) {
+          reply.status(404);
+          logger.error('File not found', { fileId });
+          return reply.send({
+            success: false,
+            message: 'File not found',
+            name: 'FILE_NOT_FOUND',
+          });
+        }
+
         if (file.expires === null) {
           reply.status(400);
-          return reply.send('File already linked');
+          logger.error('File already linked', { fileId });
+          return reply.send({
+            success: false,
+            message: 'File already linked',
+            name: 'FILE_ALREADY_LINKED',
+          });
         }
         // If the type is octet-stream, prefer mimetype lookup from the filename
         // Else prefer the content-type header
@@ -54,20 +70,38 @@ const gridfsHandler: RouteHandlerMethod = async (
           directoryName,
           fileId,
           fileName,
-          { 'content-type': type },
+          {
+            chunkSizeBytes: 1024 * 1024, // 1MB
+            metadata: { 'content-type': type },
+          },
         );
 
-        await pipeline(req.raw, new PassThrough(), writeStream);
+        await pipeline(
+          req.raw,
+          new PassThrough({ highWaterMark: 1024 * 1024 * 4 }), // 4MB Buffer
+          writeStream,
+        );
+
+        await finished(writeStream, { readable: false });
 
         const { length } = writeStream;
         await services.files.linkFile({ fileId, size: length, type });
 
         reply.status(200);
-        return reply.send();
+        return reply.send({
+          success: true,
+          fileId,
+          size: length,
+          type,
+        });
       }
-
+      logger.error('Invalid signature', { fileId, expiryDate });
       reply.status(403);
-      return reply.send();
+      return reply.send({
+        success: false,
+        message: 'Access restricted: Invalid signature.',
+        name: 'INVALID_SIGNATURE',
+      });
     }
 
     if (req.method === 'GET') {
@@ -78,17 +112,31 @@ const gridfsHandler: RouteHandlerMethod = async (
       if (fileDocument?.meta?.isPrivate) {
         const expiry = parseInt(expiryTimestamp as string, 10);
         if (expiry <= Date.now()) {
+          logger.error('URL Expired', { fileId, expiry });
           reply.status(403);
-          return reply.send('Access restricted: Expired.');
+          return reply.send({
+            success: false,
+            message: 'Access restricted: URL expired.',
+            name: 'URL_EXPIRED',
+          });
         }
 
         const fileUploadAdapter = getFileAdapter();
         const signedUrl = await fileUploadAdapter.createDownloadURL(fileDocument, expiry);
 
-        if (new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
+        if (!signedUrl || new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
           reply.status(403);
-          return reply.send('Access restricted: Invalid signature.');
+          logger.error('Invalid signature', { fileId, expiry });
+          return reply.send({
+            success: false,
+            message: 'Access restricted: Invalid signature.',
+            name: 'INVALID_SIGNATURE',
+          });
         }
+      } else if (!fileDocument) {
+        logger.error('File not found', { fileId });
+        reply.status(404);
+        return reply.send();
       }
 
       if (file?.metadata?.['content-type']) {
@@ -107,14 +155,14 @@ const gridfsHandler: RouteHandlerMethod = async (
     reply.status(404);
     return reply.send();
   } catch (e) {
+    logger.error(e);
+
     if (e.code === 'ENOENT') {
-      logger.warn(e);
       reply.status(404);
-      return reply.send({ name: e.name, code: e.code, message: e.message });
+      return reply.send();
     } else {
-      logger.warn(e);
       reply.status(504);
-      return reply.send({ name: e.name, code: e.code, message: e.message });
+      return reply.send({ success: false, name: e.name, code: e.code, message: e.message });
     }
   }
 };

package/src/files/gridfs/module.ts

@@ -5,10 +5,15 @@ export const configureGridFSFileUploadModule = ({ db }) => {
   let { GridFSBucket } = mongodb;
 
   return {
-    createWriteStream: async (directoryName, fileId, fileName, metadata) => {
+    createWriteStream: async (
+      directoryName,
+      fileId,
+      fileName,
+      uploadOptions: mongodb.GridFSBucketWriteStream['options'],
+    ) => {
       const options = { bucketName: `file_uploads_${directoryName}` };
       const bucket = new GridFSBucket(db, options);
-      return bucket.openUploadStreamWithId(fileId, fileName, { metadata });
+      return bucket.openUploadStreamWithId(fileId, fileName, uploadOptions);
     },
     getFileInfo: async (directoryName, fileId) => {
       const options = { bucketName: `file_uploads_${directoryName}` };

package/src/files/minio/handler-express.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@unchainedshop/logger';
 
-const logger = createLogger('unchained:plugins:minio');
+const logger = createLogger('unchained:minio');
 
 const { MINIO_WEBHOOK_AUTH_TOKEN } = process.env;
 
@@ -21,17 +21,14 @@ const minioHandler = async (req, res) => {
         const [fileId] = object.key.split('.');
         const { services } = req.unchainedContext;
         await services.files.linkFile({ fileId, type, size });
-        res.writeHead(200);
-        res.end();
+        res.status(200).end();
         return;
       }
     }
-    res.writeHead(404);
-    res.end();
+    res.status(404).end();
   } catch (e) {
     logger.error(e);
-    res.writeHead(503);
-    res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+    res.status(503).send({ name: e.name, code: e.code, message: e.message });
   }
 };
 

package/src/files/minio/handler-fastify.ts

@@ -2,7 +2,7 @@ import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 
-const logger = createLogger('unchained:plugins:minio');
+const logger = createLogger('unchained:minio');
 
 const { MINIO_WEBHOOK_AUTH_TOKEN } = process.env;
 
@@ -37,7 +37,7 @@ const minioHandler: RouteHandlerMethod = async (
   } catch (e) {
     logger.error(e);
     res.status(503);
-    return res.send(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+    return res.send({ name: e.name, code: e.code, message: e.message });
   }
 };