@intuned/runtime-dev 1.3.14-ts-runtime-helpers-1 → 1.3.15-ts-helpers

package/dist/runtime/captcha.js

@@ -12,13 +12,14 @@ exports.waitForCaptchaSolve = waitForCaptchaSolve;
 exports.withWaitForCaptchaSolve = withWaitForCaptchaSolve;
 var _intunedExtensionServer = require("../common/extension/intunedExtensionServer");
 var _extensionsHelpers = require("../common/extension/extensionsHelpers");
+var _types = require("../common/extension/types");
 async function withWaitForCaptchaSolve(callback, options) {
   const {
     page,
     timeoutInMs = 10_000,
     settleDurationMs = 5_000,
     waitForNetworkSettled = true
-  } = options || {};
+  } = options;
   const extensionServer = (0, _intunedExtensionServer.getIntunedExtensionServer)();
   let settledResolve = null;
   let settledPromise = new Promise(resolve => {
@@ -26,8 +27,7 @@ async function withWaitForCaptchaSolve(callback, options) {
   });
   let isTimeout = false;
   let captchasAppeared = false;
-  let hasError = false;
-  let errorMessage = "";
+  let error = undefined;
   let actionDone = false;
   const getPendingCaptchas = async () => await extensionServer.getCaptchas(page, "solving");
   const hasNoPendingCaptchas = async () => !captchasAppeared || (await getPendingCaptchas()).length === 0;
@@ -43,9 +43,7 @@ async function withWaitForCaptchaSolve(callback, options) {
       captchasAppeared = true;
     }
     if (errorCaptchas.length > 0) {
-      hasError = true;
-      const err = errorCaptchas[0].error;
-      errorMessage = err?.code ?? "Unknown error during CAPTCHA solving.";
+      error = errorCaptchas[0].error;
       await maybeSettle();
       return;
     }
@@ -66,31 +64,27 @@ async function withWaitForCaptchaSolve(callback, options) {
     if (initialPending.length > 0) {
       captchasAppeared = true;
     }
-    const initialErrors = await extensionServer.getCaptchas(page, "error");
-    if (initialErrors.length > 0) {
-      hasError = true;
-      const err = initialErrors[0].error;
-      errorMessage = err?.code ?? "Unknown error during CAPTCHA solving.";
-    }
     const result = await callback(page);
     actionDone = true;
     if (waitForNetworkSettled) {
       try {
         await page.waitForLoadState("networkidle");
-      } catch (_) {}
+      } catch (err) {
+        console.error(`Failed to wait for networkidle. Error: ${err}`);
+      }
     }
     await maybeSettle();
     let shouldContinue = true;
     while (shouldContinue) {
       await Promise.race([settledPromise, timeoutPromise]);
       await new Promise(r => setTimeout(r, settleDurationMs));
-      if (hasError) {
-        throw new Error(`CAPTCHA Solve Error: ${errorMessage}`);
+      if (error) {
+        throw new _types.CaptchaSolveError(`CAPTCHA Solve Error: ${error.code}`, error);
       }
       const noPendingCaptchas = await hasNoPendingCaptchas();
       if (actionDone && noPendingCaptchas || isTimeout) {
         if (isTimeout && !noPendingCaptchas) {
-          throw new Error("CAPTCHA Solve timed out with pending captchas.");
+          throw new _types.TimeoutError("CAPTCHA Solve timed out with pending captchas.");
         }
         shouldContinue = false;
       } else {
@@ -106,12 +100,12 @@ async function withWaitForCaptchaSolve(callback, options) {
 }
 async function waitForCaptchaSolve(page, {
   timeoutInMs = 10_000,
-  settlePeriodInMs = 5_000
+  settleDurationMs = 5_000
 } = {}) {
   await withWaitForCaptchaSolve(async () => undefined, {
     page,
     timeoutInMs,
-    settleDurationMs: settlePeriodInMs,
+    settleDurationMs,
     waitForNetworkSettled: false
   });
 }
@@ -121,19 +115,12 @@ async function removeCaptchaEventListener(page, status, f) {
 }
 async function onCaptchaEvent(page, status, f) {
   const extensionServer = (0, _intunedExtensionServer.getIntunedExtensionServer)();
-  const wrapper = async captcha => {
-    if (captcha.status === status) {
-      await f(captcha);
-    }
-  };
-  await extensionServer.subscribe(page, wrapper, status);
+  await extensionServer.subscribe(page, f, status);
 }
 async function onceCaptchaEvent(page, status, f) {
   const extensionServer = (0, _intunedExtensionServer.getIntunedExtensionServer)();
   const oneTimeHandler = async captcha => {
-    if (captcha.status === status) {
-      await extensionServer.unsubscribe(page, oneTimeHandler, status);
-    }
+    await extensionServer.unsubscribe(page, oneTimeHandler, status);
     await f(captcha);
   };
   await extensionServer.subscribe(page, oneTimeHandler, status);