Optimize timeout for invoke

PR-URL: #1958
metarhia · Feb 5, 2024 · b8d83ea · b8d83ea
1 parent a2a7ad0
commit b8d83ea
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/lib/worker.js b/lib/worker.js
@@ -69,17 +69,9 @@ const handlers = {
       return void parentPort.postMessage({ ...msg, data });
     }
     try {
-      let result;
-      if (timeout) {
-        const ac = new AbortController();
-        result = await Promise.race([
-          metarhia.metautil.timeout(timeout, ac.signal),
-          handler(args),
-        ]);
-        ac.abort();
-      } else {
-        result = await handler(args);
-      }
+      let promise = handler(args);
+      if (timeout) promise = metarhia.metautil.timeoutify(promise, timeout);
+      const result = await promise;
       const data = { id, status: 'done', result };
       parentPort.postMessage({ ...msg, data });
     } catch (err) {