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

package/dist/index.d.ts

@@ -4,6 +4,7 @@ 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;
@@ -98,4 +99,4 @@ declare class RabbitMq implements IAfRabbitMq {
     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>;
+export { sendCeleryTaskViaHttp, };

package/dist/index.js

@@ -4,11 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendToCelelryQueue = void 0;
+exports.sendCeleryTaskViaHttp = 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");
@@ -19,6 +18,8 @@ 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;
@@ -545,9 +546,3 @@ 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/dist/lib/celery.d.ts

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

package/dist/lib/celery.js

@@ -0,0 +1,54 @@
+"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 || 'localhost',
+    username: process.env.RABBITMQ_USERNAME || 'guest',
+    password: process.env.RABBITMQ_PASSWORD || 'guest',
+};
+async function sendCeleryTaskViaHttp(data) {
+    const apiUrl = `http://${config.host}:15672/api/exchanges/%2f/amq.default/publish`;
+    const message = {
+        task: 'planning_tasks.process_planning_task',
+        id: (0, node_crypto_1.randomUUID)(),
+        args: [data],
+    };
+    const payload = {
+        properties: {
+            delivery_mode: 2,
+            content_type: 'application/json',
+        },
+        routing_key: 'planning-task',
+        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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.21-beta.0.2",
+  "version": "3.2.21-beta.0.4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,7 +19,6 @@
     "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,7 +3,6 @@
 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,
@@ -42,6 +41,8 @@ import {
   AssertExchangePromisesDictionary,
 } from './lib/types';
 
+import { sendCeleryTaskViaHttp } from './lib/celery';
+
 // const debug = nodeDebug('af-rabbitmq')
 const debug = logger.debug.bind(logger);
 
@@ -737,8 +738,6 @@ 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());
+export {
+  sendCeleryTaskViaHttp,
 };

package/src/lib/celery.ts

@@ -0,0 +1,85 @@
+import { randomUUID } from 'node:crypto';
+
+// 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 sendTaskViaHttp(
+  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();
+      console.log('Successfully published message:', result);
+    } else {
+      console.error(`Failed to publish message. Status code: ${response.status}`);
+      console.error(`Response: ${await response.text()}`);
+    }
+  } catch (error) {
+    console.error('Error sending request:', error instanceof Error ? error.message : String(error));
+    throw error;
+  }
+}
+
+export { sendTaskViaHttp, TaskData, SendTaskOptions };