@weapp-vite/miniprogram-automator 1.2.8 → 1.2.10

package/dist/index.d.mts

@@ -93,6 +93,7 @@ interface IElementOptions {
   nodeId?: string;
   videoId?: string;
   pageId: number;
+  routeFallback?: boolean;
   tagName: string;
 }
 /** ITouch 的类型定义。 */
@@ -268,6 +269,8 @@ declare class Page {
   renderedNodes(selector: string, options?: PageQueryOptions): Promise<RenderedNodeSnapshot[]>;
   renderedSelectorNodes(selectors: string[], options?: PageQueryOptions): Promise<RenderedSelectorNodesSnapshot>;
   waitForRendered(options?: PageRenderedOptions): Promise<any>;
+  private readDirectRenderedNode;
+  private findDirectRenderedElement;
   data(path?: string, options?: PageDataOptions): Promise<any>;
   private readRouteData;
   setData(data: any): Promise<void>;

package/dist/index.mjs

@@ -358,7 +358,8 @@ var Element = class Element {
 		const existing = elementMap.get(options.elementId);
 		if (existing) return existing;
 		let ElementCtor = Element;
-		if (options.nodeId) ElementCtor = CustomElement;
+		if (options.routeFallback) ElementCtor = RouteFallbackElement;
+		else if (options.nodeId) ElementCtor = CustomElement;
 		else switch (options.tagName) {
 			case "input":
 				ElementCtor = InputElement;
@@ -391,6 +392,33 @@ var Element = class Element {
 		return element;
 	}
 };
+/** App-Service 路由降级元素仅用于只读查询，不能伪装成交互协议元素。 */
+var RouteFallbackElement = class extends Element {
+	unsupported(method) {
+		throw new Error(`App-Service route fallback 元素不支持 ${method}`);
+	}
+	async tap() {
+		this.unsupported("Element.tap");
+	}
+	async longpress() {
+		this.unsupported("Element.longpress");
+	}
+	async trigger() {
+		this.unsupported("Element.triggerEvent");
+	}
+	async touchstart() {
+		this.unsupported("Element.touchstart");
+	}
+	async touchmove() {
+		this.unsupported("Element.touchmove");
+	}
+	async touchend() {
+		this.unsupported("Element.touchend");
+	}
+	async dispatchEvent() {
+		this.unsupported("Element.dispatchEvent");
+	}
+};
 /** CustomElement 的实现。 */
 var CustomElement = class extends Element {
 	async setData(data) {
@@ -612,7 +640,7 @@ var Connection = class Connection extends EventEmitter {
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-DpCZfswN.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-BRRvdL_K.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region src/launcher/portLease.ts
@@ -711,7 +739,7 @@ async function acquireAutomatorPortLease(preferredPort) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.8";
+var version = "1.2.10";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -778,10 +806,162 @@ function createRouteFallbackElement(connection, elementMap, pageId, selector, no
 	return Element.create(connection, {
 		elementId,
 		pageId,
+		routeFallback: true,
 		tagName: resolveFallbackTagName(selector)
 	}, elementMap);
 }
 //#endregion
+//#region src/pageRouteMethod.ts
+const PAGE_CALL_METHOD_FALLBACK_RETRIES$1 = 3;
+const PAGE_CALL_METHOD_FALLBACK_RETRY_DELAY$1 = 300;
+const ROUTE_METHOD_CALL_STORE = "__weappViteAutomatorMethodCalls__";
+function isProtocolTimeoutError$1(error) {
+	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.callFunction";
+}
+function isRouteMethodResult(value) {
+	return value !== null && typeof value === "object" && "__weappVitePageMethodFound" in value;
+}
+const ROUTE_METHOD_FUNCTION_DECLARATION = `function (route, query, method, args, callId, cleanupDelay) {
+  var pages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
+  var normalizedRoute = String(route || '').replace(/^\\/+/, '').replace(/\\/+$/g, '');
+  function matchesQuery(page, expectedQuery) {
+    if (!expectedQuery || !Object.keys(expectedQuery).length) {
+      return true;
+    }
+    var actualQuery = page && (page.options || page.query || {});
+    return Object.keys(expectedQuery).every(function (key) {
+      var actualValue = String(actualQuery[key] == null ? '' : actualQuery[key]);
+      var expectedValue = String(expectedQuery[key]);
+      var decodedActualValue = actualValue;
+      try {
+        decodedActualValue = decodeURIComponent(actualValue);
+      }
+      catch (_) {
+      }
+      return actualValue === expectedValue
+        || decodedActualValue === expectedValue
+      || actualValue === encodeURIComponent(expectedValue);
+    });
+  }
+  function resolvePage() {
+    for (var index = pages.length - 1; index >= 0; index -= 1) {
+      var page = pages[index];
+      var pageRoute = String(page.path || page.route || page.__route__ || '').replace(/^\\/+/, '').replace(/\\/+$/g, '');
+      if (pageRoute === normalizedRoute && matchesQuery(page, query) && typeof page[method] === 'function') {
+        return page;
+      }
+    }
+    for (var fallbackIndex = pages.length - 1; fallbackIndex >= 0; fallbackIndex -= 1) {
+      var fallbackPage = pages[fallbackIndex];
+      if (matchesQuery(fallbackPage, query) && typeof fallbackPage[method] === 'function') {
+        return fallbackPage;
+      }
+    }
+  }
+  var storeOwner;
+  if (typeof getApp === 'function') {
+    try {
+      storeOwner = getApp();
+    }
+    catch (_) {
+    }
+  }
+  var store = storeOwner && storeOwner[${JSON.stringify(ROUTE_METHOD_CALL_STORE)}];
+  if (store && store[callId]) {
+    return store[callId];
+  }
+  var targetPage = resolvePage();
+  if (!targetPage) {
+    return { __weappVitePageMethodFound: false };
+  }
+  if (!storeOwner || (typeof storeOwner !== 'object' && typeof storeOwner !== 'function')) {
+    storeOwner = targetPage;
+  }
+  store = storeOwner[${JSON.stringify(ROUTE_METHOD_CALL_STORE)}];
+  if (!store || typeof store !== 'object') {
+    store = {};
+    storeOwner[${JSON.stringify(ROUTE_METHOD_CALL_STORE)}] = store;
+  }
+  if (store[callId]) {
+    return store[callId];
+  }
+  var result = {
+    __weappVitePageMethodFound: true,
+    status: 'pending'
+  };
+  store[callId] = result;
+  setTimeout(function () {
+    delete store[callId];
+  }, cleanupDelay);
+  try {
+    var value = targetPage[method].apply(targetPage, args || []);
+    if (value && typeof value.then === 'function') {
+      value.then(function (resolvedValue) {
+        result.status = 'fulfilled';
+        result.value = resolvedValue;
+      }, function (error) {
+        result.status = 'rejected';
+        result.error = error && error.message ? String(error.message) : String(error);
+      });
+    }
+    else {
+      result.status = 'fulfilled';
+      result.value = value;
+    }
+  }
+  catch (error) {
+    result.status = 'rejected';
+    result.error = error && error.message ? String(error.message) : String(error);
+  }
+  return result;
+}`;
+/** 通过 AppService 调用页面方法，并兼容 DevTools 不等待 Promise 结果的行为。 */
+async function callRouteMethodViaAppService(connection, route, query, method, args, timeout) {
+	const callId = uuid();
+	const cleanupDelay = timeout + 5e3;
+	const maxPendingPolls = Math.max(1, Math.ceil(timeout / PAGE_CALL_METHOD_FALLBACK_RETRY_DELAY$1));
+	let pendingPolls = 0;
+	let protocolFailures = 0;
+	let unavailableReads = 0;
+	let latestResult;
+	while (true) {
+		let fallbackResult;
+		try {
+			fallbackResult = (await connection.send("App.callFunction", {
+				functionDeclaration: ROUTE_METHOD_FUNCTION_DECLARATION,
+				args: [
+					route,
+					query,
+					method,
+					args,
+					callId,
+					cleanupDelay
+				]
+			}, { timeout })).result;
+		} catch (error) {
+			protocolFailures += 1;
+			if (!isProtocolTimeoutError$1(error) || protocolFailures >= PAGE_CALL_METHOD_FALLBACK_RETRIES$1) throw error;
+			await sleep$1(PAGE_CALL_METHOD_FALLBACK_RETRY_DELAY$1);
+			continue;
+		}
+		if (isRouteMethodResult(fallbackResult)) if (!fallbackResult.__weappVitePageMethodFound) {
+			unavailableReads += 1;
+			if (unavailableReads >= PAGE_CALL_METHOD_FALLBACK_RETRIES$1) return;
+		} else if (fallbackResult.status === "pending") {
+			pendingPolls += 1;
+			if (pendingPolls >= maxPendingPolls) throw new Error(`Timed out waiting for page method ${method} after ${timeout}ms`);
+		} else if (fallbackResult.status === "rejected") throw new Error(`Page method ${method} failed: ${fallbackResult.error || "unknown error"}`);
+		else return fallbackResult.value;
+		else {
+			latestResult = fallbackResult;
+			if (latestResult !== void 0) return latestResult;
+			unavailableReads += 1;
+			if (unavailableReads >= PAGE_CALL_METHOD_FALLBACK_RETRIES$1) return latestResult;
+		}
+		await sleep$1(PAGE_CALL_METHOD_FALLBACK_RETRY_DELAY$1);
+	}
+}
+//#endregion
 //#region src/Page.ts
 const PAGE_QUERY_TIMEOUT = 2500;
 const PAGE_DATA_TIMEOUT = 12e3;
@@ -801,6 +981,10 @@ const PAGE_ROOT_SELECTORS = [
 	"weapp-app-shell",
 	"view"
 ];
+const PAGE_DIRECT_RENDERED_QUERY_TIMEOUT = 800;
+const PAGE_DIRECT_RENDERED_MAX_SCOPES = 12;
+const PAGE_DIRECT_COMPONENT_SELECTORS = ["weapp-app-shell", "weapp-layout-default"];
+const DATASET_UPPERCASE_PATTERN = /[A-Z]/g;
 function isProtocolTimeoutError(error, method) {
 	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === method;
 }
@@ -826,6 +1010,9 @@ function matchesDataset(node, expected) {
 	const dataset = node.dataset ?? {};
 	return Object.entries(expected).every(([key, value]) => String(dataset[key] ?? "") === String(value));
 }
+function toDatasetAttributeName(key) {
+	return `data-${key.replace(DATASET_UPPERCASE_PATTERN, (letter) => `-${letter.toLowerCase()}`)}`;
+}
 /** Page 的实现。 */
 var Page = class Page {
 	connection;
@@ -1090,6 +1277,10 @@ var Page = class Page {
               index += 1;
               queryScope(scope).then(function (nodes) {
                 collected = collected.concat(nodes);
+                if (nodes.length > 0) {
+                  resolve(collected);
+                  return;
+                }
                 next();
               }, function () {
                 next();
@@ -1338,12 +1529,28 @@ var Page = class Page {
 		while (Date.now() - start <= timeout) {
 			try {
 				if (options.selector) {
-					const nodes = await this.renderedNodes(options.selector, {
-						componentSelectors: options.componentSelectors,
-						timeout: Math.min(PAGE_RENDERED_QUERY_TIMEOUT, Math.max(1, timeout - (Date.now() - start)))
+					const remaining = Math.max(1, timeout - (Date.now() - start));
+					let directNode = null;
+					if (!this.preferAppServicePageProtocol) try {
+						directNode = await this.readDirectRenderedNode(options.selector, options.dataset, Math.max(1, Math.floor(remaining / 2)), options.componentSelectors);
+					} catch (error) {
+						lastError = error;
+					}
+					if (directNode && matchesDataset(directNode, options.dataset)) return JSON.stringify({
+						selector: options.selector,
+						nodes: [directNode]
 					});
+					let nodes = [];
+					try {
+						nodes = await this.renderedNodes(options.selector, {
+							componentSelectors: options.componentSelectors,
+							timeout: Math.min(PAGE_RENDERED_QUERY_TIMEOUT, Math.max(1, timeout - (Date.now() - start)))
+						});
+						lastError = void 0;
+					} catch (error) {
+						lastError = error;
+					}
 					lastRenderedNodes = nodes;
-					lastError = void 0;
 					if (nodes.find((node) => matchesDataset(node, options.dataset))) return JSON.stringify({
 						selector: options.selector,
 						nodes
@@ -1367,6 +1574,45 @@ var Page = class Page {
 		const latest = options.selector ? JSON.stringify(lastRenderedNodes).slice(0, 500) : lastWxml.slice(0, 500);
 		throw new Error(`Timed out waiting page rendered:${expected}; reason=${reason}; latest=${latest}`);
 	}
+	async readDirectRenderedNode(selector, expectedDataset, timeout, componentSelectors) {
+		const element = await this.findDirectRenderedElement(selector, timeout, componentSelectors);
+		if (!element) return null;
+		const entries = await Promise.all(Object.keys(expectedDataset ?? {}).map(async (key) => [key, await element.attribute(toDatasetAttributeName(key))]));
+		return { dataset: Object.fromEntries(entries) };
+	}
+	async findDirectRenderedElement(selector, timeout, componentSelectors) {
+		const start = Date.now();
+		const getQueryTimeout = () => Math.min(PAGE_DIRECT_RENDERED_QUERY_TIMEOUT, Math.max(1, timeout - (Date.now() - start)));
+		const directElement = await this.$(selector, {
+			fallback: false,
+			timeout: getQueryTimeout()
+		});
+		if (directElement) return directElement;
+		const scopeSelectors = [...new Set([...componentSelectors ?? [], ...PAGE_DIRECT_COMPONENT_SELECTORS].filter(Boolean))];
+		for (const rootSelector of PAGE_ROOT_SELECTORS) {
+			if (Date.now() - start >= timeout) break;
+			const rootElement = await this.$(rootSelector, {
+				fallback: false,
+				timeout: getQueryTimeout()
+			});
+			if (!rootElement) continue;
+			const queue = [rootElement];
+			const visited = /* @__PURE__ */ new Set();
+			while (queue.length > 0 && visited.size < PAGE_DIRECT_RENDERED_MAX_SCOPES) {
+				if (Date.now() - start >= timeout) return null;
+				const scope = queue.shift();
+				if (visited.has(scope)) continue;
+				visited.add(scope);
+				const nestedElement = await scope.$(selector, { timeout: getQueryTimeout() });
+				if (nestedElement) return nestedElement;
+				for (const componentSelector of scopeSelectors) {
+					const childScope = await scope.$(componentSelector, { timeout: getQueryTimeout() });
+					if (childScope && !visited.has(childScope)) queue.push(childScope);
+				}
+			}
+		}
+		return null;
+	}
 	async data(path, options = {}) {
 		const payload = {};
 		if (path) payload.path = path;
@@ -1482,71 +1728,7 @@ var Page = class Page {
 		})).map((node, index) => createRouteFallbackElement(this.connection, this.elementMap, this.id, selector, node, index));
 	}
 	async callRouteMethod(method, args, timeout = PAGE_CALL_METHOD_TIMEOUT) {
-		let latestResult;
-		for (let attempt = 1; attempt <= PAGE_CALL_METHOD_FALLBACK_RETRIES; attempt += 1) {
-			try {
-				const fallbackResult = (await this.connection.send("App.callFunction", {
-					functionDeclaration: `async function (route, query, method, args) {
-            var pages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
-            var normalizedRoute = String(route || '').replace(/^\\/+/, '').replace(/\\/+$/g, '');
-            function methodResult(value) {
-              return {
-                __weappVitePageMethodFound: true,
-                value: value
-              };
-            }
-            function matchesQuery(page, expectedQuery) {
-              if (!expectedQuery || !Object.keys(expectedQuery).length) {
-                return true;
-              }
-              var actualQuery = page && (page.options || page.query || {});
-              return Object.keys(expectedQuery).every(function (key) {
-                var actualValue = String(actualQuery[key] == null ? '' : actualQuery[key]);
-                var expectedValue = String(expectedQuery[key]);
-                var decodedActualValue = actualValue;
-                try {
-                  decodedActualValue = decodeURIComponent(actualValue);
-                }
-                catch (_) {
-                }
-                return actualValue === expectedValue
-                  || decodedActualValue === expectedValue
-                  || actualValue === encodeURIComponent(expectedValue);
-              });
-            }
-            for (var index = pages.length - 1; index >= 0; index -= 1) {
-              var page = pages[index];
-              var pageRoute = String(page.path || page.route || page.__route__ || '').replace(/^\\/+/, '').replace(/\\/+$/g, '');
-              if (pageRoute === normalizedRoute && matchesQuery(page, query) && typeof page[method] === 'function') {
-                return methodResult(await page[method].apply(page, args || []));
-              }
-            }
-            for (var fallbackIndex = pages.length - 1; fallbackIndex >= 0; fallbackIndex -= 1) {
-              var fallbackPage = pages[fallbackIndex];
-              if (matchesQuery(fallbackPage, query) && typeof fallbackPage[method] === 'function') {
-                return methodResult(await fallbackPage[method].apply(fallbackPage, args || []));
-              }
-            }
-            return {
-              __weappVitePageMethodFound: false
-            };
-          }`,
-					args: [
-						this.path,
-						this.query,
-						method,
-						args
-					]
-				}, { timeout })).result;
-				if (fallbackResult && typeof fallbackResult === "object" && fallbackResult.__weappVitePageMethodFound === true) return fallbackResult.value;
-				latestResult = fallbackResult && typeof fallbackResult === "object" && fallbackResult.__weappVitePageMethodFound === false ? void 0 : fallbackResult;
-				if (latestResult !== void 0 || attempt === PAGE_CALL_METHOD_FALLBACK_RETRIES) return latestResult;
-			} catch (error) {
-				if (!isProtocolTimeoutError(error, "App.callFunction") || attempt === PAGE_CALL_METHOD_FALLBACK_RETRIES) throw error;
-			}
-			await sleep$1(PAGE_CALL_METHOD_FALLBACK_RETRY_DELAY);
-		}
-		return latestResult;
+		return await callRouteMethodViaAppService(this.connection, this.path, this.query, method, args, timeout);
 	}
 	async setRouteData(data) {
 		for (let attempt = 1; attempt <= PAGE_CALL_METHOD_FALLBACK_RETRIES; attempt += 1) {
@@ -1689,19 +1871,22 @@ function withTimeout(task, timeoutMs) {
 function isOperationTimeoutError(error, timeoutMs) {
 	return error instanceof Error && error.message.includes(`Operation timed out after ${timeoutMs}ms`);
 }
+function isAutomatorResponseTimeout(error) {
+	return error instanceof Error && /timeout waiting for automator response/i.test(error.message);
+}
 function isFnStr(value) {
 	if (!isStr(value)) return false;
 	const trimmed = trim(value);
 	return startWith(trimmed, "function") || startWith(trimmed, "() =>");
 }
 function isCurrentPageProtocolTimeout(error) {
-	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.getCurrentPage";
+	return isAutomatorResponseTimeout(error) || error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.getCurrentPage";
 }
 function isPageStackProtocolTimeout(error) {
-	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.getPageStack";
+	return isAutomatorResponseTimeout(error) || error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.getPageStack";
 }
 function isCallFunctionProtocolTimeout(error) {
-	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.callFunction";
+	return isAutomatorResponseTimeout(error) || error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.callFunction";
 }
 function isPageMetaMissingError(error) {
 	const message = error instanceof Error ? error.message : String(error);
@@ -1712,7 +1897,7 @@ function isCurrentFrameTimedOutError(error) {
 	return message.includes("unexpected current frame status timedout") || message.includes("[loader] unexpected current frame status timedout");
 }
 function isCallWxMethodProtocolTimeout(error) {
-	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.callWxMethod";
+	return isAutomatorResponseTimeout(error) || error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.callWxMethod";
 }
 function isCaptureScreenshotRecoverableError(error) {
 	if (!(error instanceof Error)) return false;