fix(mutex): support per-call-site acquire timeouts (renovatebot#41259)

fix(mutex): Support per-call-site acquire timeouts

Closes renovatebot#41210

Author: zharinov

lib/modules/datasource/crate/index.ts

@@ -338,7 +338,14 @@ export class CrateDatasource extends Datasource {
       const cacheKey = `crate-datasource/registry-clone-path/${registryFetchUrl}`;
       const lockKey = registryFetchUrl;
 
-      const releaseLock = await acquireLock(lockKey, 'crate-registry');
+      const executionTimeout =
+        GlobalConfig.get('executionTimeout', 15) * 60 * 1000;
+      const gitTimeout = GlobalConfig.get('gitTimeout', executionTimeout);
+      const releaseLock = await acquireLock(
+        lockKey,
+        'crate-registry',
+        gitTimeout,
+      );
       try {
         const cached = memCache.get<CloneResult>(cacheKey);
 

lib/util/http/http.ts

@@ -159,7 +159,8 @@ export abstract class HttpBase<
       throw new Error(HOST_DISABLED);
     }
     options = applyAuthorization(options);
-    options.timeout ??= 60000;
+    const timeout = options.timeout ?? 60000;
+    options.timeout = timeout;
 
     let cacheProvider: HttpCacheProvider | undefined;
     if (isReadMethod && options.cacheProvider) {
@@ -205,6 +206,7 @@ export abstract class HttpBase<
           releaseLock = await acquireLock(
             `${options.method} ${url}`,
             'http-mutex',
+            timeout * 2,
           );
         }
         try {

lib/util/http/types.ts

@@ -25,6 +25,7 @@ export type GotStreamOptions = Options & GotExtraOptions;
 export interface GotExtraOptions {
   abortOnError?: boolean;
   abortIgnoreStatusCodes?: number[];
+  timeout?: number;
   token?: string;
   hostType?: string;
   enabled?: boolean;

lib/util/mutex.ts

@@ -1,7 +1,8 @@
 import { Mutex, type MutexInterface, withTimeout } from 'async-mutex';
 
 const DEFAULT_NAMESPACE = 'default';
-let mutexes: Record<string, Record<string, MutexInterface>> = {};
+const DEFAULT_TIMEOUT_MS = 2 * 60 * 1000;
+let mutexes: Record<string, Record<string, Mutex>> = {};
 
 export function initMutexes(): void {
   mutexes = {};
@@ -10,16 +11,16 @@ export function initMutexes(): void {
 export function getMutex(
   key: string,
   namespace: string = DEFAULT_NAMESPACE,
-): MutexInterface {
+): Mutex {
   mutexes[namespace] ??= {};
-  // create a new mutex if it doesn't exist with a timeout of 2 minutes
-  mutexes[namespace][key] ??= withTimeout(new Mutex(), 1000 * 60 * 2);
+  mutexes[namespace][key] ??= new Mutex();
   return mutexes[namespace][key];
 }
 
 export function acquireLock(
   key: string,
   namespace: string = DEFAULT_NAMESPACE,
+  timeoutMs: number = DEFAULT_TIMEOUT_MS,
 ): Promise<MutexInterface.Releaser> {
-  return getMutex(key, namespace).acquire();
+  return withTimeout(getMutex(key, namespace), timeoutMs).acquire();
 }