@jsnw/nestjs-rabbitmq 2.0.2 → 2.0.3

package/dist/lib/rabbitmq/rabbitmq-subscriber.js

@@ -88,34 +88,29 @@ class RabbitmqSubscriber {
      * @private
      */
     onMessage = async (message) => {
-        if (!message.body || (typeof message.body !== 'string' && !Buffer.isBuffer(message.body)))
+        if (!message.body || (typeof message.body !== 'string' && typeof message.body !== 'object' && !Buffer.isBuffer(message.body)))
             return rabbitmq_client_1.ConsumerStatus.DROP;
-        const messageBody = Buffer.isBuffer(message.body)
-            ? message.body.toString('utf-8')
-            : typeof message.body === 'string'
-                ? message.body
-                : null;
-        if (!messageBody)
-            return rabbitmq_client_1.ConsumerStatus.DROP;
-        const isJSON = message.contentType === 'application/json';
-        let data;
+        let payload = null;
         try {
-            data = isJSON ? JSON.parse(messageBody) : messageBody;
+            payload = this.getMessageBody(message);
         }
         catch (e) {
-            this.logger.error(`Failed to parse message body as JSON`);
+            if (e instanceof Error && e.name === 'SyntaxError')
+                this.logger.error('Failed to parse message body as JSON');
             return rabbitmq_client_1.ConsumerStatus.DROP;
         }
         if (!!this.params.validation?.schema) {
-            const { data: parsed, error, success } = this.params.validation.schema.safeParse(data);
-            if (error || !success)
+            const { data: parsed, error, success } = this.params.validation.schema.safeParse(payload);
+            if (error || !success) {
+                this.logger.error(`Failed to validate message. Error:\n${zod_1.z.prettifyError(error)}`);
                 return (0, rabbitmq_helpers_1.mapRabbitmqResponseToConsumerStatus)(this.params.validation.onFail ?? 'drop');
-            data = parsed;
+            }
+            payload = parsed;
         }
         try {
             const response = await (typeof this.subscriber === 'function'
-                ? this.subscriber(data, message)
-                : this.subscriber.instance[this.subscriber.methodName](data, message));
+                ? this.subscriber(payload, message)
+                : this.subscriber.instance[this.subscriber.methodName](payload, message));
             return (0, rabbitmq_helpers_1.mapRabbitmqResponseToConsumerStatus)(response);
         }
         catch (e) {
@@ -127,5 +122,30 @@ class RabbitmqSubscriber {
             return !!this.params.requeue ? rabbitmq_client_1.ConsumerStatus.REQUEUE : rabbitmq_client_1.ConsumerStatus.DROP;
         }
     };
+    /**
+     * @param {AsyncMessage} message
+     * @return {string | object | null}
+     * @private
+     */
+    getMessageBody(message) {
+        if (!message.body || (typeof message.body !== 'string'
+            && typeof message.body !== 'object'
+            && !Buffer.isBuffer(message.body)))
+            return null;
+        if (message.contentType === 'application/json') {
+            if (Buffer.isBuffer(message.body) || typeof message.body === 'string') {
+                const jsonString = Buffer.isBuffer(message.body)
+                    ? message.body.toString('utf-8')
+                    : message.body;
+                return JSON.parse(jsonString);
+            }
+            return message.body;
+        }
+        else {
+            if (Buffer.isBuffer(message.body))
+                return message.body.toString('utf-8');
+            return message.body;
+        }
+    }
 }
 exports.RabbitmqSubscriber = RabbitmqSubscriber;

package/dist/lib/rabbitmq/rabbitmq.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rabbitmq = void 0;
+const node_crypto_1 = require("node:crypto");
 const rabbitmq_client_1 = require("rabbitmq-client");
 const common_1 = require("@nestjs/common");
 const rabbitmq_subscriber_1 = require("./rabbitmq-subscriber");
@@ -119,7 +120,7 @@ class Rabbitmq {
      */
     async subscribe(params, subscriber) {
         const id = params.id ?? (typeof subscriber === 'function'
-            ? Math.random().toString()
+            ? (0, node_crypto_1.randomUUID)()
             : subscriber.instance.constructor.name + '.' + subscriber.methodName);
         await this.declareQueue(params.queue);
         if (this.subscribers.has(id))

package/dist/types/rabbitmq/rabbitmq-subscriber.d.ts

@@ -40,4 +40,10 @@ export declare class RabbitmqSubscriber {
      * @private
      */
     protected onMessage: (message: AsyncMessage) => Promise<ConsumerStatus>;
+    /**
+     * @param {AsyncMessage} message
+     * @return {string | object | null}
+     * @private
+     */
+    private getMessageBody;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsnw/nestjs-rabbitmq",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "NestJS module for RabbitMQ integration",
   "main": "./dist/lib/index.js",
   "types": "./dist/types/index.d.ts",