@paralect/hive 0.1.20 → 0.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paralect/hive",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "",
   "main": "index.js",
   "bin": {

package/starter/src/db.js

@@ -1,8 +1,8 @@
 import fs from "fs";
 import _ from "lodash";
-import requireDir from "require-dir";
 import getSchemas from "helpers/getSchemas";
 import getResources from "helpers/getResources";
+import importHandlers from "helpers/importHandlers";
 import config from "app-config";
 import { connect } from "lib/node-mongo";
 
@@ -17,7 +17,7 @@ db.init = async () => {
   await Promise.all(_.map(
     schemaPaths,
     async ({ file: schemaFile, resourceName, name: schemaName }) => {
-      let schema = (await import(schemaFile)).default;
+      let { default: schema, secureFields = [] } = (await import(schemaFile));
 
       if (process.env.HIVE_SRC) {
         let extendSchemaPath = `${process.env.HIVE_SRC}/resources/${resourceName}/${schemaName}.extends.schema.js`;
@@ -27,25 +27,24 @@ db.init = async () => {
         }
       }
       db.schemas[schemaName] = schema;
+
       db.services[schemaName] = db.createService(`${resourceName}`, {
-        validate: (obj) => { 
+        validate: (obj) => {
           return { value: schema.passthrough().parse(obj) };
         },
+        secureFields: secureFields,
       });
-
     }
   ));
 
   const resourcePaths = await getResources();
-  
+
   setTimeout(() => {
-    _.each(resourcePaths, ({ dir }) => {
-      if (fs.existsSync(`${dir}/handlers`)) {
-        requireDir(`${dir}/handlers`);
-      }
+    _.each(resourcePaths, ({ name }) => {
+      importHandlers(name)
     });
   }, 0);
-  
+
   (await import("autoMap/addHandlers")).default();
   (await import("autoMap/mapSchema")).default();
 };

package/starter/src/helpers/importHandlers.js

@@ -0,0 +1,29 @@
+import fs from 'fs';
+import _ from 'lodash';
+import requireDir from "require-dir";
+
+export default (resourceName) => {
+  if (fs.existsSync(`${process.env.HIVE_SRC}/resources/${resourceName}/handlers`)) {
+    requireDir(`${process.env.HIVE_SRC}/resources/${resourceName}/handlers`, {
+      mapValue: (handler, handlerName) => {
+        console.log(
+          `[handlers] Registering handler ${handlerName}`
+        );
+
+        return handler;
+      },
+    });
+  }
+
+  if (fs.existsSync(`${__dirname}/../resources/${resourceName}/handlers`)) {
+    requireDir(`${__dirname}/../resources/${resourceName}/handlers`, {
+      mapValue: (handler, handlerName) => {
+        console.log(
+          `[handlers] Registering handler ${handlerName}`
+        );
+
+        return handler;
+      },
+    });
+  }
+};

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

@@ -1,20 +1,25 @@
-import monk from "monk";
-import _ from "lodash";
-import MongoService from "./mongo-service.js";
-import MongoQueryService from "./mongo-query-service.js";
+import monk from 'monk';
+import _ from 'lodash';
+import MongoService from './mongo-service';
+import MongoQueryService from './mongo-query-service';
+
 const logger = global.logger || console;
-const connect = (connectionString, settings) => {
+
+export const connect = (connectionString, settings) => {
   const connectionSettings = _.defaults({}, settings, {
     connectTimeoutMS: 20000,
   });
   const db = monk(connectionString, connectionSettings);
+
   db.on("error-opening", (err) => {
     logger.error(err, "Failed to connect to the mongodb on start");
     throw err;
   });
+
   db.on("open", () => {
-    logger.info(`Connected to mongodb: ${connectionString}`);
+    logger.info(`Connected to mongodb`);
   });
+
   db.on("close", (err) => {
     if (err) {
       logger.error(err, `Lost connection with mongodb: ${connectionString}`);
@@ -22,31 +27,38 @@ const connect = (connectionString, settings) => {
       logger.warn(`Closed connection with mongodb: ${connectionString}`);
     }
   });
+
   db.on("connected", (err) => {
     if (err) {
       logger.error(err);
     } else {
-      logger.info(`Connected to mongodb: ${connectionString}`);
+      logger.info(`Connected to mongodb`);
     }
   });
+
   db.createService = (collectionName, options = {}) => {
     const collection = db.get(collectionName, { castIds: false });
+
     return new MongoService(collection, options);
   };
+
   db.setServiceMethod = (name, method) => {
     MongoService.prototype[name] = function customMethod(...args) {
       return method.apply(this, [this, ...args]);
     };
   };
+
   db.createQueryService = (collectionName, options = {}) => {
     const collection = db.get(collectionName, { castIds: false });
+
     return new MongoQueryService(collection, options);
   };
+
   db.setQueryServiceMethod = (name, method) => {
     MongoQueryService.prototype[name] = function customMethod(...args) {
       return method.apply(this, [this, ...args]);
     };
   };
+
   return db;
 };
-export { connect };

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

@@ -10,6 +10,7 @@ const defaultOptions = {
   useStringId: true,
   validate: undefined,
   emitter: undefined,
+  secureFields: ['verySecureField'],
 
   onBeforeCreated: ({ docs }) => docs,
 };
@@ -111,20 +112,28 @@ class MongoService extends MongoQueryService {
     return this._bus.on(`${this._collection.name}:${eventName}`, handler);
   }
 
-  onPropertiesUpdated(fieldNames, handler) {
+  onUpdated(fieldNames = [], handler = (e) => { }) {
     return this.on(`${this._collection.name}:${eventName}`, (event) => {
       const { doc, prevDoc } = event;
 
       let isFieldChanged = false;
 
-      _.forEach(fieldNames, (fieldName) => {
-        if (!_.isEqual(doc[fieldName], prevDoc[fieldName])) {
+      if (_.isArray(fieldNames)) {
+        _.forEach(fieldNames, (fieldName) => {
+          if (!_.isEqual(doc[fieldName], prevDoc[fieldName])) {
+            isFieldChanged = true;
+            return false; // break loop
+          }
+
+          return true;
+        });
+      } else if (_.isObject(fieldNames)) {
+        const fieldName = Object.keys(fieldNames)[0];
+
+        if (_.isEqual(_.get(doc, fieldName), fieldNames[fieldName]) && !_.isEqual(_.get(doc, fieldName), _.get(prevDoc, fieldName))) {
           isFieldChanged = true;
-          return false; // break loop
         }
-
-        return true;
-      });
+      }
 
       if (isFieldChanged) handler(event);
     });
@@ -158,6 +167,10 @@ class MongoService extends MongoQueryService {
       });
     });
 
+    created = created.map(doc => {
+      return _.omit(doc, options.isIncludeSecureFields ? [] : this._options.secureFields);
+    })
+
     return created.length > 1 ? created : created[0];
   }
 
@@ -184,7 +197,7 @@ class MongoService extends MongoQueryService {
     if (this._options.addUpdatedOnField)
       entity.updatedOn = new Date().toISOString();
     entity = await updateFn(entity);
-    const updated = await this._validate(entity);
+    let updated = await this._validate(entity);
 
     await this._collection.update(
       { ...query, _id: doc._id },
@@ -192,11 +205,14 @@ class MongoService extends MongoQueryService {
       options
     );
 
+
     this._bus.emit(`${this._collection.name}:updated`, {
       doc: updated,
       prevDoc: doc,
     });
 
+    updated = _.omit(updated, options.isIncludeSecureFields ? [] : this._options.secureFields);
+
     return updated;
   }
 
@@ -213,7 +229,7 @@ class MongoService extends MongoQueryService {
     const { results: docs } = await this.find(query, findOptions);
     if (docs.length === 0) return [];
 
-    const updated = await Promise.all(
+    let updated = await Promise.all(
       docs.map(async (doc) => {
         let entity = _.cloneDeep(doc);
 
@@ -243,6 +259,8 @@ class MongoService extends MongoQueryService {
       });
     });
 
+    updated = updated.map(doc => _.omit(doc, options.isIncludeSecureFields ? [] : this._options.secureFields));
+
     return updated;
   }
 

package/starter/src/resources/users/handlers/test.js

@@ -0,0 +1 @@
+console.log('hello from handler');

package/starter/src/routes/index.js

@@ -96,6 +96,7 @@ export default async (app) => {
 
     endpoints.forEach(({ endpoint, requestSchema, middlewares = [], handler }) => {
       let targetRouter;
+      console.log('[routes] Register endpoint', resourceName, endpoint?.method || 'GET', endpoint?.url);
 
       let url = endpoint.absoluteUrl || endpoint.url;