rewrite timeout feature for node <10

netlify · Feb 13, 2019 · 2ef8382 · 2ef8382
1 parent c562d7c
commit 2ef8382
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/lib/serve.js b/lib/serve.js
@@ -136,19 +136,26 @@ function createHandler(dir, static, timeout) {
       callback
     );
 
-    var invocationTimeoutRef = null
-    
+    var invocationTimeoutRef = null;
+
     Promise.race([
       promiseCallback(promise, callback),
       new Promise(function(resolve) {
         invocationTimeoutRef = setTimeout(function() {
-          handleInvocationTimeout(response, timeout)
-          resolve()
-        }, timeout * 1000)
+          handleInvocationTimeout(response, timeout);
+          resolve();
+        }, timeout * 1000);
       })
-    ]).finally(() => {
-      clearTimeout(invocationTimeoutRef)
-    })
+    ]).then(
+      result => {
+        clearTimeout(invocationTimeoutRef);
+        return result; // not used, but writing this to avoid future footguns
+      },
+      err => {
+        clearTimeout(invocationTimeoutRef);
+        throw err;
+      }
+    );
   };
 }