@weapp-vite/miniprogram-automator 1.2.16 → 1.2.18

package/README.md

@@ -126,6 +126,21 @@ await page.waitFor(500)
 
 > 降级元素上的不支持操作会**立即抛出带替代建议的错误**，不会再像旧版那样挂起 30s 才超时。
 
+### 4.6 结构化错误日志
+
+`enableLog(timeout, { structured: true })` 先通过 `App.CDPEnable` 注册事件通道，再启用 Runtime，保留 CDP 原始日志参数，并读取 Error 的非枚举 `name`、`message`、`stack` 数据属性，避免 SDK 将错误序列化为 `{}`。普通对象仍是原始 RemoteObject；不会执行 getter 或远程函数。默认不传选项时继续使用 SDK 日志格式。
+
+```ts
+miniProgram.addListener('console', (entry) => {
+  console.log(entry)
+})
+await miniProgram.enableLog(3_000, { structured: true })
+await miniProgram.reLaunch('/pages/index/index')
+await miniProgram.flushConsole()
+```
+
+先用 `addListener` 被动注册，再显式等待 `enableLog`，可以记录初始化期间的日志。`flushConsole()` 等待调用时已收到的错误属性检查完成；每次查询最多等待 1 秒，失败会在原参数上保留 `inspectionError`。断开连接时尚未完成的日志也会携带该诊断发布。只有宿主明确返回 CDP 命令不支持时才回退 SDK 格式；其他初始化错误仍然抛出。重复调用 `enableLog` 会刷新 Runtime 订阅，并保留已选择的格式。
+
 ## 5. 主要导出
 
 | 导出                      | 说明                                     |

package/dist/index.d.mts

@@ -63,6 +63,28 @@ declare class Connection extends EventEmitter {
   static create(url: string, timeout?: number): Promise<Connection>;
 }
 //#endregion
+//#region src/structuredConsole.d.ts
+interface ConsoleLogOptions {
+  /** 使用 CDP 原始参数，并读取 Error 的非枚举数据属性；默认保留 SDK 日志格式。 */
+  structured?: boolean;
+}
+interface ConsoleRemoteObject {
+  type?: string;
+  subtype?: string;
+  className?: string;
+  objectId?: string;
+  description?: string;
+  value?: unknown;
+  /** 属性查询失败时保留原参数和诊断，不把不可检查的错误当作成功。 */
+  inspectionError?: string;
+  [key: string]: unknown;
+}
+interface StructuredConsoleEntry {
+  type: string;
+  args: ConsoleRemoteObject[];
+  [key: string]: unknown;
+}
+//#endregion
 //#region src/Native.d.ts
 /** ISwitchTabOptions 的类型定义。 */
 interface ISwitchTabOptions {
@@ -169,45 +191,45 @@ declare class Element {
   static create(connection: Connection, options: IElementOptions, elementMap: ElementMap): Element;
 }
 /** CustomElement 的实现。 */
-declare class CustomElement extends Element {
+export declare class CustomElement extends Element {
   setData(data: any): Promise<void>;
   data(path?: string): Promise<any>;
   callMethod(method: string, ...args: any[]): Promise<any>;
 }
 /** InputElement 的实现。 */
-declare class InputElement extends Element {
+export declare class InputElement extends Element {
   input(value: string): Promise<void>;
 }
 /** TextareaElement 的实现。 */
-declare class TextareaElement extends Element {
+export declare class TextareaElement extends Element {
   input(value: string): Promise<void>;
 }
 /** ScrollViewElement 的实现。 */
-declare class ScrollViewElement extends Element {
+export declare class ScrollViewElement extends Element {
   scrollTo(x: number, y: number): Promise<void>;
   property(name: string): Promise<any>;
   scrollWidth(): Promise<any>;
   scrollHeight(): Promise<any>;
 }
 /** SwiperElement 的实现。 */
-declare class SwiperElement extends Element {
+export declare class SwiperElement extends Element {
   swipeTo(index: number): Promise<void>;
 }
 /** MovableViewElement 的实现。 */
-declare class MovableViewElement extends Element {
+export declare class MovableViewElement extends Element {
   moveTo(x: number, y: number): Promise<void>;
   property(name: string): Promise<any>;
 }
 /** SwitchElement 的实现。 */
-declare class SwitchElement extends Element {
+export declare class SwitchElement extends Element {
   tap(): Promise<void>;
 }
 /** SliderElement 的实现。 */
-declare class SliderElement extends Element {
+export declare class SliderElement extends Element {
   slideTo(value: number): Promise<void>;
 }
 /** ContextElement 的实现。 */
-declare class ContextElement extends Element {
+export declare class ContextElement extends Element {
   callContextMethod(method: string, ...args: any[]): Promise<any>;
 }
 //#endregion
@@ -215,6 +237,7 @@ declare class ContextElement extends Element {
 /** IPageOptions 的类型定义。 */
 interface IPageOptions {
   id: number;
+  hasStableIdentity?: boolean;
   path: string;
   query: any;
 }
@@ -261,9 +284,12 @@ declare class Page {
   path: string;
   query: any;
   private id;
+  private hasStableIdentity;
   private elementMap;
   private preferAppServicePageProtocol;
   constructor(connection: Connection, options: IPageOptions);
+  /** 当前页面的协议帧身份，同路由新页面具有独立身份。 */
+  get pageId(): number;
   updateFromOptions(options: IPageOptions): void;
   waitFor(condition: WaitCondition): Promise<void>;
   $(selector: string, options?: PageQueryOptions): Promise<Element | null>;
@@ -313,6 +339,7 @@ interface IToolClearCacheOptions {
 type AutomatorCallable = (...args: any[]) => any;
 interface CurrentPageOptions {
   appFunctionFallback?: boolean;
+  pageStackFallback?: boolean;
   retries?: number;
   timeout?: number;
 }
@@ -324,6 +351,9 @@ declare class MiniProgram extends EventEmitter {
   private connection;
   private appBindings;
   private logEnabled;
+  private logEnabling?;
+  private structuredLogs;
+  private structuredConsole;
   private pageMap;
   private nativeIns?;
   constructor(connection: Connection);
@@ -351,7 +381,9 @@ declare class MiniProgram extends EventEmitter {
   close(): Promise<void>;
   remote(auto?: boolean): Promise<void>;
   disconnect(): void;
-  enableLog(timeout?: number): Promise<void>;
+  /** 等待已接收的结构化日志完成 Error 属性检查并发布。 */
+  flushConsole(): Promise<void>;
+  enableLog(timeout?: number, options?: ConsoleLogOptions): Promise<void>;
   on(event: string | symbol, listener: (...args: any[]) => void): this;
   exposeFunction(name: string, bindingFunction: AutomatorCallable): Promise<void>;
   checkVersion(timeout?: number): Promise<void>;
@@ -553,8 +585,8 @@ declare function devices(deviceType: string, _connectType?: string): Promise<Sma
 /**
  * @file 小程序自动化平台适配定义。
  */
-type MiniprogramAutomatorPlatform = 'wechat' | 'swan' | 'baidu';
-interface IExternalAutomatorModule {
+export type MiniprogramAutomatorPlatform = 'wechat' | 'swan' | 'baidu';
+export interface IExternalAutomatorModule {
   launch: (options: Record<string, unknown>) => Promise<unknown>;
   connect?: (options: Record<string, unknown>) => Promise<unknown>;
   devices?: (deviceType: string, connectType?: string) => Promise<unknown>;
@@ -563,17 +595,17 @@ interface IExternalAutomatorModule {
   log?: unknown;
   time?: unknown;
 }
-type NormalizedMiniprogramAutomatorPlatform = Exclude<MiniprogramAutomatorPlatform, 'baidu'>;
-declare function normalizePlatform(platform?: MiniprogramAutomatorPlatform): NormalizedMiniprogramAutomatorPlatform;
+export type NormalizedMiniprogramAutomatorPlatform = Exclude<MiniprogramAutomatorPlatform, 'baidu'>;
+export declare function normalizePlatform(platform?: MiniprogramAutomatorPlatform): NormalizedMiniprogramAutomatorPlatform;
 //#endregion
 //#region src/Launcher.d.ts
-interface IConnectOptions {
+export interface IConnectOptions {
   wsEndpoint: string;
   timeout?: number;
   platform?: MiniprogramAutomatorPlatform;
 }
 /** ILaunchOptions 的类型定义。 */
-interface ILaunchOptions {
+export interface ILaunchOptions {
   platform?: MiniprogramAutomatorPlatform;
   cliPath?: string;
   connectType?: string;
@@ -601,7 +633,7 @@ interface ILaunchOptions {
   wdaProjPath?: string;
   webModel?: string;
 }
-interface ILauncherSessionMetadata {
+export interface ILauncherSessionMetadata {
   port: number;
   projectPath: string;
   wsEndpoint: string;
@@ -635,16 +667,16 @@ declare class Automator {
 //#endregion
 //#region src/util.d.ts
 /** decodeQrCode 的方法封装。 */
-declare function decodeQrCode(qrCode: string): Promise<string>;
+export declare function decodeQrCode(qrCode: string): Promise<string>;
 /** printQrCode 的方法封装。 */
-declare function printQrCode(content: string): Promise<void>;
+export declare function printQrCode(content: string): Promise<void>;
 /** isPluginPath 的方法封装。 */
-declare function isPluginPath(p: unknown): boolean;
+export declare function isPluginPath(p: unknown): boolean;
 /** extractPluginId 的方法封装。 */
-declare function extractPluginId(p: unknown): string;
+export declare function extractPluginId(p: unknown): string;
 //#endregion
 //#region src/index.d.ts
-declare const SmartappAutomator: {
+export declare const SmartappAutomator: {
   connect: typeof connect;
   devices: typeof devices;
   file: {
@@ -669,4 +701,4 @@ declare const SmartappAutomator: {
   };
 };
 //#endregion
-export { Automator, Connection, ContextElement, CustomElement, Element, IConnectOptions, IExternalAutomatorModule, ILaunchOptions, ILauncherSessionMetadata, InputElement, Launcher, MiniProgram, MiniprogramAutomatorPlatform, MovableViewElement, Native, NormalizedMiniprogramAutomatorPlatform, Page, ScrollViewElement, SliderElement, SmartappAutomator, SwiperElement, SwitchElement, TextareaElement, Transport, decodeQrCode, extractPluginId, isPluginPath, normalizePlatform, printQrCode };
+export { Automator, Connection, type ConsoleLogOptions, type ConsoleRemoteObject, Element, Launcher, MiniProgram, Native, Page, type StructuredConsoleEntry, Transport };

package/dist/index.mjs

@@ -364,13 +364,14 @@ const ROUTE_ELEMENT_SNAPSHOT_FUNCTION_DECLARATION = `function (route, query, sel
         }
         selectorQuery
           .selectAll(selector)
-          .fields({
+          // 宿主 JSON.parse 创建可跨 DevTools evaluate 上下文传输的查询选项。
+          .fields(JSON.parse(JSON.stringify({
             id: true,
             dataset: true,
             rect: true,
             size: true,
             computedStyle: Array.isArray(styleNames) ? styleNames : []
-          }, function (nodes) {
+          })), function (nodes) {
             finish(nodes);
           })
           .exec();
@@ -942,7 +943,7 @@ var Connection = class Connection extends EventEmitter {
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-Dqnd-Lqe.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-Bvji0XA8.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region src/launcher/portLease.ts
@@ -1056,20 +1057,20 @@ async function enableAutomatorViaHttp(options) {
 	if (options.trustProject) endpoint.searchParams.set("trustProject", "true");
 	const response = await fetch(endpoint, { redirect: "follow" });
 	const body = await response.text();
-	if (!response.ok) throw new Error(`WeChat DevTools HTTP automator fallback failed with status ${response.status}${body.trim() ? `: ${body.trim().slice(0, 400)}` : ""}`);
+	if (!response.ok) throw new Error(`WeChat DevTools HTTP automator fallback failed with status ${response.status}`);
 	let result;
 	try {
 		result = JSON.parse(body);
-	} catch (error) {
-		throw new Error("WeChat DevTools HTTP automator fallback returned invalid JSON", { cause: error });
+	} catch {
+		throw new Error("WeChat DevTools HTTP automator fallback returned invalid JSON");
 	}
 	if (result && typeof result === "object" && "autoPort" in result) {
 		const autoPort = Number(result.autoPort);
-		if (!Number.isInteger(autoPort) || autoPort <= 0 || autoPort > 65535) throw new Error(`WeChat DevTools HTTP automator fallback returned invalid autoPort: ${String(result.autoPort)}`);
+		if (!Number.isInteger(autoPort) || autoPort <= 0 || autoPort > 65535) throw new Error("WeChat DevTools HTTP automator fallback returned invalid autoPort");
 		return autoPort;
 	}
-	if (typeof result === "string" && /^s\d+$/.test(result)) return options.autoPort;
-	throw new Error(`WeChat DevTools HTTP automator fallback returned unsupported response: ${body.trim().slice(0, 400)}`);
+	if (typeof result === "string" && (/^s\d+$/.test(result) || /^[0-9a-f]{32}$/i.test(result))) return options.autoPort;
+	throw new Error("WeChat DevTools HTTP automator fallback returned unsupported response");
 }
 const AUTOMATOR_VALUE_OPTIONS = /* @__PURE__ */ new Set([
 	"--auto-account",
@@ -1097,7 +1098,7 @@ function resolveWechatDevtoolsBootstrapArgs(args) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.16";
+var version = "1.2.18";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -1384,16 +1385,24 @@ var Page = class Page {
 	path = "";
 	query = {};
 	id;
+	hasStableIdentity;
 	elementMap = /* @__PURE__ */ new Map();
 	preferAppServicePageProtocol = false;
 	constructor(connection, options) {
 		this.connection = connection;
 		this.id = options.id;
+		this.hasStableIdentity = options.hasStableIdentity !== false;
 		this.path = options.path;
 		this.query = options.query;
 		this.preferAppServicePageProtocol = connection.prefersAppServicePageProtocol;
 	}
+	/** 当前页面的协议帧身份，同路由新页面具有独立身份。 */
+	get pageId() {
+		if (!this.hasStableIdentity) throw new Error("DevTools did not provide a stable page frame identity");
+		return this.id;
+	}
 	updateFromOptions(options) {
+		this.hasStableIdentity = options.hasStableIdentity !== false;
 		this.path = options.path;
 		this.query = options.query;
 	}
@@ -1443,6 +1452,7 @@ var Page = class Page {
 	async getElementByXpath(selector, options = {}) {
 		try {
 			const element = await this.send("Page.getElementByXpath", { selector }, { timeout: options.timeout ?? PAGE_QUERY_TIMEOUT });
+			if (element === null) return null;
 			return Element.create(this.connection, {
 				...element,
 				pageId: this.id
@@ -1452,7 +1462,8 @@ var Page = class Page {
 		}
 	}
 	async getElementsByXpath(selector, options = {}) {
-		const elements = (await this.send("Page.getElementsByXpath", { selector }, { timeout: options.timeout ?? PAGE_QUERY_TIMEOUT }))?.elements;
+		const response = await this.send("Page.getElementsByXpath", { selector }, { timeout: options.timeout ?? PAGE_QUERY_TIMEOUT });
+		const elements = Array.isArray(response) ? response : response?.elements;
 		if (!Array.isArray(elements)) throw new TypeError("DevTools Page.getElementsByXpath 返回了无效响应：缺少 elements 数组。");
 		return elements.map((element) => {
 			return Element.create(this.connection, {
@@ -1614,12 +1625,13 @@ var Page = class Page {
               }
               query
                 .selectAll(selector)
-                .fields({
+                // 宿主 JSON.parse 创建可跨 DevTools evaluate 上下文传输的查询选项。
+                .fields(JSON.parse(JSON.stringify({
                   dataset: true,
                   id: true,
                   rect: true,
                   size: true
-                }, function (nodes) {
+                })), function (nodes) {
                   finish(nodes);
                 })
                 .exec();
@@ -1798,12 +1810,13 @@ var Page = class Page {
               }
               query
                 .selectAll(selector)
-                .fields({
+                // 宿主 JSON.parse 创建可跨 DevTools evaluate 上下文传输的查询选项。
+                .fields(JSON.parse(JSON.stringify({
                   dataset: true,
                   id: true,
                   rect: true,
                   size: true
-                }, function (nodes) {
+                })), function (nodes) {
                   finish(nodes);
                 })
                 .exec();
@@ -2182,6 +2195,100 @@ var Page = class Page {
 	}
 };
 //#endregion
+//#region src/structuredConsole.ts
+function isRecord(value) {
+	return value !== null && typeof value === "object";
+}
+function isRemoteError(arg) {
+	return isRecord(arg) && arg.type === "object" && typeof arg.objectId === "string" && (arg.subtype === "error" || /^(?:Error|EvalError|RangeError|ReferenceError|SyntaxError|TypeError|URIError|AggregateError)$/.test(arg.className ?? ""));
+}
+/** 按原始事件顺序发布日志；查询仅读取 Error 数据描述符，不执行 getter 或远程函数。 */
+var StructuredConsole = class {
+	send;
+	emit;
+	enabled = false;
+	pending = [];
+	constructor(send, emit) {
+		this.send = send;
+		this.emit = emit;
+	}
+	receive = (event) => {
+		if (!this.enabled || !isRecord(event) || event.domain !== "Runtime" || event.event !== "consoleAPICalled") return;
+		const params = event.params;
+		if (!isRecord(params) || typeof params.type !== "string" || !Array.isArray(params.args)) return;
+		const original = params;
+		const entry = {
+			original,
+			task: Promise.resolve()
+		};
+		this.pending.push(entry);
+		entry.task = Promise.all(original.args.map((arg) => this.inspect(arg))).then((args) => {
+			if (!entry.result) {
+				entry.result = {
+					...original,
+					args
+				};
+				this.drain();
+			}
+		});
+	};
+	async flush() {
+		await Promise.all(this.pending.map((entry) => entry.task));
+	}
+	stop() {
+		this.enabled = false;
+		for (const entry of this.pending) entry.result ??= {
+			...entry.original,
+			args: entry.original.args.map((arg) => isRemoteError(arg) ? {
+				...arg,
+				inspectionError: "Console connection closed before Error inspection completed"
+			} : arg)
+		};
+		this.drain();
+	}
+	drain() {
+		while (this.pending[0]?.result) {
+			const entry = this.pending.shift();
+			this.emit(entry.result);
+		}
+	}
+	async inspect(arg) {
+		if (!isRemoteError(arg)) return arg;
+		try {
+			const response = await this.send("App.CDPCommand", {
+				domain: "Runtime",
+				method: "getProperties",
+				params: {
+					objectId: arg.objectId,
+					ownProperties: true,
+					accessorPropertiesOnly: false,
+					generatePreview: false
+				}
+			}, { timeout: 1e3 });
+			if (!isRecord(response) || !Array.isArray(response.result) || response.exceptionDetails) throw new Error("Runtime.getProperties did not return Error data descriptors");
+			const value = { name: arg.className ?? "Error" };
+			for (const descriptor of response.result) {
+				if (!isRecord(descriptor) || ![
+					"name",
+					"message",
+					"stack"
+				].includes(String(descriptor.name))) continue;
+				if (!("get" in descriptor) && !("set" in descriptor) && isRecord(descriptor.value) && typeof descriptor.value.value === "string") value[String(descriptor.name)] = descriptor.value.value;
+			}
+			return {
+				...arg,
+				value,
+				...!("message" in value) && !("stack" in value) ? { inspectionError: "Error has no readable message or stack data descriptors" } : {}
+			};
+		} catch (error) {
+			return {
+				...arg,
+				inspectionError: error instanceof Error ? error.message : String(error)
+			};
+		}
+	}
+};
+//#endregion
 //#region src/util.ts
 /**
 * @file 二维码与插件路径工具。
@@ -2328,11 +2435,16 @@ var MiniProgram = class extends EventEmitter {
 	connection;
 	appBindings = /* @__PURE__ */ new Map();
 	logEnabled = false;
+	logEnabling;
+	structuredLogs = false;
+	structuredConsole;
 	pageMap = /* @__PURE__ */ new Map();
 	nativeIns;
 	constructor(connection) {
 		super();
 		this.connection = connection;
+		this.structuredConsole = new StructuredConsole((method, params, options) => this.send(method, params, options), (entry) => this.emit("console", entry));
+		connection.on("App.CDPEvent", this.structuredConsole.receive);
 		connection.on("App.logAdded", this.onLogAdded);
 		connection.on("App.bindingCalled", this.onBindingCalled);
 		connection.on("App.exceptionThrown", this.onExceptionThrown);
@@ -2377,7 +2489,7 @@ var MiniProgram = class extends EventEmitter {
 				continue;
 			}
 		}
-		if (isCurrentPageProtocolTimeout(lastError) || isPageMetaMissingError(lastError) || isCurrentFrameTimedOutError(lastError)) try {
+		if ((options.pageStackFallback ?? true) && (isCurrentPageProtocolTimeout(lastError) || isPageMetaMissingError(lastError) || isCurrentFrameTimedOutError(lastError))) try {
 			const { pageStack } = await this.send("App.getPageStack", {}, sendOptions);
 			const page = pageStack[pageStack.length - 1];
 			if (page) return this.createPageFromPayload(page, pageStack.length);
@@ -2498,12 +2610,54 @@ var MiniProgram = class extends EventEmitter {
 		});
 	}
 	disconnect() {
+		this.structuredConsole.stop();
 		this.connection.dispose();
 	}
-	async enableLog(timeout) {
-		if (timeout === void 0) await this.send("App.enableLog");
-		else await this.send("App.enableLog", {}, { timeout });
-		this.logEnabled = true;
+	/** 等待已接收的结构化日志完成 Error 属性检查并发布。 */
+	async flushConsole() {
+		await this.structuredConsole.flush();
+	}
+	enableLog(timeout, options = {}) {
+		if (this.logEnabling) {
+			if (options.structured !== void 0 && options.structured !== this.structuredLogs) return Promise.reject(/* @__PURE__ */ new Error("Cannot change console format while logging is being enabled"));
+			return this.logEnabling;
+		}
+		this.structuredLogs = options.structured ?? this.structuredLogs;
+		this.structuredConsole.enabled = this.structuredLogs;
+		this.logEnabled = false;
+		const startedAt = Date.now();
+		const request = async (method, params = {}) => {
+			if (timeout === void 0) return await this.send(method, params);
+			const remaining = timeout - (Date.now() - startedAt);
+			if (remaining <= 0) throw new Error(`Timed out enabling console logging within ${timeout}ms`);
+			return await this.send(method, params, { timeout: remaining });
+		};
+		this.logEnabling = (async () => {
+			if (!this.structuredLogs) await request("App.enableLog");
+			let cdpMethod = this.structuredLogs ? "App.CDPEnable" : "App.CDPCommand";
+			try {
+				if (this.structuredLogs) {
+					await request(cdpMethod);
+					cdpMethod = "App.CDPCommand";
+				}
+				await request("App.CDPCommand", {
+					domain: "Runtime",
+					method: "enable",
+					params: {}
+				});
+			} catch (error) {
+				if (!(error instanceof Error) || error.message !== `appservice ${cdpMethod} unimplemented`) throw error;
+				if (this.structuredLogs) {
+					this.structuredConsole.enabled = false;
+					await request("App.enableLog");
+				}
+			}
+			this.logEnabled = true;
+		})().finally(async () => {
+			await this.flushConsole();
+			this.logEnabling = void 0;
+		});
+		return this.logEnabling;
 	}
 	on(event, listener) {
 		if (event === "console" && !this.logEnabled) this.enableLog().catch(() => {});
@@ -2710,8 +2864,10 @@ var MiniProgram = class extends EventEmitter {
 		}
 	}
 	createPageFromPayload(page, fallbackId = 1) {
+		const protocolId = page.pageId ?? page.__wxWebviewId__ ?? page.__webviewId__;
 		return Page.create(this.connection, {
 			id: resolvePagePayloadId(page, fallbackId),
+			hasStableIdentity: typeof protocolId === "number" && Number.isSafeInteger(protocolId) && protocolId >= 0,
 			path: resolvePagePayloadPath(page),
 			query: page.query ?? page.options ?? {}
 		}, this.pageMap);
@@ -2725,9 +2881,9 @@ var MiniProgram = class extends EventEmitter {
 			const { result } = await this.send("App.callFunction", {
 				functionDeclaration: `function () {
             var pages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
-            return pages.map(function (page, index) {
+            return pages.map(function (page) {
               return {
-                pageId: page.pageId || page.__wxWebviewId__ || page.__webviewId__ || index + 1,
+                pageId: page.pageId || page.__wxWebviewId__ || page.__webviewId__,
                 path: page.path || page.route || page.__route__ || '',
                 query: page.query || page.options || {}
               };
@@ -2747,7 +2903,7 @@ var MiniProgram = class extends EventEmitter {
 		return options ? await this.connection.send(method, params, options) : await this.connection.send(method, params);
 	}
 	onLogAdded = (payload) => {
-		this.emit("console", payload);
+		if (!this.structuredConsole.enabled) this.emit("console", payload);
 	};
 	onBindingCalled = (payload) => {
 		const binding = this.appBindings.get(payload.name);
@@ -3426,9 +3582,25 @@ var Launcher = class {
 	}
 	async connect(options) {
 		if (normalizePlatform(options.platform) === "swan") return await new SwanLauncher().connect(options);
-		const miniProgram = await this.connectTool(options);
-		await miniProgram.checkVersion(options.timeout);
-		return miniProgram;
+		const timeout = options.timeout ?? DEFAULT_TIMEOUT;
+		const deadlineAt = performance.now() + timeout;
+		const miniProgram = await this.connectTool({
+			...options,
+			timeout
+		});
+		try {
+			const remaining = Math.ceil(deadlineAt - performance.now());
+			if (remaining <= 0) throw new Error(`Timed out connecting to automator after ${timeout}ms`);
+			await miniProgram.checkVersion(remaining);
+			return miniProgram;
+		} catch (error) {
+			try {
+				miniProgram.disconnect();
+			} catch (cleanupError) {
+				throw new AggregateError([error, cleanupError], "Automator connection and cleanup both failed", { cause: error });
+			}
+			throw error;
+		}
 	}
 	async extendProjectConfig(projectConfig, projectPath) {
 		const projectConfigPath = path.resolve(projectPath, "project.config.json");