fix: Added timeout for browserWS connection

orkestral · Nov 21, 2020 · 1b28832 · 1b28832
1 parent 35a5898
commit 1b28832
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/src/controllers/browser.ts b/src/controllers/browser.ts
@@ -136,16 +136,28 @@ export async function initBrowser(
 
   let browser = null;
   if (options.browserWS && options.browserWS != '') {
-    await puppeteer
-      .connect({
-        browserWSEndpoint: options.browserWS,
-      })
-      .then((e) => {
-        browser = e;
-      })
-      .catch(() => {
+    const checkConnection = new Promise(async (resolve) => {
+      const timeout = setTimeout(() => {
         browser = 'connect';
-      });
+        resolve();
+      }, 10000);
+
+      puppeteer
+        .connect({
+          browserWSEndpoint: options.browserWS,
+        })
+        .then((e) => {
+          browser = e;
+        })
+        .catch(() => {
+          browser = 'connect';
+        })
+        .finally(() => {
+          clearTimeout(timeout);
+          resolve();
+        });
+    });
+    await checkConnection;
   } else {
     await puppeteer
       .launch({