@quatrain/queue-amqp 1.1.19 → 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=0`);
+    // 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/lib/AmqpQueueAdapter.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/AmqpQueueAdapter.test.js

@@ -0,0 +1,118 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const AmqpQueueAdapter_1 = require("./AmqpQueueAdapter");
+const amqp_client_1 = require("@cloudamqp/amqp-client");
+const queue_1 = require("@quatrain/queue");
+// Mock the @cloudamqp/amqp-client library
+jest.mock('@cloudamqp/amqp-client');
+// Mock @quatrain/queue to spy on Queue.info
+jest.mock('@quatrain/queue', () => (Object.assign(Object.assign({}, jest.requireActual('@quatrain/queue')), { Queue: {
+        info: jest.fn(),
+    } })));
+const mockPublish = jest
+    .fn()
+    .mockResolvedValue({ confirmId: 'mock-confirm-id' });
+const mockSubscribe = jest.fn();
+const mockQueue = jest.fn().mockResolvedValue({
+    publish: mockPublish,
+    subscribe: mockSubscribe,
+});
+const mockChannel = jest.fn().mockResolvedValue({
+    queue: mockQueue,
+});
+const mockConnect = jest.fn().mockResolvedValue({
+    channel: mockChannel,
+});
+const AMQPClientMock = amqp_client_1.AMQPClient;
+AMQPClientMock.mockImplementation(() => {
+    return {
+        connect: mockConnect,
+    };
+});
+describe('AmqpQueueAdapter', () => {
+    const params = {
+        config: {
+            host: 'test-host',
+            user: 'test-user',
+            password: 'test-password',
+            port: 1234,
+        },
+        topic: 'default-topic',
+    };
+    beforeEach(() => {
+        // Clear all instances and calls to constructor and all methods:
+        AMQPClientMock.mockClear();
+        mockConnect.mockClear();
+        mockChannel.mockClear();
+        mockQueue.mockClear();
+        mockPublish.mockClear();
+        mockSubscribe.mockClear();
+        queue_1.Queue.info.mockClear();
+    });
+    it('should construct with default and custom parameters', () => {
+        new AmqpQueueAdapter_1.AmqpQueueAdapter({ config: {} });
+        expect(AMQPClientMock).toHaveBeenCalledWith('amqp://guest:guest@localhost:5672?frameMax=0');
+        new AmqpQueueAdapter_1.AmqpQueueAdapter(params);
+        expect(AMQPClientMock).toHaveBeenCalledWith('amqp://test-user:test-password@test-host:1234?frameMax=0');
+    });
+    describe('send', () => {
+        it('should send a message to the specified topic', () => __awaiter(void 0, void 0, void 0, function* () {
+            const adapter = new AmqpQueueAdapter_1.AmqpQueueAdapter(params);
+            const data = { key: 'value' };
+            const topic = 'test-topic';
+            const confirmId = yield adapter.send(data, topic);
+            expect(mockConnect).toHaveBeenCalledTimes(1);
+            expect(mockChannel).toHaveBeenCalledTimes(1);
+            expect(mockQueue).toHaveBeenCalledWith(topic);
+            expect(mockPublish).toHaveBeenCalledWith(Buffer.from(JSON.stringify(data)), { deliveryMode: 2 });
+            expect(queue_1.Queue.info).toHaveBeenCalledWith(`[AMQP] Sending message to ${topic}`);
+            expect(queue_1.Queue.info).toHaveBeenCalledWith(`[AMQP] Message send with id mock-confirm-id`);
+            expect(confirmId).toBe('mock-confirm-id');
+        }));
+    });
+    describe('listen', () => {
+        it('should listen to the default topic if none is provided', () => __awaiter(void 0, void 0, void 0, function* () {
+            const adapter = new AmqpQueueAdapter_1.AmqpQueueAdapter(params);
+            const handler = jest.fn();
+            yield adapter.listen(undefined, handler);
+            expect(mockConnect).toHaveBeenCalledTimes(1);
+            expect(mockChannel).toHaveBeenCalledTimes(1);
+            expect(mockQueue).toHaveBeenCalledWith(params.topic);
+            expect(mockSubscribe).toHaveBeenCalledWith({ noAck: true }, expect.any(Function));
+        }));
+        it('should listen to a specific topic', () => __awaiter(void 0, void 0, void 0, function* () {
+            const adapter = new AmqpQueueAdapter_1.AmqpQueueAdapter(params);
+            const handler = jest.fn();
+            const topic = 'specific-topic';
+            yield adapter.listen(topic, handler);
+            expect(mockQueue).toHaveBeenCalledWith(topic);
+        }));
+        it('should throw an error if no topic is available', () => __awaiter(void 0, void 0, void 0, function* () {
+            const adapter = new AmqpQueueAdapter_1.AmqpQueueAdapter({ config: {} });
+            const handler = jest.fn();
+            yield expect(adapter.listen(undefined, handler)).rejects.toThrow('No topic provided for listening.');
+        }));
+        it('should call the message handler with the message body', () => __awaiter(void 0, void 0, void 0, function* () {
+            const adapter = new AmqpQueueAdapter_1.AmqpQueueAdapter(params);
+            const handler = jest.fn();
+            const messageContent = { data: 'test message' };
+            const message = {
+                bodyToString: () => JSON.stringify(messageContent),
+            };
+            mockSubscribe.mockImplementation((options, callback) => __awaiter(void 0, void 0, void 0, function* () {
+                yield callback(message);
+            }));
+            yield adapter.listen('any-topic', handler);
+            expect(handler).toHaveBeenCalledWith(JSON.stringify(messageContent));
+        }));
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/queue-amqp",
-  "version": "1.1.19",
+  "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",