Refactor config

Author: rgbabaev

JavaScript/9-logger/db.js

@@ -1,11 +1,8 @@
 'use strict';
 
 const pg = require('pg');
-const config = require('./config.js');
 
-const pool = new pg.Pool(config.db);
-
-module.exports = (table) => ({
+const createDBCrud = (pool) => (table) => ({
   async query(sql, args) {
     return await pool.query(sql, args);
   },
@@ -52,3 +49,5 @@ module.exports = (table) => ({
     return await pool.query(sql, [id]);
   },
 });
+
+module.exports = (poolOptions) => createDBCrud(new pg.Pool(poolOptions));

JavaScript/9-logger/http.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const http = require('node:http');
-const console = require('./logger.js');
 
 const answerNotFound = (res, headers) => {
   res.writeHead(404, headers);
@@ -15,7 +14,7 @@ const receiveArgs = async (req) => {
   return JSON.parse(data);
 };
 
-module.exports = (routing, port) => {
+module.exports = (routing, port, console) => {
   http
     .createServer(async (req, res) => {
       const headers = {

JavaScript/9-logger/logger.js

@@ -3,7 +3,6 @@
 const fs = require('node:fs');
 const util = require('node:util');
 const path = require('node:path');
-const config = require('./config.js');
 
 const COLORS = {
   info: '\x1b[1;37m',
@@ -69,4 +68,4 @@ class Logger {
   }
 }
 
-module.exports = new Logger(config.logPath);
+module.exports = Logger;

JavaScript/9-logger/main.js

@@ -4,12 +4,15 @@ const fsp = require('node:fs').promises;
 const path = require('node:path');
 const staticServer = require('./static.js');
 const load = require('./load.js');
-const db = require('./db.js');
+const createDbQueryConstructor = require('./db.js');
 const hash = require('./hash.js');
-const logger = require('./logger.js');
+const Logger = require('./logger.js');
 const config = require('./config.js');
 const server = require(`./${config.transport}.js`);
 
+const logger = new Logger(config.logPath);
+const db = createDbQueryConstructor(config.db);
+
 const sandbox = {
   console: Object.freeze(logger),
   db: Object.freeze(db),
@@ -27,6 +30,6 @@ const routing = {};
     routing[serviceName] = await load(filePath, sandbox);
   }
 
-  staticServer(config.staticPath, config.staticPort);
-  server(routing, config.apiPort);
+  staticServer(config.staticPath, config.staticPort, logger);
+  server(routing, config.apiPort, logger);
 })();

JavaScript/9-logger/package.json

@@ -8,6 +8,9 @@
   "engines": {
     "node": "14 || 16 || 18"
   },
+  "scripts": {
+    "start": "node --experimental-vm-modules main.js"
+  },
   "dependencies": {
     "pg": "^8.8.0",
     "ws": "^8.12.0"

JavaScript/9-logger/static.js

@@ -3,20 +3,21 @@
 const http = require('node:http');
 const path = require('node:path');
 const fs = require('node:fs');
-const console = require('./logger.js');
 
-module.exports = (root, port) => {
-  http.createServer(async (req, res) => {
-    const url = req.url === '/' ? '/index.html' : req.url;
-    const filePath = path.join(root, url);
-    try {
-      const data = await fs.promises.readFile(filePath);
-      res.end(data);
-    } catch (err) {
-      res.statusCode = 404;
-      res.end('"File is not found"');
-    }
-  }).listen(port);
+module.exports = (root, port, console) => {
+  http
+    .createServer(async (req, res) => {
+      const url = req.url === '/' ? '/index.html' : req.url;
+      const filePath = path.join(root, url);
+      try {
+        const data = await fs.promises.readFile(filePath);
+        res.end(data);
+      } catch (err) {
+        res.statusCode = 404;
+        res.end('"File is not found"');
+      }
+    })
+    .listen(port);
 
   console.log(`Static on port ${port}`);
 };

JavaScript/9-logger/ws.js

@@ -1,9 +1,8 @@
 'use strict';
 
-const console = require('./logger.js');
 const { Server } = require('ws');
 
-module.exports = (routing, port) => {
+module.exports = (routing, port, console) => {
   const ws = new Server({ port });
 
   ws.on('connection', (connection, req) => {