Cancel timer on rejection in wait.js

crawler.js

@@ -298,7 +298,7 @@ async function crawl(url, options) {
     );
     // Create a new incognito browser context.
     const context = options.browserContext || await browser.createIncognitoBrowserContext();
-    if (!options.browserContext) {
+    if (browser) {
         // Close non-incognito window
         context.once(
             'targetcreated',

helpers/wait.d.ts

@@ -1,7 +1,8 @@
 export = wait;
 /**
- * @param {Promise<any>} promise
+ * @template T
+ * @param {Promise<T>} promise
  * @param {number} maxMs max running time, 0 to disable timeout
- * @returns {Promise<any>}
+ * @returns {Promise<T>}
  */
-declare function wait(promise: Promise<any>, maxMs: number): Promise<any>;
+declare function wait<T>(promise: Promise<T>, maxMs: number): Promise<T>;

helpers/wait.js

@@ -1,19 +1,20 @@
 /**
- * @param {Promise<any>} promise
+ * @template T
+ * @param {Promise<T>} promise
  * @param {number} maxMs max running time, 0 to disable timeout
- * @returns {Promise<any>}
+ * @returns {Promise<T>}
  */
 function wait(promise, maxMs) {
     if (!maxMs) {return promise;}
     return new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
-            reject(new Error('Operation timed out'));
-        }, maxMs);
-
-        promise.then(result => {
-            clearTimeout(timeout);
-            resolve(result);
-        }).catch(e => reject(e));
+        const timeout = setTimeout(
+            () => reject(new Error("Operation timed out")),
+            maxMs
+        );
+        promise
+            .finally(() => clearTimeout(timeout))
+            .then(resolve)
+            .catch(reject);
     });
 }