@weapp-vite/miniprogram-automator 1.1.0 → 1.1.2

package/dist/index.mjs

@@ -4,7 +4,7 @@ import process from "node:process";
 import { spawn } from "node:child_process";
 import path from "node:path";
 import { EventEmitter } from "node:events";
-import debug from "debug";
+import { createDebug } from "obug";
 import WebSocket from "ws";
 import fs from "node:fs/promises";
 import { decodeQrCodeFromBase64, renderTerminalQrCode } from "@weapp-vite/qr";
@@ -224,6 +224,8 @@ function toStr(value) {
 //#region src/Element.ts
 /** Element 的实现。 */
 var Element = class Element {
+	connection;
+	elementMap;
 	tagName = "";
 	nodeId;
 	videoId;
@@ -474,6 +476,7 @@ var ContextElement = class extends Element {
 //#region src/Transport.ts
 /** Transport 的实现。 */
 var Transport = class extends EventEmitter {
+	ws;
 	constructor(ws) {
 		super();
 		this.ws = ws;
@@ -496,11 +499,12 @@ var Transport = class extends EventEmitter {
 /**
 * @file 自动化协议连接实现。
 */
-const debugProtocol = debug("automator:protocol");
+const debugProtocol = createDebug("automator:protocol");
 const closeErrTip = "Connection closed, check if wechat web devTools is still running";
 const REQUEST_TIMEOUT = 3e4;
 /** Connection 的实现。 */
 var Connection = class Connection extends EventEmitter {
+	transport;
 	callbacks = /* @__PURE__ */ new Map();
 	constructor(transport) {
 		super();
@@ -578,15 +582,16 @@ var Connection = class Connection extends EventEmitter {
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-Didv0lMX.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-F4arniwI.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region package.json
-var version = "1.1.0";
+var version = "1.1.2";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
 var Native = class extends EventEmitter {
+	connection;
 	constructor(connection) {
 		super();
 		this.connection = connection;
@@ -635,6 +640,7 @@ var Native = class extends EventEmitter {
 //#region src/Page.ts
 /** Page 的实现。 */
 var Page = class Page {
+	connection;
 	path = "";
 	query = {};
 	id;
@@ -801,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(/\/+$/, "");
 }
@@ -810,6 +819,7 @@ function logChangeRouteDebug(message) {
 }
 /** MiniProgram 的实现。 */
 var MiniProgram = class extends EventEmitter {
+	connection;
 	appBindings = /* @__PURE__ */ new Map();
 	pageMap = /* @__PURE__ */ new Map();
 	nativeIns;
@@ -856,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;
 	}
@@ -1018,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);
@@ -1127,6 +1165,9 @@ function isInputCapableElement(element) {
 	return typeof Reflect.get(element, "input") === "function";
 }
 var SmartappElement = class {
+	element;
+	selectors;
+	index;
 	id;
 	tagName;
 	constructor(element, selectors = "", index = 0) {
@@ -1184,6 +1225,7 @@ var SmartappElement = class {
 //#endregion
 //#region src/smartapp/Page.ts
 var SmartappPage = class {
+	page;
 	path;
 	query;
 	uri;
@@ -1207,6 +1249,8 @@ var SmartappPage = class {
 //#endregion
 //#region src/smartapp/App.ts
 var SmartappApp = class {
+	miniProgram;
+	appKey;
 	constructor(miniProgram, appKey) {
 		this.miniProgram = miniProgram;
 		this.appKey = appKey;
@@ -1268,6 +1312,10 @@ var SmartappApp = class {
 //#endregion
 //#region src/smartapp/Device.ts
 var SmartappDevice = class {
+	type;
+	connectType;
+	id;
+	driver;
 	constructor(type, connectType, id, driver = {}) {
 		this.type = type;
 		this.connectType = connectType;
@@ -1479,6 +1527,7 @@ function toSmartappLaunchOptions(options) {
 	};
 }
 var SwanLauncher = class {
+	automator;
 	constructor(automator = SmartappAutomator$1) {
 		this.automator = automator;
 	}

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

@@ -4047,6 +4047,8 @@ function resolveComponentScopeId(scopeId) {
 	return scopeId;
 }
 var HeadlessTestingNodeHandle = class HeadlessTestingNodeHandle {
+	node;
+	interactions;
 	constructor(node, interactions) {
 		this.node = node;
 		this.interactions = interactions;
@@ -5239,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
@@ -7720,6 +7721,9 @@ function createHeadlessSession(options) {
 const DEFAULT_WAIT_TIMEOUT$1 = 1e3;
 const DEFAULT_WAIT_INTERVAL$1 = 10;
 var HeadlessTestingPageHandle = class {
+	project;
+	page;
+	session;
 	constructor(project, page, session) {
 		this.project = project;
 		this.page = page;
@@ -7886,6 +7890,9 @@ async function pollUntil(check, errorMessage, options = {}) {
 //#endregion
 //#region ../../mpcore/packages/simulator/src/testing/sessionHandle/scope.ts
 var HeadlessTestingScopeHandle = class HeadlessTestingScopeHandle {
+	scopeId;
+	project;
+	session;
 	constructor(scopeId, project, session) {
 		this.scopeId = scopeId;
 		this.project = project;
@@ -7940,6 +7947,8 @@ var HeadlessTestingScopeHandle = class HeadlessTestingScopeHandle {
 //#endregion
 //#region ../../mpcore/packages/simulator/src/testing/sessionHandle/index.ts
 var HeadlessTestingSessionHandle = class {
+	project;
+	session;
 	constructor(project, session) {
 		this.project = project;
 		this.session = session;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/miniprogram-automator",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "完全兼容微信 miniprogram-automator 的现代化替代实现",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -41,8 +41,8 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "dependencies": {
-    "debug": "^4.4.3",
-    "ws": "^8.18.3",
+    "obug": "^2.1.1",
+    "ws": "^8.20.1",
     "@weapp-vite/qr": "1.1.0"
   },
   "publishConfig": {