@ecom-micro/common 2.0.7 → 2.0.9

package/build/events/baseListener.d.ts

@@ -1,4 +1,4 @@
-import { Message, Connection, Channel } from 'amqplib';
+import { Message, Stan } from 'node-nats-streaming';
 import { Subjects } from '../types/subjects';
 interface Event {
     subject: Subjects;
@@ -6,10 +6,13 @@ interface Event {
 }
 export declare abstract class Listener<T extends Event> {
     abstract subject: T['subject'];
-    abstract onMessage(data: T['data'], msg: Message, channel: Channel): void;
-    private client;
-    constructor(client: Connection);
-    listen(): Promise<void>;
+    abstract queueGroupName: string;
+    abstract onMessage(data: T['data'], msg: Message): void;
+    protected client: Stan;
+    protected ackWait: number;
+    constructor(client: Stan);
+    subscriptionOptions(): import("node-nats-streaming").SubscriptionOptions;
+    listen(): void;
     parseMessage(msg: Message): any;
 }
 export {};

package/build/events/baseListener.js

@@ -1,68 +1,30 @@
 "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());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Listener = void 0;
 var Listener = /** @class */ (function () {
     function Listener(client) {
+        this.ackWait = 5 * 1000;
         this.client = client;
     }
+    Listener.prototype.subscriptionOptions = function () {
+        return this.client
+            .subscriptionOptions()
+            .setDeliverAllAvailable()
+            .setManualAckMode(true)
+            .setAckWait(this.ackWait)
+            .setDurableName(this.queueGroupName);
+    };
     Listener.prototype.listen = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                this.client.createChannel().then(function (channel) {
-                    channel.assertQueue(_this.subject);
-                    channel.consume(_this.subject, function (message) {
-                        if (message !== null) {
-                            console.log("Message Received to: ".concat(_this.subject));
-                            var parseMsg = _this.parseMessage(message);
-                            _this.onMessage(parseMsg, message, channel);
-                        }
-                    }, {
-                        noAck: true,
-                    });
-                });
-                return [2 /*return*/];
-            });
+        var _this = this;
+        var subscription = this.client.subscribe(this.subject, this.queueGroupName, this.subscriptionOptions());
+        subscription.on('message', function (msg) {
+            console.log("Message received: ".concat(_this.subject, " / ").concat(_this.queueGroupName));
+            var parsedData = _this.parseMessage(msg);
+            _this.onMessage(parsedData, msg);
         });
     };
     Listener.prototype.parseMessage = function (msg) {
-        var data = msg.content;
+        var data = msg.getData();
         return typeof data === 'string' ? JSON.parse(data) : JSON.parse(data.toString('utf8'));
     };
     return Listener;

package/build/events/basePublisher.d.ts

@@ -1,4 +1,4 @@
-import { Connection } from 'amqplib';
+import { Stan } from 'node-nats-streaming';
 import { Subjects } from '../types/subjects';
 interface Event {
     subject: Subjects;
@@ -6,8 +6,8 @@ interface Event {
 }
 export declare abstract class Publisher<T extends Event> {
     abstract subject: T['subject'];
-    protected client: Connection;
-    constructor(client: Connection);
+    protected client: Stan;
+    constructor(client: Stan);
     publish(data: T['data']): Promise<void>;
 }
 export {};

package/build/events/basePublisher.js

@@ -8,18 +8,13 @@ var Publisher = /** @class */ (function () {
     Publisher.prototype.publish = function (data) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            _this.client
-                .createChannel()
-                .then(function (channel) {
-                channel.assertQueue(_this.subject, {
-                    durable: false,
-                    exclusive: true,
-                });
-                channel.sendToQueue(_this.subject, Buffer.from(JSON.stringify(data)));
-                console.log("Event published to subject: ".concat(_this.subject));
+            _this.client.publish(_this.subject, JSON.stringify(data), function (err) {
+                if (err) {
+                    return reject(err);
+                }
+                console.log('Event published to subject', _this.subject);
                 resolve();
-            })
-                .catch(function (error) { return reject(error); });
+            });
         });
     };
     return Publisher;

package/build/index.d.ts

@@ -9,6 +9,4 @@ export * from './middleware/requestValidation';
 export * from './events/baseListener';
 export * from './events/basePublisher';
 export * from './events/productCreatedEvent';
-export * from './events/productCreatedListener';
-export * from './events/productCreatedPublisher';
 export * from './types/subjects';

package/build/index.js

@@ -25,6 +25,4 @@ __exportStar(require("./middleware/requestValidation"), exports);
 __exportStar(require("./events/baseListener"), exports);
 __exportStar(require("./events/basePublisher"), exports);
 __exportStar(require("./events/productCreatedEvent"), exports);
-__exportStar(require("./events/productCreatedListener"), exports);
-__exportStar(require("./events/productCreatedPublisher"), exports);
 __exportStar(require("./types/subjects"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecom-micro/common",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -21,11 +21,11 @@
     "@types/express": "^4.17.14",
     "@types/express-validator": "^3.0.0",
     "@types/jsonwebtoken": "^8.5.9",
-    "amqplib": "^0.10.3",
     "cookie-session": "^2.0.0",
     "express": "^4.18.2",
     "express-validator": "^6.14.2",
     "jsonwebtoken": "^8.5.1",
+    "node-nats-streaming": "^0.2.6",
     "typescript": "^4.8.4"
   }
 }

package/build/events/productCreatedListener.d.ts

@@ -1,8 +0,0 @@
-import { Message, Channel } from 'amqplib';
-import { Subjects } from '../types/subjects';
-import { Listener } from './baseListener';
-import { ProductCreatedEvent } from './productCreatedEvent';
-export declare class ProductCreatedListener extends Listener<ProductCreatedEvent> {
-    subject: Subjects.ProductCreated;
-    onMessage(data: ProductCreatedEvent['data'], message: Message, channel: Channel): void;
-}

package/build/events/productCreatedListener.js

@@ -1,33 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProductCreatedListener = void 0;
-var subjects_1 = require("../types/subjects");
-var baseListener_1 = require("./baseListener");
-var ProductCreatedListener = /** @class */ (function (_super) {
-    __extends(ProductCreatedListener, _super);
-    function ProductCreatedListener() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.subject = subjects_1.Subjects.ProductCreated;
-        return _this;
-    }
-    ProductCreatedListener.prototype.onMessage = function (data, message, channel) {
-        channel.ack(message);
-    };
-    return ProductCreatedListener;
-}(baseListener_1.Listener));
-exports.ProductCreatedListener = ProductCreatedListener;

package/build/events/productCreatedPublisher.d.ts

@@ -1,6 +0,0 @@
-import { Subjects } from '../types/subjects';
-import { Publisher } from './basePublisher';
-import { ProductCreatedEvent } from './productCreatedEvent';
-export declare class ProductCreatedPublisher extends Publisher<ProductCreatedEvent> {
-    subject: Subjects.ProductCreated;
-}

package/build/events/productCreatedPublisher.js

@@ -1,30 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProductCreatedPublisher = void 0;
-var subjects_1 = require("../types/subjects");
-var basePublisher_1 = require("./basePublisher");
-var ProductCreatedPublisher = /** @class */ (function (_super) {
-    __extends(ProductCreatedPublisher, _super);
-    function ProductCreatedPublisher() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.subject = subjects_1.Subjects.ProductCreated;
-        return _this;
-    }
-    return ProductCreatedPublisher;
-}(basePublisher_1.Publisher));
-exports.ProductCreatedPublisher = ProductCreatedPublisher;