@quatrain/queue-amqp 1.1.20 → 1.2.1

package/lib/AmqpQueueAdapter.d.ts

@@ -1,6 +1,6 @@
-import { AbstractQueueAdapter, QueueParameters } from '@quatrain/queue';
+import { AbstractQueueAdapter } from '@quatrain/queue';
 export declare class AmqpQueueAdapter extends AbstractQueueAdapter {
-    constructor(params: QueueParameters);
+    protected _connect(): Promise<any>;
     send(data: any, topic: string): Promise<string>;
     listen(topic: string | undefined, messageHandler: Function): Promise<any>;
 }

package/lib/AmqpQueueAdapter.js

@@ -8,26 +8,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AmqpQueueAdapter = void 0;
 const queue_1 = require("@quatrain/queue");
-const amqp_client_1 = require("@cloudamqp/amqp-client");
+const amqplib_1 = __importDefault(require("amqplib"));
 class AmqpQueueAdapter extends queue_1.AbstractQueueAdapter {
-    constructor(params) {
-        super(params);
-        const { host = 'localhost', user = 'guest', password = 'guest', port = 5672, } = params.config || {};
-        this._client = new amqp_client_1.AMQPClient(`amqp://${user}:${password}@${host}:${port}?frameMax=0x80000000`);
+    // constructor(params: QueueParameters) {
+    //    super(params)
+    //    const {
+    //       host = 'localhost',
+    //       user = 'guest',
+    //       password = 'guest',
+    //       port = 5672,
+    //    } = params.config || {}
+    //    this._client = new AMQPClient(
+    //       `amqp://${user}:${password}@${host}:${port}?frameMax=0x80000000`
+    //    )
+    // }
+    _connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._client) {
+                return this._client;
+            }
+            const { host = 'localhost', user = 'guest', password = 'guest', port = 5672, } = this._params.config || {};
+            this._client = amqplib_1.default.connect(`amqp://${user}:${password}@${host}:${port}`);
+        });
     }
     send(data, topic) {
         return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this._client.connect();
-            const channel = yield connection.channel();
-            const queue = yield channel.queue(topic);
+            yield this._connect(); // this._client.connect()
+            const ch = yield this._client.createChannel();
+            // const channel: AMQPChannel = await connection.channel()
+            // const queue: AMQPQueue = await channel.queue(topic)
             const dataBuffer = Buffer.from(JSON.stringify(data));
             queue_1.Queue.info(`[AMQP] Sending message to ${topic}`);
-            const res = yield queue.publish(dataBuffer, { deliveryMode: 2 });
-            queue_1.Queue.info(`[AMQP] Message send with id ${res.confirmId}`);
-            return res.confirmId;
+            ch.sendToQueue(topic, dataBuffer);
+            // const res = await queue.publish(dataBuffer, { deliveryMode: 1 })
+            const id = Date.now(); // fake
+            queue_1.Queue.info(`[AMQP] Message send with id ${id}`);
+            return String(id);
         });
     }
     listen(topic = this._params.topic, messageHandler) {
@@ -35,10 +57,18 @@ class AmqpQueueAdapter extends queue_1.AbstractQueueAdapter {
             if (!topic) {
                 throw new Error(`No topic provided for listening.`);
             }
-            const connection = yield this._client.connect();
-            const channel = yield connection.channel();
-            const queue = yield channel.queue(topic);
-            return queue.subscribe({ noAck: true }, (message) => __awaiter(this, void 0, void 0, function* () { return yield messageHandler(message.bodyToString()); }));
+            yield this._connect();
+            const ch = yield this._client.createChannel();
+            yield ch.assertQueue(topic);
+            return ch.consume(topic, (message) => __awaiter(this, void 0, void 0, function* () { return yield messageHandler(message.content.toString()); }));
+            // const connection = await this._client.connect()
+            // const channel = await connection.channel()
+            // const queue = await channel.queue(topic)
+            // return queue.subscribe(
+            //    { noAck: true },
+            //    async (message: AMQPMessage) =>
+            //       await messageHandler(message.bodyToString())
+            // )
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/queue-amqp",
-  "version": "1.1.20",
+  "version": "1.2.1",
   "description": "Queue adapter for AMQP compatible queue",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -12,6 +12,7 @@
   "license": "MIT",
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.1",
+    "@types/amqplib": "^0",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^27.0.3",
     "@types/node": "^22.10.1",
@@ -26,7 +27,8 @@
   "dependencies": {
     "@cloudamqp/amqp-client": "^3.4.1",
     "@quatrain/core": "^1.1.22",
-    "@quatrain/queue": "^1.1.16"
+    "@quatrain/queue": "^1.1.16",
+    "amqplib": "^0.10.9"
   },
   "scripts": {
     "test-ci": "jest --runInBand",