@vroskus/library-api 1.1.2 → 1.1.4

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-import AxiosMockAdapter from 'axios-mock-adapter';
-import type { $Config, $Connection, $RequestContext, $ResponseContext } from './types';
+import type { $Config, $Connection, $MockAdapter, $RequestContext, $ResponseContext } from './types';
 export * from './types';
 type $RequestContextListener = (arg0: $RequestContext) => void;
 type $ResponseContextListener = (arg0: $ResponseContext) => void;
@@ -7,12 +6,11 @@ type $UnauthenticatedHandler = () => unknown;
 declare class ApiService<C extends $Config> {
     #private;
     connection: $Connection;
-    mockAdapter: AxiosMockAdapter | null;
     expressRouteToMockRoute: (arg0: string) => RegExp | string;
     constructor({ apiUrl, headers, httpsAgent, interceptors, timeout, }: C);
     setUnauthenticatedHandler(handler: $UnauthenticatedHandler): void;
     setRequestContextListener(listener: $RequestContextListener): void;
     setResponseContextListener(listener: $ResponseContextListener): void;
-    initMock(mockSetup: (mockAdapter: AxiosMockAdapter) => void, delay?: number): void;
+    initMockAdapter(delayResponse?: number): $MockAdapter;
 }
 export default ApiService;

package/dist/index.js

@@ -88,6 +88,7 @@ const parseRequestData = (value) => {
     }
     return undefined;
 };
+const getRequestId = (config) => lodash_1.default.get(config, 'headers.X-Request-Id', '');
 class ApiService {
     constructor({ apiUrl, headers, httpsAgent, interceptors, timeout, }) {
         _ApiService_instances.add(this);
@@ -105,7 +106,6 @@ class ApiService {
         __classPrivateFieldSet(this, _ApiService_unauthenticatedHandler, () => { }, "f");
         __classPrivateFieldSet(this, _ApiService_requestContextListener, () => { }, "f");
         __classPrivateFieldSet(this, _ApiService_responseContextListener, () => { }, "f");
-        this.mockAdapter = null;
         this.expressRouteToMockRoute = (v) => {
             if (v.includes(':')) {
                 return new RegExp(v.replace(/:\w+/g, '[^/]+'));
@@ -124,14 +124,21 @@ class ApiService {
     setResponseContextListener(listener) {
         __classPrivateFieldSet(this, _ApiService_responseContextListener, listener, "f");
     }
-    initMock(mockSetup, delay) {
-        this.mockAdapter = new axios_mock_adapter_1.default(this.connection, {
-            delayResponse: delay,
+    initMockAdapter(delayResponse) {
+        return new axios_mock_adapter_1.default(this.connection, {
+            delayResponse,
         });
-        mockSetup(this.mockAdapter);
     }
 }
 _ApiService_unauthenticatedHandler = new WeakMap(), _ApiService_requestContextListener = new WeakMap(), _ApiService_responseContextListener = new WeakMap(), _ApiService_instances = new WeakSet(), _ApiService_initInterceptors = function _ApiService_initInterceptors(interceptorsConfig) {
+    this.connection.interceptors.request.use((config) => {
+        const newRequestId = crypto.randomUUID();
+        const requestId = getRequestId(config);
+        if (requestId === '') {
+            lodash_1.default.set(config, 'headers.X-Request-Id', newRequestId);
+        }
+        return config;
+    });
     if (interceptorsConfig.unauth !== false) {
         this.connection.interceptors.response.use((response) => response, (error) => {
             const status = lodash_1.default.get(error, 'response.status');
@@ -143,11 +150,9 @@ _ApiService_unauthenticatedHandler = new WeakMap(), _ApiService_requestContextLi
     }
     if (interceptorsConfig.context !== false) {
         this.connection.interceptors.request.use((config) => {
-            const requestId = crypto.randomUUID();
-            lodash_1.default.set(config, 'headers.X-Request-Id', requestId);
             const startTimestamp = performance.now();
             lodash_1.default.set(config, 'startTimestamp', startTimestamp);
-            __classPrivateFieldGet(this, _ApiService_instances, "m", _ApiService_pushRequestContext).call(this, config, requestId);
+            __classPrivateFieldGet(this, _ApiService_instances, "m", _ApiService_pushRequestContext).call(this, config);
             return config;
         });
         this.connection.interceptors.response.use((response) => {
@@ -181,28 +186,35 @@ _ApiService_unauthenticatedHandler = new WeakMap(), _ApiService_requestContextLi
             return Promise.reject(error);
         });
     }
-}, _ApiService_pushRequestContext = function _ApiService_pushRequestContext(config, requestId) {
+    if (interceptorsConfig.debug !== false) {
+        this.connection.interceptors.request.use((requestConfig) => {
+            console.info('Request:', requestConfig.method, requestConfig.url, requestConfig.data);
+            return requestConfig;
+        });
+    }
+}, _ApiService_pushRequestContext = function _ApiService_pushRequestContext(config) {
     const requestContext = {
+        Domain: config.baseURL || 'Unknown',
         Method: `${(config.method || 'Unknown').toUpperCase()}`,
         RequestData: config.data,
         RequestHeaders: config.headers,
-        RequestId: requestId,
+        RequestId: getRequestId(config),
         RequestParams: config.params,
         Route: config.url || 'Unknown',
     };
     const cleanRequestContext = lodash_1.default.omitBy(requestContext, lodash_1.default.isUndefined);
     __classPrivateFieldGet(this, _ApiService_requestContextListener, "f").call(this, cleanRequestContext);
 }, _ApiService_pushResponseContext = function _ApiService_pushResponseContext(response) {
-    const requestId = lodash_1.default.get(response.config, 'headers.X-Request-Id', '');
     const { config, data, headers, status, } = response;
     const endTimestamp = performance.now();
     const startTimestamp = lodash_1.default.get(config, 'startTimestamp', endTimestamp);
     const responseContext = {
+        Domain: config.baseURL || 'Unknown',
         Duration: endTimestamp - startTimestamp,
         Method: `${(config.method || 'Unknown').toUpperCase()}`,
         RequestData: parseRequestData(config.data),
         RequestHeaders: config.headers,
-        RequestId: requestId,
+        RequestId: getRequestId(config),
         RequestParams: config.params,
         ResponseData: data,
         ResponseHeaders: headers,

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { Agent } from 'https';
+import type { Agent } from 'node:https';
 import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
 import type AxiosMockAdapter from 'axios-mock-adapter';
 export type $Connection = AxiosInstance;
@@ -7,6 +7,7 @@ export type $Response<V> = AxiosResponse<V>;
 export type $MockAdapter = AxiosMockAdapter;
 export type $ConfigInterceptors = {
     context?: boolean;
+    debug?: boolean;
     requestReplay?: boolean;
     unauth?: boolean;
 };
@@ -18,6 +19,7 @@ export type $Config = {
     timeout: number;
 };
 export type $RequestContext = {
+    Domain: string;
     Method: string;
     RequestData?: unknown;
     RequestHeaders: unknown;
@@ -26,6 +28,7 @@ export type $RequestContext = {
     Route: string;
 };
 export type $ResponseContext = {
+    Domain: string;
     Duration: number;
     Method: string;
     RequestData?: Record<string, unknown>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vroskus/library-api",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Api",
   "author": "Vilius Roškus <vilius@regattas.eu>",
   "license": "MIT",
@@ -52,10 +52,10 @@
     ],
     "coverageThreshold": {
       "global": {
-        "branches": 58.82,
-        "functions": 78.37,
-        "lines": 86.25,
-        "statements": 79.47
+        "branches": 59.02,
+        "functions": 80,
+        "lines": 86.86,
+        "statements": 80.37
       }
     }
   }