@adaptivestone/framework 4.4.0 → 4.6.0

package/coverage/sorter.js

@@ -0,0 +1,196 @@
+/* eslint-disable */
+var addSorting = (function() {
+    'use strict';
+    var cols,
+        currentSort = {
+            index: 0,
+            desc: false
+        };
+
+    // returns the summary table element
+    function getTable() {
+        return document.querySelector('.coverage-summary');
+    }
+    // returns the thead element of the summary table
+    function getTableHeader() {
+        return getTable().querySelector('thead tr');
+    }
+    // returns the tbody element of the summary table
+    function getTableBody() {
+        return getTable().querySelector('tbody');
+    }
+    // returns the th element for nth column
+    function getNthColumn(n) {
+        return getTableHeader().querySelectorAll('th')[n];
+    }
+
+    function onFilterInput() {
+        const searchValue = document.getElementById('fileSearch').value;
+        const rows = document.getElementsByTagName('tbody')[0].children;
+        for (let i = 0; i < rows.length; i++) {
+            const row = rows[i];
+            if (
+                row.textContent
+                    .toLowerCase()
+                    .includes(searchValue.toLowerCase())
+            ) {
+                row.style.display = '';
+            } else {
+                row.style.display = 'none';
+            }
+        }
+    }
+
+    // loads the search box
+    function addSearchBox() {
+        var template = document.getElementById('filterTemplate');
+        var templateClone = template.content.cloneNode(true);
+        templateClone.getElementById('fileSearch').oninput = onFilterInput;
+        template.parentElement.appendChild(templateClone);
+    }
+
+    // loads all columns
+    function loadColumns() {
+        var colNodes = getTableHeader().querySelectorAll('th'),
+            colNode,
+            cols = [],
+            col,
+            i;
+
+        for (i = 0; i < colNodes.length; i += 1) {
+            colNode = colNodes[i];
+            col = {
+                key: colNode.getAttribute('data-col'),
+                sortable: !colNode.getAttribute('data-nosort'),
+                type: colNode.getAttribute('data-type') || 'string'
+            };
+            cols.push(col);
+            if (col.sortable) {
+                col.defaultDescSort = col.type === 'number';
+                colNode.innerHTML =
+                    colNode.innerHTML + '<span class="sorter"></span>';
+            }
+        }
+        return cols;
+    }
+    // attaches a data attribute to every tr element with an object
+    // of data values keyed by column name
+    function loadRowData(tableRow) {
+        var tableCols = tableRow.querySelectorAll('td'),
+            colNode,
+            col,
+            data = {},
+            i,
+            val;
+        for (i = 0; i < tableCols.length; i += 1) {
+            colNode = tableCols[i];
+            col = cols[i];
+            val = colNode.getAttribute('data-value');
+            if (col.type === 'number') {
+                val = Number(val);
+            }
+            data[col.key] = val;
+        }
+        return data;
+    }
+    // loads all row data
+    function loadData() {
+        var rows = getTableBody().querySelectorAll('tr'),
+            i;
+
+        for (i = 0; i < rows.length; i += 1) {
+            rows[i].data = loadRowData(rows[i]);
+        }
+    }
+    // sorts the table using the data for the ith column
+    function sortByIndex(index, desc) {
+        var key = cols[index].key,
+            sorter = function(a, b) {
+                a = a.data[key];
+                b = b.data[key];
+                return a < b ? -1 : a > b ? 1 : 0;
+            },
+            finalSorter = sorter,
+            tableBody = document.querySelector('.coverage-summary tbody'),
+            rowNodes = tableBody.querySelectorAll('tr'),
+            rows = [],
+            i;
+
+        if (desc) {
+            finalSorter = function(a, b) {
+                return -1 * sorter(a, b);
+            };
+        }
+
+        for (i = 0; i < rowNodes.length; i += 1) {
+            rows.push(rowNodes[i]);
+            tableBody.removeChild(rowNodes[i]);
+        }
+
+        rows.sort(finalSorter);
+
+        for (i = 0; i < rows.length; i += 1) {
+            tableBody.appendChild(rows[i]);
+        }
+    }
+    // removes sort indicators for current column being sorted
+    function removeSortIndicators() {
+        var col = getNthColumn(currentSort.index),
+            cls = col.className;
+
+        cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, '');
+        col.className = cls;
+    }
+    // adds sort indicators for current column being sorted
+    function addSortIndicators() {
+        getNthColumn(currentSort.index).className += currentSort.desc
+            ? ' sorted-desc'
+            : ' sorted';
+    }
+    // adds event listeners for all sorter widgets
+    function enableUI() {
+        var i,
+            el,
+            ithSorter = function ithSorter(i) {
+                var col = cols[i];
+
+                return function() {
+                    var desc = col.defaultDescSort;
+
+                    if (currentSort.index === i) {
+                        desc = !currentSort.desc;
+                    }
+                    sortByIndex(i, desc);
+                    removeSortIndicators();
+                    currentSort.index = i;
+                    currentSort.desc = desc;
+                    addSortIndicators();
+                };
+            };
+        for (i = 0; i < cols.length; i += 1) {
+            if (cols[i].sortable) {
+                // add the click event handler on the th so users
+                // dont have to click on those tiny arrows
+                el = getNthColumn(i).querySelector('.sorter').parentElement;
+                if (el.addEventListener) {
+                    el.addEventListener('click', ithSorter(i));
+                } else {
+                    el.attachEvent('onclick', ithSorter(i));
+                }
+            }
+        }
+    }
+    // adds sorting functionality to the UI
+    return function() {
+        if (!getTable()) {
+            return;
+        }
+        cols = loadColumns();
+        loadData();
+        addSearchBox();
+        addSortIndicators();
+        enableUI();
+    };
+})();
+
+window.addEventListener('load', addSorting);

package/models/Sequence.test.js

@@ -1,3 +1,5 @@
+import { describe, it, expect } from 'vitest';
+
 describe('sequence model', () => {
   it('should produce sequence', async () => {
     expect.assertions(1);

package/models/User.js

@@ -88,8 +88,8 @@ class User extends AbstractModel {
     const scryptAsync = promisify(scrypt);
     const data = await scryptAsync(
       this.email + Date.now(),
-      this.constructor.getSuper().saltSecret,
-      this.constructor.getSuper().hashRounds,
+      this.getSuper().saltSecret,
+      this.getSuper().hashRounds,
     );
     const token = data.toString('base64url');
     this.sessionTokens.push({ token, valid: timestamp });
@@ -138,8 +138,8 @@ class User extends AbstractModel {
     const scryptAsync = promisify(scrypt);
     const data = await scryptAsync(
       userMongoose.email + Date.now(),
-      userMongoose.constructor.getSuper().saltSecret,
-      userMongoose.constructor.getSuper().hashRounds,
+      userMongoose.getSuper().saltSecret,
+      userMongoose.getSuper().hashRounds,
     );
     const token = data.toString('base64url');
     //       if (err) {
@@ -177,7 +177,7 @@ class User extends AbstractModel {
     const passwordRecoveryToken =
       await User.generateUserPasswordRecoveryToken(this);
     const mail = new Mailer(
-      this.constructor.getSuper().app,
+      this.getSuper().app,
       'recovery',
       {
         link: `${i18n.language}/auth/recovery?password_recovery_token=${passwordRecoveryToken.token}`,
@@ -194,8 +194,8 @@ class User extends AbstractModel {
     const scryptAsync = promisify(scrypt);
     const data = await scryptAsync(
       userMongoose.email + Date.now(),
-      userMongoose.constructor.getSuper().saltSecret,
-      userMongoose.constructor.getSuper().hashRounds,
+      userMongoose.getSuper().saltSecret,
+      userMongoose.getSuper().hashRounds,
     );
     const token = data.toString('base64url');
     // if (err) {
@@ -243,7 +243,7 @@ class User extends AbstractModel {
   async sendVerificationEmail(i18n) {
     const verificationToken = await User.generateUserVerificationToken(this);
     const mail = new Mailer(
-      this.constructor.getSuper().app,
+      this.getSuper().app,
       'verification',
       {
         link: `${i18n.language}/auth/login?verification_token=${verificationToken.token}`,

package/models/User.test.js

@@ -1,3 +1,5 @@
+import { describe, it, expect } from 'vitest';
+
 const userEmail = 'testing@test.com';
 const userPassword = 'SuperNiceSecret123$';
 

package/modules/AbstractModel.js

@@ -14,6 +14,7 @@ class AbstractModel extends Base {
     this.mongooseSchema.set('minimize', false);
     this.mongooseSchema.loadClass(this.constructor);
     this.mongooseSchema.statics.getSuper = () => this;
+    this.mongooseSchema.methods.getSuper = () => this;
     this.initHooks();
     this.mongooseModel = mongoose.model(
       this.constructor.name,

package/modules/BaseCli.js

@@ -48,10 +48,10 @@ class Cli extends Base {
       return false;
     }
     // TODO wait until https://github.com/nodejs/node/issues/35889
-    // const { default: Command } = await import(this.commands[command]);
+    const { default: Command } = await import(this.commands[command]);
 
     // eslint-disable-next-line import/no-dynamic-require, global-require
-    const Command = require(this.commands[command]);
+    // const Command = require(this.commands[command]);
 
     const c = new Command(this.app, this.commands, args);
     let result = false;

package/modules/Modules.test.js

@@ -1,5 +1,6 @@
-const SomeController = require('../controllers/test/SomeController');
-const AbstractController = require('./AbstractController');
+import { describe, it, expect } from 'vitest';
+import SomeController from '../controllers/test/SomeController';
+import AbstractController from './AbstractController';
 
 describe('abstract controller methods', () => {
   it('can get routes', async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "4.4.0",
+  "version": "4.6.0",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "engines": {
@@ -14,7 +14,7 @@
   "scripts": {
     "dev": "nodemon ./index.js",
     "prod": "nodemon ./cluster.js",
-    "test": "jest --coverage=true",
+    "test": "vitest  run --coverage",
     "prettier": "prettier --check '**/*.(js|jsx|ts|tsx|json|css|scss|md)'",
     "lint": "eslint '**/*.js'",
     "lint:fix": "eslint '**/*.js' --fix",
@@ -25,18 +25,6 @@
     "benchmark2": "h2load -n 10000 -c 50  https://localhost:3300/",
     "redis:docker": "docker run --rm  -p 6379:6379 redis"
   },
-  "jest": {
-    "setupFilesAfterEnv": [
-      "./tests/setup.js"
-    ],
-    "testEnvironment": "node",
-    "verbose": true,
-    "collectCoverage": true,
-    "coverageReporters": [
-      "text",
-      "text-summary"
-    ]
-  },
   "author": "Andrey Logunov",
   "license": "MIT",
   "dependencies": {
@@ -56,23 +44,24 @@
     "nodemailer-sendmail-transport": "^1.0.2",
     "nodemailer-stub-transport": "^1.1.0",
     "pug": "^3.0.2",
-    "rate-limiter-flexible": "^2.2.4",
+    "rate-limiter-flexible": "^3.0.0",
     "redis": "^4.3.1",
     "winston": "^3.3.3",
     "winston-transport-sentry-node": "^2.0.0",
     "yup": "^1.0.0"
   },
   "devDependencies": {
+    "@vitest/coverage-v8": "^0.34.3",
     "eslint": "^8.0.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-jest": "^27.0.0",
+    "eslint-plugin-vitest": "^0.3.1",
     "husky": "^8.0.0",
-    "jest": "^29.0.0",
     "lint-staged": "^14.0.0",
     "mongodb-memory-server": "^8.0.2",
     "nodemon": "^3.0.1",
-    "prettier": "^3.0.0"
+    "prettier": "^3.0.0",
+    "vitest": "^0.34.3"
   },
   "lint-staged": {
     "**/*.{js,jsx,ts,tsx,json,css,scss,md}": [

package/server.js

@@ -52,17 +52,17 @@ class Server {
    */
   async startServer(callbackBefore404 = async () => Promise.resolve()) {
     // eslint-disable-next-line global-require
-    const HttpServer = require('./services/http/HttpServer');
+    // const HttpServer = require('./services/http/HttpServer');
     // eslint-disable-next-line global-require
-    const ControllerManager = require('./controllers/index');
+    // const ControllerManager = require('./controllers/index');
     // TODO wait until https://github.com/nodejs/node/issues/35889
-    // const [{ default: HttpServer }, { default: ControllerManager }] =
-    //   await Promise.all([
-    //     // eslint-disable-next-line import/extensions
-    //     import('./services/http/HttpServer.js'), // Speed optimisation
-    //     // eslint-disable-next-line import/extensions
-    //     import('./controllers/index.js'), // Speed optimisation
-    //   ]);
+    const [{ default: HttpServer }, { default: ControllerManager }] =
+      await Promise.all([
+        // eslint-disable-next-line import/extensions
+        import('./services/http/HttpServer.js'), // Speed optimisation
+        // eslint-disable-next-line import/extensions
+        import('./controllers/index.js'), // Speed optimisation
+      ]);
 
     this.addErrorHandling();
 

package/services/http/middleware/I18n.test.js

@@ -1,4 +1,5 @@
-const I18n = require('./I18n');
+import { beforeAll, describe, it, expect } from 'vitest';
+import I18n from './I18n';
 
 describe('i18n middleware methods', () => {
   let middleware;
@@ -45,13 +46,16 @@ describe('i18n middleware methods', () => {
 
   it('middleware that works', async () => {
     expect.assertions(4);
-    const nextFunction = jest.fn(() => {});
+    let isCalled = false;
+    const nextFunction = () => {
+      isCalled = true;
+    };
     const req = {
       get: () => 'en',
       appInfo: {},
     };
     await middleware.middleware(req, {}, nextFunction);
-    expect(nextFunction).toHaveBeenCalledWith();
+    expect(isCalled).toBe(true);
     expect(req.appInfo.i18n).toBeDefined();
     expect(req.appInfo.i18n.t('aaaaa')).toBe('aaaaa');
     expect(req.i18n.t('aaaaa')).toBe('aaaaa'); // proxy test
@@ -62,13 +66,16 @@ describe('i18n middleware methods', () => {
     global.server.app.updateConfig('i18n', { enabled: false });
     middleware = new I18n(global.server.app);
 
-    const nextFunction = jest.fn(() => {});
+    let isCalled = false;
+    const nextFunction = () => {
+      isCalled = true;
+    };
     const req = {
       get: () => 'en',
       appInfo: {},
     };
     await middleware.middleware(req, {}, nextFunction);
-    expect(nextFunction).toHaveBeenCalledWith();
+    expect(isCalled).toBe(true);
     expect(req.appInfo.i18n).toBeDefined();
     expect(req.appInfo.i18n.t('aaaaa')).toBe('aaaaa');
     expect(req.i18n.t('aaaaa')).toBe('aaaaa'); // proxy test

package/services/http/middleware/PrepareAppInfo.test.js

@@ -1,4 +1,5 @@
-const PrepareAppInfo = require('./PrepareAppInfo');
+import { describe, it, expect } from 'vitest';
+import PrepareAppInfo from './PrepareAppInfo';
 
 describe('prepareAppInfo methods', () => {
   it('have description fields', async () => {
@@ -10,10 +11,13 @@ describe('prepareAppInfo methods', () => {
   it('middleware that works', async () => {
     expect.assertions(3);
     const middleware = new PrepareAppInfo(global.server.app);
-    const nextFunction = jest.fn(() => {});
+    let isCalled = false;
+    const nextFunction = () => {
+      isCalled = true;
+    };
     const req = {};
     await middleware.middleware(req, {}, nextFunction);
-    expect(nextFunction).toHaveBeenCalledWith();
+    expect(isCalled).toBe(true);
     expect(req.appInfo).toBeDefined();
     req.appInfo.test = 5;
     await middleware.middleware(req, {}, nextFunction);

package/services/http/middleware/RateLimiter.js

@@ -16,10 +16,9 @@ class RateLimiter extends AbstractMiddleware {
 
   constructor(app, params) {
     super(app, params);
-    const routeParams = params;
     const limiterOptions = this.app.getConfig('rateLimiter');
 
-    this.finalOptions = merge(limiterOptions, routeParams);
+    this.finalOptions = merge(limiterOptions, params);
     this.limiter = null;
 
     switch (this.finalOptions.driver) {
@@ -32,7 +31,7 @@ class RateLimiter extends AbstractMiddleware {
         break;
 
       case 'mongo':
-        this.limiter = RateLimiterMongo({
+        this.limiter = new RateLimiterMongo({
           storeClient: mongoose.connection,
           ...this.finalOptions.limiterOptions,
         });
@@ -50,7 +49,6 @@ class RateLimiter extends AbstractMiddleware {
     const redisConfig = this.app.getConfig('redis');
     const redisClient = redis.createClient({
       url: redisConfig.url,
-      legacyMode: true,
     });
 
     // TODO: change it
@@ -71,6 +69,7 @@ class RateLimiter extends AbstractMiddleware {
 
     return new RateLimiterRedis({
       storeClient: redisClient,
+      useRedisPackage: true,
       ...this.finalOptions.limiterOptions,
     });
   }
@@ -91,7 +90,7 @@ class RateLimiter extends AbstractMiddleware {
 
     if (request && request.length) {
       request.forEach((val) => {
-        if (req.body[val]) {
+        if (req.body && req.body[val]) {
           key.push(req.body[val]);
         }
         // if (req.appInfo.request && req.appInfo.request[val]) {
@@ -108,6 +107,7 @@ class RateLimiter extends AbstractMiddleware {
       this.logger.info(
         `RateLimmiter not inited correclty! Please check init logs `,
       );
+      return res.status(500).send('');
     }
 
     const { namespace } = this.app.getConfig('redis');
@@ -119,7 +119,6 @@ class RateLimiter extends AbstractMiddleware {
       .catch(() => {
         this.logger.warn(`Too many requests. Consume key: ${consumeKey}`);
       });
-
     if (consumeResult) {
       return next();
     }