@weapp-vite/miniprogram-automator 1.2.5 → 1.2.7

package/dist/index.mjs

@@ -223,6 +223,8 @@ function toStr(value) {
 }
 //#endregion
 //#region src/Element.ts
+const ELEMENT_QUERY_TIMEOUT = 2500;
+const ELEMENT_WXML_TIMEOUT = 8e3;
 /** Element 的实现。 */
 var Element = class Element {
 	connection;
@@ -242,9 +244,9 @@ var Element = class Element {
 		this.videoId = options.videoId || null;
 		this.tagName = options.tagName;
 	}
-	async $(selector) {
+	async $(selector, options = {}) {
 		try {
-			const element = await this.send("Element.getElement", { selector });
+			const element = await this.send("Element.getElement", { selector }, { timeout: options.timeout ?? ELEMENT_QUERY_TIMEOUT });
 			return Element.create(this.connection, {
 				...element,
 				pageId: this.pageId
@@ -253,8 +255,8 @@ var Element = class Element {
 			return null;
 		}
 	}
-	async $$(selector) {
-		const { elements } = await this.send("Element.getElements", { selector });
+	async $$(selector, options = {}) {
+		const { elements } = await this.send("Element.getElements", { selector }, { timeout: options.timeout ?? ELEMENT_QUERY_TIMEOUT });
 		return elements.map((element) => {
 			return Element.create(this.connection, {
 				...element,
@@ -293,10 +295,10 @@ var Element = class Element {
 		return await this._property(name);
 	}
 	async wxml() {
-		return (await this.send("Element.getWXML", { type: "inner" })).wxml;
+		return (await this.send("Element.getWXML", { type: "inner" }, { timeout: ELEMENT_WXML_TIMEOUT })).wxml;
 	}
 	async outerWxml() {
-		return (await this.send("Element.getWXML", { type: "outer" })).wxml;
+		return (await this.send("Element.getWXML", { type: "outer" }, { timeout: ELEMENT_WXML_TIMEOUT })).wxml;
 	}
 	async style(name) {
 		if (!isStr(name)) throw new Error("name must be a string");
@@ -330,12 +332,12 @@ var Element = class Element {
 	async _property(name) {
 		return await this.getter(name, "getProperties", "properties");
 	}
-	async send(method, params = {}) {
+	async send(method, params = {}, options) {
 		params.elementId = this.id;
 		params.pageId = this.pageId;
 		if (this.nodeId) params.nodeId = this.nodeId;
 		if (this.videoId) params.videoId = this.videoId;
-		return await this.connection.send(method, params);
+		return options ? await this.connection.send(method, params, options) : await this.connection.send(method, params);
 	}
 	async callFunction(functionName, ...args) {
 		const { result } = await this.send("Element.callFunction", {
@@ -504,10 +506,13 @@ const debugProtocol = createDebug("automator:protocol");
 const closeErrTip = "Connection closed, check if wechat web devTools is still running";
 const REQUEST_TIMEOUT = 3e4;
 const CONNECT_TIMEOUT = 3e4;
+/** Page frame 定向消息失效、需要切换到 App-service Page 协议的 DevTools 版本。 */
+const APP_SERVICE_PAGE_PROTOCOL_VERSIONS = /* @__PURE__ */ new Set(["2.01.2510290"]);
 /** Connection 的实现。 */
 var Connection = class Connection extends EventEmitter {
 	transport;
 	callbacks = /* @__PURE__ */ new Map();
+	useAppServicePageProtocol = false;
 	constructor(transport) {
 		super();
 		this.transport = transport;
@@ -548,6 +553,13 @@ var Connection = class Connection extends EventEmitter {
 	dispose() {
 		this.transport.close();
 	}
+	/** 根据 DevTools 版本选择稳定的 Page 协议实现。 */
+	configureToolInfo(info) {
+		this.useAppServicePageProtocol = APP_SERVICE_PAGE_PROTOCOL_VERSIONS.has(String(info.version ?? ""));
+	}
+	get prefersAppServicePageProtocol() {
+		return this.useAppServicePageProtocol;
+	}
 	onMessage = (message) => {
 		debugProtocol(`${dateFormat("yyyy-mm-dd HH:MM:ss:l")} ◀ RECV ${message}`);
 		const { id, method, error, result, params } = JSON.parse(message);
@@ -699,7 +711,7 @@ async function acquireAutomatorPortLease(preferredPort) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.5";
+var version = "1.2.7";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -750,7 +762,70 @@ var Native = class extends EventEmitter {
 	}
 };
 //#endregion
+//#region src/pageRouteFallback.ts
+function normalizeFallbackIdPart(value) {
+	return encodeURIComponent(value).replace(/%/g, "_");
+}
+function resolveFallbackTagName(selector) {
+	const tagSelector = selector.trim();
+	if (/^[a-z][\w-]*$/i.test(tagSelector)) return tagSelector.toLowerCase();
+	return "view";
+}
+/** 将 App-Service 查询到的渲染节点包装为 Element 兼容对象。 */
+function createRouteFallbackElement(connection, elementMap, pageId, selector, node, index) {
+	const nodeId = typeof node.id === "string" && node.id ? normalizeFallbackIdPart(node.id) : String(index);
+	const elementId = `__weapp_vite_route_fallback_${pageId}_${normalizeFallbackIdPart(selector)}_${nodeId}_${index}`;
+	return Element.create(connection, {
+		elementId,
+		pageId,
+		tagName: resolveFallbackTagName(selector)
+	}, elementMap);
+}
+//#endregion
 //#region src/Page.ts
+const PAGE_QUERY_TIMEOUT = 2500;
+const PAGE_DATA_TIMEOUT = 12e3;
+const PAGE_DATA_PROTOCOL_TIMEOUT = 2500;
+const PAGE_SET_DATA_TIMEOUT = 12e3;
+const PAGE_SET_DATA_PROTOCOL_TIMEOUT = 2500;
+const PAGE_CALL_METHOD_TIMEOUT = 12e3;
+const PAGE_CALL_METHOD_PROTOCOL_TIMEOUT = 2500;
+const PAGE_CALL_METHOD_FALLBACK_RETRIES = 3;
+const PAGE_CALL_METHOD_FALLBACK_RETRY_DELAY = 300;
+const PAGE_RENDERED_TIMEOUT = 15e3;
+const PAGE_RENDERED_POLL_DELAY = 220;
+const PAGE_RENDERED_QUERY_TIMEOUT = 5e3;
+const PAGE_ROOT_SELECTORS = [
+	"page",
+	"body",
+	"weapp-app-shell",
+	"view"
+];
+function isProtocolTimeoutError(error, method) {
+	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === method;
+}
+function isPageStackStaleError(error) {
+	return (error instanceof Error ? error.message : String(error)).includes("page is not on top of page stack");
+}
+function isPageMetaMissingError$1(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	return message.includes("getPageMetaByWebviewId") && message.includes("rawPath") && message.includes("is null");
+}
+function isCurrentFrameTimedOutError$1(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	return message.includes("unexpected current frame status timedout") || message.includes("[loader] unexpected current frame status timedout");
+}
+function isRecoverablePageProtocolError(error, method) {
+	return isProtocolTimeoutError(error, method) || isPageMetaMissingError$1(error) || isCurrentFrameTimedOutError$1(error);
+}
+function normalizeRoute(value) {
+	return String(value || "").replace(/^\/+/, "").replace(/\/+$/g, "");
+}
+function matchesDataset(node, expected) {
+	if (!expected) return true;
+	const dataset = node.dataset ?? {};
+	return Object.entries(expected).every(([key, value]) => String(dataset[key] ?? "") === String(value));
+}
 /** Page 的实现。 */
 var Page = class Page {
 	connection;
@@ -758,11 +833,17 @@ var Page = class Page {
 	query = {};
 	id;
 	elementMap = /* @__PURE__ */ new Map();
+	preferAppServicePageProtocol = false;
 	constructor(connection, options) {
 		this.connection = connection;
 		this.id = options.id;
 		this.path = options.path;
 		this.query = options.query;
+		this.preferAppServicePageProtocol = connection.prefersAppServicePageProtocol;
+	}
+	updateFromOptions(options) {
+		this.path = options.path;
+		this.query = options.query;
 	}
 	async waitFor(condition) {
 		if (isNum(condition)) {
@@ -775,29 +856,41 @@ var Page = class Page {
 		}
 		if (isStr(condition)) await waitUntil(async () => (await this.$$(condition)).length > 0);
 	}
-	async $(selector) {
+	async $(selector, options = {}) {
+		if (options.routeOnly || options.fallback !== false && this.preferAppServicePageProtocol) return await this.queryRouteElement(selector, options);
 		try {
-			const element = await this.send("Page.getElement", { selector });
+			const element = await this.send("Page.getElement", { selector }, { timeout: options.timeout ?? PAGE_QUERY_TIMEOUT });
 			return Element.create(this.connection, {
 				...element,
 				pageId: this.id
 			}, this.elementMap);
-		} catch {
+		} catch (error) {
+			if (options.fallback !== false && isRecoverablePageProtocolError(error, "Page.getElement")) {
+				this.preferAppServicePageProtocol = true;
+				return await this.queryRouteElement(selector, options);
+			}
 			return null;
 		}
 	}
-	async $$(selector) {
-		const { elements } = await this.send("Page.getElements", { selector });
-		return elements.map((element) => {
-			return Element.create(this.connection, {
-				...element,
-				pageId: this.id
-			}, this.elementMap);
-		});
+	async $$(selector, options = {}) {
+		if (options.routeOnly || options.fallback !== false && this.preferAppServicePageProtocol) return await this.queryRouteElements(selector, options);
+		try {
+			const { elements } = await this.send("Page.getElements", { selector }, { timeout: options.timeout ?? PAGE_QUERY_TIMEOUT });
+			return elements.map((element) => {
+				return Element.create(this.connection, {
+					...element,
+					pageId: this.id
+				}, this.elementMap);
+			});
+		} catch (error) {
+			if (options.fallback === false || !isRecoverablePageProtocolError(error, "Page.getElements")) throw error;
+			this.preferAppServicePageProtocol = true;
+			return await this.queryRouteElements(selector, options);
+		}
 	}
-	async getElementByXpath(selector) {
+	async getElementByXpath(selector, options = {}) {
 		try {
-			const element = await this.send("Page.getElementByXpath", { selector });
+			const element = await this.send("Page.getElementByXpath", { selector }, { timeout: options.timeout ?? PAGE_QUERY_TIMEOUT });
 			return Element.create(this.connection, {
 				...element,
 				pageId: this.id
@@ -806,8 +899,8 @@ var Page = class Page {
 			return null;
 		}
 	}
-	async getElementsByXpath(selector) {
-		const { elements } = await this.send("Page.getElementsByXpath", { selector });
+	async getElementsByXpath(selector, options = {}) {
+		const { elements } = await this.send("Page.getElementsByXpath", { selector }, { timeout: options.timeout ?? PAGE_QUERY_TIMEOUT });
 		return elements.map((element) => {
 			return Element.create(this.connection, {
 				...element,
@@ -818,13 +911,542 @@ var Page = class Page {
 	async xpath(selector) {
 		return await this.getElementByXpath(selector);
 	}
-	async data(path) {
+	async wxml() {
+		let lastError;
+		for (const selector of PAGE_ROOT_SELECTORS) try {
+			const element = await this.$(selector, { timeout: PAGE_QUERY_TIMEOUT });
+			if (!element) continue;
+			return await element.wxml();
+		} catch (error) {
+			lastError = error;
+		}
+		throw lastError instanceof Error ? lastError : /* @__PURE__ */ new Error("Failed to find page element");
+	}
+	async renderedNodes(selector, options = {}) {
+		const { result } = await this.connection.send("App.callFunction", {
+			functionDeclaration: `function (route, query, selector, scopeSelectors) {
+        function normalizeRoute(value) {
+          return String(value || '').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);
+          });
+        }
+        var pages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
+        var expectedRoute = normalizeRoute(route);
+        var page = null;
+        for (var index = pages.length - 1; index >= 0; index -= 1) {
+          var candidate = pages[index];
+          var candidateRoute = normalizeRoute(candidate && (candidate.path || candidate.route || candidate.__route__));
+          if ((!expectedRoute || candidateRoute === expectedRoute) && matchesQuery(candidate, query)) {
+            page = candidate;
+            break;
+          }
+        }
+        if (!page) {
+          return [];
+        }
+        function createSelectorQuery(scope) {
+          var query = null;
+          var createdFromScope = false;
+          if (scope && typeof scope.createSelectorQuery === 'function') {
+            query = scope.createSelectorQuery();
+            createdFromScope = true;
+          }
+          else if (typeof wx !== 'undefined' && wx && typeof wx.createSelectorQuery === 'function') {
+            query = wx.createSelectorQuery();
+          }
+          else if (typeof page.createSelectorQuery === 'function') {
+            query = page.createSelectorQuery();
+          }
+          if (!query) {
+            return null;
+          }
+          if (!createdFromScope && typeof query.in === 'function') {
+            try {
+              query = query.in(scope || page);
+            }
+            catch (_) {
+            }
+          }
+          return query;
+        }
+        function pushUnique(list, seen, item) {
+          if (!item) {
+            return;
+          }
+          var id = item.is || item.id || item.__wxWebviewId__ || item.__wxExparserNodeId__ || String(list.length);
+          if (seen[id]) {
+            return;
+          }
+          seen[id] = true;
+          list.push(item);
+        }
+        function collectScopes(root) {
+          var scopes = [];
+          var seen = {};
+          var queue = [];
+          pushUnique(scopes, seen, root);
+          queue.push(root);
+          for (var queueIndex = 0; queueIndex < queue.length && queueIndex < 60; queueIndex += 1) {
+            var scope = queue[queueIndex];
+            if (!scope || typeof scope.selectAllComponents !== 'function') {
+              continue;
+            }
+            var children = [];
+            var componentSelectors = Array.isArray(scopeSelectors) ? scopeSelectors.slice() : [];
+            componentSelectors.push(selector, '*', 'weapp-app-shell', 'weapp-layout-default');
+            for (var selectorIndex = 0; selectorIndex < componentSelectors.length; selectorIndex += 1) {
+              if (!componentSelectors[selectorIndex]) {
+                continue;
+              }
+              try {
+                var selected = scope.selectAllComponents(componentSelectors[selectorIndex]);
+                if (Array.isArray(selected)) {
+                  children = children.concat(selected);
+                }
+              }
+              catch (_) {
+              }
+            }
+            for (var childIndex = 0; childIndex < children.length; childIndex += 1) {
+              var child = children[childIndex];
+              var previousLength = scopes.length;
+              pushUnique(scopes, seen, child);
+              if (scopes.length > previousLength) {
+                queue.push(child);
+              }
+            }
+          }
+          return scopes;
+        }
+        function queryScope(scope) {
+          return new Promise(function (resolve) {
+            var settled = false;
+            var timer = setTimeout(function () {
+              if (settled) {
+                return;
+              }
+              settled = true;
+              resolve([]);
+            }, 800);
+            function finish(nodes) {
+              if (settled) {
+                return;
+              }
+              settled = true;
+              clearTimeout(timer);
+              resolve(Array.isArray(nodes) ? nodes : nodes ? [nodes] : []);
+            }
+            try {
+              var query = createSelectorQuery(scope);
+              if (!query) {
+                finish([]);
+                return;
+              }
+              query
+                .selectAll(selector)
+                .fields({
+                  dataset: true,
+                  id: true,
+                  rect: true,
+                  size: true
+                }, function (nodes) {
+                  finish(nodes);
+                })
+                .exec();
+            }
+            catch (_) {
+              finish([]);
+            }
+          });
+        }
+        return new Promise(function (resolve) {
+          try {
+            var scopes = collectScopes(page);
+            var collected = [];
+            var index = 0;
+            function next() {
+              if (index >= scopes.length) {
+                resolve(collected);
+                return;
+              }
+              var scope = scopes[index];
+              index += 1;
+              queryScope(scope).then(function (nodes) {
+                collected = collected.concat(nodes);
+                next();
+              }, function () {
+                next();
+              });
+            }
+            next();
+          }
+          catch (_) {
+            resolve([]);
+          }
+        });
+      }`,
+			args: [
+				normalizeRoute(this.path),
+				this.query,
+				selector,
+				options.componentSelectors ?? []
+			]
+		}, { timeout: options.timeout ?? PAGE_RENDERED_QUERY_TIMEOUT });
+		return Array.isArray(result) ? result : [];
+	}
+	async renderedSelectorNodes(selectors, options = {}) {
+		const normalizedSelectors = selectors.map((selector) => String(selector || "").trim()).filter(Boolean);
+		if (normalizedSelectors.length === 0) return {};
+		const { result } = await this.connection.send("App.callFunction", {
+			functionDeclaration: `function (route, query, selectors, scopeSelectors) {
+        function normalizeRoute(value) {
+          return String(value || '').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 createSelectorQuery(scope, page) {
+          var query = null;
+          var createdFromScope = false;
+          if (scope && typeof scope.createSelectorQuery === 'function') {
+            query = scope.createSelectorQuery();
+            createdFromScope = true;
+          }
+          else if (typeof wx !== 'undefined' && wx && typeof wx.createSelectorQuery === 'function') {
+            query = wx.createSelectorQuery();
+          }
+          else if (page && typeof page.createSelectorQuery === 'function') {
+            query = page.createSelectorQuery();
+          }
+          if (!query) {
+            return null;
+          }
+          if (!createdFromScope && typeof query.in === 'function') {
+            try {
+              query = query.in(scope || page);
+            }
+            catch (_) {
+            }
+          }
+          return query;
+        }
+        function pushUnique(list, seen, item) {
+          if (!item) {
+            return;
+          }
+          var id = item.is || item.id || item.__wxWebviewId__ || item.__wxExparserNodeId__ || String(list.length);
+          if (seen[id]) {
+            return;
+          }
+          seen[id] = true;
+          list.push(item);
+        }
+        function collectScopes(root, selectorList) {
+          var scopes = [];
+          var seen = {};
+          var queue = [];
+          pushUnique(scopes, seen, root);
+          queue.push(root);
+          for (var queueIndex = 0; queueIndex < queue.length && queueIndex < 30; queueIndex += 1) {
+            var scope = queue[queueIndex];
+            if (!scope || typeof scope.selectAllComponents !== 'function') {
+              continue;
+            }
+            var children = [];
+            var componentSelectors = Array.isArray(scopeSelectors) ? scopeSelectors.slice() : [];
+            for (var selectorIndex = 0; selectorIndex < selectorList.length; selectorIndex += 1) {
+              componentSelectors.push(selectorList[selectorIndex]);
+            }
+            componentSelectors.push('*', 'weapp-app-shell', 'weapp-layout-default');
+            for (var componentIndex = 0; componentIndex < componentSelectors.length; componentIndex += 1) {
+              if (!componentSelectors[componentIndex]) {
+                continue;
+              }
+              try {
+                var selected = scope.selectAllComponents(componentSelectors[componentIndex]);
+                if (Array.isArray(selected)) {
+                  children = children.concat(selected);
+                }
+              }
+              catch (_) {
+              }
+            }
+            for (var childIndex = 0; childIndex < children.length; childIndex += 1) {
+              var child = children[childIndex];
+              var previousLength = scopes.length;
+              pushUnique(scopes, seen, child);
+              if (scopes.length > previousLength) {
+                queue.push(child);
+              }
+            }
+          }
+          return scopes;
+        }
+        function queryScope(scope, page, selector) {
+          return new Promise(function (resolve) {
+            var settled = false;
+            var timer = setTimeout(function () {
+              if (settled) {
+                return;
+              }
+              settled = true;
+              resolve([]);
+            }, 450);
+            function finish(nodes) {
+              if (settled) {
+                return;
+              }
+              settled = true;
+              clearTimeout(timer);
+              resolve(Array.isArray(nodes) ? nodes : nodes ? [nodes] : []);
+            }
+            try {
+              var query = createSelectorQuery(scope, page);
+              if (!query) {
+                finish([]);
+                return;
+              }
+              query
+                .selectAll(selector)
+                .fields({
+                  dataset: true,
+                  id: true,
+                  rect: true,
+                  size: true
+                }, function (nodes) {
+                  finish(nodes);
+                })
+                .exec();
+            }
+            catch (_) {
+              finish([]);
+            }
+          });
+        }
+        var selectorList = Array.isArray(selectors)
+          ? selectors.map(function (selector) {
+            return String(selector || '').trim();
+          }).filter(Boolean)
+          : [];
+        if (!selectorList.length) {
+          return {};
+        }
+        var pages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
+        var expectedRoute = normalizeRoute(route);
+        var page = null;
+        for (var index = pages.length - 1; index >= 0; index -= 1) {
+          var candidate = pages[index];
+          var candidateRoute = normalizeRoute(candidate && (candidate.path || candidate.route || candidate.__route__));
+          if ((!expectedRoute || candidateRoute === expectedRoute) && matchesQuery(candidate, query)) {
+            page = candidate;
+            break;
+          }
+        }
+        if (!page) {
+          return {};
+        }
+        return new Promise(function (resolve) {
+          try {
+            var result = {};
+            var scopes = collectScopes(page, selectorList);
+            var startedAt = Date.now();
+            var maxQueries = 40;
+            var queryCount = 0;
+            var selectorIndex = 0;
+            var scopeIndex = 0;
+            function next() {
+              if (selectorIndex >= selectorList.length || queryCount >= maxQueries || Date.now() - startedAt > 1800) {
+                resolve(result);
+                return;
+              }
+              var selector = selectorList[selectorIndex];
+              if (scopeIndex >= scopes.length) {
+                selectorIndex += 1;
+                scopeIndex = 0;
+                next();
+                return;
+              }
+              var scope = scopes[scopeIndex];
+              scopeIndex += 1;
+              queryCount += 1;
+              queryScope(scope, page, selector).then(function (nodes) {
+                if (Array.isArray(nodes) && nodes.length > 0) {
+                  result[selector] = (result[selector] || []).concat(nodes);
+                  selectorIndex += 1;
+                  scopeIndex = 0;
+                }
+                next();
+              }, function () {
+                next();
+              });
+            }
+            next();
+          }
+          catch (_) {
+            resolve({});
+          }
+        });
+      }`,
+			args: [
+				normalizeRoute(this.path),
+				this.query,
+				normalizedSelectors,
+				options.componentSelectors ?? []
+			]
+		}, { timeout: options.timeout ?? PAGE_RENDERED_QUERY_TIMEOUT });
+		return result && typeof result === "object" && !Array.isArray(result) ? result : {};
+	}
+	async waitForRendered(options = {}) {
+		const timeout = options.timeout ?? PAGE_RENDERED_TIMEOUT;
+		const start = Date.now();
+		let lastWxml = "";
+		let lastRenderedNodes = [];
+		let lastError;
+		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)))
+					});
+					lastRenderedNodes = nodes;
+					lastError = void 0;
+					if (nodes.find((node) => matchesDataset(node, options.dataset))) return JSON.stringify({
+						selector: options.selector,
+						nodes
+					});
+				} else {
+					const wxml = await this.wxml();
+					lastWxml = wxml;
+					lastError = void 0;
+					const normalized = wxml.trim();
+					if (options.predicate?.(wxml)) return wxml;
+					if (options.text && normalized.includes(options.text)) return wxml;
+					if (!options.text && !options.predicate && normalized && normalized !== "<text></text>") return wxml;
+				}
+			} catch (error) {
+				lastError = error;
+			}
+			await sleep$1(PAGE_RENDERED_POLL_DELAY);
+		}
+		const reason = lastError instanceof Error ? lastError.message : String(lastError ?? "condition not met");
+		const expected = options.selector ? ` selector=${options.selector} dataset=${JSON.stringify(options.dataset ?? {})}` : options.text ? ` text=${options.text}` : options.predicate ? " predicate=true" : " non-empty wxml";
+		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 data(path, options = {}) {
 		const payload = {};
 		if (path) payload.path = path;
-		return (await this.send("Page.getData", payload)).data;
+		const timeout = options.timeout ?? PAGE_DATA_TIMEOUT;
+		if (options.routeOnly || options.fallback !== false && this.preferAppServicePageProtocol) return await this.readRouteData(path, timeout);
+		try {
+			return (await this.send("Page.getData", payload, { timeout: Math.min(timeout, PAGE_DATA_PROTOCOL_TIMEOUT) })).data;
+		} catch (error) {
+			if (options.fallback === false) throw error;
+			if (!isRecoverablePageProtocolError(error, "Page.getData")) throw error;
+			this.preferAppServicePageProtocol = true;
+			return await this.readRouteData(path, timeout);
+		}
+	}
+	async readRouteData(path, timeout) {
+		return (await this.connection.send("App.callFunction", {
+			functionDeclaration: `function (route, query, dataPath) {
+            function normalizeRoute(value) {
+              return String(value || '').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 readPath(data, path) {
+              if (!path) {
+                return data;
+            }
+            if (data && Object.prototype.hasOwnProperty.call(data, path)) {
+              return data[path];
+            }
+            return String(path).replace(/\\[(\\d+)\\]/g, '.$1').split('.').filter(Boolean).reduce(function (current, segment) {
+              return current == null ? undefined : current[segment];
+            }, data);
+          }
+          var pages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
+          var normalizedRoute = normalizeRoute(route);
+          for (var index = pages.length - 1; index >= 0; index -= 1) {
+            var page = pages[index];
+            var pageRoute = normalizeRoute(page.path || page.route || page.__route__);
+            if (pageRoute === normalizedRoute && matchesQuery(page, query)) {
+              return readPath(page.data || {}, dataPath);
+            }
+          }
+          return undefined;
+        }`,
+			args: [
+				this.path,
+				this.query,
+				path
+			]
+		}, { timeout })).result;
 	}
 	async setData(data) {
-		await this.send("Page.setData", { data });
+		if (this.preferAppServicePageProtocol) {
+			await this.setRouteData(data);
+			return;
+		}
+		try {
+			await this.send("Page.setData", { data }, { timeout: PAGE_SET_DATA_PROTOCOL_TIMEOUT });
+		} catch (error) {
+			if (!isRecoverablePageProtocolError(error, "Page.setData") && !isPageStackStaleError(error)) throw error;
+			this.preferAppServicePageProtocol = true;
+			await this.setRouteData(data);
+		}
 	}
 	async size() {
 		const [width, height] = await this.windowProperty(["document.documentElement.scrollWidth", "document.documentElement.scrollHeight"]);
@@ -834,10 +1456,146 @@ var Page = class Page {
 		};
 	}
 	async callMethod(method, ...args) {
-		return (await this.send("Page.callMethod", {
-			method,
-			args
-		})).result;
+		return await this.callMethodWithOptions(method, {}, ...args);
+	}
+	async callMethodWithOptions(method, options = {}, ...args) {
+		if (options.routeOnly || options.fallback !== false && this.preferAppServicePageProtocol) return await this.callRouteMethod(method, args, options.timeout);
+		try {
+			return (await this.send("Page.callMethod", {
+				method,
+				args
+			}, { timeout: options.timeout ?? PAGE_CALL_METHOD_PROTOCOL_TIMEOUT })).result;
+		} catch (error) {
+			if (options.fallback === false) throw error;
+			if (!isRecoverablePageProtocolError(error, "Page.callMethod") && !isPageStackStaleError(error)) throw error;
+			this.preferAppServicePageProtocol = true;
+		}
+		return await this.callRouteMethod(method, args, options.timeout);
+	}
+	async queryRouteElement(selector, options) {
+		return (await this.queryRouteElements(selector, options))[0] ?? null;
+	}
+	async queryRouteElements(selector, options) {
+		return (await this.renderedNodes(selector, {
+			componentSelectors: options.componentSelectors,
+			timeout: options.timeout ?? PAGE_QUERY_TIMEOUT
+		})).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;
+	}
+	async setRouteData(data) {
+		for (let attempt = 1; attempt <= PAGE_CALL_METHOD_FALLBACK_RETRIES; attempt += 1) {
+			try {
+				await this.connection.send("App.callFunction", {
+					functionDeclaration: `function (route, query, data) {
+            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);
+              });
+            }
+            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.setData === 'function') {
+                page.setData(data || {});
+                return true;
+              }
+            }
+            return false;
+          }`,
+					args: [
+						this.path,
+						this.query,
+						data
+					]
+				}, { timeout: PAGE_SET_DATA_TIMEOUT });
+				return;
+			} catch (error) {
+				if (!isProtocolTimeoutError(error, "App.callFunction") || attempt === PAGE_CALL_METHOD_FALLBACK_RETRIES) throw error;
+			}
+			await sleep$1(PAGE_CALL_METHOD_FALLBACK_RETRY_DELAY);
+		}
 	}
 	async scrollTop() {
 		const bodyScrollTop = await this.windowProperty("document.body.scrollTop");
@@ -849,13 +1607,16 @@ var Page = class Page {
 		const properties = (await this.send("Page.getWindowProperties", { names })).properties;
 		return isStr(name) ? properties[0] : properties;
 	}
-	async send(method, params = {}) {
+	async send(method, params = {}, options) {
 		params.pageId = this.id;
-		return await this.connection.send(method, params);
+		return options ? await this.connection.send(method, params, options) : await this.connection.send(method, params);
 	}
 	static create(connection, options, pageMap) {
 		const existing = pageMap.get(options.id);
-		if (existing) return existing;
+		if (existing) {
+			existing.updateFromOptions(options);
+			return existing;
+		}
 		const page = new Page(connection, options);
 		pageMap.set(options.id, page);
 		return page;
@@ -866,7 +1627,7 @@ var Page = class Page {
 /**
 * @file 二维码与插件路径工具。
 */
-const regPluginId = /^plugin-private:\/\/([0-9a-zA-Z]+)\//;
+const regPluginId = /^(?:plugin-private:\/\/|__plugin__\/)([0-9a-zA-Z]+)\//;
 /** decodeQrCode 的方法封装。 */
 function decodeQrCode(qrCode) {
 	return decodeQrCodeFromBase64(qrCode);
@@ -881,7 +1642,7 @@ function printQrCode(content) {
 /** isPluginPath 的方法封装。 */
 function isPluginPath(p) {
 	if (typeof p !== "string") return false;
-	return startWith(p, "plugin-private://");
+	return startWith(p, "plugin-private://") || startWith(p, "__plugin__/");
 }
 /** extractPluginId 的方法封装。 */
 function extractPluginId(p) {
@@ -898,6 +1659,10 @@ const CHANGE_ROUTE_CONTEXT_TIMEOUT = 12e3;
 const CHANGE_ROUTE_CALL_TIMEOUT = 12e3;
 const CHANGE_ROUTE_READY_TIMEOUT = 15e3;
 const CHANGE_ROUTE_POLL_DELAY = 500;
+const CHANGE_ROUTE_POLL_PROTOCOL_TIMEOUT = 2500;
+const CHANGE_ROUTE_APP_FUNCTION_TIMEOUT = 15e3;
+const CHANGE_ROUTE_APP_FUNCTION_RETRIES = 2;
+const CHANGE_ROUTE_APP_FUNCTION_RETRY_DELAY = 800;
 const APP_READY_TIMEOUT = 2e4;
 const APP_READY_PROBE_TIMEOUT = 3e3;
 const APP_READY_POLL_DELAY = 500;
@@ -935,6 +1700,17 @@ function isCurrentPageProtocolTimeout(error) {
 function isPageStackProtocolTimeout(error) {
 	return 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";
+}
+function isPageMetaMissingError(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	return message.includes("getPageMetaByWebviewId") && message.includes("rawPath") && message.includes("is null");
+}
+function isCurrentFrameTimedOutError(error) {
+	const message = error instanceof Error ? error.message : String(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";
 }
@@ -944,11 +1720,44 @@ function isCaptureScreenshotRecoverableError(error) {
 	return error.message.includes("fail to capture screenshot") || error.message.includes("App.captureScreenshot");
 }
 function isRouteContextProbeError(error) {
-	return isCurrentPageProtocolTimeout(error) || isPageStackProtocolTimeout(error);
+	return isCurrentPageProtocolTimeout(error) || isPageStackProtocolTimeout(error) || isPageMetaMissingError(error) || isCurrentFrameTimedOutError(error);
+}
+function isRoutePollingRecoverableError(error) {
+	return isRouteContextProbeError(error) || isCallFunctionProtocolTimeout(error) || isPageStackProtocolTimeout(error) || isPageMetaMissingError(error);
+}
+function resolveAppFunctionTimeout(timeout) {
+	return Math.max(timeout ?? CHANGE_ROUTE_APP_FUNCTION_TIMEOUT, CHANGE_ROUTE_APP_FUNCTION_TIMEOUT);
 }
 function normalizeRoutePath(value) {
 	return String(value ?? "").split("?", 1)[0].replace(/^\/+/, "").replace(/\/+$/, "");
 }
+function isPluginNavigationUrl(value) {
+	return String(value ?? "").startsWith("plugin://");
+}
+function matchesRouteChange(options) {
+	const normalizedCurrentPath = normalizeRoutePath(options.currentPath);
+	if (!options.expectedRoute || normalizedCurrentPath === options.expectedRoute) return true;
+	if (!isPluginNavigationUrl(options.requestedUrl) || !isPluginPath(options.currentPath)) return false;
+	return normalizedCurrentPath !== normalizeRoutePath(options.previousPath);
+}
+function parseRouteQuery(value) {
+	const queryText = String(value ?? "").split("?", 2)[1] ?? "";
+	const query = {};
+	if (!queryText) return query;
+	for (const part of queryText.split("&")) {
+		if (!part) continue;
+		const [rawKey, rawValue = ""] = part.split("=", 2);
+		if (!rawKey) continue;
+		query[decodeURIComponent(rawKey)] = decodeURIComponent(rawValue);
+	}
+	return query;
+}
+function resolvePagePayloadId(page, fallbackId) {
+	return page.pageId ?? page.__wxWebviewId__ ?? page.__webviewId__ ?? fallbackId;
+}
+function resolvePagePayloadPath(page) {
+	return page.path ?? page.route ?? page.__route__ ?? "";
+}
 function logChangeRouteDebug(message) {
 	if (!CHANGE_ROUTE_DEBUG_ENABLED) return;
 	process.stdout.write(`[automator:changeRoute] ${message}\n`);
@@ -997,30 +1806,27 @@ var MiniProgram = class extends EventEmitter {
 		const retries = options.retries ?? CURRENT_PAGE_RETRIES;
 		const sendOptions = options.timeout ? { timeout: options.timeout } : void 0;
 		for (let attempt = 1; attempt <= retries; attempt += 1) try {
-			const { pageId, path, query } = await this.send("App.getCurrentPage", {}, sendOptions);
-			return Page.create(this.connection, {
-				id: pageId,
-				path,
-				query
-			}, this.pageMap);
+			const page = await this.send("App.getCurrentPage", {}, sendOptions);
+			return this.createPageFromPayload(page);
 		} catch (error) {
 			lastError = error;
-			if (!isCurrentPageProtocolTimeout(error)) throw error;
+			if (!isCurrentPageProtocolTimeout(error) && !isPageMetaMissingError(error) && !isCurrentFrameTimedOutError(error)) throw error;
 			if (attempt < retries) {
 				await sleep(CURRENT_PAGE_RETRY_DELAY);
 				continue;
 			}
 		}
-		if (isCurrentPageProtocolTimeout(lastError)) try {
+		if (isCurrentPageProtocolTimeout(lastError) || isPageMetaMissingError(lastError) || isCurrentFrameTimedOutError(lastError)) try {
 			const { pageStack } = await this.send("App.getPageStack", {}, sendOptions);
 			const page = pageStack[pageStack.length - 1];
-			if (page) return Page.create(this.connection, {
-				id: page.pageId,
-				path: page.path,
-				query: page.query
-			}, this.pageMap);
+			if (page) return this.createPageFromPayload(page, pageStack.length);
 		} catch (error) {
-			if (!isPageStackProtocolTimeout(error)) throw error;
+			if (!isPageStackProtocolTimeout(error) && !isPageMetaMissingError(error) && !isCurrentFrameTimedOutError(error)) throw error;
+		}
+		if ((options.appFunctionFallback ?? true) && (isCurrentPageProtocolTimeout(lastError) || isPageMetaMissingError(lastError) || isCurrentFrameTimedOutError(lastError))) {
+			const pageStack = await this.readAppFunctionPageStack(resolveAppFunctionTimeout(sendOptions?.timeout));
+			const page = pageStack[pageStack.length - 1];
+			if (page) return page;
 		}
 		throw lastError;
 	}
@@ -1033,6 +1839,13 @@ var MiniProgram = class extends EventEmitter {
 			args
 		})).result;
 	}
+	async callWxMethodWithOptions(method, options = {}, ...args) {
+		const sendOptions = options.timeout ? { timeout: options.timeout } : void 0;
+		return (await this.send("App.callWxMethod", {
+			method,
+			args
+		}, sendOptions)).result;
+	}
 	async callWxMethodWithTimeout(method, timeout, ...args) {
 		return (await this.send("App.callWxMethod", {
 			method,
@@ -1086,10 +1899,14 @@ var MiniProgram = class extends EventEmitter {
 		});
 	}
 	async evaluate(appFunction, ...args) {
+		return await this.evaluateWithOptions(appFunction, {}, ...args);
+	}
+	async evaluateWithOptions(appFunction, options = {}, ...args) {
+		const sendOptions = options.timeout ? { timeout: options.timeout } : void 0;
 		const { result } = await this.send("App.callFunction", {
 			functionDeclaration: appFunction.toString(),
 			args
-		});
+		}, sendOptions);
 		return result;
 	}
 	async pageScrollTo(scrollTop) {
@@ -1137,7 +1954,9 @@ var MiniProgram = class extends EventEmitter {
 		await this.send("App.addBinding", { name });
 	}
 	async checkVersion() {
-		const sdkVersion = (await this.send("Tool.getInfo")).SDKVersion;
+		const toolInfo = await this.send("Tool.getInfo");
+		this.connection.configureToolInfo(toolInfo);
+		const sdkVersion = toolInfo.SDKVersion;
 		if (sdkVersion !== "dev" && cmpVersion(sdkVersion, "2.7.3") < 0) throw new Error(`SDKVersion is currently ${sdkVersion}, while automator(${version}) requires at least version 2.7.3`);
 	}
 	/**
@@ -1219,14 +2038,19 @@ var MiniProgram = class extends EventEmitter {
 	async changeRoute(method, url) {
 		const currentPage = await this.resolveRouteContextPage();
 		logChangeRouteDebug(`start method=${method} url=${url ?? "<none>"} current=${currentPage?.path ?? "<none>"}`);
+		let routeCommandSent = false;
 		try {
 			if (currentPage && isPluginPath(currentPage.path)) await this.callPluginWxMethod(extractPluginId(currentPage.path), method, { url });
 			else await this.callWxMethodWithTimeout(method, CHANGE_ROUTE_CALL_TIMEOUT, { url });
+			routeCommandSent = true;
 		} catch (error) {
-			if (isCallWxMethodProtocolTimeout(error) || isOperationTimeoutError(error, CHANGE_ROUTE_CALL_TIMEOUT)) logChangeRouteDebug(`call-timeout method=${method} url=${url ?? "<none>"}`);
-			else throw error;
+			if (isCallWxMethodProtocolTimeout(error) || isOperationTimeoutError(error, CHANGE_ROUTE_CALL_TIMEOUT) || isPageMetaMissingError(error)) {
+				routeCommandSent = true;
+				logChangeRouteDebug(`call-timeout method=${method} url=${url ?? "<none>"}`);
+			} else throw error;
 		}
 		const expectedRoute = normalizeRoutePath(url);
+		const expectedRouteQuery = parseRouteQuery(url);
 		const startedAt = Date.now();
 		let lastPage;
 		let lastError;
@@ -1235,7 +2059,12 @@ var MiniProgram = class extends EventEmitter {
 				const page = await this.readRoutePollingCurrentPage();
 				lastPage = page;
 				logChangeRouteDebug(`poll method=${method} url=${url ?? "<none>"} current=${page?.path ?? "<none>"}`);
-				if (!expectedRoute || normalizeRoutePath(page?.path) === expectedRoute) {
+				if (matchesRouteChange({
+					currentPath: page?.path,
+					previousPath: currentPage?.path,
+					requestedUrl: url,
+					expectedRoute
+				})) {
 					logChangeRouteDebug(`ready method=${method} url=${url ?? "<none>"} current=${page?.path ?? "<none>"}`);
 					return page;
 				}
@@ -1249,7 +2078,12 @@ var MiniProgram = class extends EventEmitter {
 				if (stackTop) {
 					lastPage = stackTop;
 					logChangeRouteDebug(`stack method=${method} url=${url ?? "<none>"} current=${stackTop.path}`);
-					if (!expectedRoute || normalizeRoutePath(stackTop.path) === expectedRoute) {
+					if (matchesRouteChange({
+						currentPath: stackTop.path,
+						previousPath: currentPage?.path,
+						requestedUrl: url,
+						expectedRoute
+					})) {
 						logChangeRouteDebug(`stack-ready method=${method} url=${url ?? "<none>"} current=${stackTop.path}`);
 						return stackTop;
 					}
@@ -1257,7 +2091,7 @@ var MiniProgram = class extends EventEmitter {
 			} catch (error) {
 				lastError = error;
 				logChangeRouteDebug(`stack-error method=${method} url=${url ?? "<none>"} error=${error instanceof Error ? error.message : String(error)}`);
-				if (isOperationTimeoutError(error, CHANGE_ROUTE_CONTEXT_TIMEOUT)) {
+				if (isOperationTimeoutError(error, CHANGE_ROUTE_CONTEXT_TIMEOUT) || isRoutePollingRecoverableError(error)) {
 					await sleep(CHANGE_ROUTE_POLL_DELAY);
 					continue;
 				}
@@ -1269,11 +2103,23 @@ var MiniProgram = class extends EventEmitter {
 			throw new Error(`Timed out waiting route ${expectedRoute || "<current>"} after ${method}; current page: ${lastPage.path}`);
 		}
 		logChangeRouteDebug(`timeout method=${method} url=${url ?? "<none>"} current=<none> error=${lastError instanceof Error ? lastError.message : String(lastError)}`);
+		if (isRoutePollingRecoverableError(lastError)) {
+			if (routeCommandSent && expectedRoute) return this.createPageFromPayload({
+				pageId: 1,
+				path: `/${expectedRoute}`,
+				query: expectedRouteQuery
+			});
+			throw new Error(`Timed out waiting route ${expectedRoute || "<current>"} after ${method}; last recoverable error: ${lastError instanceof Error ? lastError.message : String(lastError)}`);
+		}
 		throw lastError instanceof Error ? lastError : /* @__PURE__ */ new Error(`Timed out waiting route ${expectedRoute || "<current>"} after ${method}`);
 	}
 	async resolveRouteContextPage() {
-		const currentPageTask = this.currentPage().catch((error) => {
-			if (isRouteContextProbeError(error)) return;
+		const currentPageTask = this.currentPage({
+			appFunctionFallback: false,
+			retries: 1,
+			timeout: CHANGE_ROUTE_POLL_PROTOCOL_TIMEOUT
+		}).catch((error) => {
+			if (isRoutePollingRecoverableError(error)) return;
 			throw error;
 		});
 		const timeoutTask = sleep(CHANGE_ROUTE_CONTEXT_TIMEOUT).then(() => void 0);
@@ -1284,22 +2130,51 @@ var MiniProgram = class extends EventEmitter {
 		}
 	}
 	async readRoutePollingCurrentPage() {
-		const { pageId, path, query } = await this.send("App.getCurrentPage", {}, { timeout: CHANGE_ROUTE_CONTEXT_TIMEOUT });
+		const page = await this.send("App.getCurrentPage", {}, { timeout: CHANGE_ROUTE_POLL_PROTOCOL_TIMEOUT });
+		return this.createPageFromPayload(page);
+	}
+	async readRoutePollingPageStack() {
+		try {
+			const { pageStack } = await this.send("App.getPageStack", {}, { timeout: CHANGE_ROUTE_POLL_PROTOCOL_TIMEOUT });
+			return this.createPagesFromPayloads(pageStack);
+		} catch (error) {
+			if (!isPageStackProtocolTimeout(error) && !isPageMetaMissingError(error)) throw error;
+			throw error;
+		}
+	}
+	createPageFromPayload(page, fallbackId = 1) {
 		return Page.create(this.connection, {
-			id: pageId,
-			path,
-			query
+			id: resolvePagePayloadId(page, fallbackId),
+			path: resolvePagePayloadPath(page),
+			query: page.query ?? page.options ?? {}
 		}, this.pageMap);
 	}
-	async readRoutePollingPageStack() {
-		const { pageStack } = await this.send("App.getPageStack", {}, { timeout: CHANGE_ROUTE_CONTEXT_TIMEOUT });
-		return pageStack.map((page) => {
-			return Page.create(this.connection, {
-				id: page.pageId,
-				path: page.path,
-				query: page.query
-			}, this.pageMap);
-		});
+	createPagesFromPayloads(pageStack) {
+		return pageStack.map((page, index) => this.createPageFromPayload(page, index + 1));
+	}
+	async readAppFunctionPageStack(timeout = CHANGE_ROUTE_APP_FUNCTION_TIMEOUT, retries = CHANGE_ROUTE_APP_FUNCTION_RETRIES) {
+		let lastError;
+		for (let attempt = 1; attempt <= retries; attempt += 1) try {
+			const { result } = await this.send("App.callFunction", {
+				functionDeclaration: `function () {
+            var pages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
+            return pages.map(function (page, index) {
+              return {
+                pageId: page.pageId || page.__wxWebviewId__ || page.__webviewId__ || index + 1,
+                path: page.path || page.route || page.__route__ || '',
+                query: page.query || page.options || {}
+              };
+            });
+          }`,
+				args: []
+			}, { timeout });
+			return this.createPagesFromPayloads(Array.isArray(result) ? result : []);
+		} catch (error) {
+			lastError = error;
+			if (!isCallFunctionProtocolTimeout(error) || attempt >= retries) throw error;
+			await sleep(CHANGE_ROUTE_APP_FUNCTION_RETRY_DELAY);
+		}
+		throw lastError;
 	}
 	async send(method, params = {}, options) {
 		return options ? await this.connection.send(method, params, options) : await this.connection.send(method, params);
@@ -1697,7 +2572,8 @@ async function launch(options = {}) {
 }
 async function connect(options) {
 	if (typeof options.wsEndpoint !== "string") throw new TypeError("wsEndpoint is required for smartapp runtime connection.");
-	return new SmartappDevice("devtools", DEFAULT_CONNECT_TYPE, "devtools-usb", { miniProgram: await connectMiniProgram(options.wsEndpoint) });
+	const miniProgram = await connectMiniProgram(options.wsEndpoint);
+	return new SmartappDevice("devtools", DEFAULT_CONNECT_TYPE, "devtools-usb", { miniProgram });
 }
 async function devices(deviceType, _connectType = DEFAULT_CONNECT_TYPE) {
 	const resolvedDeviceType = resolveDeviceType(deviceType);