@weapp-vite/miniprogram-automator 1.2.21 → 1.2.23

package/dist/index.d.mts

@@ -52,12 +52,15 @@ declare class Connection extends EventEmitter {
   private transport;
   private callbacks;
   private useAppServicePageProtocol;
+  private useAppServicePageMethod;
   constructor(transport: Transport);
   send(method: string, params?: Record<string, any>, options?: SendOptions): Promise<any>;
   dispose(): void;
   /** 根据 DevTools 版本选择稳定的 Page 协议实现。 */
   configureToolInfo(info: ToolInfo): void;
   get prefersAppServicePageProtocol(): boolean;
+  /** 页面方法调用独立选择协议，不影响节点查询及其组件作用域。 */
+  get prefersAppServicePageMethod(): boolean;
   private onMessage;
   private onClose;
   static create(url: string, timeout?: number): Promise<Connection>;
@@ -294,6 +297,7 @@ declare class Page {
   waitFor(condition: WaitCondition): Promise<void>;
   $(selector: string, options?: PageQueryOptions): Promise<Element | null>;
   $$(selector: string, options?: PageQueryOptions): Promise<any>;
+  private queryPageElements;
   getElementByXpath(selector: string, options?: PageQueryOptions): Promise<Element | null>;
   getElementsByXpath(selector: string, options?: PageQueryOptions): Promise<Element[]>;
   xpath(selector: string): Promise<Element | null>;

package/dist/index.mjs

@@ -839,11 +839,14 @@ 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"]);
+/** 仅页面方法调用失效的版本，元素查询仍保留原生组件作用域。 */
+const APP_SERVICE_PAGE_METHOD_VERSIONS = /* @__PURE__ */ new Set(["2.02.2608070", "2.02.2609231"]);
 /** Connection 的实现。 */
 var Connection = class Connection extends EventEmitter {
 	transport;
 	callbacks = /* @__PURE__ */ new Map();
 	useAppServicePageProtocol = false;
+	useAppServicePageMethod = false;
 	constructor(transport) {
 		super();
 		this.transport = transport;
@@ -886,11 +889,17 @@ var Connection = class Connection extends EventEmitter {
 	}
 	/** 根据 DevTools 版本选择稳定的 Page 协议实现。 */
 	configureToolInfo(info) {
-		this.useAppServicePageProtocol = APP_SERVICE_PAGE_PROTOCOL_VERSIONS.has(String(info.version ?? ""));
+		const version = String(info.version ?? "");
+		this.useAppServicePageProtocol = APP_SERVICE_PAGE_PROTOCOL_VERSIONS.has(version);
+		this.useAppServicePageMethod = this.useAppServicePageProtocol || APP_SERVICE_PAGE_METHOD_VERSIONS.has(version);
 	}
 	get prefersAppServicePageProtocol() {
 		return this.useAppServicePageProtocol;
 	}
+	/** 页面方法调用独立选择协议，不影响节点查询及其组件作用域。 */
+	get prefersAppServicePageMethod() {
+		return this.useAppServicePageMethod;
+	}
 	onMessage = (message) => {
 		debugProtocol(`${dateFormat("yyyy-mm-dd HH:MM:ss:l")} ◀ RECV ${message}`);
 		const { id, method, error, result, params } = JSON.parse(message);
@@ -943,7 +952,7 @@ var Connection = class Connection extends EventEmitter {
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-BNQZTcKo.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-CSjvON-f.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region src/launcher/portLease.ts
@@ -1098,7 +1107,7 @@ function resolveWechatDevtoolsBootstrapArgs(args) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.21";
+var version = "1.2.23";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -1420,7 +1429,7 @@ var Page = class Page {
 	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 }, { timeout: options.timeout ?? PAGE_QUERY_TIMEOUT });
+			const element = await this.queryPageElements("Page.getElement", selector, options);
 			return Element.create(this.connection, {
 				...element,
 				pageId: this.id
@@ -1436,7 +1445,7 @@ var Page = class Page {
 	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 });
+			const { elements } = await this.queryPageElements("Page.getElements", selector, options);
 			return elements.map((element) => {
 				return Element.create(this.connection, {
 					...element,
@@ -1449,6 +1458,15 @@ var Page = class Page {
 			return await this.queryRouteElements(selector, options);
 		}
 	}
+	async queryPageElements(method, selector, options) {
+		const timeout = options.timeout ?? PAGE_QUERY_TIMEOUT;
+		try {
+			return await this.send(method, { selector }, { timeout });
+		} catch (error) {
+			if (options.fallback === false || !isRecoverablePageProtocolError(error, method)) throw error;
+			return await this.send(method, { selector }, { timeout });
+		}
+	}
 	async getElementByXpath(selector, options = {}) {
 		try {
 			const element = await this.send("Page.getElementByXpath", { selector }, { timeout: options.timeout ?? PAGE_QUERY_TIMEOUT });
@@ -2084,7 +2102,7 @@ var Page = class Page {
 		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);
+		if (options.routeOnly || options.fallback !== false && (this.preferAppServicePageProtocol || this.connection.prefersAppServicePageMethod)) return await this.callRouteMethod(method, args, options.timeout);
 		try {
 			return (await this.send("Page.callMethod", {
 				method,