@weapp-vite/miniprogram-automator 1.1.1 → 1.1.3

package/dist/index.d.mts

@@ -42,12 +42,15 @@ declare class Transport extends EventEmitter {
 }
 //#endregion
 //#region src/Connection.d.ts
+interface SendOptions {
+  timeout?: number;
+}
 /** Connection 的实现。 */
 declare class Connection extends EventEmitter {
   private transport;
   private callbacks;
   constructor(transport: Transport);
-  send(method: string, params?: Record<string, any>): Promise<any>;
+  send(method: string, params?: Record<string, any>, options?: SendOptions): Promise<any>;
   dispose(): void;
   private onMessage;
   private onClose;
@@ -240,6 +243,10 @@ interface IToolClearCacheOptions {
   clean: 'all' | 'auth' | 'compile' | 'file' | 'network' | 'session' | 'storage';
 }
 type AutomatorCallable = (...args: any[]) => any;
+interface CurrentPageOptions {
+  retries?: number;
+  timeout?: number;
+}
 /** MiniProgram 的实现。 */
 declare class MiniProgram extends EventEmitter {
   private connection;
@@ -253,9 +260,10 @@ declare class MiniProgram extends EventEmitter {
   navigateBack(): Promise<any>;
   reLaunch(url: string): Promise<any>;
   switchTab(url: string): Promise<any>;
-  currentPage(): Promise<Page>;
+  currentPage(options?: CurrentPageOptions): Promise<Page>;
   systemInfo(): Promise<any>;
   callWxMethod(method: string, ...args: any[]): Promise<any>;
+  private callWxMethodWithTimeout;
   mockWxMethod(method: string, result: any, ...args: any[]): Promise<void>;
   restoreWxMethod(method: string): Promise<void>;
   callPluginWxMethod(pluginId: string, method: string, ...args: any[]): Promise<any>;
@@ -293,6 +301,9 @@ declare class MiniProgram extends EventEmitter {
   refreshTicket(): Promise<void>;
   native(): Native;
   private changeRoute;
+  private resolveRouteContextPage;
+  private readRoutePollingCurrentPage;
+  private readRoutePollingPageStack;
   private send;
   private onLogAdded;
   private onBindingCalled;

package/dist/index.mjs

@@ -512,22 +512,23 @@ var Connection = class Connection extends EventEmitter {
 		transport.on("message", this.onMessage);
 		transport.on("close", this.onClose);
 	}
-	send(method, params = {}) {
+	send(method, params = {}, options = {}) {
 		const id = uuid();
 		const payload = stringify({
 			id,
 			method,
 			params
 		});
+		const requestTimeout = options.timeout ?? REQUEST_TIMEOUT;
 		debugProtocol(`${dateFormat("yyyy-mm-dd HH:MM:ss:l")} SEND ► ${payload}`);
 		return new Promise((resolve, reject) => {
 			const timeout = setTimeout(() => {
 				this.callbacks.delete(id);
-				const error = /* @__PURE__ */ new Error(`DevTools did not respond to protocol method ${method} within ${REQUEST_TIMEOUT}ms`);
+				const error = /* @__PURE__ */ new Error(`DevTools did not respond to protocol method ${method} within ${requestTimeout}ms`);
 				error.code = "DEVTOOLS_PROTOCOL_TIMEOUT";
 				error.method = method;
 				reject(error);
-			}, REQUEST_TIMEOUT);
+			}, requestTimeout);
 			this.callbacks.set(id, {
 				resolve,
 				reject,
@@ -582,11 +583,11 @@ var Connection = class Connection extends EventEmitter {
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-CDd9gHVW.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-F4arniwI.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region package.json
-var version = "1.1.1";
+var version = "1.1.3";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -779,6 +780,8 @@ function extractPluginId(p) {
 const CLOSE_STEP_TIMEOUT = 2e3;
 const CURRENT_PAGE_RETRIES = 3;
 const CURRENT_PAGE_RETRY_DELAY = 400;
+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_DEBUG_ENABLED = process.env.WEAPP_VITE_E2E_CHANGE_ROUTE_DEBUG === "1";
@@ -799,6 +802,9 @@ function withTimeout(task, timeoutMs) {
 		});
 	});
 }
+function isOperationTimeoutError(error, timeoutMs) {
+	return error instanceof Error && error.message.includes(`Operation timed out after ${timeoutMs}ms`);
+}
 function isFnStr(value) {
 	if (!isStr(value)) return false;
 	const trimmed = trim(value);
@@ -807,6 +813,15 @@ 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 isPageStackProtocolTimeout(error) {
+	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.getPageStack";
+}
+function isCallWxMethodProtocolTimeout(error) {
+	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.callWxMethod";
+}
+function isRouteContextProbeError(error) {
+	return isCurrentPageProtocolTimeout(error) || isPageStackProtocolTimeout(error);
+}
 function normalizeRoutePath(value) {
 	return String(value ?? "").split("?", 1)[0].replace(/^\/+/, "").replace(/\/+$/, "");
 }
@@ -852,10 +867,12 @@ var MiniProgram = class extends EventEmitter {
 	async switchTab(url) {
 		return await this.changeRoute("switchTab", url);
 	}
-	async currentPage() {
+	async currentPage(options = {}) {
 		let lastError;
-		for (let attempt = 1; attempt <= CURRENT_PAGE_RETRIES; attempt += 1) try {
-			const { pageId, path, query } = await this.send("App.getCurrentPage");
+		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,
@@ -863,8 +880,22 @@ var MiniProgram = class extends EventEmitter {
 			}, this.pageMap);
 		} catch (error) {
 			lastError = error;
-			if (!isCurrentPageProtocolTimeout(error) || attempt >= CURRENT_PAGE_RETRIES) throw error;
-			await sleep(CURRENT_PAGE_RETRY_DELAY);
+			if (!isCurrentPageProtocolTimeout(error)) throw error;
+			if (attempt < retries) {
+				await sleep(CURRENT_PAGE_RETRY_DELAY);
+				continue;
+			}
+		}
+		if (isCurrentPageProtocolTimeout(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);
+		} catch (error) {
+			if (!isPageStackProtocolTimeout(error)) throw error;
 		}
 		throw lastError;
 	}
@@ -877,6 +908,12 @@ var MiniProgram = class extends EventEmitter {
 			args
 		})).result;
 	}
+	async callWxMethodWithTimeout(method, timeout, ...args) {
+		return (await this.send("App.callWxMethod", {
+			method,
+			args
+		}, { timeout })).result;
+	}
 	async mockWxMethod(method, result, ...args) {
 		if (isFn(result) || isFnStr(result)) {
 			await this.send("App.mockWxMethod", {
@@ -1025,19 +1062,22 @@ var MiniProgram = class extends EventEmitter {
 		return this.nativeIns;
 	}
 	async changeRoute(method, url) {
-		const currentPage = await this.currentPage();
+		const currentPage = await this.resolveRouteContextPage();
 		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 });
+		try {
+			if (currentPage && isPluginPath(currentPage.path)) await this.callPluginWxMethod(extractPluginId(currentPage.path), method, { url });
+			else await this.callWxMethodWithTimeout(method, CHANGE_ROUTE_CALL_TIMEOUT, { url });
+		} catch (error) {
+			if (isCallWxMethodProtocolTimeout(error) || isOperationTimeoutError(error, CHANGE_ROUTE_CALL_TIMEOUT)) logChangeRouteDebug(`call-timeout method=${method} url=${url ?? "<none>"}`);
+			else throw error;
+		}
 		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();
+				const page = await this.readRoutePollingCurrentPage();
 				lastPage = page;
 				logChangeRouteDebug(`poll method=${method} url=${url ?? "<none>"} current=${page?.path ?? "<none>"}`);
 				if (!expectedRoute || normalizeRoutePath(page?.path) === expectedRoute) {
@@ -1049,7 +1089,7 @@ var MiniProgram = class extends EventEmitter {
 				logChangeRouteDebug(`poll-error method=${method} url=${url ?? "<none>"} error=${error instanceof Error ? error.message : String(error)}`);
 			}
 			try {
-				const stack = await this.pageStack();
+				const stack = await this.readRoutePollingPageStack();
 				const stackTop = stack[stack.length - 1];
 				if (stackTop) {
 					lastPage = stackTop;
@@ -1062,6 +1102,10 @@ 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)) {
+					await sleep(CHANGE_ROUTE_POLL_DELAY);
+					continue;
+				}
 			}
 			await sleep(CHANGE_ROUTE_POLL_DELAY);
 		}
@@ -1072,8 +1116,38 @@ var MiniProgram = class extends EventEmitter {
 		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);
+	async resolveRouteContextPage() {
+		const currentPageTask = this.currentPage().catch((error) => {
+			if (isRouteContextProbeError(error)) return;
+			throw error;
+		});
+		const timeoutTask = sleep(CHANGE_ROUTE_CONTEXT_TIMEOUT).then(() => void 0);
+		try {
+			return await Promise.race([currentPageTask, timeoutTask]);
+		} finally {
+			currentPageTask.catch(() => {});
+		}
+	}
+	async readRoutePollingCurrentPage() {
+		const { pageId, path, query } = await this.send("App.getCurrentPage", {}, { timeout: CHANGE_ROUTE_CONTEXT_TIMEOUT });
+		return Page.create(this.connection, {
+			id: pageId,
+			path,
+			query
+		}, 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);
+		});
+	}
+	async send(method, params = {}, options) {
+		return options ? await this.connection.send(method, params, options) : await this.connection.send(method, params);
 	}
 	onLogAdded = (payload) => {
 		this.emit("console", payload);

package/dist/{launch-CDd9gHVW.mjs → launch-F4arniwI.mjs}

@@ -5241,11 +5241,10 @@ function deriveMenuButtonBoundingClientRect(systemInfo) {
 	const height = 32;
 	const top = 32;
 	const right = Math.max(systemInfo.windowWidth - 12, width);
-	const left = Math.max(0, right - width);
 	return {
-		bottom: top + height,
+		bottom: 64,
 		height,
-		left,
+		left: Math.max(0, right - width),
 		right,
 		top,
 		width

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/miniprogram-automator",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "完全兼容微信 miniprogram-automator 的现代化替代实现",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "obug": "^2.1.1",
-    "ws": "^8.20.1",
+    "ws": "^8.21.0",
     "@weapp-vite/qr": "1.1.0"
   },
   "publishConfig": {