@autofleet/rabbit 3.2.21-beta.0.6 → 3.2.21

package/dist/index.d.ts

@@ -4,7 +4,6 @@ import { AmqpConnectionManager, ChannelWrapper, CreateChannelOpts } from 'amqp-c
 import { ConfirmChannel, ConsumeMessage, Options, Replies } from 'amqplib';
 import { RedisConfig } from './lib/redis';
 import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, AssertExchangePromisesDictionary } from './lib/types';
-import { sendCeleryTaskViaHttp } from './lib/celery';
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -86,6 +85,7 @@ declare class RabbitMq implements IAfRabbitMq {
     private deleteQueue;
     bindQueue(queue: string, exchange: string): Promise<void>;
     setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
+    static shouldUseQuorum(queueName: string): boolean;
     assertQueue(queueName: string, options?: Options.AssertQueue): Promise<any>;
     private saveConsumer;
     consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any>;
@@ -99,4 +99,3 @@ declare class RabbitMq implements IAfRabbitMq {
     gracefulShutdown(signal: string): Promise<void>;
 }
 export default RabbitMq;
-export { sendCeleryTaskViaHttp, };

package/dist/index.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendCeleryTaskViaHttp = void 0;
 const events_1 = require("events");
 const util_1 = require("util");
 const moment_1 = __importDefault(require("moment"));
@@ -18,8 +17,6 @@ const redis_1 = __importDefault(require("./lib/redis"));
 const utils_1 = require("./lib/utils");
 const consts_1 = require("./lib/consts");
 const types_1 = require("./lib/types");
-const celery_1 = require("./lib/celery");
-Object.defineProperty(exports, "sendCeleryTaskViaHttp", { enumerable: true, get: function () { return celery_1.sendCeleryTaskViaHttp; } });
 // const debug = nodeDebug('af-rabbitmq')
 const debug = logger_1.default.debug.bind(logger_1.default);
 const PUBLISH_TIMEOUT = 1000 * 10;
@@ -304,12 +301,22 @@ class RabbitMq {
     }
     async setupQueue(queueName, options) {
         let queue;
+        const shouldUseQuorum = RabbitMq.shouldUseQuorum(queueName);
+        const localeOptions = {
+            ...options,
+            durable: true,
+            arguments: {
+                ...options?.arguments,
+                'x-consumer-timeout': 1000 * 60 * 60 * 24,
+                'x-queue-type': shouldUseQuorum ? 'quorum' : 'classic',
+            },
+        };
         try {
             const channel = await this.assertChannel();
             debug('assertQueue->channel.addSetup', { queueName });
-            await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, options));
+            await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, localeOptions));
             debug('assertQueue->channel.assertQueue', { queueName });
-            queue = await channel.assertQueue(queueName, options);
+            queue = await channel.assertQueue(queueName, localeOptions);
         }
         catch (e) {
             logger_1.default.error('rabbit: assertQueue error', { queueName, options, error: e });
@@ -318,17 +325,28 @@ class RabbitMq {
                 const channel = await this.assertChannel({ force: true });
                 await this.deleteQueue(queueName);
                 debug('retrying assertQueue->channel.addSetup', { queueName });
-                await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, options));
+                await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, localeOptions));
                 debug('retrying assertQueue->channel.assertQueue', { queueName });
-                queue = await channel.assertQueue(queueName, options);
+                queue = await channel.assertQueue(queueName, localeOptions);
             }
             else {
                 throw e;
             }
         }
-        this.queues[queueName] = queueName;
+        this.queues[queueName] = queue;
         return queue;
     }
+    static shouldUseQuorum(queueName) {
+        const envQuorumQueuesWhitelist = process.env.QUORUM_QUEUES_WHITELIST;
+        if (envQuorumQueuesWhitelist === '*') {
+            return true;
+        }
+        if (envQuorumQueuesWhitelist) {
+            const whitelist = envQuorumQueuesWhitelist.split(',');
+            return whitelist.includes(queueName);
+        }
+        return false;
+    }
     async assertQueue(queueName, options) {
         RabbitMq.validateName('queue', queueName);
         if (this.queues[queueName]) {
@@ -383,8 +401,8 @@ class RabbitMq {
         }
         const channel = await this.getNewChannel({});
         return channel.addSetup(async (confirmChannel) => {
-            await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
-            await confirmChannel.prefetch(limit, true);
+            const q = await this.assertQueue(queue, optionsWithDefaults);
+            await confirmChannel.prefetch(limit, false);
             const { consumerTag } = await confirmChannel.consume(queue, async (msg) => {
                 if (!msg) {
                     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.21-beta.0.6",
+  "version": "3.2.21",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -43,4 +43,4 @@
   },
   "author": "",
   "license": "ISC"
-}
+}

package/src/index.ts

@@ -41,8 +41,6 @@ import {
   AssertExchangePromisesDictionary,
 } from './lib/types';
 
-import { sendCeleryTaskViaHttp } from './lib/celery';
-
 // const debug = nodeDebug('af-rabbitmq')
 const debug = logger.debug.bind(logger);
 
@@ -453,12 +451,22 @@ class RabbitMq implements IAfRabbitMq {
 
   async setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
     let queue: Replies.AssertQueue;
+    const shouldUseQuorum = RabbitMq.shouldUseQuorum(queueName);
+    const localeOptions = {
+      ...options,
+      durable: true,
+      arguments: {
+        ...options?.arguments,
+        'x-consumer-timeout': 1000 * 60 * 60 * 24,
+        'x-queue-type': shouldUseQuorum ? 'quorum' : 'classic',
+      },
+    };
     try {
       const channel: ChannelWrapper = await this.assertChannel();
       debug('assertQueue->channel.addSetup', { queueName });
-      await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, options));
+      await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
       debug('assertQueue->channel.assertQueue', { queueName });
-      queue = await channel.assertQueue(queueName, options);
+      queue = await channel.assertQueue(queueName, localeOptions);
     } catch (e) {
       logger.error('rabbit: assertQueue error', { queueName, options, error: e });
       if (!this.options?.dontRetryAssert) {
@@ -467,19 +475,34 @@ class RabbitMq implements IAfRabbitMq {
         await this.deleteQueue(queueName);
 
         debug('retrying assertQueue->channel.addSetup', { queueName });
-        await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, options));
+        await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
         debug('retrying assertQueue->channel.assertQueue', { queueName });
-        queue = await channel.assertQueue(queueName, options);
+        queue = await channel.assertQueue(queueName, localeOptions);
       } else {
         throw e;
       }
     }
 
-    this.queues[queueName] = queueName;
+    this.queues[queueName] = queue;
     return queue;
   }
 
-  async assertQueue(queueName: string, options?: Options.AssertQueue) {
+  static shouldUseQuorum(queueName: string): boolean {
+    const envQuorumQueuesWhitelist = process.env.QUORUM_QUEUES_WHITELIST;
+
+    if (envQuorumQueuesWhitelist === '*') {
+      return true;
+    }
+
+    if (envQuorumQueuesWhitelist) {
+      const whitelist = envQuorumQueuesWhitelist.split(',');
+      return whitelist.includes(queueName);
+    }
+
+    return false;
+  }
+
+  async assertQueue(queueName: string, options?: Options.AssertQueue): Promise<any> {
     RabbitMq.validateName('queue', queueName);
     if (this.queues[queueName]) {
       delete this.queueSetupPromises[queueName];
@@ -546,8 +569,8 @@ class RabbitMq implements IAfRabbitMq {
     }
     const channel = await this.getNewChannel({});
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
-      await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
-      await confirmChannel.prefetch(limit, true);
+      const q = await this.assertQueue(queue, optionsWithDefaults);
+      await confirmChannel.prefetch(limit, false);
       const { consumerTag } = await confirmChannel.consume(
         queue,
         async (msg: ConsumeMessageOrNull) => {
@@ -737,7 +760,3 @@ class RabbitMq implements IAfRabbitMq {
 }
 
 export default RabbitMq;
-
-export {
-  sendCeleryTaskViaHttp,
-};

package/dist/lib/celery.d.ts

@@ -1,9 +0,0 @@
-interface TaskData {
-    [key: string]: any;
-}
-interface SendTaskOptions {
-    taskName: string;
-    queueName: string;
-}
-declare function sendCeleryTaskViaHttp(data: TaskData, { taskName, queueName }: SendTaskOptions): Promise<void>;
-export { sendCeleryTaskViaHttp, TaskData, SendTaskOptions };

package/dist/lib/celery.js

@@ -1,54 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendCeleryTaskViaHttp = void 0;
-const node_crypto_1 = require("node:crypto");
-const logger_1 = __importDefault(require("../logger"));
-// Environment configuration
-const config = {
-    host: process.env.RABBITMQ_SERVICE_HOST || '10.132.15.204',
-    username: process.env.RABBITMQ_USERNAME || 'default_user_Zjlb8cnBF-jwc61bbC8',
-    password: process.env.RABBITMQ_PASSWORD || 'SDjnZWKAgz9TROLDV85OUZb6FOLlfw1b',
-};
-async function sendCeleryTaskViaHttp(data, { taskName, queueName }) {
-    const apiUrl = `http://${config.host}:15672/api/exchanges/%2f/amq.default/publish`;
-    const message = {
-        task: taskName,
-        id: (0, node_crypto_1.randomUUID)(),
-        args: [data],
-    };
-    const payload = {
-        properties: {
-            delivery_mode: 2,
-            content_type: 'application/json',
-        },
-        routing_key: queueName,
-        payload: JSON.stringify(message),
-        payload_encoding: 'string',
-    };
-    try {
-        const response = await fetch(apiUrl, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Basic ${Buffer.from(`${config.username}:${config.password}`).toString('base64')}`,
-            },
-            body: JSON.stringify(payload),
-        });
-        if (response.ok) {
-            const result = await response.json();
-            logger_1.default.info('Successfully published message:', result);
-        }
-        else {
-            logger_1.default.error(`Failed to publish message. Status code: ${response.status}`);
-            logger_1.default.error(`Response: ${await response.text()}`);
-        }
-    }
-    catch (error) {
-        logger_1.default.error('Error sending request:', error instanceof Error ? error.message : String(error));
-        throw error;
-    }
-}
-exports.sendCeleryTaskViaHttp = sendCeleryTaskViaHttp;

package/src/lib/celery.ts

@@ -1,85 +0,0 @@
-import { randomUUID } from 'node:crypto';
-import logger from '../logger';
-// Environment configuration
-const config = {
-  host: process.env.RABBITMQ_SERVICE_HOST || '10.132.15.204',
-  username: process.env.RABBITMQ_USERNAME || 'default_user_Zjlb8cnBF-jwc61bbC8',
-  password: process.env.RABBITMQ_PASSWORD || 'SDjnZWKAgz9TROLDV85OUZb6FOLlfw1b',
-};
-
-// Type definitions
-interface TaskData {
-    [key: string]: any;
-}
-
-interface TaskMessage {
-    task: string;
-    id: string;
-    args: TaskData[];
-}
-
-interface PublishPayload {
-    properties: {
-        delivery_mode: number;
-        content_type: string;
-    };
-    routing_key: string;
-    payload: string;
-    payload_encoding: string;
-}
-
-interface PublishResponse {
-    routed: boolean;
-}
-
-interface SendTaskOptions {
-    taskName: string;
-    queueName: string;
-}
-
-async function sendCeleryTaskViaHttp(
-  data: TaskData,
-  { taskName, queueName }: SendTaskOptions,
-): Promise<void> {
-  const apiUrl = `http://${config.host}:15672/api/exchanges/%2f/amq.default/publish`;
-
-  const message: TaskMessage = {
-    task: taskName,
-    id: randomUUID(),
-    args: [data],
-  };
-
-  const payload: PublishPayload = {
-    properties: {
-      delivery_mode: 2,
-      content_type: 'application/json',
-    },
-    routing_key: queueName,
-    payload: JSON.stringify(message),
-    payload_encoding: 'string',
-  };
-
-  try {
-    const response = await fetch(apiUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Basic ${Buffer.from(`${config.username}:${config.password}`).toString('base64')}`,
-      },
-      body: JSON.stringify(payload),
-    });
-
-    if (response.ok) {
-      const result: PublishResponse = await response.json();
-      logger.info('Successfully published message:', result);
-    } else {
-      logger.error(`Failed to publish message. Status code: ${response.status}`);
-      logger.error(`Response: ${await response.text()}`);
-    }
-  } catch (error) {
-    logger.error('Error sending request:', error instanceof Error ? error.message : String(error));
-    throw error;
-  }
-}
-
-export { sendCeleryTaskViaHttp, TaskData, SendTaskOptions };