@skrillex1224/playwright-toolkit 2.1.260 → 2.1.262

package/dist/index.js

@@ -9039,7 +9039,7 @@ var Share = {
    * @param {import('playwright').Page} page
    * @param {Object} [options]
    * @param {{ mode?: 'dom' | 'response' | 'custom', prefix: string, xurl?: Array<string | string[]> }} options.share
-   * @param {number} [options.timeoutMs=50000]
+   * @param {number} [options.timeoutMs=50000] 传 0 表示关闭超时，直到捕获成功或 signal.abort()
    * @param {number} [options.payloadSnapshotMaxLen=500]
    * @param {string | string[]} [options.domSelectors='html']
    * @param {'added' | 'changed' | 'all'} [options.domMode='all']
@@ -9048,7 +9048,8 @@ var Share = {
    */
   async captureLink(page, options = {}) {
     const share = normalizeShare(options.share);
-    const timeoutMs = Math.max(0, Number(options.timeoutMs ?? DEFAULT_TIMEOUT_MS2) || 0);
+    const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
+    const timeoutDisabled = timeoutMs === 0;
     const payloadSnapshotMaxLen = options.payloadSnapshotMaxLen ?? DEFAULT_PAYLOAD_SNAPSHOT_MAX_LEN;
     const domSelectors = options.domSelectors ?? "html";
     const domMode = options.domMode ?? Mutation.Mode.All;
@@ -9072,7 +9073,7 @@ var Share = {
     if (share.mode === "response" && apiMatchers.length === 0) {
       throw new Error("Share.captureLink requires share.xurl[0] api matcher when mode=response");
     }
-    logger15.start("captureLink", `mode=${share.mode}, timeoutMs=${timeoutMs}, prefix=${share.prefix}`);
+    logger15.start("captureLink", `mode=${share.mode}, timeoutMs=${timeoutDisabled ? "disabled" : timeoutMs}, prefix=${share.prefix}`);
     logger15.info(`captureLink \u914D\u7F6E: xurl=${toJsonInline(share.xurl)}, domMode=${domMode}, domSelectors=${toJsonInline(domSelectors, 120)}`);
     const stats = {
       actionTimedOut: false,
@@ -9200,19 +9201,21 @@ var Share = {
     if (share.mode === "custom") {
       logger15.info("\u5F53\u524D\u4E3A custom \u6A21\u5F0F\uFF0C\u5C06\u4F7F\u7528 performActions \u8FD4\u56DE\u503C");
     }
-    const deadline = Date.now() + timeoutMs;
-    const getRemainingMs = () => Math.max(0, deadline - Date.now());
+    const deadline = timeoutDisabled ? Infinity : Date.now() + timeoutMs;
+    const getRemainingMs = () => timeoutDisabled ? Infinity : Math.max(0, deadline - Date.now());
     try {
       const actionTimeout = getRemainingMs();
-      logger15.start("captureLink.performActions", `\u6267\u884C\u52A8\u4F5C\u9884\u7B97=${actionTimeout}ms`);
+      logger15.start("captureLink.performActions", `\u6267\u884C\u52A8\u4F5C\u9884\u7B97=${timeoutDisabled ? "disabled" : `${actionTimeout}ms`}`);
       let actionValue;
       if (!isAborted() && actionTimeout > 0) {
         let timer = null;
         const actionPromise = Promise.resolve().then(() => performActions()).then((result) => ({ type: "done", result })).catch((error) => ({ type: "error", error }));
-        const timeoutPromise = new Promise((resolve) => {
-          timer = setTimeout(() => resolve({ type: "timeout" }), actionTimeout);
-        });
-        const actionResult = await Promise.race([actionPromise, timeoutPromise]);
+        const actionResult = timeoutDisabled ? await actionPromise : await Promise.race([
+          actionPromise,
+          new Promise((resolve) => {
+            timer = setTimeout(() => resolve({ type: "timeout" }), actionTimeout);
+          })
+        ]);
         if (timer) clearTimeout(timer);
         if (actionResult.type === "error") {
           logger15.fail("captureLink.performActions", actionResult.error);
@@ -9262,19 +9265,19 @@ var Share = {
         const now = Date.now();
         if (now >= nextProgressLogTs) {
           logger15.info(
-            `captureLink \u7B49\u5F85\u4E2D: remaining=${remaining}ms, domMutationCount=${stats.domMutationCount}, responseMatched=${stats.responseMatched}`
+            `captureLink \u7B49\u5F85\u4E2D: remaining=${timeoutDisabled ? "disabled" : `${remaining}ms`}, domMutationCount=${stats.domMutationCount}, responseMatched=${stats.responseMatched}`
           );
           nextProgressLogTs = now + 5e3;
         }
         await delay4(Math.max(0, Math.min(DEFAULT_POLL_INTERVAL_MS, remaining)));
       }
-      if (share.mode === "response" && stats.responseMatched === 0) {
+      if (!timeoutDisabled && share.mode === "response" && stats.responseMatched === 0) {
         logger15.warning(
           `\u63A5\u53E3\u76D1\u542C\u672A\u547D\u4E2D: apiMatchers=${toJsonInline(apiMatchers, 220)}, \u54CD\u5E94\u6837\u672CURLs=${toJsonInline(stats.responseSampleUrls, 420)}`
         );
       }
       logger15.warning(
-        `captureLink \u8D85\u65F6\u672A\u62FF\u5230\u94FE\u63A5: mode=${share.mode}, actionTimedOut=${stats.actionTimedOut}, domMutationCount=${stats.domMutationCount}, responseObserved=${stats.responseObserved}, responseMatched=${stats.responseMatched}, lastMatchedUrl=${stats.lastMatchedUrl || "none"}`
+        `captureLink ${timeoutDisabled ? "\u672A\u62FF\u5230\u94FE\u63A5" : "\u8D85\u65F6\u672A\u62FF\u5230\u94FE\u63A5"}: mode=${share.mode}, actionTimedOut=${stats.actionTimedOut}, domMutationCount=${stats.domMutationCount}, responseObserved=${stats.responseObserved}, responseMatched=${stats.responseMatched}, lastMatchedUrl=${stats.lastMatchedUrl || "none"}`
       );
       return {
         link: null,