@paralect/hive 0.0.20 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paralect/hive",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -23,6 +23,7 @@
     "aws-sdk": "2.1080.0",
     "axios": "^1.7.2",
     "bcryptjs": "2.4.3",
+    "bullmq": "^5.10.3",
     "commander": "^12.1.0",
     "dotenv": "16.0.0",
     "eslint-config-prettier": "8.5.0",

package/starter/src/bullMq.js

@@ -0,0 +1,24 @@
+const config = require('app-config');
+
+const { Queue, Worker } = require('bullmq');
+
+let connectionOpts = {
+  host: config.redis.url.split('@')[1].split(':')[0],
+  port: config.redis.url.split('@')[1].split(':')[1],
+  username: 'default',
+  password: config.redis.url.split(':')[2].split('@')[0],
+};
+
+module.exports = {
+  Queue(queueName) {
+    return new Queue(queueName, {
+      connection: connectionOpts,
+    });
+  },
+  Worker(queueName, workerFn, options = {}) {
+    return new Worker(queueName, workerFn, {
+      ...options,
+      connection: connectionOpts,
+    });
+  },
+};

package/starter/src/bullMqBus.js

@@ -0,0 +1,21 @@
+const config = require('app-config');
+const bullMq = require('./bullMq');
+const queue = bullMq.Queue(`database-${config.env}`);
+
+let handlers = {};
+
+module.exports = {
+  on(eventName, handler) {
+    console.log('registering', eventName);
+
+    handlers[eventName] = handlers[eventName] || [];
+    handlers[eventName].push(handler);
+  },
+  emit(eventName, data) {
+    queue.add(eventName, data);
+  }
+}
+
+bullMq.Worker(`database-${config.env}`, async ({ name: eventName, data }) => {
+  await Promise.all((handlers[eventName] || []).map(h => h(data)));
+});

package/starter/src/db.js

@@ -6,6 +6,9 @@ const getSchemas = require("helpers/getSchemas");
 const getResources = require("helpers/getResources");
 
 const config = require("app-config");
+
+const bullMqBus = require("./bullMqBus");
+
 const db = require("lib/node-mongo").connect(config.mongoUri);
 
 db.services = {};
@@ -34,6 +37,7 @@ db.init = async () => {
 
       db.services[schemaName] = db.createService(`${resourceName}`, {
         validate: (obj) => schema.validate(obj, { allowUnknown: true }),
+        emitter: bullMqBus
       });
     }
   );

package/starter/src/lib/node-mongo/src/index.js

@@ -18,7 +18,7 @@ const connect = (connectionString, settings) => {
   });
 
   db.on("open", () => {
-    logger.info(`Connected to mongodb: ${connectionString}`);
+    logger.info(`Connected to mongodb`);
   });
 
   db.on("close", (err) => {
@@ -33,7 +33,7 @@ const connect = (connectionString, settings) => {
     if (err) {
       logger.error(err);
     } else {
-      logger.info(`Connected to mongodb: ${connectionString}`);
+      logger.info(`Connected to mongodb`);
     }
   });
 

package/starter/src/lib/node-mongo/src/mongo-service.js

@@ -18,7 +18,6 @@ const defaultOptions = {
 class MongoService extends MongoQueryService {
   constructor(collection, options = {}) {
     super(collection, options);
-
     _.defaults(this._options, defaultOptions);
 
     this._bus = this._options.emitter || new EventEmitter();
@@ -102,25 +101,34 @@ class MongoService extends MongoQueryService {
   }
 
   emit(eventName, event) {
-    return this._bus.emit(eventName, event);
+    return this._bus.emit(`${this._collection.name}:${eventName}`, event);
   }
 
   once(eventName, handler) {
-    return this._bus.once(eventName, handler);
+    return this._bus.once(`${this._collection.name}:${eventName}`, handler);
   }
 
   on(eventName, handler) {
-    return this._bus.on(eventName, handler);
+    console.log("this._bus.on(`${this._collection.name}:${eventName}`, handler);", `${this._collection.name}:${eventName}`);
+    return this._bus.on(`${this._collection.name}:${eventName}`, handler);
   }
 
-  onPropertiesUpdated(properties, handler) {
-    return this.on("updated", (event) => {
-      const isChanged = MongoService._deepCompare(
-        event.doc,
-        event.prevDoc,
-        properties
-      );
-      if (isChanged) handler(event);
+  onPropertiesUpdated(fieldNames, handler) {
+    return this.on(`${this._collection.name}:${eventName}`, (event) => {
+      const { doc, prevDoc } = event;
+
+      let isFieldChanged = false;
+
+      _.forEach(fieldNames, (fieldName) => {
+        if (!_.isEqual(doc[fieldName], prevDoc[fieldName])) {
+          isFieldChanged = true;
+          return false; // break loop
+        }
+
+        return true;
+      });
+
+      if (isFieldChanged) handler(event);
     });
   }
 
@@ -147,7 +155,7 @@ class MongoService extends MongoQueryService {
     await this._collection.insert(created, options);
 
     created.forEach((doc) => {
-      this._bus.emit("created", {
+      this._bus.emit(`${this._collection.name}:created`, {
         doc,
       });
     });
@@ -186,7 +194,7 @@ class MongoService extends MongoQueryService {
       options
     );
 
-    this._bus.emit("updated", {
+    this._bus.emit(`${this._collection.name}:updated`, {
       doc: updated,
       prevDoc: doc,
     });
@@ -247,7 +255,7 @@ class MongoService extends MongoQueryService {
     await this._collection.remove(query, options);
 
     removed.results.forEach((doc) => {
-      this._bus.emit("removed", {
+      this._bus.emit(`${this._collection.name}:removed`, {
         doc,
       });
     });