Refactoring

mocha.setup.mjs

@@ -1,7 +1,6 @@
 import 'mocha';
 import { use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
-import { reset } from 'testdouble';
 
 use(chaiAsPromised);
 
@@ -14,10 +13,6 @@ process.env = {
 
 /** @type {import('mocha').RootHookObject} */
 export const mochaHooks = {
-    /** @returns {void} */
-    afterEach() {
-        reset();
-    },
     afterAll() {
         process.env = { ...env };
     },

package.json

@@ -25,8 +25,8 @@
     "@myrotvorets/express-request-logger": "^1.2.0",
     "@myrotvorets/facex": "^2.6.1",
     "@myrotvorets/oav-installer": "^5.0.0",
-    "@myrotvorets/opentelemetry-configurator": "^7.0.0",
-    "@myrotvorets/otel-utils": "^0.0.10",
+    "@myrotvorets/opentelemetry-configurator": "^7.1.0",
+    "@myrotvorets/otel-utils": "^1.0.0",
     "@opentelemetry/api": "^1.6.0",
     "@opentelemetry/core": "^1.17.1",
     "@opentelemetry/semantic-conventions": "^1.17.1",
@@ -36,7 +36,7 @@
     "express-openapi-validator": "^5.0.6"
   },
   "devDependencies": {
-    "@myrotvorets/eslint-config-myrotvorets-ts": "^2.22.5",
+    "@myrotvorets/eslint-config-myrotvorets-ts": "^2.22.6",
     "@types/chai": "^4.3.9",
     "@types/chai-as-promised": "^7.1.7",
     "@types/express": "^4.17.20",
@@ -55,7 +55,6 @@
     "mocha-reporter-sonarqube": "^2.0.4",
     "nodemon": "^3.0.1",
     "supertest": "^6.3.3",
-    "testdouble": "^3.20.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   }

sonar-project.properties

@@ -4,6 +4,4 @@ sonar.sources=src
 sonar.tests=test
 sonar.testExecutionReportPaths=test-report.xml
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
-sonar.eslint.reportPaths=eslint-report.json
 sonar.sourceEncoding=UTF-8
-sonar.coverage.exclusions=src/index.mts,src/lib/tracing.mts

src/lib/container.mts

@@ -60,6 +60,10 @@ export function initializeContainer(): typeof container {
     });
 
     container.register('req', asValue(undefined));
+    process.on('beforeExit', () => {
+        container.dispose().catch((e) => console.error(e));
+    });
+
     return container;
 }
 

src/server.mts

@@ -68,14 +68,7 @@ export function createApp(): Express {
 /* c8 ignore start */
 export async function run(): Promise<void> {
     const app = createApp();
-    const container = configureApp(app);
-    const env = container.resolve('environment');
-
-    const server = await createServer(app);
-    server.listen(env.PORT);
-
-    process.on('beforeExit', () => {
-        container.dispose().catch((e) => console.error(e));
-    });
+    configureApp(app);
+    await createServer(app);
 }
 /* c8 ignore end */