@autofleet/rabbit 3.2.21-beta.0.1 → 3.2.21-beta.0.2

package/dist/index.d.ts

@@ -94,8 +94,8 @@ declare class RabbitMq implements IAfRabbitMq {
     consumeFromExchange(queue: string, exchange: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any>;
     publish(exchange: string, content: any, customHeaders?: any): Promise<boolean>;
     sendToQueue(queue: string, content: any, options?: any, customHeaders?: any): Promise<boolean | undefined>;
-    sendToCeleryQueue(queue: string, taskName: string, data: any, options?: any, customHeaders?: any): Promise<boolean | undefined>;
     isConnected(): Promise<boolean>;
     gracefulShutdown(signal: string): Promise<void>;
 }
 export default RabbitMq;
+export declare const sendToCelelryQueue: (queueName: string, taskName: string, payload: any) => Promise<import("celery-node/dist/app/result").AsyncResult>;

package/dist/index.js

@@ -4,9 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendToCelelryQueue = void 0;
 const events_1 = require("events");
 const util_1 = require("util");
 const moment_1 = __importDefault(require("moment"));
+const celery_node_1 = __importDefault(require("celery-node"));
 const redis_lock_1 = __importDefault(require("redis-lock"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const zehut_1 = require("@autofleet/zehut");
@@ -505,47 +507,6 @@ class RabbitMq {
             throw e;
         }
     }
-    async sendToCeleryQueue(queue, taskName, data, options, customHeaders) {
-        try {
-            await this.assertChannel();
-        }
-        catch (e) {
-            logger_1.default.error(`rabbit sendToCeleryQueue: failed to assert channel when sending to queue ${queue}`, { e });
-            throw e;
-        }
-        try {
-            RabbitMq.validateName('queue', queue);
-            await this.assertQueue(queue, options);
-        }
-        catch (e) {
-            logger_1.default.error(`rabbit sendToCeleryQueue: failed to assert queue ${queue}`, { e });
-            throw e;
-        }
-        try {
-            // Create Celery-compatible message format
-            const celeryMessage = {
-                task: taskName,
-                id: (0, node_crypto_1.randomUUID)(),
-                args: [data],
-            };
-            const celeryHeaders = {
-                ...RabbitMq.getPublishOptions(customHeaders),
-                properties: {
-                    delivery_mode: 2,
-                    content_type: 'application/json',
-                    content_encoding: 'utf-8',
-                },
-            };
-            const res = await this.channel?.sendToQueue(queue, Buffer.from(JSON.stringify(celeryMessage)), celeryHeaders);
-            debug(`rabbit: sending to celery queue ${queue}`, { res });
-            return res;
-        }
-        catch (e) {
-            const isConnected = await this.isConnected();
-            logger_1.default.error(`rabbit sendToCeleryQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
-            throw e;
-        }
-    }
     async isConnected() {
         const connection = await this.getConnection();
         const isConnected = connection.isConnected();
@@ -584,3 +545,9 @@ class RabbitMq {
     }
 }
 exports.default = RabbitMq;
+const sendToCelelryQueue = async (queueName, taskName, payload) => {
+    const host = process.env.RABBITMQ_SERVICE_HOST || 'localhost';
+    const client = celery_node_1.default.createClient(host, undefined, queueName);
+    return client.sendTask(taskName, [payload], undefined, (0, node_crypto_1.randomUUID)());
+};
+exports.sendToCelelryQueue = sendToCelelryQueue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.21-beta.0.1",
+  "version": "3.2.21-beta.0.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,6 +19,7 @@
     "amqp-connection-manager": "4.1.9",
     "amqplib": "0.10.3",
     "bluebird": "^3.7.2",
+    "celery-node": "^0.5.9",
     "moment": "^2.29.1",
     "redis": "^3.1.2",
     "redis-lock": "^0.1.4"

package/src/index.ts

@@ -3,6 +3,7 @@
 import { EventEmitter, once } from 'events';
 import { promisify } from 'util';
 import moment from 'moment';
+import celery from 'celery-node';
 import RedisLock from 'redis-lock';
 import {
   AmqpConnectionManager, ChannelWrapper, connect, CreateChannelOpts,
@@ -697,60 +698,6 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async sendToCeleryQueue(
-    queue: string,
-    taskName: string,
-    data: any,
-    options?: any,
-    customHeaders?: any,
-  ): Promise<boolean | undefined> {
-    try {
-      await this.assertChannel();
-    } catch (e) {
-      logger.error(`rabbit sendToCeleryQueue: failed to assert channel when sending to queue ${queue}`, { e });
-      throw e;
-    }
-
-    try {
-      RabbitMq.validateName('queue', queue);
-      await this.assertQueue(queue, options);
-    } catch (e) {
-      logger.error(`rabbit sendToCeleryQueue: failed to assert queue ${queue}`, { e });
-      throw e;
-    }
-
-    try {
-      // Create Celery-compatible message format
-      const celeryMessage = {
-        task: taskName,
-        id: randomUUID(),
-        args: [data],
-      };
-
-      const celeryHeaders = {
-        ...RabbitMq.getPublishOptions(customHeaders),
-        properties: {
-          delivery_mode: 2,
-          content_type: 'application/json',
-          content_encoding: 'utf-8',
-        },
-      };
-
-      const res = await this.channel?.sendToQueue(
-        queue,
-        Buffer.from(JSON.stringify(celeryMessage)),
-        celeryHeaders,
-      );
-
-      debug(`rabbit: sending to celery queue ${queue}`, { res });
-      return res;
-    } catch (e) {
-      const isConnected = await this.isConnected();
-      logger.error(`rabbit sendToCeleryQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
-      throw e;
-    }
-  }
-
   async isConnected() : Promise<boolean> {
     const connection = await this.getConnection();
     const isConnected = connection.isConnected();
@@ -789,3 +736,9 @@ class RabbitMq implements IAfRabbitMq {
 }
 
 export default RabbitMq;
+
+export const sendToCelelryQueue = async (queueName: string, taskName: string, payload: any) => {
+  const host = process.env.RABBITMQ_SERVICE_HOST || 'localhost';
+  const client = celery.createClient(host, undefined, queueName);
+  return client.sendTask(taskName, [payload], undefined, randomUUID());
+};