#102 into [email protected] 🐘 add logger support

.eslintrc.js

@@ -16,11 +16,13 @@ module.exports = {
         '@typescript-eslint/no-unsafe-enum-comparison': 'off',
         '@typescript-eslint/no-var-requires': 'off',
         '@typescript-eslint/naming-convention': 'off',
+        '@typescript-eslint/no-namespace': ['error', { allowDeclarations: true }],
         'no-underscore-dangle': 'off',
         'no-restricted-syntax': 'off',
         'no-continue': 'off',
         'promise/always-return': ['error', { ignoreLastCallback: true }],
-        'arrow-body-style': ['error', 'as-needed']
+        'arrow-body-style': ['error', 'as-needed'],
+        'no-console': ['warn', { allow: ['info', 'dir', 'error'] }]
       }
     }
   ]

src/core/graphql/createGraphQLRoutes/createGraphQLRoutes.ts

@@ -126,9 +126,7 @@ export const createGraphQLRoutes = ({
       });
     });
 
-    if (!matchedRouteConfig) {
-      return next();
-    }
+    if (!matchedRouteConfig) return next();
 
     if (matchedRouteConfig.interceptors?.request) {
       await callRequestInterceptor({

src/core/middlewares/contextMiddleware/contextMiddleware.ts

@@ -0,0 +1,44 @@
+import type { Express } from 'express';
+
+import { getGraphQLInput, parseQuery } from '@/utils/helpers';
+import type { GraphQLEntity, GraphQLOperationName, GraphQLOperationType } from '@/utils/types';
+
+declare global {
+  namespace Express {
+    export interface Request {
+      id: number;
+      timestamp: number;
+      graphQL: {
+        operationType: GraphQLOperationType;
+        operationName: GraphQLOperationName;
+        variables?: GraphQLEntity<'variables'>;
+      } | null;
+    }
+  }
+}
+
+export const contextMiddleware = (server: Express) => {
+  let requestId = 0;
+
+  server.use((request, _response, next) => {
+    requestId += 1;
+    request.id = requestId;
+
+    request.timestamp = Date.now();
+
+    const graphQLInput = getGraphQLInput(request);
+    const graphQLQuery = parseQuery(graphQLInput.query ?? '');
+
+    if (graphQLInput.query && graphQLQuery) {
+      request.graphQL = {
+        operationType: graphQLQuery.operationType as GraphQLOperationType,
+        operationName: graphQLQuery.operationName as GraphQLOperationName,
+        variables: graphQLInput.variables
+      };
+      return next();
+    }
+
+    request.graphQL = null;
+    return next();
+  });
+};

src/core/middlewares/cookieParseMiddleware/helpers/parseCookie/parseCookie.ts

@@ -1,4 +1,4 @@
-type Cookies = Record<string, string>;
+import type { Cookies } from '@/utils/types';
 
 export const parseCookie = (cookieHeader: string) => {
   if (!cookieHeader) return {};

src/core/middlewares/index.ts

@@ -1,3 +1,4 @@
+export * from './contextMiddleware/contextMiddleware';
 export * from './cookieParseMiddleware/cookieParseMiddleware';
 export * from './corsMiddleware/corsMiddleware';
 export * from './destroyerMiddleware/destroyerMiddleware';

src/core/middlewares/notFoundMiddleware/notFoundMiddleware.ts

@@ -53,17 +53,19 @@ export const notFoundMiddleware = (
       });
     }
 
+    response.status(404);
+
     const isRequestSupportHtml =
       request.headers.accept?.includes('text/html') || request.headers.accept?.includes('*/*');
     if (isRequestSupportHtml) {
-      response.status(404).render('pages/404', {
+      response.render('pages/404', {
         restRequestSuggestions,
         graphqlRequestSuggestions
       });
       return;
     }
 
-    response.status(404).json({
+    response.json({
       message: 'Request or page not found. Similar requests in data',
       data: {
         restRequestSuggestions,

src/core/rest/createRestRoutes/createRestRoutes.ts

@@ -98,9 +98,7 @@ export const createRestRoutes = ({
           });
         });
 
-        if (!matchedRouteConfig) {
-          return next();
-        }
+        if (!matchedRouteConfig) return next();
 
         if (matchedRouteConfig.interceptors?.request) {
           await callRequestInterceptor({

src/server/createDatabaseMockServer/createDatabaseMockServer.ts

@@ -4,6 +4,7 @@ import express from 'express';
 
 import { createDatabaseRoutes } from '@/core/database';
 import {
+  contextMiddleware,
   cookieParseMiddleware,
   corsMiddleware,
   errorMiddleware,
@@ -32,6 +33,8 @@ export const createDatabaseMockServer = (
 
   server.use(bodyParser.text());
 
+  contextMiddleware(server);
+
   cookieParseMiddleware(server);
 
   const serverRequestInterceptor = databaseMockServerConfig.interceptors?.request;

src/server/createGraphQLMockServer/createGraphQLMockServer.ts

@@ -5,6 +5,7 @@ import express from 'express';
 import { createDatabaseRoutes } from '@/core/database';
 import { createGraphQLRoutes } from '@/core/graphql';
 import {
+  contextMiddleware,
   cookieParseMiddleware,
   corsMiddleware,
   errorMiddleware,
@@ -33,6 +34,8 @@ export const createGraphQLMockServer = (
 
   server.use(bodyParser.text());
 
+  contextMiddleware(server);
+
   cookieParseMiddleware(server);
 
   const serverRequestInterceptor = graphqlMockServerConfig.interceptors?.request;

src/server/createMockServer/createMockServer.ts

@@ -5,6 +5,7 @@ import express from 'express';
 import { createDatabaseRoutes } from '@/core/database';
 import { createGraphQLRoutes } from '@/core/graphql';
 import {
+  contextMiddleware,
   cookieParseMiddleware,
   corsMiddleware,
   errorMiddleware,
@@ -34,6 +35,8 @@ export const createMockServer = (
 
   server.use(bodyParser.text());
 
+  contextMiddleware(server);
+
   cookieParseMiddleware(server);
 
   const serverRequestInterceptor = mockServerConfig.interceptors?.request;

src/server/createRestMockServer/createRestMockServer.ts

@@ -4,6 +4,7 @@ import express from 'express';
 
 import { createDatabaseRoutes } from '@/core/database';
 import {
+  contextMiddleware,
   cookieParseMiddleware,
   corsMiddleware,
   errorMiddleware,
@@ -33,6 +34,8 @@ export const createRestMockServer = (
 
   server.use(bodyParser.text());
 
+  contextMiddleware(server);
+
   cookieParseMiddleware(server);
 
   const serverRequestInterceptor = restMockServerConfig.interceptors?.request;

src/server/startDatabaseMockServer/startDatabaseMockServer.ts

@@ -11,7 +11,7 @@ export const startDatabaseMockServer = (databaseMockServerConfig: DatabaseMockSe
   const port = databaseMockServerConfig.port ?? DEFAULT.PORT;
 
   const server = mockServer.listen(port, () => {
-    console.log(color.green(`🎉 Database Mock Server is running at http://localhost:${port}`));
+    console.info(color.green(`🎉 Database Mock Server is running at http://localhost:${port}`));
   });
 
   // ✅ important: add destroy method for closing keep-alive connections after server shutdown

src/server/startGraphQLMockServer/startGraphQLMockServer.ts

@@ -11,7 +11,7 @@ export const startGraphQLMockServer = (graphQLMockServerConfig: GraphQLMockServe
   const port = graphQLMockServerConfig.port ?? DEFAULT.PORT;
 
   const server = mockServer.listen(port, () => {
-    console.log(color.green(`🎉 GraphQL Mock Server is running at http://localhost:${port}`));
+    console.info(color.green(`🎉 GraphQL Mock Server is running at http://localhost:${port}`));
   });
 
   // ✅ important: add destroy method for closing keep-alive connections after server shutdown

src/server/startMockServer/startMockServer.ts

@@ -11,7 +11,7 @@ export const startMockServer = (mockServerConfig: MockServerConfig) => {
   const port = mockServerConfig.port ?? DEFAULT.PORT;
 
   const server = mockServer.listen(port, () => {
-    console.log(color.green(`🎉 Mock Server is running at http://localhost:${port}`));
+    console.info(color.green(`🎉 Mock Server is running at http://localhost:${port}`));
   });
 
   // ✅ important: add destroy method for closing keep-alive connections after server shutdown

src/server/startRestMockServer/startRestMockServer.ts

@@ -11,7 +11,7 @@ export const startRestMockServer = (restMockServerConfig: RestMockServerConfig)
   const port = restMockServerConfig.port ?? DEFAULT.PORT;
 
   const server = mockServer.listen(port, () => {
-    console.log(color.green(`🎉 Rest Mock Server is running at http://localhost:${port}`));
+    console.info(color.green(`🎉 Rest Mock Server is running at http://localhost:${port}`));
   });
 
   // ✅ important: add destroy method for closing keep-alive connections after server shutdown

src/static/views/pages/404/index.ejs

@@ -1,85 +1,82 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>404 - 🎉 Mock Config Server</title>
 
-  <title>404 - 🎉 Mock Config Server</title>
+    <link rel="stylesheet" href="/assets/styles/global.css" />
+    <link rel="stylesheet" href="/pages/404/index.css" />
 
-  <link rel="stylesheet" href="/assets/styles/global.css" />
-  <link rel="stylesheet" href="/pages/404/index.css" />
+    <% const api = { rest: "REST", graphql: "GraphQL" } %>
 
-  <% const api = { rest: "REST", graphql: "GraphQL" } %>
+    <% const rootPath = (path) => `../../${path}` %>
+    <%- include(rootPath('features/scheme/index')) -%>
+    <%- include(rootPath('features/tab/index')) -%>
+  </head>
 
-  <% const rootPath = (path) => `../../${path}` %>
-  <%- include(rootPath('features/scheme/index')) -%>
-  <%- include(rootPath('features/tab/index')) -%>
-</head>
-
-<body class="tab_item-<%= graphqlRequestSuggestions.length ? api.graphql : api.rest %>">
-  <%- include(rootPath('components/header/index')) -%>
-  <div class="margin_container">
-    <div class="hero">
-      <div class="title">
-        <img src="/assets/images/404.png" />
-        404
-      </div>
-      <div class="description">
-        Such request or page not found ☹️
-        <a class="link" href="/">
-          Return on main page
-        </a>
-      </div>
-    </div>
-  </div>
-  <div class="margin_container">
-    <div class="content">
-      <div class="content_head">
-        <div class="tab_items">
-          <% Object.values(api).forEach((variant)=> { %>
-          <div id="tab_item-<%=variant%>" class="tab_item">
-            <%=variant%>
-          </div>
-          <% }) %>
+  <body class="tab_item-<%= graphqlRequestSuggestions.length ? api.graphql : api.rest %>">
+    <%- include(rootPath('components/header/index')) -%>
+    <div class="margin_container">
+      <div class="hero">
+        <div class="title">
+          <img src="/assets/images/404.png" />
+          404
         </div>
-      </div>
-      <div id="tab_content-<%=api.rest%>" class="tab_content">
         <div class="description">
-          <% if (restRequestSuggestions.length) { %>
-          <span>We searched a bit, maybe this will help you:</span>
-          <% restRequestSuggestions.forEach((requestSuggestion) => { %>
-          <span><%= requestSuggestion.method.toUpperCase() %> <%=
-              requestSuggestion.path %></span>
-          <% })} else { %>
-          <span>We searched, but found nothing.</span>
-          <span>Maybe you don't have <%=api.rest%> configs? 👀</span>
-          <a class="link" href="https://github.com/siberiacancode/mock-config-server#configs" rel="noopener noreferrer" target="_blank">
-            Read documentation 📘 for more information
+          Such request or page not found ☹️
+          <a class="link" href="/">
+            Return on main page
           </a>
-          <% } %>
         </div>
       </div>
+    </div>
+    <div class="margin_container">
+      <div class="content">
+        <div class="content_head">
+          <div class="tab_items">
+            <% Object.values(api).forEach((variant)=> { %>
+            <div id="tab_item-<%=variant%>" class="tab_item">
+              <%=variant%>
+            </div>
+            <% }) %>
+          </div>
+        </div>
+        <div id="tab_content-<%=api.rest%>" class="tab_content">
+          <div class="description">
+            <% if (restRequestSuggestions.length) { %>
+            <span>We searched a bit, maybe this will help you:</span>
+            <% restRequestSuggestions.forEach((requestSuggestion) => { %>
+            <span><%= requestSuggestion.method.toUpperCase() %> <%=
+                requestSuggestion.path %></span>
+            <% })} else { %>
+            <span>We searched, but found nothing.</span>
+            <span>Maybe you don't have <%=api.rest%> configs? 👀</span>
+            <a class="link" href="https://github.com/siberiacancode/mock-config-server#configs" rel="noopener noreferrer" target="_blank">
+              Read documentation 📘 for more information
+            </a>
+            <% } %>
+          </div>
+        </div>
 
-      <div id="tab_content-<%=api.graphql%>" class="tab_content">
-        <div class="description">
-          <% if (graphqlRequestSuggestions.length) { %>
-          <span>We searched a bit, maybe this will help you:</span>
-          <% graphqlRequestSuggestions.forEach((requestSuggestion) => { %>
-          <span><%= requestSuggestion.operationType %> <%=
-              requestSuggestion.operationName %></span>
-          <% })} else { %>
-          <span>We searched, but found nothing.</span>
-          <span>Maybe you don't have <%=api.graphql%> configs? 👀</span>
-          <a class="link" href="https://github.com/siberiacancode/mock-config-server#configs" rel="noopener noreferrer" target="_blank">
-            Read documentation 📘 for more information
-          </a>
-          <% } %>
+        <div id="tab_content-<%=api.graphql%>" class="tab_content">
+          <div class="description">
+            <% if (graphqlRequestSuggestions.length) { %>
+            <span>We searched a bit, maybe this will help you:</span>
+            <% graphqlRequestSuggestions.forEach((requestSuggestion) => { %>
+            <span><%= requestSuggestion.operationType %> <%=
+                requestSuggestion.operationName %></span>
+            <% })} else { %>
+            <span>We searched, but found nothing.</span>
+            <span>Maybe you don't have <%=api.graphql%> configs? 👀</span>
+            <a class="link" href="https://github.com/siberiacancode/mock-config-server#configs" rel="noopener noreferrer" target="_blank">
+              Read documentation 📘 for more information
+            </a>
+            <% } %>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-  </div>
-</body>
-
-</html>
+  </body>
+</html>

src/utils/helpers/date/formatTimestamp/formatTimestamp.test.ts

@@ -0,0 +1,7 @@
+import { formatTimestamp } from './formatTimestamp';
+
+describe('formatTimestamp', () => {
+  test('Should correctly format timestamp', () => {
+    expect(formatTimestamp(1735623296789)).toBe('31.12.2024, 12:34:56,789');
+  });
+});

src/utils/helpers/date/formatTimestamp/formatTimestamp.ts

@@ -0,0 +1,9 @@
+export const formatTimestamp = (timestamp: number) =>
+  new Date(timestamp).toLocaleString('ru-RU', {
+    day: 'numeric',
+    month: 'numeric',
+    year: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
+    fractionalSecondDigits: 3
+  });

src/utils/helpers/date/index.ts

@@ -0,0 +1 @@
+export * from './formatTimestamp/formatTimestamp';