@unchainedshop/plugins 4.0.0-rc.15 → 4.0.0-rc.16

package/src/payment/stripe/handler-express.ts

@@ -21,8 +21,10 @@ export const stripeHandler = async (request, response) => {
     event = stripe.webhooks.constructEvent(request.body, sig, process.env.STRIPE_ENDPOINT_SECRET);
   } catch (err) {
     logger.error(`Error constructing event: ${err.message}`);
-    response.writeHead(400);
-    response.end(err.message);
+    response.status(400).send({
+      message: err.message,
+      name: err.name,
+    });
     return;
   }
 
@@ -30,13 +32,10 @@ export const stripeHandler = async (request, response) => {
     logger.info(`unhandled event type`, {
       type: event.type,
     });
-    response.writeHead(200);
-    response.end(
-      JSON.stringify({
-        ignored: true,
-        message: `Unhandled event type: ${event.type}. Supported types: ${Object.values(WebhookEventTypes).join(', ')}`,
-      }),
-    );
+    response.status(200).send({
+      ignored: true,
+      message: `Unhandled event type: ${event.type}. Supported types: ${Object.values(WebhookEventTypes).join(', ')}`,
+    });
     return;
   }
 
@@ -47,13 +46,10 @@ export const stripeHandler = async (request, response) => {
       type: event.type,
       environment: environmentInMetadata,
     });
-    response.writeHead(200);
-    response.end(
-      JSON.stringify({
-        ignored: true,
-        message: `Unhandled event environment: ${environmentInMetadata}. Supported environment: ${environmentInEnv}`,
-      }),
-    );
+    response.status(200).send({
+      ignored: true,
+      message: `Unhandled event environment: ${environmentInMetadata}. Supported environment: ${environmentInEnv}`,
+    });
     return;
   }
 
@@ -89,13 +85,10 @@ export const stripeHandler = async (request, response) => {
         orderId: order._id,
         type: event.type,
       });
-      response.writeHead(200);
-      response.end(
-        JSON.stringify({
-          message: 'checkout successful',
-          orderId: order._id,
-        }),
-      );
+      response.status(200).send({
+        message: 'checkout successful',
+        orderId: order._id,
+      });
     } else if (event.type === WebhookEventTypes.SETUP_INTENT_SUCCEEDED) {
       const setupIntent = event.data.object;
       const { paymentProviderId, userId } = setupIntent.metadata || {};
@@ -118,19 +111,18 @@ export const stripeHandler = async (request, response) => {
         paymentCredentialsId: paymentCredentials?._id,
         type: event.type,
       });
-      response.writeHead(200);
-      response.end(
-        JSON.stringify({
-          message: 'payment credentials registration successful',
-          paymentCredentialsId: paymentCredentials?._id,
-        }),
-      );
+      response.status(200).send({
+        message: 'payment credentials registration successful',
+        paymentCredentialsId: paymentCredentials?._id,
+      });
     }
   } catch (error) {
     logger.error(error, {
       type: event.type,
     });
-    response.writeHead(500);
-    response.end(error.message);
+    response.status(500).send({
+      message: error.message,
+      name: error.name,
+    });
   }
 };

package/src/payment/stripe/handler-fastify.ts

@@ -28,7 +28,11 @@ export const stripeHandler: RouteHandlerMethod = async (
   } catch (err) {
     logger.error(`Error constructing event: ${err.message}`);
     reply.status(400);
-    return reply.send(err.message);
+    return reply.send({
+      success: false,
+      message: err.message,
+      name: err.name,
+    });
   }
 
   if (!Object.values(WebhookEventTypes).includes(event.type)) {
@@ -36,12 +40,12 @@ export const stripeHandler: RouteHandlerMethod = async (
       type: event.type,
     });
     reply.status(200);
-    return reply.send(
-      JSON.stringify({
-        ignored: true,
-        message: `Unhandled event type: ${event.type}. Supported types: ${Object.values(WebhookEventTypes).join(', ')}`,
-      }),
-    );
+    return reply.send({
+      success: false,
+      ignored: true,
+      name: 'UNHANDLED_EVENT_TYPE',
+      message: `Unhandled event type: ${event.type}. Supported types: ${Object.values(WebhookEventTypes).join(', ')}`,
+    });
   }
 
   const environmentInMetadata = event.data?.object?.metadata?.environment || '';
@@ -52,12 +56,12 @@ export const stripeHandler: RouteHandlerMethod = async (
       environment: environmentInMetadata,
     });
     reply.status(200);
-    return reply.send(
-      JSON.stringify({
-        ignored: true,
-        message: `Unhandled event environment: ${environmentInMetadata}. Supported environment: ${environmentInEnv}`,
-      }),
-    );
+    return reply.send({
+      success: false,
+      ignored: true,
+      name: 'UNHANDLED_EVENT_ENVIRONMENT',
+      message: `Unhandled event environment: ${environmentInMetadata}. Supported environment: ${environmentInEnv}`,
+    });
   }
 
   logger.info(`Processing event`, {
@@ -93,12 +97,10 @@ export const stripeHandler: RouteHandlerMethod = async (
         type: event.type,
       });
       reply.status(200);
-      return reply.send(
-        JSON.stringify({
-          message: 'checkout successful',
-          orderId: order._id,
-        }),
-      );
+      return reply.send({
+        success: true,
+        orderId: order._id,
+      });
     } else if (event.type === WebhookEventTypes.SETUP_INTENT_SUCCEEDED) {
       const setupIntent = event.data.object;
       const { paymentProviderId, userId } = setupIntent.metadata || {};
@@ -122,18 +124,21 @@ export const stripeHandler: RouteHandlerMethod = async (
         type: event.type,
       });
       reply.status(200);
-      return reply.send(
-        JSON.stringify({
-          message: 'payment credentials registration successful',
-          paymentCredentialsId: paymentCredentials?._id,
-        }),
-      );
+      return reply.send({
+        success: true,
+        message: 'payment credentials registration successful',
+        paymentCredentialsId: paymentCredentials?._id,
+      });
     }
   } catch (error) {
     logger.error(error, {
       type: event.type,
     });
     reply.status(500);
-    return reply.send(error.message);
+    return reply.send({
+      success: false,
+      message: error.message,
+      name: error.name,
+    });
   }
 };

package/src/worker/bulk-import.ts

@@ -1,56 +1,8 @@
 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';
 
 const logger = createLogger('unchained:worker:bulk-import');
 
-const streamPayloadToBulkImporter = async (
-  bulkImporter,
-  payloadId,
-  unchainedAPI: Pick<UnchainedCore, 'bulkImporter' | 'modules' | 'services'>,
-) => {
-  logger.trace(`parseAsync start`);
-
-  const readStream = await unchainedAPI.services.files.createDownloadStream({ fileId: payloadId });
-
-  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 jsonStream = JSONStream.parse('events.*'); // rows, ANYTHING, doc
-      jsonStream.on('data', queue.push);
-      jsonStream.on('close', queue.stop);
-      jsonStream.on('error', queue.fail);
-
-      queue.on('highWater', () => readStream.pause());
-      queue.on('lowWater', () => readStream.resume());
-
-      readStream.pipe(jsonStream);
-      readStream.on('error', queue.fail);
-
-      return () => {
-        jsonStream.removeListener('data', queue.push);
-        jsonStream.removeListener('close', queue.stop);
-        jsonStream.removeListener('error', queue.fail);
-        jsonStream.destroy();
-      };
-    },
-    { highWaterMark: 100, lowWaterMark: 5 },
-  );
-
-  for await (const event of eventIterator) {
-    await bulkImporter.prepare(event, unchainedAPI);
-  }
-
-  logger.trace(`parseAsync done`);
-};
-
 export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
   ...WorkerAdapter,
 
@@ -76,7 +28,15 @@ export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
 
       if (rawPayload.payloadId) {
         // stream payload from gridfs
-        await streamPayloadToBulkImporter(bulkImporter, rawPayload.payloadId, unchainedAPI);
+        const readStream = await unchainedAPI.services.files.createDownloadStream({
+          fileId: rawPayload.payloadId,
+        });
+        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.',
+          );
+        }
+        await unchainedAPI.bulkImporter.pipeEventStream(readStream, bulkImporter, unchainedAPI);
       } else {
         const { events } = rawPayload;
         if (!events?.length) throw new Error('No events submitted');