@weapp-vite/miniprogram-automator 1.1.1 → 1.1.2

package/dist/index.mjs

@@ -582,11 +582,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.2";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -807,6 +807,9 @@ 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 normalizeRoutePath(value) {
 	return String(value ?? "").split("?", 1)[0].replace(/^\/+/, "").replace(/\/+$/, "");
 }
@@ -863,8 +866,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 < CURRENT_PAGE_RETRIES) {
+				await sleep(CURRENT_PAGE_RETRY_DELAY);
+				continue;
+			}
+		}
+		if (isCurrentPageProtocolTimeout(lastError)) try {
+			const { pageStack } = await this.send("App.getPageStack");
+			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;
 	}
@@ -1025,7 +1042,21 @@ var MiniProgram = class extends EventEmitter {
 		return this.nativeIns;
 	}
 	async changeRoute(method, url) {
-		const currentPage = await this.currentPage();
+		const currentPage = await this.currentPage().catch(async (error) => {
+			if (!isCurrentPageProtocolTimeout(error)) throw error;
+			try {
+				const { pageStack } = await this.send("App.getPageStack");
+				const page = pageStack[pageStack.length - 1];
+				return page ? Page.create(this.connection, {
+					id: page.pageId,
+					path: page.path,
+					query: page.query
+				}, this.pageMap) : void 0;
+			} catch (pageStackError) {
+				if (!isPageStackProtocolTimeout(pageStackError)) throw pageStackError;
+				return;
+			}
+		});
 		logChangeRouteDebug(`start method=${method} url=${url ?? "<none>"} current=${currentPage?.path ?? "<none>"}`);
 		if (currentPage && isPluginPath(currentPage.path)) {
 			const pluginId = extractPluginId(currentPage.path);

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.2",
   "description": "完全兼容微信 miniprogram-automator 的现代化替代实现",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",