14832449887

Committed 05 May 2025 08:38AM UTC coverage: 90.502% (+0.1%) from 90.366%

Build # 14832449887

Build Type

Pull #2506

github

Committed by

web-flow

Commit Message

Merge 52fcdb189 into d35949d6f

Pull Request Pull Request #2506: feat: cache in-flight network requests

Run Details

3286 of 3953 branches covered (83.13%)

Branch coverage included in aggregate %.

28 of 29 new or added lines in 3 files covered. (96.55%)

26 existing lines in 6 files now uncovered.

11360 of 12230 relevant lines covered (92.89%)

561.48 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

94.0

/src/datasources/network/network.module.ts

import { Global, Module } from '@nestjs/common';
import { IConfigurationService } from '@/config/configuration.service.interface';
import { FetchNetworkService } from '@/datasources/network/fetch.network.service';
import { NetworkService } from '@/datasources/network/network.service.interface';
import { NetworkResponse } from '@/datasources/network/entities/network.response.entity';
import {
  NetworkRequestError,
  NetworkResponseError,
} from '@/datasources/network/entities/network.error.entity';
import type { Raw } from '@/validation/entities/raw.entity';
import { ILoggingService, LoggingService } from '@/logging/logging.interface';
import { LogType } from '@/domain/common/entities/log-type.entity';
import { hashString } from '@/domain/common/utils/utils';

export type FetchClient = <T>(
  url: string,
  options: RequestInit,
) => Promise<NetworkResponse<T>>;

/**
 * Use this factory to create a {@link FetchClient} instance
 * that can be used to make HTTP requests.
 */
function fetchClientFactory(
  configurationService: IConfigurationService,
  loggingService: ILoggingService,
): FetchClient {
  const cacheInFlightRequests = configurationService.getOrThrow<boolean>(
    'features.cacheInFlightRequests',
  );
  const requestTimeout = configurationService.getOrThrow<number>(
    'httpClient.requestTimeout',
  );

  const request = createRequestFunction(requestTimeout);

  if (!cacheInFlightRequests) {
    return request;
  }

  return createCachedRequestFunction(request, loggingService);
}

function createRequestFunction(requestTimeout: number) {
  return async <T>(
    url: string,
    options: RequestInit,
  ): Promise<NetworkResponse<T>> => {
    let urlObject: URL | null = null;
    let response: Response | null = null;

    try {
      urlObject = new URL(url);
      response = await fetch(url, {
        ...options,
        signal: AbortSignal.timeout(requestTimeout),
        keepalive: true,
      });
    } catch (error) {
      throw new NetworkRequestError(urlObject, error);
    }

    // We validate data so don't need worry about casting `null` response
    const data = (await response.json().catch(() => null)) as Raw<T>;

    if (!response.ok) {
      throw new NetworkResponseError(urlObject, response, data);
    }

    return {
      status: response.status,
      data,
    };
  };
}

function createCachedRequestFunction(
  request: <T>(
    url: string,
    options: RequestInit,
  ) => Promise<NetworkResponse<T>>,
  loggingService: ILoggingService,
) {
  const cache: Record<string, Promise<NetworkResponse<unknown>>> = {};

  return async <T>(
    url: string,
    options: RequestInit,
  ): Promise<NetworkResponse<T>> => {
    const key = getCacheKey(url, options);
    if (key in cache) {
      loggingService.debug({
        type: LogType.ExternalRequestCacheHit,
        url,
        key,
      });
    } else {
      loggingService.debug({
        type: LogType.ExternalRequestCacheMiss,
        url,
        key,
      });

      cache[key] = request(url, options)
        .catch((err) => {
          loggingService.debug({
            type: LogType.ExternalRequestCacheError,
            url,
            key,
          });
          return err;
        })
        .finally(() => {
          delete cache[key];
        });
    }

    return cache[key];
  };
}

function getCacheKey(url: string, requestInit?: RequestInit): string {
  if (!requestInit) {
    return url;
  }

  // JSON.stringify does not produce a stable key but initially
  // use a naive implementation for testing the implementation
  // TODO: Revisit this and use a more stable key
  const key = JSON.stringify({ url, ...requestInit });
  return hashString(key);
}

/**
 * A {@link Global} Module which provides HTTP support via {@link NetworkService}
 * Feature Modules don't need to import this module directly in order to inject
 * the {@link NetworkService}.
 *
 * This module should be included in the "root" application module
 */
@Global()
@Module({
  providers: [
    {
      provide: 'FetchClient',
      useFactory: fetchClientFactory,
      inject: [IConfigurationService, LoggingService],
    },
    { provide: NetworkService, useClass: FetchNetworkService },
  ],
  exports: [NetworkService],
})
export class NetworkModule {}

1	import { Global, Module } from '@nestjs/common';	106✔
2	import { IConfigurationService } from '@/config/configuration.service.interface';	106✔
3	import { FetchNetworkService } from '@/datasources/network/fetch.network.service';	106✔
4	import { NetworkService } from '@/datasources/network/network.service.interface';	106✔
5	import { NetworkResponse } from '@/datasources/network/entities/network.response.entity';
6	import {	106✔
7	NetworkRequestError,
8	NetworkResponseError,
9	} from '@/datasources/network/entities/network.error.entity';
10	import type { Raw } from '@/validation/entities/raw.entity';
11	import { ILoggingService, LoggingService } from '@/logging/logging.interface';	106✔
12	import { LogType } from '@/domain/common/entities/log-type.entity';	106✔
13	import { hashString } from '@/domain/common/utils/utils';	106✔
14
15	export type FetchClient = <T>(
16	url: string,
17	options: RequestInit,
18	) => Promise<NetworkResponse<T>>;
19
20	/**
21	* Use this factory to create a {@link FetchClient} instance
22	* that can be used to make HTTP requests.
23	*/
24	function fetchClientFactory(
25	configurationService: IConfigurationService,
26	loggingService: ILoggingService,
27	): FetchClient {
28	const cacheInFlightRequests = configurationService.getOrThrow<boolean>(	10✔
29	'features.cacheInFlightRequests',
30	);
31	const requestTimeout = configurationService.getOrThrow<number>(	10✔
32	'httpClient.requestTimeout',
33	);
34
35	const request = createRequestFunction(requestTimeout);	10✔
36
37	if (!cacheInFlightRequests) {	10✔
38	return request;	8✔
39	}
40
41	return createCachedRequestFunction(request, loggingService);	2✔
42	}
43
44	function createRequestFunction(requestTimeout: number) {
45	return async <T>(	10✔
46	url: string,
47	options: RequestInit,
48	): Promise<NetworkResponse<T>> => {
49	let urlObject: URL \| null = null;	22✔
50	let response: Response \| null = null;	22✔
51
52	try {	22✔
53	urlObject = new URL(url);	22✔
54	response = await fetch(url, {	20✔
55	...options,
56	signal: AbortSignal.timeout(requestTimeout),
57	keepalive: true,
58	});
59	} catch (error) {
60	throw new NetworkRequestError(urlObject, error);	4✔
61	}
62
63	// We validate data so don't need worry about casting `null` response
64	const data = (await response.json().catch(() => null)) as Raw<T>;	18✔
65
66	if (!response.ok) {	16✔
67	throw new NetworkResponseError(urlObject, response, data);	6✔
68	}
69
70	return {	10✔
71	status: response.status,
72	data,
73	};
74	};
75	}
76
77	function createCachedRequestFunction(
78	request: <T>(
79	url: string,
80	options: RequestInit,
81	) => Promise<NetworkResponse<T>>,
82	loggingService: ILoggingService,
83	) {
84	const cache: Record<string, Promise<NetworkResponse<unknown>>> = {};	2✔
85
86	return async <T>(	2✔
87	url: string,
88	options: RequestInit,
89	): Promise<NetworkResponse<T>> => {
90	const key = getCacheKey(url, options);	20✔
91	if (key in cache) {	20✔
92	loggingService.debug({	6✔
93	type: LogType.ExternalRequestCacheHit,
94	url,
95	key,
96	});
97	} else {
98	loggingService.debug({	14✔
99	type: LogType.ExternalRequestCacheMiss,
100	url,
101	key,
102	});
103
104	cache[key] = request(url, options)	14✔
105	.catch((err) => {
106	loggingService.debug({	4✔
107	type: LogType.ExternalRequestCacheError,
108	url,
109	key,
110	});
111	return err;	4✔
112	})
113	.finally(() => {
114	delete cache[key];	14✔
115	});
116	}
117
118	return cache[key];	20✔
119	};
120	}
121
122	function getCacheKey(url: string, requestInit?: RequestInit): string {
123	if (!requestInit) {	20!
NEW 124	return url;	×
125	}
126
127	// JSON.stringify does not produce a stable key but initially
128	// use a naive implementation for testing the implementation
129	// TODO: Revisit this and use a more stable key
130	const key = JSON.stringify({ url, ...requestInit });	20✔
131	return hashString(key);	20✔
132	}
133
134	/**
135	* A {@link Global} Module which provides HTTP support via {@link NetworkService}
136	* Feature Modules don't need to import this module directly in order to inject
137	* the {@link NetworkService}.
138	*
139	* This module should be included in the "root" application module
140	*/
141	@Global()
142	@Module({
143	providers: [
144	{
145	provide: 'FetchClient',
146	useFactory: fetchClientFactory,
147	inject: [IConfigurationService, LoggingService],
148	},
149	{ provide: NetworkService, useClass: FetchNetworkService },
150	],
151	exports: [NetworkService],
152	})
153	export class NetworkModule {}	106✔

safe-global / safe-client-gateway / 14832449887

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous