chore: use c8/mocha instead of node_coverage env

.mdeprc.js

@@ -14,14 +14,14 @@ if (os.platform() !== 'darwin') {
   } catch (e) { }
 }
 
-exports.node = "20.11";
+exports.node = "20";
 exports.in_one = true;
 exports.auto_compose = true;
 exports.with_local_compose = true;
 exports.tester_flavour = "chrome-tester";
 exports.rebuild = ['ms-flakeless'];
 exports.docker_compose = './test/docker-compose.yml';
-exports.test_framework = 'mocha';
+exports.test_framework = 'c8 ./node_modules/.bin/mocha';
 exports.extras = {
   tester: {
     user: `${uid}:${uid}`,
@@ -40,13 +40,12 @@ exports.extras = {
       CERT_NAME: 'default',
       SKIP_FB: process.env.SKIP_FB,
       SKIP_MASTERS: process.env.SKIP_MASTERS,
-      NODE_V8_COVERAGE: 'coverage/tmp'
     },
   },
 };
 
 exports.pre = 'rimraf ./coverage/tmp';
-exports.post_exec = 'pnpm exec -- c8 report -r text -r lcov';
+// exports.post_exec = 'pnpm c8 report -r text -r lcov';
 
 switch (process.env.DB_SRV) {
   case 'redisCluster':

package.json

@@ -80,6 +80,7 @@
     "jwa": "^2.0.0",
     "jwks-rsa": "^3.1.0",
     "lodash": "^4.17.21",
+    "make-promises-safe": "^5.1.0",
     "moment": "^2.30.1",
     "ms-conf": "^8.2.1",
     "ms-flakeless": "^4.7.2",

src/utils/bypass/masters.js

@@ -59,7 +59,7 @@ class MastersService {
 
     this.pools = baseUrls.map((baseUrl) => {
       return [new undici.Pool(baseUrl, {
-        connections: 1,
+        connections: 10,
         pipelining: 1,
         ...this.config.httpPoolOptions,
       }), baseUrl];
@@ -223,12 +223,14 @@ class MastersService {
     let response;
 
     try {
+      const ac = new AbortController();
       const params = {
         headersTimeout: 5000,
         bodyTimeout: 5000,
         ...this.config.httpClientOptions,
         path: `${this.config.authPath}?token=${profileToken}`,
         method: 'GET',
+        signal: ac.signal,
       };
 
       response = await Promise.any(this.pools.map(async ([pool, baseUrl]) => {
@@ -245,6 +247,9 @@ class MastersService {
 
         return output;
       }));
+
+      // cleans up ongoing requests
+      ac.abort();
     } catch (e) {
       this.service.log.warn({ err: e, profileToken }, 'failed to get user from masters');
       throw USERS_INVALID_TOKEN;
@@ -270,7 +275,7 @@ class MastersService {
   }
 
   async close() {
-    await this.pools.map(([pool]) => pool.close());
+    await Promise.all(this.pools.map(([pool]) => pool.destroy()));
   }
 }
 

test/config.js

@@ -1,4 +1,5 @@
 const Promise = require('bluebird');
+const sinon = require('sinon');
 
 function registerUser(username, opts = {}) {
   return async function register() {
@@ -42,7 +43,7 @@ async function startService(testConfig = {}) {
     await this.users.register();
 
     this.users.on('plugin:connect:amqp', () => {
-      this.users._mailer = { send: () => Promise.resolve() };
+      sinon.stub(this.users.mailer, 'send').resolves();
     });
 
     await this.users.connect();

test/suites/actions/regenerate-token.js

@@ -1,7 +1,6 @@
-const Promise = require('bluebird');
 const assert = require('node:assert/strict');
 const is = require('is');
-const sinon = require('sinon').usingPromise(Promise);
+const sinon = require('sinon');
 const { startService, clearRedis } = require('../../config');
 
 describe('`regenerate-token` action', function regenerateTokenSuite() {