arnavmq 0.16.4 → 0.17.1

package/.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [20.x, 22.x, 24.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -42,7 +42,7 @@ jobs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: 20.x
+        node-version: 22.x
         registry-url: https://registry.npmjs.org
 
     - run: npm publish --access public

package/README.md

@@ -171,7 +171,7 @@ const arnavmq = require('arnavmq')({
   consumerSuffix: '',
 
   // generate a hostname so we can track this connection on the broker (rabbitmq management plugin)
-  hostname: process.env.HOSTNAME || process.env.USER || uuid.v4(),
+  hostname: process.env.HOSTNAME || process.env.USER || crypto.randomUUID(),
 
   /**
    * A logger object with a log function for each of the log levels ("debug", "info", "warn", or "error").

package/eslint.config.mjs

@@ -0,0 +1,82 @@
+import globals from 'globals';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+
+// eslint-disable-next-line no-underscore-dangle
+const __filename = fileURLToPath(import.meta.url);
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+});
+
+export default [
+  {
+    ignores: [
+      'bin/**/*',
+      'build/**/*',
+      'coverage/**/*',
+      'docs/**/*',
+      'jsdoc/**/*',
+      'templates/**/*',
+      'tests/bench/**/*',
+      'tests/fixtures/**/*',
+      'tests/performance/**/*',
+      'tmp/**/*',
+      'public/**/*',
+      'node_modules/**/*',
+      'lib-cov/**/*',
+      '.grunt/**/*',
+      '.sonar/**/*',
+      'logs/**/*',
+      '.idea/**/*',
+      'samples/**/*',
+    ],
+  },
+  ...compat.extends('eslint-config-prettier'),
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.mocha,
+        ...globals.mongo,
+      },
+    },
+
+    rules: {
+      'no-await-in-loop': 0,
+      'comma-dangle': 0,
+      'max-classes-per-file': 0,
+
+      'max-len': [
+        'error',
+        {
+          code: 190,
+          ignoreComments: true,
+          ignoreUrls: true,
+        },
+      ],
+
+      'no-underscore-dangle': [
+        1,
+        {
+          allow: ['_config', '_connection', '_maxListeners'],
+          allowAfterThis: true,
+        },
+      ],
+
+      'no-return-await': 'off',
+      'no-console': 'error',
+      'no-param-reassign': 'error',
+      'global-require': 'error',
+      'no-unused-expressions': 'error',
+      'no-sequences': 'error',
+      'prefer-rest-params': 'error',
+      'func-names': ['error', 'as-needed'],
+    },
+  },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arnavmq",
-  "version": "0.16.4",
+  "version": "0.17.1",
   "description": "ArnavMQ is a RabbitMQ wrapper",
   "keywords": [
     "rabbitmq",
@@ -34,26 +34,26 @@
   },
   "homepage": "https://github.com/bringg/node-arnavmq#readme",
   "dependencies": {
-    "@types/amqplib": "^0.10.5",
-    "amqplib": "^0.10.3",
+    "@types/amqplib": "^0.10.7",
+    "amqplib": "^0.10.9",
     "p-defer": "^3.0.0",
-    "serialize-error": "^8.0.1",
-    "uuid": "^9.0.0"
+    "serialize-error": "^8.0.1"
   },
   "devDependencies": {
+    "@eslint/js": "^9.13.0",
     "child-process-promise": "^2.2.1",
     "dot-only-hunter": "^1.0.3",
-    "eslint": "^8.25.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "mocha": "^10.0.0",
-    "nyc": "^15.1.0",
+    "eslint": "^9.13.0",
+    "eslint-config-prettier": "^10.0.1",
+    "eslint-plugin-import": "^2.31.0",
+    "globals": "^17.0.0",
+    "mocha": "^11.0.1",
+    "nyc": "^17.0.0",
     "prettier": "^3.0.0",
-    "sinon": "^17.0.1",
+    "sinon": "^21.0.1",
     "typescript": "^5.3.3"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   }
 }

package/src/index.js

@@ -1,4 +1,4 @@
-const uuid = require('uuid');
+const crypto = require('crypto');
 const connection = require('./modules/connection');
 const { setLogger } = require('./modules/logger');
 
@@ -28,7 +28,7 @@ module.exports = (config) => {
     consumerSuffix: '',
 
     // generate a hostname so we can track this connection on the broker (rabbitmq management plugin)
-    hostname: process.env.HOSTNAME || process.env.USER || uuid.v4(),
+    hostname: process.env.HOSTNAME || process.env.USER || crypto.randomUUID(),
 
     ...config,
   };

package/src/modules/consumer.js

@@ -190,10 +190,10 @@ class Consumer {
         params: { queue, message: messageString },
       });
 
-      // main answer management chaining
-      // receive message, parse it, execute callback, check if should answer, ack/reject message
-      const body = parsers.in(msg);
+      let body = {};
       try {
+        body = parsers.in(msg);
+
         const action = { message: msg, content: body, callback };
         await this.hooks.trigger(this, ConsumerHooks.beforeProcessMessageEvent, {
           queue,
@@ -203,13 +203,20 @@ class Consumer {
         const res = await action.callback(body, msg.properties);
         await this.checkRpc(msg.properties, queue, res);
       } catch (error) {
-        // if something bad happened in the callback, reject the message so we can requeue it (or not)
         logger.error({
           message: `${loggerAlias} Failed processing message from queue ${queue}: ${error.message}`,
           error,
           params: { queue, message: messageString },
         });
 
+        if (error instanceof SyntaxError) {
+          // For parsing errors, reject the message and don't requeue it.
+          await this._rejectMessageAfterProcess(channel, queue, msg, body, false, error);
+          // Backward compatibility: For parsing errors, throw to let client handle it
+          throw error;
+        }
+
+        // For callback errors, use default behavior with _rejectMessageAfterProcess
         await this._rejectMessageAfterProcess(channel, queue, msg, body, this._connection.config.requeue, error);
         return;
       }
@@ -274,7 +281,4 @@ class Consumer {
   }
 }
 
-/* eslint no-unused-expressions: "off" */
-/* eslint no-sequences: "off" */
-/* eslint arrow-body-style: "off" */
 module.exports = Consumer;

package/src/modules/hooks/base_hooks.js

@@ -103,7 +103,7 @@ module.exports = class BaseHooks {
 
     const hookPromises = [];
     // This rule intends to restrict it for arrays, but this is a Set which doesn't have a '.map' function to use instead.
-    // eslint-disable-next-line no-restricted-syntax
+
     for (const callback of callbacks) {
       hookPromises.push(runHook(source, eventName, payload, callback));
     }

package/src/modules/message-parsers.js

@@ -33,19 +33,19 @@ module.exports.in = (msg) => {
  * @param  {object} options amqp.node message options object
  * @return {Buffer}         node.js Buffer object, sent by amqp.node
  */
-/* eslint no-param-reassign: "off" */
 module.exports.out = (content, options) => {
+  let parsedContent = content;
   const falsie = [undefined, null];
   if (!falsie.includes(content) && typeof content !== 'string') {
-    if (content.error instanceof Error) {
-      content.error = serializeError(content.error);
+    if (parsedContent.error instanceof Error) {
+      parsedContent.error = serializeError(parsedContent.error);
     }
     // if content is not a string, we JSONify it (JSON.parse can handle numbers, etc. so we can skip all the checks)
-    content = JSON.stringify(content);
+    parsedContent = JSON.stringify(parsedContent);
     options.contentType = 'application/json';
-  } else if (falsie.includes(content)) {
+  } else if (falsie.includes(parsedContent)) {
     return Buffer.from([]);
   }
 
-  return Buffer.from(content, 'utf-8');
+  return Buffer.from(parsedContent, 'utf-8');
 };

package/src/modules/producer.js

@@ -205,7 +205,6 @@ class Producer {
    * @param  {object} options message options (persistent, durable, rpc, etc.)
    * @return {Promise}         checkRpc response
    */
-  /* eslint prefer-rest-params: off */
   produce(queue, msg, options) {
     return this.publish(queue, msg, options);
   }
@@ -217,7 +216,6 @@ class Producer {
    * @param  {object} options message options (persistent, durable, rpc, etc.)
    * @return {Promise}         checkRpc response
    */
-  /* eslint no-param-reassign: "off" */
   async publish(queue, msg, options) {
     // default options are persistent and durable because we do not want to miss any outgoing message
     // unless user specify it
@@ -236,6 +234,7 @@ class Producer {
   async _sendToQueue(queue, message, settings, currentRetryNumber) {
     // undefined can't be serialized/buffered :p
     if (!message) {
+      // eslint-disable-next-line no-param-reassign
       message = null;
     }
 
@@ -311,7 +310,4 @@ class Producer {
   }
 }
 
-/* eslint no-unused-expressions: "off" */
-/* eslint no-sequences: "off" */
-/* eslint arrow-body-style: "off" */
 module.exports = Producer;

package/src/modules/utils.js

@@ -1,4 +1,4 @@
-const uuid = require('uuid');
+const crypto = require('crypto');
 
 function empty() {}
 
@@ -19,7 +19,7 @@ function getCorrelationId(options) {
   if (options.correlationId) {
     return options.correlationId;
   }
-  return uuid.v4();
+  return crypto.randomUUID();
 }
 
 module.exports = {

package/types/modules/channels.d.ts

@@ -5,8 +5,8 @@ interface ChannelConfig {
 }
 
 declare class Channels {
-  constructor(connection: amqp.Connection, config: ChannelConfig);
-  private readonly _connection: amqp.Connection;
+  constructor(connection: amqp.ChannelModel, config: ChannelConfig);
+  private readonly _connection: amqp.ChannelModel;
   private readonly _config: ChannelConfig;
   private readonly _channels: Map<string, { chann: Promise<amqp.Channel>; config: ChannelConfig }>;
   get(queue: string, config: ChannelConfig): Promise<amqp.Channel>;

package/types/modules/connection.d.ts

@@ -57,14 +57,14 @@ interface ConnectionConfig {
 declare class Connection {
   constructor(config: ConnectionConfig);
 
-  private _connectionPromise: Promise<amqp.Connection>;
+  private _connectionPromise: Promise<amqp.ChannelModel>;
   private _config: ConnectionConfig;
   public hooks: ConnectionHooks;
 
   get config(): ConnectionConfig;
   set config(value: ConnectionConfig);
 
-  getConnection(): Promise<amqp.Connection>;
+  getConnection(): Promise<amqp.ChannelModel>;
   getChannel(queue: string, config: channels.ChannelConfig): Promise<amqp.Channel>;
   getDefaultChannel(): Promise<amqp.Channel>;
   /**
@@ -74,14 +74,14 @@ declare class Connection {
    */
   addListener(on: string, func: Function): Promise<void>;
 
-  private _connect(): Promise<amqp.Connection>;
+  private _connect(): Promise<amqp.ChannelModel>;
 }
 
 declare function connection(config: ConnectionConfig): Connection;
 
 declare namespace connection {
   export interface Connection {
-    getConnection(): Promise<amqp.Connection>;
+    getConnection(): Promise<amqp.ChannelModel>;
     getChannel(queue: string, config: channels.ChannelConfig): Promise<amqp.Channel>;
     getDefaultChannel(): Promise<amqp.Channel>;
     /**

package/types/modules/hooks/connection_hooks.d.ts

@@ -8,7 +8,7 @@ type AfterConnectInfo = {
   config: ConnectionConfig;
 } & (
   | {
-      connection: amqp.Connection;
+      connection: amqp.ChannelModel;
       error: undefined;
     }
   | {