Merge pull request #727 from GuillaumeGomez/handle-execution-context-destroyed

Handle "execution context was destroyed" errors in changing page waiter

Author: GuillaumeGomez

src/index.js

@@ -175,7 +175,8 @@ async function runInstruction(loadedInstruction, pages, extras) {
         return;
     } catch (err) { // execution error
         if (err.message && err.message.indexOf
-            && err.message.indexOf('Execution context was destroyed') === 0) {
+            && err.message.indexOf('Execution context was destroyed') === 0
+        ) {
             // Puppeteer error so this time we wait until the document is ready before trying
             // again.
             await pages[0].waitForFunction('document.readyState === "complete"');

src/utils.js

@@ -206,11 +206,21 @@ async function waitForConditionTrue(pages, callback) {
 
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        if (await callback()) {
-            return true;
-        }
-        if (timeLimit === 0) {
-            continue;
+        try {
+            if (await callback()) {
+                return true;
+            }
+            if (timeLimit === 0) {
+                continue;
+            }
+        } catch (err) {
+            if (err.message && err.message.indexOf
+                && err.message.indexOf('Execution context was destroyed') === 0
+            ) {
+                // "All good", we continue to wait.
+            } else {
+                throw err;
+            }
         }
         allTime += timeAdd;
         if (allTime >= timeLimit) {