FI-1635 fix: add separate resources group to API statistics

uid11 · uid11 · commit 40d72e72ac85 · 2025-03-13T23:45:06.000+03:00
diff --git a/src/context/apiStatistics.ts b/src/context/apiStatistics.ts
@@ -22,6 +22,7 @@ export const getApiStatistics = (): ApiStatistics => {
   const apiStatistics: ApiStatistics = {
     pages: Object.create(null) as {},
     requests: Object.create(null) as {},
+    resources: Object.create(null) as {},
   };
 
   setRawApiStatistics(apiStatistics);
diff --git a/src/types/apiStatistics.ts b/src/types/apiStatistics.ts
@@ -7,6 +7,7 @@ import type {Method, StatusCode, Url} from './http';
 export type ApiStatistics = Readonly<{
   pages: Readonly<Record<PageName, Readonly<Record<Url, PageStatistics>>>>;
   requests: Readonly<Record<Url, Readonly<Partial<Record<Method, RequestStatistics>>>>>;
+  resources: Readonly<Record<Url, RequestStatistics>>;
 }>;
 
 /**
diff --git a/src/utils/apiStatistics/addApiStatistics.ts b/src/utils/apiStatistics/addApiStatistics.ts
@@ -1,20 +1,15 @@
 import {addPages} from './addPages';
 import {addRequests} from './addRequests';
+import {addResources} from './addResources';
 
 import type {ApiStatistics} from '../../types/internal';
 
 /**
- * Add additional API statistics to total API statistics.
+ * Adds additional API statistics to total API statistics.
  * @internal
  */
 export const addApiStatistics = (target: ApiStatistics, source: ApiStatistics): void => {
-  const sourceByPageName = source.pages;
-  const targetByPageName = target.pages;
-
-  addPages(targetByPageName, sourceByPageName);
-
-  const sourceByUrl = source.requests;
-  const targetByUrl = target.requests;
-
-  addRequests(targetByUrl, sourceByUrl);
+  addPages(target.pages, source.pages);
+  addRequests(target.requests, source.requests);
+  addResources(target.resources, source.resources);
 };
diff --git a/src/utils/apiStatistics/addPageToApiStatistics.ts b/src/utils/apiStatistics/addPageToApiStatistics.ts
@@ -12,16 +12,17 @@ type Options = Readonly<{
 }>;
 
 /**
- * Add single page to API statistics.
+ * Adds single page to API statistics.
  * @internal
  */
 export const addPageToApiStatistics = ({duration, pageName, url}: Options): void => {
   const apiStatistics = getApiStatistics();
-  const urlTemplate = getUrlTemplate(url);
+  const {urlTemplate} = getUrlTemplate(url);
 
   const additionalApiStatistics: ApiStatistics = {
     pages: {[pageName]: {[urlTemplate]: {count: 1, duration}}},
     requests: {},
+    resources: {},
   };
 
   addApiStatistics(apiStatistics, additionalApiStatistics);
diff --git a/src/utils/apiStatistics/addPages.ts b/src/utils/apiStatistics/addPages.ts
@@ -4,7 +4,7 @@ import {getKeys, setReadonlyProperty} from '../object';
 import type {ApiStatistics, PageStatistics} from '../../types/internal';
 
 /**
- * Add additional pages to total API statistics pages.
+ * Adds additional pages to total API statistics pages.
  * @internal
  */
 export const addPages = (
diff --git a/src/utils/apiStatistics/addRequestStatistics.ts b/src/utils/apiStatistics/addRequestStatistics.ts
@@ -0,0 +1,30 @@
+import {assertValueIsDefined} from '../asserts';
+import {getKeys, setReadonlyProperty} from '../object';
+
+import type {RequestStatistics, StatisticsUnit} from '../../types/internal';
+
+/**
+ * Adds additional requests statistics to total API resource statistics.
+ * @internal
+ */
+export const addRequestStatistics = (
+  targetByStatusCode: RequestStatistics,
+  sourceByStatusCode: RequestStatistics,
+): void => {
+  for (const statusCode of getKeys(sourceByStatusCode)) {
+    const sourceUnit: StatisticsUnit | undefined = sourceByStatusCode[statusCode];
+
+    assertValueIsDefined(sourceUnit, 'sourceUnit is defined', {statusCode});
+
+    let targetUnit = targetByStatusCode[statusCode];
+
+    if (targetUnit === undefined) {
+      targetUnit = {count: 0, duration: 0, size: 0};
+      setReadonlyProperty(targetByStatusCode, statusCode, targetUnit);
+    }
+
+    setReadonlyProperty(targetUnit, 'count', targetUnit.count + sourceUnit.count);
+    setReadonlyProperty(targetUnit, 'duration', targetUnit.duration + sourceUnit.duration);
+    setReadonlyProperty(targetUnit, 'size', targetUnit.size + sourceUnit.size);
+  }
+};
diff --git a/src/utils/apiStatistics/addRequests.ts b/src/utils/apiStatistics/addRequests.ts
@@ -1,10 +1,12 @@
 import {assertValueIsDefined} from '../asserts';
 import {getKeys, setReadonlyProperty} from '../object';
 
-import type {ApiStatistics, RequestStatistics, StatisticsUnit} from '../../types/internal';
+import {addRequestStatistics} from './addRequestStatistics';
+
+import type {ApiStatistics, RequestStatistics} from '../../types/internal';
 
 /**
- * Add additional requests to total API statistics requests.
+ * Adds additional requests to total API statistics requests.
  * @internal
  */
 export const addRequests = (
@@ -32,23 +34,7 @@ export const addRequests = (
         setReadonlyProperty(targetByMethod, method, targetByStatusCode);
       }
 
-      for (const statusCode of getKeys(sourceByStatusCode)) {
-        const sourceUnit: StatisticsUnit | undefined = sourceByStatusCode[statusCode];
-
-        assertValueIsDefined(sourceUnit, 'sourceUnit is defined', {method, statusCode, url});
-
-        let targetUnit = targetByStatusCode[statusCode];
-
-        // eslint-disable-next-line max-depth
-        if (targetUnit === undefined) {
-          targetUnit = {count: 0, duration: 0, size: 0};
-          setReadonlyProperty(targetByStatusCode, statusCode, targetUnit);
-        }
-
-        setReadonlyProperty(targetUnit, 'count', targetUnit.count + sourceUnit.count);
-        setReadonlyProperty(targetUnit, 'duration', targetUnit.duration + sourceUnit.duration);
-        setReadonlyProperty(targetUnit, 'size', targetUnit.size + sourceUnit.size);
-      }
+      addRequestStatistics(targetByStatusCode, sourceByStatusCode);
     }
   }
 };
diff --git a/src/utils/apiStatistics/addResources.ts b/src/utils/apiStatistics/addResources.ts
@@ -0,0 +1,30 @@
+import {assertValueIsDefined} from '../asserts';
+import {getKeys, setReadonlyProperty} from '../object';
+
+import {addRequestStatistics} from './addRequestStatistics';
+
+import type {ApiStatistics} from '../../types/internal';
+
+/**
+ * Adds additional resources to total API statistics resources.
+ * @internal
+ */
+export const addResources = (
+  targetByUrl: ApiStatistics['resources'],
+  sourceByUrl: ApiStatistics['resources'],
+): void => {
+  for (const url of getKeys(sourceByUrl)) {
+    const sourceByStatusCode = sourceByUrl[url];
+
+    assertValueIsDefined(sourceByStatusCode, 'sourceByStatusCode is defined', {
+      sourceByUrl,
+      url,
+    });
+
+    let targetByStatusCode = targetByUrl[url];
+
+    targetByStatusCode ??= setReadonlyProperty(targetByUrl, url, Object.create(null) as {});
+
+    addRequestStatistics(targetByStatusCode, sourceByStatusCode);
+  }
+};
diff --git a/src/utils/apiStatistics/addResponseToApiStatistics.ts b/src/utils/apiStatistics/addResponseToApiStatistics.ts
@@ -5,10 +5,10 @@ import {getHeaderValue} from '../headers';
 import {addApiStatistics} from './addApiStatistics';
 import {getUrlTemplate} from './getUrlTemplate';
 
-import type {ApiStatistics, ResponseWithRequest} from '../../types/internal';
+import type {ApiStatistics, RequestStatistics, ResponseWithRequest} from '../../types/internal';
 
 /**
- * Add single `ResponseWithRequest` to API statistics.
+ * Adds single `ResponseWithRequest` to API statistics.
  * @internal
  */
 export const addResponseToApiStatistics = (responseWithRequest: ResponseWithRequest): void => {
@@ -19,13 +19,14 @@ export const addResponseToApiStatistics = (responseWithRequest: ResponseWithRequ
     statusCode,
   } = responseWithRequest;
 
+  const {hasExtension, urlTemplate} = getUrlTemplate(url);
+  const isResource = hasExtension && method === 'GET';
   const size = Number(getHeaderValue(responseWithRequest.responseHeaders, 'content-length')) || 0;
-  const urlTemplate = getUrlTemplate(url);
+  const requestStatistics: RequestStatistics = {[statusCode]: {count: 1, duration, size}};
 
-  const additionalApiStatistics: ApiStatistics = {
-    pages: {},
-    requests: {[urlTemplate]: {[method]: {[statusCode]: {count: 1, duration, size}}}},
-  };
+  const additionalApiStatistics: ApiStatistics = isResource
+    ? {pages: {}, requests: {}, resources: {[urlTemplate]: requestStatistics}}
+    : {pages: {}, requests: {[urlTemplate]: {[method]: requestStatistics}}, resources: {}};
 
   addApiStatistics(apiStatistics, additionalApiStatistics);
 };
diff --git a/src/utils/apiStatistics/getBorderCount.ts b/src/utils/apiStatistics/getBorderCount.ts
@@ -9,13 +9,19 @@ const zCodePoint = 122;
 const ZCodePoint = 90;
 const zeroCodePoint = 48;
 
+type Return = Readonly<{
+  borderCount: number;
+  letterCount: number;
+}>;
+
 /**
  * Returns count of border (letter or non-letter) inside string.
  * @internal
  */
 // eslint-disable-next-line complexity
-export const getBorderCount = (value: string): number => {
+export const getBorderCount = (value: string): Return => {
   let borderCount = -1;
+  let letterCount = 0;
   let mode: '.' | '0' | 'A' | 'a' | undefined;
 
   for (const char of value) {
@@ -37,6 +43,7 @@ export const getBorderCount = (value: string): number => {
           borderCount += 1;
         }
 
+        letterCount += 1;
         mode = 'A';
         break;
 
@@ -45,6 +52,7 @@ export const getBorderCount = (value: string): number => {
           borderCount += 1;
         }
 
+        letterCount += 1;
         mode = 'a';
         break;
 
@@ -57,5 +65,5 @@ export const getBorderCount = (value: string): number => {
     }
   }
 
-  return borderCount;
+  return {borderCount, letterCount};
 };
diff --git a/src/utils/apiStatistics/getUrlTemplate.ts b/src/utils/apiStatistics/getUrlTemplate.ts
@@ -1,3 +1,4 @@
+import {extname} from 'node:path';
 import {URL} from 'node:url';
 
 import {assertValueIsDefined} from '../asserts';
@@ -9,44 +10,41 @@ import type {Url} from '../../types/internal';
 const maxExtensionLength = 4;
 const minExtensionLength = 2;
 
+type Return = Readonly<{
+  hasExtension: boolean;
+  urlTemplate: Url;
+}>;
+
 /**
  * Get url template from url (for API statistics).
  * `query` part is cut off, and all identifiers in the `pathname` are replaced with asterisks.
  * @internal
  */
-export const getUrlTemplate = (url: Url): Url => {
+export const getUrlTemplate = (url: Url): Return => {
   const {origin, pathname} = new URL(url);
   const parts = pathname.split('/');
 
+  const extension = extname(pathname).slice(1);
+
+  if (
+    extension.length >= minExtensionLength &&
+    extension.length <= maxExtensionLength &&
+    /^[a-z]+$/.test(extension)
+  ) {
+    return {hasExtension: true, urlTemplate: `${origin}${pathname}` as Url};
+  }
+
   for (let index = 0; index < parts.length; index += 1) {
     const part = parts[index];
 
     assertValueIsDefined(part, 'part is defined', {url});
 
-    if (index === parts.length - 1) {
-      const indexOfPoint = part.lastIndexOf('.');
-      const extensionLength = part.length - indexOfPoint - 1;
-
-      if (
-        indexOfPoint !== -1 &&
-        extensionLength >= minExtensionLength &&
-        extensionLength <= maxExtensionLength
-      ) {
-        const extension = part.slice(indexOfPoint + 1);
-
-        // eslint-disable-next-line max-depth
-        if (/^[a-z]+$/.test(extension)) {
-          continue;
-        }
-      }
-    }
-
     if (isIdentifier(part)) {
       parts[index] = '*';
     }
   }
 
   const newPathname = parts.join('/');
 
-  return `${origin}${newPathname}` as Url;
+  return {hasExtension: false, urlTemplate: `${origin}${newPathname}` as Url};
 };
diff --git a/src/utils/apiStatistics/isIdentifier.ts b/src/utils/apiStatistics/isIdentifier.ts
@@ -2,6 +2,7 @@ import {getBorderCount} from './getBorderCount';
 
 const maxBorderCountOfNonIdentifier = 6;
 const minIdentifierLength = 6;
+const minProportionOfLetters = 0.4;
 const maxIdentifierLengthForMaxBorder = 12;
 
 /**
@@ -13,7 +14,11 @@ export const isIdentifier = (value: string): boolean => {
     return false;
   }
 
-  const borderCount = getBorderCount(value);
+  const {borderCount, letterCount} = getBorderCount(value);
+
+  if (letterCount / value.length < minProportionOfLetters) {
+    return true;
+  }
 
   if (borderCount > maxBorderCountOfNonIdentifier) {
     return true;
@@ -33,9 +38,5 @@ export const isIdentifier = (value: string): boolean => {
     return true;
   }
 
-  if (/^[0-9]+$/.test(value)) {
-    return true;
-  }
-
   return false;
 };
diff --git a/src/utils/report/getTotalApiStatistics.ts b/src/utils/report/getTotalApiStatistics.ts
@@ -12,6 +12,7 @@ export const getTotalApiStatistics = (
   const totalApiStatistics: ApiStatistics = {
     pages: Object.create(null) as {},
     requests: Object.create(null) as {},
+    resources: Object.create(null) as {},
   };
 
   for (const apiStatistics of apiStatisticsOfTests) {
