@weapp-vite/miniprogram-automator 1.2.13 → 1.2.15

package/dist/index.mjs

@@ -217,9 +217,222 @@ function cmpVersion(versionA, versionB) {
 	}
 	return 0;
 }
-/** toStr 的方法封装。 */
-function toStr(value) {
-	return value == null ? "" : String(value);
+//#endregion
+//#region src/pageRouteSnapshot.ts
+const ROUTE_ELEMENT_SNAPSHOT_TIMEOUT = 5e3;
+const ROUTE_ELEMENT_SNAPSHOT_EMPTY_RETRIES = 2;
+const ROUTE_ELEMENT_SNAPSHOT_RETRY_DELAY = 220;
+/**
+* 页面定位 + 组件作用域遍历逻辑与 Page.renderedNodes 保持一致:
+* 先按 route/query 找到目标页面,再逐层进入自定义组件作用域查询,
+* 返回首个命中作用域里 selectAll(selector)[index] 的快照;未命中返回 null。
+*/
+const ROUTE_ELEMENT_SNAPSHOT_FUNCTION_DECLARATION = `function (route, query, selector, index, scopeSelectors, styleNames) {
+  function normalizeRoute(value) {
+    return String(value || '').replace(/^\\/+/, '').replace(/\\/+$/g, '');
+  }
+  function matchesQuery(page, expectedQuery) {
+    if (!expectedQuery || !Object.keys(expectedQuery).length) {
+      return true;
+    }
+    var actualQuery = page && (page.options || page.query || {});
+    return Object.keys(expectedQuery).every(function (key) {
+      var actualValue = String(actualQuery[key] == null ? '' : actualQuery[key]);
+      var expectedValue = String(expectedQuery[key]);
+      var decodedActualValue = actualValue;
+      try {
+        decodedActualValue = decodeURIComponent(actualValue);
+      }
+      catch (_) {
+      }
+      return actualValue === expectedValue
+        || decodedActualValue === expectedValue
+        || actualValue === encodeURIComponent(expectedValue);
+    });
+  }
+  var pages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
+  var expectedRoute = normalizeRoute(route);
+  var page = null;
+  for (var pageIndex = pages.length - 1; pageIndex >= 0; pageIndex -= 1) {
+    var candidate = pages[pageIndex];
+    var candidateRoute = normalizeRoute(candidate && (candidate.path || candidate.route || candidate.__route__));
+    if ((!expectedRoute || candidateRoute === expectedRoute) && matchesQuery(candidate, query)) {
+      page = candidate;
+      break;
+    }
+  }
+  if (!page) {
+    return null;
+  }
+  function createSelectorQuery(scope) {
+    var selectorQuery = null;
+    var createdFromScope = false;
+    if (scope && typeof scope.createSelectorQuery === 'function') {
+      selectorQuery = scope.createSelectorQuery();
+      createdFromScope = true;
+    }
+    else if (typeof wx !== 'undefined' && wx && typeof wx.createSelectorQuery === 'function') {
+      selectorQuery = wx.createSelectorQuery();
+    }
+    else if (typeof page.createSelectorQuery === 'function') {
+      selectorQuery = page.createSelectorQuery();
+    }
+    if (!selectorQuery) {
+      return null;
+    }
+    if (!createdFromScope && typeof selectorQuery.in === 'function') {
+      try {
+        selectorQuery = selectorQuery.in(scope || page);
+      }
+      catch (_) {
+      }
+    }
+    return selectorQuery;
+  }
+  function pushUnique(list, seen, item) {
+    if (!item) {
+      return;
+    }
+    var id = item.is || item.id || item.__wxWebviewId__ || item.__wxExparserNodeId__ || String(list.length);
+    if (seen[id]) {
+      return;
+    }
+    seen[id] = true;
+    list.push(item);
+  }
+  function collectScopes(root, scopeSelectors) {
+    var scopes = [];
+    var seen = {};
+    var queue = [];
+    pushUnique(scopes, seen, root);
+    queue.push(root);
+    for (var queueIndex = 0; queueIndex < queue.length && queueIndex < 60; queueIndex += 1) {
+      var scope = queue[queueIndex];
+      if (!scope || typeof scope.selectAllComponents !== 'function') {
+        continue;
+      }
+      var children = [];
+      var componentSelectors = Array.isArray(scopeSelectors) ? scopeSelectors.slice() : [];
+      componentSelectors.push(selector, '*', 'weapp-app-shell', 'weapp-layout-default');
+      for (var selectorIndex = 0; selectorIndex < componentSelectors.length; selectorIndex += 1) {
+        if (!componentSelectors[selectorIndex]) {
+          continue;
+        }
+        try {
+          var selected = scope.selectAllComponents(componentSelectors[selectorIndex]);
+          if (Array.isArray(selected)) {
+            children = children.concat(selected);
+          }
+        }
+        catch (_) {
+        }
+      }
+      for (var childIndex = 0; childIndex < children.length; childIndex += 1) {
+        var child = children[childIndex];
+        var previousLength = scopes.length;
+        pushUnique(scopes, seen, child);
+        if (scopes.length > previousLength) {
+          queue.push(child);
+        }
+      }
+    }
+    return scopes;
+  }
+  function queryScope(scope) {
+    return new Promise(function (resolve) {
+      var settled = false;
+      var timer = setTimeout(function () {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        resolve([]);
+      }, 800);
+      function finish(nodes) {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        clearTimeout(timer);
+        resolve(Array.isArray(nodes) ? nodes : nodes ? [nodes] : []);
+      }
+      try {
+        var selectorQuery = createSelectorQuery(scope);
+        if (!selectorQuery) {
+          finish([]);
+          return;
+        }
+        selectorQuery
+          .selectAll(selector)
+          .fields({
+            id: true,
+            dataset: true,
+            rect: true,
+            size: true,
+            computedStyle: Array.isArray(styleNames) ? styleNames : []
+          }, function (nodes) {
+            finish(nodes);
+          })
+          .exec();
+      }
+      catch (_) {
+        finish([]);
+      }
+    });
+  }
+  return new Promise(function (resolve) {
+    try {
+      var scopes = collectScopes(page, scopeSelectors);
+      var scopeIndex = 0;
+      function next() {
+        if (scopeIndex >= scopes.length) {
+          resolve(null);
+          return;
+        }
+        var scope = scopes[scopeIndex];
+        scopeIndex += 1;
+        queryScope(scope).then(function (nodes) {
+          if (nodes.length > 0) {
+            resolve(nodes[index] || null);
+            return;
+          }
+          next();
+        }, function () {
+          next();
+        });
+      }
+      next();
+    }
+    catch (_) {
+      resolve(null);
+    }
+  });
+}`;
+/**
+* 读取降级元素快照。未找到(页面不在/选择器无命中/索引越界)返回 null,
+* 由调用方决定抛错文案;永不因为协议失效而长时间挂起。
+*/
+async function readRouteElementSnapshot(connection, route, query, selector, index, scopeSelectors = [], styleNames = [], timeout = ROUTE_ELEMENT_SNAPSHOT_TIMEOUT) {
+	const startedAt = Date.now();
+	for (let attempt = 0; attempt <= ROUTE_ELEMENT_SNAPSHOT_EMPTY_RETRIES; attempt += 1) {
+		const remaining = attempt === 0 ? timeout : Math.max(1, timeout - (Date.now() - startedAt));
+		const { result } = await connection.send("App.callFunction", {
+			functionDeclaration: ROUTE_ELEMENT_SNAPSHOT_FUNCTION_DECLARATION,
+			args: [
+				route,
+				query,
+				selector,
+				index,
+				scopeSelectors,
+				styleNames
+			]
+		}, { timeout: remaining });
+		if (result != null || attempt === ROUTE_ELEMENT_SNAPSHOT_EMPTY_RETRIES) return result ?? null;
+		const retryRemaining = timeout - (Date.now() - startedAt);
+		if (retryRemaining <= 0) break;
+		await sleep$1(Math.min(ROUTE_ELEMENT_SNAPSHOT_RETRY_DELAY, retryRemaining));
+	}
+	return null;
 }
 //#endregion
 //#region src/Element.ts
@@ -272,7 +485,17 @@ var Element = class Element {
 		};
 	}
 	async offset() {
-		return await this.send("Element.getOffset");
+		const offset = await this.send("Element.getOffset");
+		if (offset?.width !== void 0 && offset.height !== void 0) return offset;
+		try {
+			const dimensions = await this.size();
+			return {
+				...offset,
+				...dimensions
+			};
+		} catch {
+			return offset;
+		}
 	}
 	async text() {
 		return await this.domProperty("innerText");
@@ -394,8 +617,87 @@ var Element = class Element {
 };
 /** App-Service 路由降级元素仅用于只读查询，不能伪装成交互协议元素。 */
 var RouteFallbackElement = class extends Element {
+	routeSelector;
+	routeIndex;
+	routeRoute;
+	routeQuery;
+	routeScopeSelectors;
+	constructor(connection, options, elementMap) {
+		super(connection, options, elementMap);
+		this.routeSelector = options.routeFallbackSelector;
+		this.routeIndex = options.routeFallbackIndex;
+		this.routeRoute = options.routeFallbackRoute;
+		this.routeQuery = options.routeFallbackQuery;
+		this.routeScopeSelectors = options.routeFallbackScopeSelectors ?? [];
+	}
+	/**
+	* 经 App-service SelectorQuery 实时重查元素快照(rect/size/dataset/computedStyle)。
+	* 每次读取都重新查询,保证滚动/重渲染后拿到的是当前值;未命中返回 null。
+	*/
+	async readSnapshot(styleNames = []) {
+		if (!this.routeSelector || this.routeIndex === void 0 || !this.routeRoute) return null;
+		return await readRouteElementSnapshot(this.connection, this.routeRoute, this.routeQuery ?? {}, this.routeSelector, this.routeIndex, this.routeScopeSelectors, styleNames);
+	}
+	missingSnapshot(what) {
+		return /* @__PURE__ */ new Error(`route fallback 元素未取到${what}: ${this.routeSelector ?? "(未知选择器)"}(页面已切换或元素已卸载)`);
+	}
+	async $(selector, _options = {}) {
+		return this.unsupported(`Element.$(${selector})`);
+	}
+	async $$(selector, _options = {}) {
+		return this.unsupported(`Element.$$(${selector})`);
+	}
+	async offset() {
+		const snapshot = await this.readSnapshot();
+		if (snapshot?.left === void 0 || snapshot.top === void 0) throw this.missingSnapshot("坐标");
+		return {
+			left: snapshot.left,
+			top: snapshot.top,
+			width: snapshot.width,
+			height: snapshot.height
+		};
+	}
+	async size() {
+		const snapshot = await this.readSnapshot();
+		if (snapshot?.width === void 0 || snapshot.height === void 0) throw this.missingSnapshot("尺寸");
+		return {
+			width: snapshot.width,
+			height: snapshot.height
+		};
+	}
+	async style(name) {
+		if (!isStr(name)) throw new Error("name must be a string");
+		const value = (await this.readSnapshot([name]))?.[name];
+		if (value === void 0) throw this.missingSnapshot(`样式 ${name}`);
+		return value;
+	}
+	async attribute(name) {
+		if (!isStr(name)) throw new Error("name must be a string");
+		const snapshot = await this.readSnapshot();
+		if (name === "id") return snapshot?.id;
+		if (name.startsWith("data-")) {
+			const key = name.slice(5).replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
+			return snapshot?.dataset?.[key];
+		}
+		throw new Error(`route fallback 元素仅支持读取 id 与 data-* 属性,不支持 attribute(${name})`);
+	}
 	unsupported(method) {
-		throw new Error(`App-Service route fallback 元素不支持 ${method}`);
+		throw new Error(`App-Service route fallback 元素不支持 ${method}(真实交互依赖已失效的 page-frame 协议);可改用 page.callMethod()/evaluate 间接触发页面逻辑`);
+	}
+	async text() {
+		throw new Error("App-Service route fallback 元素不支持 text(SelectorQuery 无法读取 innerText);请改用 page.data() 断言数据源,或 page.callMethod()/evaluate 读取");
+	}
+	async value() {
+		this.unsupported("Element.value");
+	}
+	async property(name) {
+		this.unsupported(`Element.property(${name})`);
+	}
+	async wxml() {
+		this.unsupported("Element.wxml");
+	}
+	async outerWxml() {
+		this.unsupported("Element.outerWxml");
 	}
 	async tap() {
 		this.unsupported("Element.tap");
@@ -640,7 +942,7 @@ var Connection = class Connection extends EventEmitter {
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-yIGimB0F.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-Dqnd-Lqe.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region src/launcher/portLease.ts
@@ -738,8 +1040,64 @@ async function acquireAutomatorPortLease(preferredPort) {
 	return createLease(await getPort(0, "127.0.0.1"));
 }
 //#endregion
+//#region src/launcher/wechatCliFallback.ts
+const WECHAT_DEVTOOLS_SERVICE_PORT_RE = /listening\s+on\s+http:\/\/127\.0\.0\.1:(\d{2,5})/i;
+function extractWechatDevtoolsServicePort(output) {
+	const port = Number(output.match(WECHAT_DEVTOOLS_SERVICE_PORT_RE)?.[1]);
+	return Number.isInteger(port) && port > 0 && port <= 65535 ? port : void 0;
+}
+async function enableAutomatorViaHttp(options) {
+	const endpoint = new URL("/auto", `http://127.0.0.1:${options.servicePort}`);
+	endpoint.searchParams.set("project", options.projectPath);
+	endpoint.searchParams.set("port", String(options.autoPort));
+	endpoint.searchParams.set("autoPort", String(options.autoPort));
+	if (options.account) endpoint.searchParams.set("account", options.account);
+	if (options.ticket) endpoint.searchParams.set("ticket", options.ticket);
+	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)}` : ""}`);
+	let result;
+	try {
+		result = JSON.parse(body);
+	} catch (error) {
+		throw new Error("WeChat DevTools HTTP automator fallback returned invalid JSON", { cause: error });
+	}
+	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)}`);
+		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)}`);
+}
+const AUTOMATOR_VALUE_OPTIONS = /* @__PURE__ */ new Set([
+	"--auto-account",
+	"--auto-port",
+	"--autoAccount",
+	"--autoPort",
+	"--project",
+	"--test-ticket",
+	"--ticket"
+]);
+const AUTOMATOR_FLAG_OPTIONS = /* @__PURE__ */ new Set(["--trust-project"]);
+function resolveWechatDevtoolsBootstrapArgs(args) {
+	const bootstrapArgs = [];
+	for (let index = 0; index < args.length; index += 1) {
+		const arg = args[index];
+		if (AUTOMATOR_VALUE_OPTIONS.has(arg)) {
+			index += 1;
+			continue;
+		}
+		if (AUTOMATOR_FLAG_OPTIONS.has(arg) || arg === "auto") continue;
+		bootstrapArgs.push(arg);
+	}
+	bootstrapArgs.push("islogin");
+	return bootstrapArgs;
+}
+//#endregion
 //#region package.json
-var version = "1.2.13";
+var version = "1.2.15";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -800,14 +1158,19 @@ function resolveFallbackTagName(selector) {
 	return "view";
 }
 /** 将 App-Service 查询到的渲染节点包装为 Element 兼容对象。 */
-function createRouteFallbackElement(connection, elementMap, pageId, selector, node, index) {
+function createRouteFallbackElement(connection, elementMap, pageId, selector, node, index, route, query, scopeSelectors = []) {
 	const nodeId = typeof node.id === "string" && node.id ? normalizeFallbackIdPart(node.id) : String(index);
 	const elementId = `__weapp_vite_route_fallback_${pageId}_${normalizeFallbackIdPart(selector)}_${nodeId}_${index}`;
 	return Element.create(connection, {
 		elementId,
 		pageId,
 		routeFallback: true,
-		tagName: resolveFallbackTagName(selector)
+		tagName: resolveFallbackTagName(selector),
+		routeFallbackSelector: selector,
+		routeFallbackIndex: index,
+		routeFallbackRoute: route,
+		routeFallbackQuery: query,
+		routeFallbackScopeSelectors: [...scopeSelectors]
 	}, elementMap);
 }
 //#endregion
@@ -976,6 +1339,7 @@ const PAGE_CALL_METHOD_FALLBACK_RETRY_DELAY = 300;
 const PAGE_RENDERED_TIMEOUT = 15e3;
 const PAGE_RENDERED_POLL_DELAY = 220;
 const PAGE_RENDERED_QUERY_TIMEOUT = 5e3;
+const PAGE_RENDERED_EMPTY_RETRIES = 2;
 const PAGE_ROOT_SELECTORS = [
 	"page",
 	"body",
@@ -1723,10 +2087,21 @@ var Page = class Page {
 		return (await this.queryRouteElements(selector, options))[0] ?? null;
 	}
 	async queryRouteElements(selector, options) {
-		return (await this.renderedNodes(selector, {
-			componentSelectors: options.componentSelectors,
-			timeout: options.timeout ?? PAGE_QUERY_TIMEOUT
-		})).map((node, index) => createRouteFallbackElement(this.connection, this.elementMap, this.id, selector, node, index));
+		const timeout = options.timeout ?? PAGE_QUERY_TIMEOUT;
+		const startedAt = Date.now();
+		let nodes = [];
+		for (let attempt = 0; attempt <= PAGE_RENDERED_EMPTY_RETRIES; attempt += 1) {
+			const requestTimeout = attempt === 0 ? timeout : Math.max(1, timeout - (Date.now() - startedAt));
+			nodes = await this.renderedNodes(selector, {
+				componentSelectors: options.componentSelectors,
+				timeout: requestTimeout
+			});
+			if (nodes.length > 0 || attempt === PAGE_RENDERED_EMPTY_RETRIES) break;
+			const remaining = timeout - (Date.now() - startedAt);
+			if (remaining <= 0) break;
+			await sleep$1(Math.min(PAGE_RENDERED_POLL_DELAY, remaining));
+		}
+		return nodes.map((node, index) => createRouteFallbackElement(this.connection, this.elementMap, this.id, selector, node, index, this.path, this.query, options.componentSelectors));
 	}
 	async callRouteMethod(method, args, timeout = PAGE_CALL_METHOD_TIMEOUT) {
 		return await callRouteMethodViaAppService(this.connection, this.path, this.query, method, args, timeout);
@@ -2124,8 +2499,9 @@ var MiniProgram = class extends EventEmitter {
 	disconnect() {
 		this.connection.dispose();
 	}
-	async enableLog() {
-		await this.send("App.enableLog");
+	async enableLog(timeout) {
+		if (timeout === void 0) await this.send("App.enableLog");
+		else await this.send("App.enableLog", {}, { timeout });
 		this.logEnabled = true;
 	}
 	on(event, listener) {
@@ -2138,8 +2514,8 @@ var MiniProgram = class extends EventEmitter {
 		this.appBindings.set(name, bindingFunction);
 		await this.send("App.addBinding", { name });
 	}
-	async checkVersion() {
-		const toolInfo = await this.send("Tool.getInfo");
+	async checkVersion(timeout) {
+		const toolInfo = timeout === void 0 ? await this.send("Tool.getInfo") : await this.send("Tool.getInfo", {}, { timeout });
 		this.connection.configureToolInfo(toolInfo);
 		const sdkVersion = toolInfo.SDKVersion;
 		if (typeof sdkVersion !== "string" || !sdkVersion.trim()) return;
@@ -2151,12 +2527,16 @@ var MiniProgram = class extends EventEmitter {
 	async waitForAppReady(timeout = APP_READY_TIMEOUT) {
 		const startedAt = Date.now();
 		let lastError;
-		while (Date.now() - startedAt <= timeout) try {
-			await this.send("App.captureScreenshot", {}, { timeout: APP_READY_PROBE_TIMEOUT });
-			return;
-		} catch (error) {
-			lastError = error;
-			await sleep(APP_READY_POLL_DELAY);
+		while (Date.now() - startedAt < timeout) {
+			const remainingTimeout = timeout - (Date.now() - startedAt);
+			try {
+				await this.send("App.captureScreenshot", {}, { timeout: Math.min(APP_READY_PROBE_TIMEOUT, remainingTimeout) });
+				return;
+			} catch (error) {
+				lastError = error;
+				const remainingAfterProbe = timeout - (Date.now() - startedAt);
+				if (remainingAfterProbe > 0) await sleep(Math.min(APP_READY_POLL_DELAY, remainingAfterProbe));
+			}
 		}
 		throw lastError instanceof Error ? lastError : /* @__PURE__ */ new Error(`Timed out waiting App domain readiness after ${timeout}ms`);
 	}
@@ -2805,6 +3185,7 @@ var SwanLauncher = class {
 * @file 开发者工具启动与连接流程。
 */
 const DEFAULT_TIMEOUT = 3e4;
+const VERSION_CHECK_TIMEOUT = 3e4;
 const AUTOMATOR_LAUNCH_RETRIES = 3;
 const DEFAULT_RUNTIME_PROVIDER_ENV = "WEAPP_VITE_AUTOMATOR_RUNTIME_PROVIDER";
 const LEGACY_RUNTIME_PROVIDER_ENV = "WEAPP_VITE_E2E_RUNTIME_PROVIDER";
@@ -2920,24 +3301,23 @@ var Launcher = class {
 			let processError = null;
 			let processExitCode = null;
 			let processSignal = null;
-			args = [
-				...args,
-				"auto",
-				"--project",
-				resolvedProjectPath,
-				"--auto-port",
-				toStr(port)
-			];
-			if (account) args.push("--auto-account", account);
-			else if (ticket) args.push("--ticket", ticket);
-			if (trustProject) args.push("--trust-project");
+			let successfulCliExitSettled = false;
+			let httpFallbackAttempted = false;
+			let httpFallbackError = null;
+			let targetPort = port;
+			const cliOutput = [];
+			args = resolveWechatDevtoolsBootstrapArgs(args);
 			try {
 				const spawnTarget = shouldUseWindowsCommandShell(cliPath) ? resolveWindowsBatchSpawn(cliPath, args) : {
 					file: cliPath,
 					args
 				};
 				const child = spawn(spawnTarget.file, spawnTarget.args, {
-					stdio: "ignore",
+					stdio: [
+						"ignore",
+						"pipe",
+						"pipe"
+					],
 					cwd: cwd || void 0,
 					...shouldUseWindowsCommandShell(cliPath) ? {
 						windowsHide: true,
@@ -2947,10 +3327,17 @@ var Launcher = class {
 				child.on("error", (error) => {
 					processError = error;
 				});
+				child.stdout?.on("data", (chunk) => {
+					cliOutput.push(String(chunk));
+				});
+				child.stderr?.on("data", (chunk) => {
+					cliOutput.push(String(chunk));
+				});
 				child.on("exit", (code, signal) => {
 					processExitCode = code;
 					processSignal = signal;
 					if (code !== 0 || signal) processError = /* @__PURE__ */ new Error(`DevTools cli exited unexpectedly with code ${code ?? "null"}${signal ? ` and signal ${signal}` : ""}`);
+					else successfulCliExitSettled = true;
 				});
 				child.unref();
 			} catch (error) {
@@ -2958,16 +3345,51 @@ var Launcher = class {
 			}
 			let miniProgram = null;
 			let lastConnectError = null;
+			const readinessStartedAt = Date.now();
+			const resolveRemainingTimeout = () => Math.max(0, timeout - (Date.now() - readinessStartedAt));
 			await waitUntil(async () => {
 				try {
 					if (processError) return true;
+					if (successfulCliExitSettled && !httpFallbackAttempted) {
+						const servicePort = extractWechatDevtoolsServicePort(cliOutput.join("\n"));
+						if (servicePort) {
+							httpFallbackAttempted = true;
+							try {
+								targetPort = await enableAutomatorViaHttp({
+									account,
+									autoPort: port,
+									projectPath: resolvedProjectPath,
+									servicePort,
+									ticket,
+									trustProject
+								});
+							} catch (error) {
+								httpFallbackError = error;
+								return true;
+							}
+						}
+					}
+					const connectTimeout = resolveRemainingTimeout();
+					if (connectTimeout <= 0) return false;
 					const candidate = await this.connectTool({
-						timeout: 3e3,
-						wsEndpoint: `ws://127.0.0.1:${port}`
+						timeout: Math.min(3e3, connectTimeout),
+						wsEndpoint: `ws://127.0.0.1:${targetPort}`
 					});
 					try {
-						await candidate.checkVersion();
-						if (typeof candidate.waitForAppReady === "function") await candidate.waitForAppReady(timeout);
+						const checkVersionTimeout = resolveRemainingTimeout();
+						if (checkVersionTimeout <= 0) {
+							candidate.disconnect();
+							return false;
+						}
+						await candidate.checkVersion(Math.min(VERSION_CHECK_TIMEOUT, checkVersionTimeout));
+						if (typeof candidate.waitForAppReady === "function") {
+							const appReadyTimeout = resolveRemainingTimeout();
+							if (appReadyTimeout <= 0) {
+								candidate.disconnect();
+								return false;
+							}
+							await candidate.waitForAppReady(appReadyTimeout);
+						}
 					} catch (error) {
 						candidate.disconnect();
 						lastConnectError = error;
@@ -2982,6 +3404,7 @@ var Launcher = class {
 				}
 			}, timeout, 1e3);
 			if (!miniProgram) {
+				if (httpFallbackError) throw httpFallbackError;
 				if (processError) throw new Error("Failed to launch wechat web devTools, please make sure cliPath is correctly specified");
 				if (lastConnectError) throw lastConnectError;
 				if (processExitCode !== null || processSignal) throw new Error("Failed to launch wechat web devTools, please make sure http port is open");
@@ -2989,9 +3412,9 @@ var Launcher = class {
 			}
 			const resolvedMiniProgram = miniProgram;
 			Reflect.set(resolvedMiniProgram, "__WEAPP_VITE_SESSION_METADATA", {
-				port,
+				port: targetPort,
 				projectPath: resolvedProjectPath,
-				wsEndpoint: `ws://127.0.0.1:${port}`
+				wsEndpoint: `ws://127.0.0.1:${targetPort}`
 			});
 			releasePortLeaseOnExit = !retainPortLeaseUntilSessionClose(resolvedMiniProgram, portLease);
 			await sleep$1(5e3);
@@ -3003,7 +3426,7 @@ 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();
+		await miniProgram.checkVersion(options.timeout);
 		return miniProgram;
 	}
 	async extendProjectConfig(projectConfig, projectPath) {