@vulkano/core 1.15.6 → 1.17.0

package/database/mongodb.js

@@ -2,13 +2,9 @@
  * Database connection
  */
 
-const Promise = require('bluebird');
-const paginate = require('mongoose-paginate-v2');
-const merge = require('deepmerge');
-
 const mongoose = require('mongoose');
-
-mongoose.Promise = Promise;
+const paginate = require('mongoose-paginate-v2');
+const merge = require('../libs/Merge');
 
 global.mongoose = mongoose;
 global.Virtual = 'Virtual';
@@ -45,15 +41,13 @@ module.exports = async function loadDatabaseApplication() {
     : (connection || null);
 
   if (!toConnect) {
-    throw `Invalid conection to user MongoDB with source ${connection}`;
+    throw new Error(`Invalid connection to MongoDB with source "${connection}"`);
   }
 
-  const defaultProps = {
-    family: 4
-  };
-
+  // Build connection props from user config; family defaults to 4 (IPv4)
+  // unless explicitly set to another value in database.config
   const connectionProps = merge.all([
-    defaultProps,
+    { family: 4 },
     (database ? database.config || {} : {})
   ]);
 

package/database/scaffold.js

@@ -80,13 +80,30 @@ module.exports = {
    */
   update(_id, data) {
 
+    // Blocklist: these fields are never writable from outside
+    const BLOCKED = ['_id', 'createdAt', '__v'];
+    const sanitized = { ...data };
+    BLOCKED.forEach((field) => delete sanitized[field]);
+
+    // Allowlist: if fillable is defined and non-empty, only those fields pass through
+    const { fillable } = this;
+    let filtered = sanitized;
+    if (Array.isArray(fillable) && fillable.length > 0) {
+      filtered = {};
+      fillable.forEach((field) => {
+        if (sanitized[field] !== undefined) {
+          filtered[field] = sanitized[field];
+        }
+      });
+    }
+
     return this.getByField(_id)
       .then( (record) => {
 
         // Merge current info with incoming values
         const merged = {
           ...record,
-          ...data,
+          ...filtered,
           updatedAt: Date.now()
         };
 
@@ -110,10 +127,7 @@ module.exports = {
    */
   delete(id) {
 
-    // Scaffold Model
-    // const Model = global[modelName];
-
-    // Soft delete
+    // Soft delete: set active=false instead of removing the document
     return this.update(id, { active: false });
 
   },

package/libs/ApiClient.js

@@ -1,6 +1,4 @@
-const http = require('http');
-const https = require('https');
-const axios = require('axios');
+const { Agent } = require('undici');
 
 module.exports = {
 
@@ -12,13 +10,7 @@ module.exports = {
    * @returns {Promise}
    */
   get(url, props) {
-
-    return this.send({
-      url,
-      ...props,
-      method: 'GET'
-    });
-
+    return this.send({ url, ...props, method: 'GET' });
   },
 
   /**
@@ -30,14 +22,7 @@ module.exports = {
    * @returns {Promise}
    */
   post(url, body, props) {
-
-    return this.send({
-      url,
-      body,
-      ...props,
-      method: 'POST'
-    });
-
+    return this.send({ url, body, ...props, method: 'POST' });
   },
 
   /**
@@ -49,32 +34,18 @@ module.exports = {
    * @returns {Promise}
    */
   put(url, body, props) {
-
-    return this.send({
-      url,
-      body,
-      ...props,
-      method: 'PUT'
-    });
-
+    return this.send({ url, body, ...props, method: 'PUT' });
   },
 
   /**
    * Method to make a DELETE request
    *
    * @param {String} url
-   * @param {Object} body
    * @param {Object} props { headers }
    * @returns {Promise}
    */
   delete(url, props) {
-
-    return this.send({
-      url,
-      ...props,
-      method: 'DELETE'
-    });
-
+    return this.send({ url, ...props, method: 'DELETE' });
   },
 
   /**
@@ -83,77 +54,78 @@ module.exports = {
    * @param {Object} props
    * @returns {Promise}
    */
-  send(props) {
+  async send(props) {
 
     const {
       url,
       body,
       method,
       responseType,
-      headers
+      headers,
+      rejectUnauthorized
     } = typeof props === 'string'
-      ? { path: props, method: 'get' }
+      ? { url: props, method: 'GET' }
       : (props || {});
 
+    // SSL verification is enabled by default; pass rejectUnauthorized: false to disable
+    const sslVerify = rejectUnauthorized !== false;
+
     const optHeaders = {
       'Content-Type': 'application/json',
-      Accept: 'application/json'
+      Accept: 'application/json',
+      ...(headers || {})
     };
 
     const options = {
-      url,
-      method: (method || 'GET').toLowerCase(),
-      headers: Object.assign(optHeaders, headers || {}),
-      httpAgent: new http.Agent({ keepAlive: true, rejectUnauthorized: false }),
-      httpsAgent: new https.Agent({ keepAlive: true, rejectUnauthorized: false }),
-      responseType: responseType || 'json'
+      method: (method || 'GET').toUpperCase(),
+      headers: optHeaders,
+      dispatcher: new Agent({ connect: { rejectUnauthorized: sslVerify } })
     };
 
     if (body) {
-      // convert body into just one line of json.
-      options.data = JSON.parse(JSON.stringify(body || {}));
+      options.body = JSON.stringify(body);
     }
 
-    return axios(options)
-      .then( (response) => {
+    const target = `${options.method} ${url}`;
 
-        const {
-          data
-        } = response;
+    try {
 
-        return data || {};
+      const response = await fetch(url, options);
 
-      })
-      .catch( (err) => {
+      if (!response.ok) {
 
-        const {
-          response
-        } = err || {};
+        let errorData = {};
+        try { errorData = await response.json(); } catch (_) {}
 
-        const {
-          data: errorData,
-          status: statusCode
-        } = response || {};
-
-        const target = options.baseURL ? `${options.method} ${options.baseURL}/${options.url}` : `${options.method} ${options.url}`;
+        const { msg, message: errorMessage, error: errorMessage2 } = errorData || {};
+        const message = msg || errorMessage || errorMessage2 || 'Unable to connect to the Request Service';
 
-        console.log('');
         console.log('');
         console.log('---------------------');
         console.log('ApiClient', target);
         console.log('---------------------');
 
-        const {
-          msg,
-          message: errorMessage,
-          error: errorMessage2
-        } = errorData || {};
+        return VSError.reject(message, response.status || 500);
 
-        const message = msg || errorMessage || errorMessage2 || 'Unable to connect to the Request Service';
+      }
+
+      if (responseType === 'arraybuffer') return response.arrayBuffer();
+      if (responseType === 'text') return response.text();
+      if (responseType === 'stream') return response.body;
+
+      const data = await response.json();
+      return data || {};
 
-        return VSError.reject(message, statusCode || 500);
+    } catch (err) {
 
-      });
+      console.log('');
+      console.log('---------------------');
+      console.log('ApiClient', target);
+      console.log('---------------------');
+
+      return VSError.reject(err.message || 'Unable to connect to the Request Service', 500);
+
+    }
 
   }
 

package/libs/Encrypter.js

@@ -2,10 +2,14 @@ const crypto = require('crypto');
 
 class Encrypter {
 
-  constructor(encryptionKey) {
+  constructor(encryptionKey, opts = {}) {
 
-    this.algorithm = 'aes-256-cbc';
-    this.key = crypto.scryptSync(encryptionKey, 'salt', 32);
+    const { encryption } = (typeof app !== 'undefined' && app.config) ? app.config : {};
+    const salt = opts.salt || (encryption && encryption.salt) || process.env.ENCRYPTION_SALT || 'vulkano-salt-v1';
+    const algorithm = opts.algorithm || (encryption && encryption.algorithm) || process.env.ENCRYPTION_ALGORITHM || 'aes-256-cbc';
+
+    this.algorithm = algorithm;
+    this.key = crypto.scryptSync(encryptionKey, salt, 32);
 
   }
 

package/libs/Filter.js

@@ -7,7 +7,7 @@
  */
 const path = require('path');
 
-// Include all api controllers
+// Load built-in core filters and app-level custom filters
 const coreFilters = require('include-all')({
   dirname: path.join(CORE_PATH, '/libs/filters'),
   filter: /(.+)\.js$/,
@@ -24,14 +24,14 @@ const allFilters = { ...coreFilters, ...appFilters };
 
 module.exports = {
 
-  get(str, filters, opts) {    
+  get(str, filters, opts) {
 
     if (Array.isArray(filters)) {
 
       let result = str;
-      
+
       filters.forEach((filter) => {
-        const f = Filter.load(filter);
+        const f = this.load(filter);
         result = (!f) ? '' : f.exec(result, opts);
       });
 
@@ -39,7 +39,7 @@ module.exports = {
 
     }
 
-    const f = Filter.load(filters);
+    const f = this.load(filters);
     return (!f) ? '' : f.exec(str, opts);
 
   },

package/libs/Jwt.js

@@ -1,6 +1,5 @@
 const { expressjwt: JWT } = require('express-jwt');
 const jwtSimple = require('jwt-simple');
-const moment = require('moment');
 
 module.exports = {
 
@@ -13,7 +12,7 @@ module.exports = {
 
     const {
       jwt,
-      // Express config folder in app/confg/express
+      // Express config folder in app/config/express
       express
     } = app.config || {};
 
@@ -143,7 +142,7 @@ module.exports = {
       expiration
     } = data || {};
 
-    const now = moment().format('x');
+    const now = String(Date.now());
 
     // Token expired
     if (expiration && ( Number(now) > Number(expiration) )) {
@@ -166,7 +165,7 @@ module.exports = {
   },
 
   /**
-   * Decryp Token
+   * Decrypt token payload
    *
    * @param {String} str
    * @returns {String}

package/libs/Merge.js

@@ -0,0 +1,109 @@
+function isMergeableObject(value) {
+  return value !== null
+    && typeof value === 'object'
+    && !(value instanceof RegExp)
+    && !(value instanceof Date);
+}
+
+function emptyTarget(val) {
+  return Array.isArray(val) ? [] : {};
+}
+
+function cloneUnlessOtherwiseSpecified(value, options) {
+  return (options.clone !== false && options.isMergeableObject(value))
+    ? merge(emptyTarget(value), value, options) // eslint-disable-line no-use-before-define
+    : value;
+}
+
+function defaultArrayMerge(target, source, options) {
+  return target.concat(source).map((element) => cloneUnlessOtherwiseSpecified(element, options));
+}
+
+function getMergeFunction(key, options) {
+  if (!options.customMerge) return merge; // eslint-disable-line no-use-before-define
+  const custom = options.customMerge(key);
+  return typeof custom === 'function' ? custom : merge; // eslint-disable-line no-use-before-define
+}
+
+function getKeys(target) {
+  const keys = Object.keys(target);
+  if (Object.getOwnPropertySymbols) {
+    Object.getOwnPropertySymbols(target).forEach((sym) => {
+      if (Object.propertyIsEnumerable.call(target, sym)) {
+        keys.push(sym);
+      }
+    });
+  }
+  return keys;
+}
+
+function propertyIsOnObject(object, property) {
+  try {
+    return property in object;
+  } catch (_) {
+    return false;
+  }
+}
+
+function propertyIsUnsafe(target, key) {
+  return propertyIsOnObject(target, key)
+    && !(Object.prototype.hasOwnProperty.call(target, key)
+      && Object.propertyIsEnumerable.call(target, key));
+}
+
+function mergeObject(target, source, options) {
+
+  const destination = {};
+
+  if (options.isMergeableObject(target)) {
+    getKeys(target).forEach((key) => {
+      destination[key] = cloneUnlessOtherwiseSpecified(target[key], options);
+    });
+  }
+
+  getKeys(source).forEach((key) => {
+
+    if (propertyIsUnsafe(target, key)) return;
+
+    if (propertyIsOnObject(target, key) && options.isMergeableObject(source[key])) {
+      destination[key] = getMergeFunction(key, options)(target[key], source[key], options);
+    } else {
+      destination[key] = cloneUnlessOtherwiseSpecified(source[key], options);
+    }
+
+  });
+
+  return destination;
+
+}
+
+function merge(target, source, options) {
+
+  const opts = options || {};
+  opts.arrayMerge = opts.arrayMerge || defaultArrayMerge;
+  opts.isMergeableObject = opts.isMergeableObject || isMergeableObject;
+  opts.cloneUnlessOtherwiseSpecified = cloneUnlessOtherwiseSpecified;
+
+  const sourceIsArray = Array.isArray(source);
+  const targetIsArray = Array.isArray(target);
+
+  if (sourceIsArray !== targetIsArray) {
+    return cloneUnlessOtherwiseSpecified(source, opts);
+  }
+
+  if (sourceIsArray) {
+    return opts.arrayMerge(target, source, opts);
+  }
+
+  return mergeObject(target, source, opts);
+
+}
+
+merge.all = function mergeAll(array, options) {
+  if (!Array.isArray(array)) {
+    throw new Error('first argument should be an array');
+  }
+  return array.reduce((prev, next) => merge(prev, next, options), {});
+};
+
+module.exports = merge;

package/libs/Paginate.js

@@ -1,34 +1,43 @@
-const _ = require('underscore');
+// Built once when the module loads: maps each base letter to a character class
+// containing all its accented variants. Pre-compiling the RegExp objects avoids
+// rebuilding them on every accentToRegex() call.
+const _ACCENT_MAP = (() => {
+
+  const from = 'ŠŒŽšœžŸ¥µÀÁÂÃÄÅÆÇÈÉÊËẼÌÍÎÏĨÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëẽìíîïĩðñòóôõöøùúûüýÿ'.split('');
+  const to = 'SOZsozYYuAAAAAAACEEEEEIIIIIDNOOOOOOUUUUYsaaaaaaaceeeeeiiiiionoooooouuuuyy'.split('');
+
+  const groups = [];
+
+  to.forEach((letter, key) => {
+    const exist = groups.indexOf(letter);
+    if (exist >= 0) {
+      groups[exist] += from[key];
+    } else {
+      groups.push(letter);
+    }
+  });
+
+  return groups.map((rg, key) => ({
+    charClass: new RegExp(`[${rg}]`),
+    placeholder: new RegExp(`_${key}_`),
+    expanded: `[${rg}]`,
+    key
+  }));
+
+})();
 
 module.exports = {
 
   accentToRegex(_text) {
 
-    const ACCENT_STRINGS = 'ŠŒŽšœžŸ¥µÀÁÂÃÄÅÆÇÈÉÊËẼÌÍÎÏĨÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëẽìíîïĩðñòóôõöøùúûüýÿ';
-    const NO_ACCENT_STRINGS = 'SOZsozYYuAAAAAAACEEEEEIIIIIDNOOOOOOUUUUYsaaaaaaaceeeeeiiiiionoooooouuuuyy';
-
-    const from = ACCENT_STRINGS.split('');
-    const to = NO_ACCENT_STRINGS.split('');
-    const result = [];
     let text = _text;
 
-    to.forEach( (letter, key) => {
-      const exist = result.indexOf(letter);
-      if (exist >= 0) {
-        result[exist] += from[key];
-      } else {
-        result.push(letter);
-      }
+    _ACCENT_MAP.forEach(({ charClass, key }) => {
+      text = text.replace(charClass, `_${key}_`);
     });
 
-    result.forEach( (rg, key) => {
-      const regex = new RegExp(`[${rg}]`);
-      text = text.replace(regex, `_${key}_`);
-    });
-
-    result.forEach( (rg, key) => {
-      const regex = new RegExp(`_${key}_`);
-      text = text.replace(regex, `[${rg}]`);
+    _ACCENT_MAP.forEach(({ placeholder, expanded }) => {
+      text = text.replace(placeholder, expanded);
     });
 
     return text;
@@ -50,13 +59,11 @@ module.exports = {
     const search = query.search || props.search || null;
     const searchType = (query.searchType || '').toLowerCase().replace('-', '');
 
-    const result = _.omit({
-      page,
-      perPage,
-      fields,
-      sort,
-      search
-    }, (value) => !value );
+    const result = Object.fromEntries(
+      Object.entries({
+        page, perPage, fields, sort, search
+      }).filter(([, v]) => v)
+    );
 
     // Filter by search
     const searchBy = props.searchBy || [];
@@ -77,12 +84,16 @@ module.exports = {
 
         if (type === String) {
 
+          const safeSearch = this.accentToRegex(
+            search.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
+          );
+
           if (searchType === 'startwith' || searchType === 'start') {
-            row[item] = new RegExp(['^', this.accentToRegex(search), '*.'].join(''), 'i');
+            row[item] = new RegExp(`^${safeSearch}`, 'i');
           } else if (searchType === 'endwith' || searchType === 'end') {
-            row[item] = new RegExp(['.*', this.accentToRegex(search)].join(''), 'i');
+            row[item] = new RegExp(`${safeSearch}$`, 'i');
           } else {
-            row[item] = new RegExp(['.*', this.accentToRegex(search), '*.'].join(''), 'i');
+            row[item] = new RegExp(safeSearch, 'i');
           }
 
         } else if (type === Number) {
@@ -199,7 +210,7 @@ module.exports = {
 
     const populate = hasPopulate || [];
 
-    let criteria = query || {};
+    const criteria = query || {};
 
     // Setup
     const page = criteria.page === 'all' ? 'all' : ( parseInt(criteria.page, 10) || 1);
@@ -236,16 +247,16 @@ module.exports = {
     delete criteria.sort;
 
     if (criteria.search) {
-      criteria = _.extend(criteria, criteria.search);
+      Object.assign(criteria, criteria.search);
       delete criteria.search;
     }
 
     const optPopulate = this.getPopulatedCollections(populate || []);
-    const queryModel = _.extend(criteria, {});
+    const queryModel = { ...criteria };
 
     if (page === 'all') {
 
-      const optsModel = _.extend(sort, { populate: optPopulate });
+      const optsModel = { ...sort, populate: optPopulate };
       return Model.find(queryModel, fields.join(' '), optsModel);
 
     }
@@ -265,7 +276,7 @@ module.exports = {
 
         opts.populate = optPopulate;
 
-        const optsModel = _.extend(opts, sort);
+        const optsModel = { ...opts, ...sort };
 
         return Model
           .paginate(queryModel, optsModel)
@@ -282,7 +293,7 @@ module.exports = {
 
     let cursor = (page > 1) ? ((page * perPage) - (perPage - 1)) : 1;
 
-    const tmpNext = (((perPage * (page - 1)) + perPage) <= total);
+    const tmpNext = (((perPage * (page - 1)) + perPage) < total);
     const next = tmpNext ? (page + 1) : false;
     let prev = (page > 1) ? (page - 1) : false;
     const totalPages = Math.ceil(total / perPage);

package/libs/VSError.js

@@ -1,5 +1,3 @@
-const Promise = require('bluebird');
-
 function VSError(msg, code, props) {
 
   Error.captureStackTrace(this, this.constructor);

package/libs/i18n.js

@@ -1,9 +1,4 @@
 const i18next = require('i18next');
-const moment = require('moment');
-
-require('moment/min/locales.min');
-
-moment.locale('en');
 
 module.exports = (() => {
 
@@ -35,17 +30,6 @@ module.exports = (() => {
     resources: Object.fromEntries(resources)
   });
 
-  // catch the event and make changes accordingly
-  i18next.on('languageChanged', (lng) => {
-
-    try {
-      moment.locale(lng);
-    } catch (err) {
-      console.log(err);
-    }
-
-  });
-
   return i18next;
 
 })();