Worker task execution timeout (global)

The setting server.workers.timeout in application configuration is required but allows zero value to switch off the limit. Closes: #1950 Co-authored-by: Timur Shemsedinov <[email protected]> PR-URL: #1951
metarhia · Dec 19, 2023 · 1fd89f6 · 1fd89f6
1 parent cf552d5
commit 1fd89f6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Unreleased][unreleased]
 
 - Fixed API endpoints local queue settings applying
+- Worker task execution global timeout implementation
 - Reimplement global timeouts.request usage during a Procedure invocation
 
 ## [3.0.13][] - 2023-10-22

diff --git a/lib/worker.js b/lib/worker.js
@@ -50,15 +50,26 @@ const handlers = {
 
   invoke: async ({ exclusive, data, port }) => {
     const { method, args } = data;
-    const { sandbox } = application;
+    const { sandbox, config } = application;
     const handler = metarhia.metautil.namespaceByPath(sandbox, method);
     if (!handler) {
       const error = new Error('Handler not found');
       return void port.postMessage({ name: 'error', error });
     }
     const msg = { name: 'invoke', status: 'done' };
+    const { timeout } = config.server.workers;
     try {
-      const result = await handler(args);
+      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);
+      }
       port.postMessage({ ...msg, data: result });
     } catch (error) {
       port.postMessage({ name: 'error', error });