@skrillex1224/playwright-toolkit 3.0.53 → 3.0.55

package/dist/index.js

@@ -6754,11 +6754,14 @@ var DEFAULT_QBOT_PAGE_OPTIONS = Object.freeze({
   formVisibleTimeoutMs: 1e4,
   imageVisibleTimeoutMs: 1e4,
   extraVisibleTimeoutMs: 5e3,
+  payloadReadyTimeoutMs: 1e4,
+  payloadPollIntervalMs: 200,
   vcSelector: "#vc",
   vcValueTimeoutMs: 8e3,
   submitLoadTimeoutMs: 3e4,
   coordinateBaseWidth: QBOT_IMAGE_BASE_WIDTH,
   coordinateBaseHeight: QBOT_IMAGE_BASE_HEIGHT,
+  coordinateYOffsetPx: -10,
   clickIntervalMs: 250,
   refreshVisibleTimeoutMs: 1e3,
   refreshWaitMs: 1e3,
@@ -6773,6 +6776,7 @@ var parseQbotCaptchaCoordinates = (value = "") => String(value || "").split("|")
   const [x, y] = pair.split(",").map(Number);
   return Number.isFinite(x) && Number.isFinite(y) ? { x, y } : null;
 }).filter(Boolean);
+var normalizeQbotCaptchaExtraPayload = (extra = []) => Array.isArray(extra) ? extra.join(",") : String(extra || "");
 async function solveQbotCaptcha(image, extra = [], token, options = {}, dependencies = {}) {
   const { callCaptchaRecognitionApi: callCaptchaRecognitionApi2 } = dependencies;
   if (!token) {
@@ -6786,20 +6790,29 @@ async function solveQbotCaptcha(image, extra = [], token, options = {}, dependen
     token,
     type: QBOT_CAPTCHA_TYPE,
     image,
-    extra
+    extra: normalizeQbotCaptchaExtraPayload(extra)
   });
   return response?.data?.data ?? response?.data;
 }
 var readQbotCaptcha = async (page, config) => {
   const imageLocator = page.locator(config.imageSelector).first();
   await imageLocator.waitFor({ state: "visible", timeout: config.imageVisibleTimeoutMs });
-  const image = normalizeQbotCaptchaImage(await imageLocator.getAttribute("src"));
+  const extraLocator = page.locator(config.extraSelector).first();
+  await extraLocator.waitFor({ state: "visible", timeout: config.extraVisibleTimeoutMs });
+  const deadline = Date.now() + config.payloadReadyTimeoutMs;
+  let image = "";
+  let extra = [];
+  while (Date.now() <= deadline) {
+    image = normalizeQbotCaptchaImage(await imageLocator.getAttribute("src"));
+    extra = extractQbotCaptchaExtra(await extraLocator.textContent());
+    if (image && extra.length > 0) {
+      return { imageLocator, image, extra };
+    }
+    await page.waitForTimeout(config.payloadPollIntervalMs);
+  }
   if (!image) {
     throw new Error("[Captcha] qbot \u9A8C\u8BC1\u7801\u56FE\u7247\u4E3A\u7A7A\u3002");
   }
-  const extraLocator = page.locator(config.extraSelector).first();
-  await extraLocator.waitFor({ state: "visible", timeout: config.extraVisibleTimeoutMs });
-  const extra = extractQbotCaptchaExtra(await extraLocator.textContent());
   if (extra.length === 0) {
     throw new Error("[Captcha] qbot \u9A8C\u8BC1\u7801 extra \u4E3A\u7A7A\u3002");
   }
@@ -6815,7 +6828,7 @@ var clickQbotPoints = async (page, imageLocator, coordinates, config, deviceInpu
   for (const point of coordinates) {
     await deviceInput.clickPoint(page, {
       x: box.x + point.x * scaleX,
-      y: box.y + point.y * scaleY
+      y: box.y + point.y * scaleY + config.coordinateYOffsetPx
     }, config);
     if (config.clickIntervalMs > 0) {
       await page.waitForTimeout(config.clickIntervalMs);