Merge pull request #5 from knopki/fix-dont-wait-timeout

fix: don't wait stale timeout
roxiness · Oct 1, 2020 · f79c3e6 · f79c3e6
2 parents 2f4af03 + 6dacc54
commit f79c3e6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ssr.js b/ssr.js
@@ -65,12 +65,16 @@ module.exports.ssr = async function ssr(template, script, url, options) {
 
             if (eventName) {
                 dom.window.addEventListener(eventName, resolveHtml)
-                setTimeout(() => {
+                const eventTimeout = setTimeout(() => {
                     if (dom.window._document) {
                         console.log(`${url} timedout after ${timeout} ms`);
                         resolveHtml()
                     }
                 }, timeout)
+                dom.window.addEventListener(
+                    eventName,
+                    () => clearTimeout(eventTimeout)
+                )
             }
             await beforeEval(dom)
             if (meta) setMeta(dom, meta)