@weapp-vite/miniprogram-automator 1.0.3 → 1.0.5

package/dist/index.d.mts

@@ -202,6 +202,12 @@ interface IScreenshotOptions {
 interface IAuditsOptions {
   path?: string;
 }
+interface IToolCompileOptions {
+  force?: boolean;
+}
+interface IToolClearCacheOptions {
+  clean: 'all' | 'auth' | 'compile' | 'file' | 'network' | 'session' | 'storage';
+}
 type AutomatorCallable = (...args: any[]) => any;
 /** MiniProgram 的实现。 */
 declare class MiniProgram extends EventEmitter {
@@ -211,11 +217,11 @@ declare class MiniProgram extends EventEmitter {
   private nativeIns?;
   constructor(connection: Connection);
   pageStack(): Promise<any>;
-  navigateTo(url: string): Promise<Page>;
-  redirectTo(url: string): Promise<Page>;
-  navigateBack(): Promise<Page>;
-  reLaunch(url: string): Promise<Page>;
-  switchTab(url: string): Promise<Page>;
+  navigateTo(url: string): Promise<any>;
+  redirectTo(url: string): Promise<any>;
+  navigateBack(): Promise<any>;
+  reLaunch(url: string): Promise<any>;
+  switchTab(url: string): Promise<any>;
   currentPage(): Promise<Page>;
   systemInfo(): Promise<any>;
   callWxMethod(method: string, ...args: any[]): Promise<any>;
@@ -234,6 +240,22 @@ declare class MiniProgram extends EventEmitter {
   checkVersion(): Promise<void>;
   screenshot(options?: IScreenshotOptions): Promise<any>;
   testAccounts(): Promise<any>;
+  /**
+   * @description 获取开发者工具 Tool 域基础信息。
+   */
+  toolInfo(): Promise<any>;
+  /**
+   * @description 触发开发者工具执行一次项目编译。
+   */
+  compile(options?: IToolCompileOptions): Promise<any>;
+  /**
+   * @description 清理开发者工具缓存。
+   */
+  clearCache(options: IToolClearCacheOptions): Promise<any>;
+  /**
+   * @description 调用开发者工具 Tool 域协议方法。
+   */
+  tool(method: string, params?: Record<string, any>): Promise<any>;
   stopAudits(options?: IAuditsOptions): Promise<any>;
   getTicket(): Promise<any>;
   setTicket(ticket: string): Promise<void>;

package/dist/index.mjs

@@ -581,7 +581,7 @@ async function launchHeadlessAutomator(options) {
 }
 //#endregion
 //#region package.json
-var version = "1.0.3";
+var version = "1.0.5";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -772,6 +772,9 @@ function extractPluginId(p) {
 const CLOSE_STEP_TIMEOUT = 2e3;
 const CURRENT_PAGE_RETRIES = 3;
 const CURRENT_PAGE_RETRY_DELAY = 400;
+const CHANGE_ROUTE_READY_TIMEOUT = 15e3;
+const CHANGE_ROUTE_POLL_DELAY = 500;
+const CHANGE_ROUTE_DEBUG_ENABLED = process.env.WEAPP_VITE_E2E_CHANGE_ROUTE_DEBUG === "1";
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -797,6 +800,13 @@ function isFnStr(value) {
 function isCurrentPageProtocolTimeout(error) {
 	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.getCurrentPage";
 }
+function normalizeRoutePath(value) {
+	return String(value ?? "").split("?", 1)[0].replace(/^\/+/, "").replace(/\/+$/, "");
+}
+function logChangeRouteDebug(message) {
+	if (!CHANGE_ROUTE_DEBUG_ENABLED) return;
+	process.stdout.write(`[automator:changeRoute] ${message}\n`);
+}
 /** MiniProgram 的实现。 */
 var MiniProgram = class extends EventEmitter {
 	appBindings = /* @__PURE__ */ new Map();
@@ -943,7 +953,7 @@ var MiniProgram = class extends EventEmitter {
 		this.connection.dispose();
 	}
 	on(event, listener) {
-		if (event === "console") this.send("App.enableLog");
+		if (event === "console") this.send("App.enableLog").catch(() => {});
 		super.on(event, listener);
 		return this;
 	}
@@ -964,6 +974,30 @@ var MiniProgram = class extends EventEmitter {
 	async testAccounts() {
 		return (await this.send("Tool.getTestAccounts")).accounts;
 	}
+	/**
+	* @description 获取开发者工具 Tool 域基础信息。
+	*/
+	async toolInfo() {
+		return await this.send("Tool.getInfo");
+	}
+	/**
+	* @description 触发开发者工具执行一次项目编译。
+	*/
+	async compile(options = {}) {
+		return await this.send("Tool.compile", options);
+	}
+	/**
+	* @description 清理开发者工具缓存。
+	*/
+	async clearCache(options) {
+		return await this.send("Tool.clearCache", options);
+	}
+	/**
+	* @description 调用开发者工具 Tool 域协议方法。
+	*/
+	async tool(method, params = {}) {
+		return await this.send(`Tool.${method}`, params);
+	}
 	async stopAudits(options = {}) {
 		const result = await this.send("Tool.stopAudits");
 		if (options.path) await fs.writeFile(options.path, result.report, "utf8");
@@ -984,12 +1018,50 @@ var MiniProgram = class extends EventEmitter {
 	}
 	async changeRoute(method, url) {
 		const currentPage = await this.currentPage();
+		logChangeRouteDebug(`start method=${method} url=${url ?? "<none>"} current=${currentPage?.path ?? "<none>"}`);
 		if (currentPage && isPluginPath(currentPage.path)) {
 			const pluginId = extractPluginId(currentPage.path);
 			await this.callPluginWxMethod(pluginId, method, { url });
 		} else await this.callWxMethod(method, { url });
-		await sleep(3e3);
-		return await this.currentPage();
+		const expectedRoute = normalizeRoutePath(url);
+		const startedAt = Date.now();
+		let lastPage;
+		let lastError;
+		while (Date.now() - startedAt <= CHANGE_ROUTE_READY_TIMEOUT) {
+			try {
+				const page = await this.currentPage();
+				lastPage = page;
+				logChangeRouteDebug(`poll method=${method} url=${url ?? "<none>"} current=${page?.path ?? "<none>"}`);
+				if (!expectedRoute || normalizeRoutePath(page?.path) === expectedRoute) {
+					logChangeRouteDebug(`ready method=${method} url=${url ?? "<none>"} current=${page?.path ?? "<none>"}`);
+					return page;
+				}
+			} catch (error) {
+				lastError = error;
+				logChangeRouteDebug(`poll-error method=${method} url=${url ?? "<none>"} error=${error instanceof Error ? error.message : String(error)}`);
+			}
+			try {
+				const stackTop = (await this.pageStack()).at(-1);
+				if (stackTop) {
+					lastPage = stackTop;
+					logChangeRouteDebug(`stack method=${method} url=${url ?? "<none>"} current=${stackTop.path}`);
+					if (!expectedRoute || normalizeRoutePath(stackTop.path) === expectedRoute) {
+						logChangeRouteDebug(`stack-ready method=${method} url=${url ?? "<none>"} current=${stackTop.path}`);
+						return stackTop;
+					}
+				}
+			} catch (error) {
+				lastError = error;
+				logChangeRouteDebug(`stack-error method=${method} url=${url ?? "<none>"} error=${error instanceof Error ? error.message : String(error)}`);
+			}
+			await sleep(CHANGE_ROUTE_POLL_DELAY);
+		}
+		if (lastPage) {
+			logChangeRouteDebug(`timeout method=${method} url=${url ?? "<none>"} current=${lastPage.path}`);
+			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)}`);
+		throw lastError instanceof Error ? lastError : /* @__PURE__ */ new Error(`Timed out waiting route ${expectedRoute || "<current>"} after ${method}`);
 	}
 	async send(method, params = {}) {
 		return await this.connection.send(method, params);

package/package.json

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