@skrillex1224/playwright-toolkit 2.1.238 → 2.1.240

package/dist/index.js

@@ -56,7 +56,7 @@ var createActorInfo = (info) => {
   const normalizeShare2 = (value) => {
     const raw = value && typeof value === "object" ? value : {};
     const modeRaw = String(raw.mode || "dom").trim().toLowerCase();
-    const mode = modeRaw === "response" ? "response" : "dom";
+    const mode = ["dom", "response", "custom"].includes(modeRaw) ? modeRaw : "dom";
     const prefix = String(raw.prefix || "").trim();
     const rawXurl = Array.isArray(raw.xurl) ? raw.xurl : [];
     const normalizeMatcherList = (input) => {
@@ -213,7 +213,7 @@ var ActorInfo = {
     path: "/",
     device: Device.Mobile,
     share: {
-      mode: "dom",
+      mode: "custom",
       prefix: "",
       xurl: []
     }
@@ -8339,7 +8339,7 @@ var normalizeXurl = (value) => {
 var normalizeShare = (share) => {
   const source = share && typeof share === "object" ? share : {};
   const modeRaw = String(source.mode || "dom").trim().toLowerCase();
-  const mode = modeRaw === "response" ? "response" : "dom";
+  const mode = ["dom", "response", "custom"].includes(modeRaw) ? modeRaw : "dom";
   return {
     mode,
     prefix: normalizePrefix(source.prefix),
@@ -8455,16 +8455,17 @@ var Share = {
    * 捕获分享链接（单模式）
    * - mode='dom': 仅 DOM 监听
    * - mode='response': 仅接口监听
+   * - mode='custom': 使用 performActions 返回值作为链接
    *
    * @param {import('playwright').Page} page
    * @param {Object} [options]
-   * @param {{ mode?: 'dom' | 'response', prefix: string, xurl?: Array<string | string[]> }} options.share
+   * @param {{ mode?: 'dom' | 'response' | 'custom', prefix: string, xurl?: Array<string | string[]> }} options.share
    * @param {number} [options.timeoutMs=50000]
    * @param {number} [options.payloadSnapshotMaxLen=500]
    * @param {string | string[]} [options.domSelectors='html']
    * @param {'added' | 'changed' | 'all'} [options.domMode='all']
-   * @param {() => Promise<void>} [options.performActions]
-   * @returns {Promise<{ link: string | null; payloadText: string; payloadSnapshot: string; source: 'dom' | 'response' | 'none' }>}
+   * @param {() => void | string | { link?: string | null; payloadText?: string } | Promise<void | string | { link?: string | null; payloadText?: string }>} [options.performActions]
+   * @returns {Promise<{ link: string | null; payloadText: string; payloadSnapshot: string; source: 'dom' | 'response' | 'custom' | 'none' }>}
    */
   async captureLink(page, options = {}) {
     const share = normalizeShare(options.share);
@@ -8477,7 +8478,7 @@ var Share = {
     if (share.prefix === void 0) {
       throw new Error("Share.captureLink requires options.share.prefix");
     }
-    if (share.mode !== "dom" && share.mode !== "response") {
+    if (share.mode !== "dom" && share.mode !== "response" && share.mode !== "custom") {
       throw new Error(`Share.captureLink unsupported share.mode: ${share.mode}`);
     }
     const apiMatchers = share.mode === "response" ? share.xurl[0] || [] : [];
@@ -8499,7 +8500,8 @@ var Share = {
     };
     const candidates = {
       dom: null,
-      response: null
+      response: null,
+      custom: null
     };
     const setCandidate = (source, link, payloadText = "") => {
       const safe = String(link || "").trim();
@@ -8599,37 +8601,47 @@ var Share = {
       logger15.info(`\u5F53\u524D\u4E3A\u63A5\u53E3\u6A21\u5F0F\uFF0C\u6302\u8F7D response \u76D1\u542C: apiMatchers=${toJsonInline(apiMatchers, 160)}`);
       page.on("response", onResponse);
     }
+    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());
     try {
       const actionTimeout = getRemainingMs();
       logger15.start("captureLink.performActions", `\u6267\u884C\u52A8\u4F5C\u9884\u7B97=${actionTimeout}ms`);
+      let actionValue;
       if (actionTimeout > 0) {
         let timer = null;
-        let actionError = null;
-        const actionPromise = Promise.resolve().then(() => performActions()).then(() => "__ACTION_DONE__").catch((error) => {
-          actionError = error;
-          return "__ACTION_ERROR__";
-        });
+        const actionPromise = Promise.resolve().then(() => performActions()).then((result) => ({ type: "done", result })).catch((error) => ({ type: "error", error }));
         const timeoutPromise = new Promise((resolve) => {
-          timer = setTimeout(() => resolve("__ACTION_TIMEOUT__"), actionTimeout);
+          timer = setTimeout(() => resolve({ type: "timeout" }), actionTimeout);
         });
         const actionResult = await Promise.race([actionPromise, timeoutPromise]);
         if (timer) clearTimeout(timer);
-        if (actionResult === "__ACTION_ERROR__") {
-          logger15.fail("captureLink.performActions", actionError);
-          throw actionError;
+        if (actionResult.type === "error") {
+          logger15.fail("captureLink.performActions", actionResult.error);
+          throw actionResult.error;
         }
-        if (actionResult === "__ACTION_TIMEOUT__") {
+        if (actionResult.type === "timeout") {
           stats.actionTimedOut = true;
           logger15.warning(`performActions \u5DF2\u8D85\u65F6 (${actionTimeout}ms)\uFF0C\u52A8\u4F5C\u53EF\u80FD\u4ECD\u5728\u5F02\u6B65\u6267\u884C`);
         } else {
+          actionValue = actionResult.result;
           logger15.success("captureLink.performActions", "\u6267\u884C\u52A8\u4F5C\u5B8C\u6210");
         }
       }
+      if (share.mode === "custom") {
+        const customLink = typeof actionValue === "string" ? actionValue : actionValue?.link || actionValue?.payloadText;
+        const customPayloadText = typeof actionValue === "string" ? actionValue : actionValue?.payloadText;
+        if (setCandidate("custom", customLink, customPayloadText)) {
+          logger15.success("captureLink.customResult", `custom \u547D\u4E2D\u5206\u4EAB\u94FE\u63A5: link=${candidates.custom.link}`);
+        } else {
+          logger15.warning("performActions \u6267\u884C\u5B8C\u6210\u4F46\u672A\u8FD4\u56DE\u6709\u6548\u5206\u4EAB\u94FE\u63A5");
+        }
+      }
       let nextProgressLogTs = Date.now() + 3e3;
       while (true) {
-        const selected = share.mode === "dom" ? candidates.dom : candidates.response;
+        const selected = candidates[share.mode];
         if (selected?.link) {
           logger15.success("captureLink", `\u6355\u83B7\u6210\u529F: source=${share.mode}, link=${selected.link}`);
           return {
@@ -8639,6 +8651,7 @@ var Share = {
             source: share.mode
           };
         }
+        if (share.mode === "custom") break;
         const remaining = getRemainingMs();
         if (remaining <= 0) break;
         const now = Date.now();