@adaptivestone/framework 4.8.3 → 4.9.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 4.9.1
+
+[UPDATE] all responces from framework now happens in JSON. Previouls sometime aswers was in plan text
+
+### 4.9.0
+
+[BREAKING] We are separated testsing to setyp and global setup. Global setup now care of mongo to make sure that only on mongodb memoery server is spinned up. If you are using vitest please add "globalSetup: node_modules/@adaptivestone/framework/tests/globalSetupVitest" to your vitest config
+
 ### 4.8.3
 
 [UPDATE] Fix problme with fat start and closing connections after

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "4.8.3",
+  "version": "4.9.1",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "engines": {
@@ -14,7 +14,7 @@
   "scripts": {
     "dev": "nodemon ./index.js",
     "prod": "nodemon ./cluster.js",
-    "test": "vitest  run --coverage",
+    "test": "vitest run",
     "prettier": "prettier --check '**/*.(js|jsx|ts|tsx|json|css|scss|md)'",
     "lint": "eslint '**/*.js'",
     "lint:fix": "eslint '**/*.js' --fix",

package/services/http/HttpServer.js

@@ -46,7 +46,7 @@ class HttpServer extends Base {
       // eslint-disable-next-line no-console
       console.error(err.stack);
       // TODO
-      res.status(500).send('Something broke!');
+      res.status(500).json({ message: 'Something broke!' });
     });
 
     this.httpServer = http.Server(this.express);

package/services/http/middleware/RateLimiter.js

@@ -105,9 +105,9 @@ class RateLimiter extends AbstractMiddleware {
   async middleware(req, res, next) {
     if (!this.limiter) {
       this.logger.info(
-        `RateLimmiter not inited correclty! Please check init logs `,
+        `RateLimiter not inited correclty! Please check init logs `,
       );
-      return res.status(500).send('');
+      return res.status(500).json({ message: 'RateLimiter error' });
     }
 
     const { namespace } = this.app.getConfig('redis');
@@ -122,7 +122,7 @@ class RateLimiter extends AbstractMiddleware {
     if (consumeResult) {
       return next();
     }
-    return res.status(429).send('Too Many Requests');
+    return res.status(429).json({ message: 'Too Many Requests' });
   }
 }
 

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

@@ -106,7 +106,7 @@ describe('rate limiter methods', () => {
           status = statusCode;
           return this;
         },
-        send() {
+        json() {
           isSend = true;
         },
       },
@@ -137,7 +137,7 @@ describe('rate limiter methods', () => {
           status = statusCode;
           return this;
         },
-        send() {
+        json() {
           isSend = true;
         },
       },

package/services/http/middleware/Role.js

@@ -9,7 +9,7 @@ class RoleMiddleware extends AbstractMiddleware {
     const { user } = req.appInfo;
 
     if (!user) {
-      return res.status(401).send();
+      return res.status(401).json({ message: 'User should be provided' });
     }
 
     let hasRole = false;

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

@@ -48,7 +48,7 @@ describe('role middleware methods', () => {
           status = statusCode;
           return this;
         },
-        send() {
+        json() {
           isSend = true;
         },
       },

package/tests/globalSetupVitest.js

@@ -0,0 +1,35 @@
+const { MongoMemoryReplSet } = require('mongodb-memory-server');
+
+let isTeardown = false;
+let mongoMemoryServerInstance;
+
+const setup = async () => {
+  console.log('GLOBAL SETUP PREPARE RUNNING...');
+  console.time('GLOBAL TEST PREPARE. DONE');
+  mongoMemoryServerInstance = await MongoMemoryReplSet.create({
+    // binary: { version: '4.4.6' },
+    replSet: { count: 1, storageEngine: 'wiredTiger' },
+  });
+  await mongoMemoryServerInstance.waitUntilRunning();
+  const connectionStringMongo =
+    await mongoMemoryServerInstance.getUri('__DB_TO_REPLACE__');
+  process.env.TEST_MONGO_URI = connectionStringMongo;
+  // console.info('MONGO_URI: ', connectionStringMongo);
+  console.timeEnd('GLOBAL TEST PREPARE. DONE');
+};
+
+const teardown = async () => {
+  if (isTeardown) {
+    throw new Error('teardown called twice');
+  }
+  console.time('GLOBAL TEARDOWN RUNNING. DONE');
+
+  isTeardown = true;
+  console.log('GLOBAL TEARDOWN RUNNING...');
+  await mongoMemoryServerInstance.stop();
+  console.timeEnd('GLOBAL TEARDOWN RUNNING. DONE');
+
+  return Promise.resolve();
+};
+
+export { setup, teardown };

package/tests/setupVitest.js

@@ -1,28 +1,18 @@
 import path from 'node:path';
+import crypto from 'node:crypto';
 import { beforeAll, beforeEach, afterEach, afterAll } from 'vitest';
 
-const { MongoMemoryReplSet } = require('mongodb-memory-server');
-
 const mongoose = require('mongoose');
 
 mongoose.set('autoIndex', false); // we do not need create indexes щт еуыеы
 
-let mongoMemoryServerInstance;
-
 const redis = require('redis');
 const Server = require('../server');
 
 const clearRedisNamespace = require('../helpers/redis/clearNamespace');
 
 beforeAll(async () => {
-  mongoMemoryServerInstance = await MongoMemoryReplSet.create({
-    // binary: { version: '4.4.6' },
-    replSet: { count: 1, storageEngine: 'wiredTiger' },
-  });
-  await mongoMemoryServerInstance.waitUntilRunning();
   process.env.LOGGER_CONSOLE_LEVEL = 'error';
-  const connectionStringMongo = await mongoMemoryServerInstance.getUri();
-  // console.info('MONGO_URI: ', connectionStringMongo);
   global.server = new Server({
     folders: {
       config: process.env.TEST_FOLDER_CONFIG || path.resolve('./config'),
@@ -42,8 +32,12 @@ beforeAll(async () => {
     },
   });
   await global.server.init({ isSkipModelInit: true });
+  const connectionString = process.env.TEST_MONGO_URI.replace(
+    '__DB_TO_REPLACE__',
+    `TEST_${crypto.randomUUID()}`,
+  );
   global.server.updateConfig('mongo', {
-    connectionString: connectionStringMongo,
+    connectionString,
   });
   global.server.updateConfig('http', { port: 0 }); // allow to use random
   global.server.updateConfig('mail', { transport: 'stub' });
@@ -108,13 +102,9 @@ afterAll(async () => {
     global.server.app.httpServer.shutdown();
     global.server.app.events.emit('shutdown');
   }
-  // setTimeout(async () => {
   if (typeof global.testSetup.afterAll === 'function') {
     await global.testSetup.afterAll();
   }
-
+  await mongoose.connection.db.dropDatabase(); // clean database after test
   await mongoose.disconnect();
-  await mongoMemoryServerInstance.stop();
-
-  // }, 2000);
 });

package/vitest.config.js

@@ -3,7 +3,14 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
+    globalSetup: './tests/globalSetupVitest.js',
     setupFiles: './tests/setupVitest.js',
     testTimeout: 10000,
+    outputFile: './coverage/rspec.xml',
+    reporters: ['default', 'junit'],
+    coverage: {
+      enabled: true,
+      reporter: ['text', 'html', 'clover', 'json', 'cobertura'],
+    },
   },
 });

package/coverage/base.css

@@ -1,224 +0,0 @@
-body, html {
-  margin:0; padding: 0;
-  height: 100%;
-}
-body {
-    font-family: Helvetica Neue, Helvetica, Arial;
-    font-size: 14px;
-    color:#333;
-}
-.small { font-size: 12px; }
-*, *:after, *:before {
-  -webkit-box-sizing:border-box;
-     -moz-box-sizing:border-box;
-          box-sizing:border-box;
-  }
-h1 { font-size: 20px; margin: 0;}
-h2 { font-size: 14px; }
-pre {
-    font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace;
-    margin: 0;
-    padding: 0;
-    -moz-tab-size: 2;
-    -o-tab-size:  2;
-    tab-size: 2;
-}
-a { color:#0074D9; text-decoration:none; }
-a:hover { text-decoration:underline; }
-.strong { font-weight: bold; }
-.space-top1 { padding: 10px 0 0 0; }
-.pad2y { padding: 20px 0; }
-.pad1y { padding: 10px 0; }
-.pad2x { padding: 0 20px; }
-.pad2 { padding: 20px; }
-.pad1 { padding: 10px; }
-.space-left2 { padding-left:55px; }
-.space-right2 { padding-right:20px; }
-.center { text-align:center; }
-.clearfix { display:block; }
-.clearfix:after {
-  content:'';
-  display:block;
-  height:0;
-  clear:both;
-  visibility:hidden;
-  }
-.fl { float: left; }
-@media only screen and (max-width:640px) {
-  .col3 { width:100%; max-width:100%; }
-  .hide-mobile { display:none!important; }
-}
-
-.quiet {
-  color: #7f7f7f;
-  color: rgba(0,0,0,0.5);
-}
-.quiet a { opacity: 0.7; }
-
-.fraction {
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-  font-size: 10px;
-  color: #555;
-  background: #E8E8E8;
-  padding: 4px 5px;
-  border-radius: 3px;
-  vertical-align: middle;
-}
-
-div.path a:link, div.path a:visited { color: #333; }
-table.coverage {
-  border-collapse: collapse;
-  margin: 10px 0 0 0;
-  padding: 0;
-}
-
-table.coverage td {
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-}
-table.coverage td.line-count {
-    text-align: right;
-    padding: 0 5px 0 20px;
-}
-table.coverage td.line-coverage {
-    text-align: right;
-    padding-right: 10px;
-    min-width:20px;
-}
-
-table.coverage td span.cline-any {
-    display: inline-block;
-    padding: 0 5px;
-    width: 100%;
-}
-.missing-if-branch {
-    display: inline-block;
-    margin-right: 5px;
-    border-radius: 3px;
-    position: relative;
-    padding: 0 4px;
-    background: #333;
-    color: yellow;
-}
-
-.skip-if-branch {
-    display: none;
-    margin-right: 10px;
-    position: relative;
-    padding: 0 4px;
-    background: #ccc;
-    color: white;
-}
-.missing-if-branch .typ, .skip-if-branch .typ {
-    color: inherit !important;
-}
-.coverage-summary {
-  border-collapse: collapse;
-  width: 100%;
-}
-.coverage-summary tr { border-bottom: 1px solid #bbb; }
-.keyline-all { border: 1px solid #ddd; }
-.coverage-summary td, .coverage-summary th { padding: 10px; }
-.coverage-summary tbody { border: 1px solid #bbb; }
-.coverage-summary td { border-right: 1px solid #bbb; }
-.coverage-summary td:last-child { border-right: none; }
-.coverage-summary th {
-  text-align: left;
-  font-weight: normal;
-  white-space: nowrap;
-}
-.coverage-summary th.file { border-right: none !important; }
-.coverage-summary th.pct { }
-.coverage-summary th.pic,
-.coverage-summary th.abs,
-.coverage-summary td.pct,
-.coverage-summary td.abs { text-align: right; }
-.coverage-summary td.file { white-space: nowrap;  }
-.coverage-summary td.pic { min-width: 120px !important;  }
-.coverage-summary tfoot td { }
-
-.coverage-summary .sorter {
-    height: 10px;
-    width: 7px;
-    display: inline-block;
-    margin-left: 0.5em;
-    background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent;
-}
-.coverage-summary .sorted .sorter {
-    background-position: 0 -20px;
-}
-.coverage-summary .sorted-desc .sorter {
-    background-position: 0 -10px;
-}
-.status-line {  height: 10px; }
-/* yellow */
-.cbranch-no { background: yellow !important; color: #111; }
-/* dark red */
-.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 }
-.low .chart { border:1px solid #C21F39 }
-.highlighted,
-.highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{
-  background: #C21F39 !important;
-}
-/* medium red */
-.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE }
-/* light red */
-.low, .cline-no { background:#FCE1E5 }
-/* light green */
-.high, .cline-yes { background:rgb(230,245,208) }
-/* medium green */
-.cstat-yes { background:rgb(161,215,106) }
-/* dark green */
-.status-line.high, .high .cover-fill { background:rgb(77,146,33) }
-.high .chart { border:1px solid rgb(77,146,33) }
-/* dark yellow (gold) */
-.status-line.medium, .medium .cover-fill { background: #f9cd0b; }
-.medium .chart { border:1px solid #f9cd0b; }
-/* light yellow */
-.medium { background: #fff4c2; }
-
-.cstat-skip { background: #ddd; color: #111; }
-.fstat-skip { background: #ddd; color: #111 !important; }
-.cbranch-skip { background: #ddd !important; color: #111; }
-
-span.cline-neutral { background: #eaeaea; }
-
-.coverage-summary td.empty {
-    opacity: .5;
-    padding-top: 4px;
-    padding-bottom: 4px;
-    line-height: 1;
-    color: #888;
-}
-
-.cover-fill, .cover-empty {
-  display:inline-block;
-  height: 12px;
-}
-.chart {
-  line-height: 0;
-}
-.cover-empty {
-    background: white;
-}
-.cover-full {
-    border-right: none !important;
-}
-pre.prettyprint {
-    border: none !important;
-    padding: 0 !important;
-    margin: 0 !important;
-}
-.com { color: #999 !important; }
-.ignore-none { color: #999; font-weight: normal; }
-
-.wrapper {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -48px;
-}
-.footer, .push {
-  height: 48px;
-}

package/coverage/block-navigation.js

@@ -1,87 +0,0 @@
-/* eslint-disable */
-var jumpToCode = (function init() {
-    // Classes of code we would like to highlight in the file view
-    var missingCoverageClasses = ['.cbranch-no', '.cstat-no', '.fstat-no'];
-
-    // Elements to highlight in the file listing view
-    var fileListingElements = ['td.pct.low'];
-
-    // We don't want to select elements that are direct descendants of another match
-    var notSelector = ':not(' + missingCoverageClasses.join('):not(') + ') > '; // becomes `:not(a):not(b) > `
-
-    // Selecter that finds elements on the page to which we can jump
-    var selector =
-        fileListingElements.join(', ') +
-        ', ' +
-        notSelector +
-        missingCoverageClasses.join(', ' + notSelector); // becomes `:not(a):not(b) > a, :not(a):not(b) > b`
-
-    // The NodeList of matching elements
-    var missingCoverageElements = document.querySelectorAll(selector);
-
-    var currentIndex;
-
-    function toggleClass(index) {
-        missingCoverageElements
-            .item(currentIndex)
-            .classList.remove('highlighted');
-        missingCoverageElements.item(index).classList.add('highlighted');
-    }
-
-    function makeCurrent(index) {
-        toggleClass(index);
-        currentIndex = index;
-        missingCoverageElements.item(index).scrollIntoView({
-            behavior: 'smooth',
-            block: 'center',
-            inline: 'center'
-        });
-    }
-
-    function goToPrevious() {
-        var nextIndex = 0;
-        if (typeof currentIndex !== 'number' || currentIndex === 0) {
-            nextIndex = missingCoverageElements.length - 1;
-        } else if (missingCoverageElements.length > 1) {
-            nextIndex = currentIndex - 1;
-        }
-
-        makeCurrent(nextIndex);
-    }
-
-    function goToNext() {
-        var nextIndex = 0;
-
-        if (
-            typeof currentIndex === 'number' &&
-            currentIndex < missingCoverageElements.length - 1
-        ) {
-            nextIndex = currentIndex + 1;
-        }
-
-        makeCurrent(nextIndex);
-    }
-
-    return function jump(event) {
-        if (
-            document.getElementById('fileSearch') === document.activeElement &&
-            document.activeElement != null
-        ) {
-            // if we're currently focused on the search input, we don't want to navigate
-            return;
-        }
-
-        switch (event.which) {
-            case 78: // n
-            case 74: // j
-                goToNext();
-                break;
-            case 66: // b
-            case 75: // k
-            case 80: // p
-                goToPrevious();
-                break;
-        }
-    };
-})();
-window.addEventListener('keydown', jumpToCode);