@skrillex1224/playwright-toolkit 2.1.219 → 2.1.220

package/dist/index.js

@@ -412,6 +412,7 @@ function createInternalLogger(moduleName, explicitLogger) {
     },
     warning(message) {
       baseLogger.warning(message);
+      a;
     },
     info(message) {
       baseLogger.info(message);
@@ -657,9 +658,9 @@ var resolveResourceTypeMeta = (domain) => {
   if (!byType || byType.size === 0) {
     return { resourceType: "", resourceTypeCounts: void 0 };
   }
-  const entries = Array.from(byType.entries()).filter(([type, count]) => type && Number(count) > 0).sort((a, b) => {
-    if (Number(b[1]) !== Number(a[1])) return Number(b[1]) - Number(a[1]);
-    return String(a[0]).localeCompare(String(b[0]));
+  const entries = Array.from(byType.entries()).filter(([type, count]) => type && Number(count) > 0).sort((a2, b) => {
+    if (Number(b[1]) !== Number(a2[1])) return Number(b[1]) - Number(a2[1]);
+    return String(a2[0]).localeCompare(String(b[0]));
   });
   if (entries.length === 0) {
     return { resourceType: "", resourceTypeCounts: void 0 };
@@ -749,10 +750,10 @@ var normalizeDomainRows = (hosts) => {
       resourceTypeCounts: resourceTypeMeta.resourceTypeCounts || void 0
     });
   }
-  rows.sort((a, b) => {
-    if (b.totalBytes !== a.totalBytes) return b.totalBytes - a.totalBytes;
-    if (b.requests !== a.requests) return b.requests - a.requests;
-    return String(a.domain).localeCompare(String(b.domain));
+  rows.sort((a2, b) => {
+    if (b.totalBytes !== a2.totalBytes) return b.totalBytes - a2.totalBytes;
+    if (b.requests !== a2.requests) return b.requests - a2.requests;
+    return String(a2.domain).localeCompare(String(b.domain));
   });
   return {
     topDomains: rows.slice(0, MAX_TOP_DOMAINS),
@@ -2973,9 +2974,17 @@ var DEFAULT_BYTEDANCE_CAPTCHA_OPTIONS = Object.freeze({
   actionVisibleTimeoutMs: 1500,
   sourceImageVisibleTimeoutMs: 3e3,
   challengeReadyTimeoutMs: 15e3,
+  challengeReadyRefreshTimeoutMs: 2e4,
   challengeReadyPollMs: 300,
   loadingIndicatorVisibleTimeoutMs: 200,
   loadingTexts: ["\u52A0\u8F7D\u4E2D", "\u52A0\u8F7D\u4E2D..."],
+  errorTexts: [
+    "\u68C0\u6D4B\u5230\u60A8\u7684\u7F51\u7EDC\u73AF\u5883\u8F83\u5DEE",
+    "\u7F51\u7EDC\u73AF\u5883\u8F83\u5DEE",
+    "\u8BF7\u66F4\u6362\u7F51\u7EDC\u6216\u8005\u7A0D\u540E\u518D\u8BD5",
+    "\u8BF7\u66F4\u6362\u7F51\u7EDC\u6216\u7A0D\u540E\u518D\u8BD5",
+    "\u7A0D\u540E\u518D\u8BD5"
+  ],
   recognitionDelayMs: 2e3,
   refreshWaitMs: 3e3,
   submitWaitMs: 3e3,
@@ -3142,6 +3151,7 @@ var isAnyCaptchaTextVisible = async (frame, texts, timeout) => {
 };
 var waitForCaptchaChallengeReady = async (page, frame, options) => {
   const deadline = Date.now() + options.challengeReadyTimeoutMs;
+  let refreshDeadline = Date.now() + options.challengeReadyRefreshTimeoutMs;
   let hasSeenLoading = false;
   while (Date.now() < deadline) {
     const isLoadingVisible = await isAnyCaptchaTextVisible(
@@ -3149,6 +3159,11 @@ var waitForCaptchaChallengeReady = async (page, frame, options) => {
       options.loadingTexts,
       options.loadingIndicatorVisibleTimeoutMs
     );
+    const hasErrorTextVisible = await isAnyCaptchaTextVisible(
+      frame,
+      options.errorTexts,
+      options.loadingIndicatorVisibleTimeoutMs
+    );
     hasSeenLoading = hasSeenLoading || isLoadingVisible;
     const sourceImages = frame.locator(options.sourceImageSelector);
     const imageCount = await sourceImages.count().catch(() => 0);
@@ -3157,6 +3172,20 @@ var waitForCaptchaChallengeReady = async (page, frame, options) => {
       logger9.info(hasSeenLoading ? "\u9A8C\u8BC1\u7801\u56FE\u7247\u5DF2\u52A0\u8F7D\u5B8C\u6210\u3002" : "\u9A8C\u8BC1\u7801\u56FE\u7247\u5DF2\u5C31\u7EEA\u3002");
       return;
     }
+    if (hasErrorTextVisible) {
+      logger9.warn("\u9A8C\u8BC1\u7801\u9762\u677F\u51FA\u73B0\u7F51\u7EDC\u5F02\u5E38\u6587\u6848\uFF0C\u5C1D\u8BD5\u7ACB\u5373\u5237\u65B0\u9898\u76EE\u3002");
+      await refreshCaptcha(page, frame, options);
+      refreshDeadline = Date.now() + options.challengeReadyRefreshTimeoutMs;
+      hasSeenLoading = false;
+      continue;
+    }
+    if (!hasVisibleSourceImage && Date.now() >= refreshDeadline) {
+      logger9.warn(`\u9A8C\u8BC1\u7801\u56FE\u7247\u8D85\u8FC7 ${options.challengeReadyRefreshTimeoutMs}ms \u4ECD\u672A\u51FA\u73B0\uFF0C\u5C1D\u8BD5\u5237\u65B0\u9898\u76EE\u3002`);
+      await refreshCaptcha(page, frame, options);
+      refreshDeadline = Date.now() + options.challengeReadyRefreshTimeoutMs;
+      hasSeenLoading = false;
+      continue;
+    }
     await page.waitForTimeout(options.challengeReadyPollMs);
   }
   throw new Error("Captcha challenge is still loading and did not become ready in time.");