@weapp-vite/miniprogram-automator 1.2.6 → 1.2.7

package/dist/index.d.mts

@@ -44,13 +44,20 @@ declare class Transport extends EventEmitter {
 interface SendOptions {
   timeout?: number;
 }
+interface ToolInfo {
+  version?: string;
+}
 /** Connection 的实现。 */
 declare class Connection extends EventEmitter {
   private transport;
   private callbacks;
+  private useAppServicePageProtocol;
   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;
   private onMessage;
   private onClose;
   static create(url: string, timeout?: number): Promise<Connection>;
@@ -248,7 +255,7 @@ declare class Page {
   query: any;
   private id;
   private elementMap;
-  private preferRoutePageFallback;
+  private preferAppServicePageProtocol;
   constructor(connection: Connection, options: IPageOptions);
   updateFromOptions(options: IPageOptions): void;
   waitFor(condition: WaitCondition): Promise<void>;

package/dist/index.mjs

@@ -506,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;
@@ -550,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);
@@ -701,7 +711,7 @@ async function acquireAutomatorPortLease(preferredPort) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.6";
+var version = "1.2.7";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -823,12 +833,13 @@ var Page = class Page {
 	query = {};
 	id;
 	elementMap = /* @__PURE__ */ new Map();
-	preferRoutePageFallback = false;
+	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;
@@ -846,7 +857,7 @@ var Page = class Page {
 		if (isStr(condition)) await waitUntil(async () => (await this.$$(condition)).length > 0);
 	}
 	async $(selector, options = {}) {
-		if (options.routeOnly || this.preferRoutePageFallback) return await this.queryRouteElement(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 });
 			return Element.create(this.connection, {
@@ -855,14 +866,14 @@ var Page = class Page {
 			}, this.elementMap);
 		} catch (error) {
 			if (options.fallback !== false && isRecoverablePageProtocolError(error, "Page.getElement")) {
-				this.preferRoutePageFallback = true;
+				this.preferAppServicePageProtocol = true;
 				return await this.queryRouteElement(selector, options);
 			}
 			return null;
 		}
 	}
 	async $$(selector, options = {}) {
-		if (options.routeOnly || this.preferRoutePageFallback) return await this.queryRouteElements(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) => {
@@ -873,7 +884,7 @@ var Page = class Page {
 			});
 		} catch (error) {
 			if (options.fallback === false || !isRecoverablePageProtocolError(error, "Page.getElements")) throw error;
-			this.preferRoutePageFallback = true;
+			this.preferAppServicePageProtocol = true;
 			return await this.queryRouteElements(selector, options);
 		}
 	}
@@ -1360,13 +1371,13 @@ var Page = class Page {
 		const payload = {};
 		if (path) payload.path = path;
 		const timeout = options.timeout ?? PAGE_DATA_TIMEOUT;
-		if (options.routeOnly || this.preferRoutePageFallback) return await this.readRouteData(path, 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.preferRoutePageFallback = true;
+			this.preferAppServicePageProtocol = true;
 			return await this.readRouteData(path, timeout);
 		}
 	}
@@ -1425,7 +1436,7 @@ var Page = class Page {
 		}, { timeout })).result;
 	}
 	async setData(data) {
-		if (this.preferRoutePageFallback) {
+		if (this.preferAppServicePageProtocol) {
 			await this.setRouteData(data);
 			return;
 		}
@@ -1433,7 +1444,7 @@ var Page = class Page {
 			await this.send("Page.setData", { data }, { timeout: PAGE_SET_DATA_PROTOCOL_TIMEOUT });
 		} catch (error) {
 			if (!isRecoverablePageProtocolError(error, "Page.setData") && !isPageStackStaleError(error)) throw error;
-			this.preferRoutePageFallback = true;
+			this.preferAppServicePageProtocol = true;
 			await this.setRouteData(data);
 		}
 	}
@@ -1448,7 +1459,7 @@ var Page = class Page {
 		return await this.callMethodWithOptions(method, {}, ...args);
 	}
 	async callMethodWithOptions(method, options = {}, ...args) {
-		if (options.routeOnly || this.preferRoutePageFallback) return await this.callRouteMethod(method, args, options.timeout);
+		if (options.routeOnly || options.fallback !== false && this.preferAppServicePageProtocol) return await this.callRouteMethod(method, args, options.timeout);
 		try {
 			return (await this.send("Page.callMethod", {
 				method,
@@ -1457,7 +1468,7 @@ var Page = class Page {
 		} catch (error) {
 			if (options.fallback === false) throw error;
 			if (!isRecoverablePageProtocolError(error, "Page.callMethod") && !isPageStackStaleError(error)) throw error;
-			this.preferRoutePageFallback = true;
+			this.preferAppServicePageProtocol = true;
 		}
 		return await this.callRouteMethod(method, args, options.timeout);
 	}
@@ -1943,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`);
 	}
 	/**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/miniprogram-automator",
   "type": "module",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "完全兼容微信 miniprogram-automator 的现代化替代实现",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",