Refactor procedure timeout

Refs: #1936 Refs: #1958
metarhia · Feb 6, 2024 · 93f9527 · 93f9527
1 parent 294e8b0
commit 93f9527
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/lib/procedure.js b/lib/procedure.js
@@ -67,17 +67,9 @@ class Procedure {
       if (!valid) return new Error('Invalid parameters type: ' + problems);
     }
     if (validate) await validate(args);
-    let result;
-    if (timeout) {
-      const ac = new AbortController();
-      result = await Promise.race([
-        metarhia.metautil.timeout(timeout, ac.signal),
-        method(args),
-      ]);
-      ac.abort();
-    } else {
-      result = await method(args);
-    }
+    let promise = method(args);
+    if (timeout) promise = metarhia.metautil.timeoutify(promise, timeout);
+    let result = await promise;
     if (metarhia.metautil.isError(result)) {
       if (result instanceof DomainError) result = result.toError(errors);
       return result;