@weapp-vite/miniprogram-automator 1.2.3 → 1.2.5

package/dist/index.d.mts

@@ -54,7 +54,7 @@ declare class Connection extends EventEmitter {
   dispose(): void;
   private onMessage;
   private onClose;
-  static create(url: string): Promise<Connection>;
+  static create(url: string, timeout?: number): Promise<Connection>;
 }
 //#endregion
 //#region src/Native.d.ts
@@ -232,6 +232,7 @@ declare class Page {
 //#region src/MiniProgram.d.ts
 interface IScreenshotOptions {
   path?: string;
+  timeout?: number;
 }
 interface IAuditsOptions {
   path?: string;
@@ -251,6 +252,7 @@ interface CurrentPageOptions {
 declare class MiniProgram extends EventEmitter {
   private connection;
   private appBindings;
+  private logEnabled;
   private pageMap;
   private nativeIns?;
   constructor(connection: Connection);
@@ -274,6 +276,7 @@ declare class MiniProgram extends EventEmitter {
   close(): Promise<void>;
   remote(auto?: boolean): Promise<void>;
   disconnect(): void;
+  enableLog(): Promise<void>;
   on(event: string | symbol, listener: (...args: any[]) => void): this;
   exposeFunction(name: string, bindingFunction: AutomatorCallable): Promise<void>;
   checkVersion(): Promise<void>;
@@ -281,7 +284,7 @@ declare class MiniProgram extends EventEmitter {
    * @description 等待小程序 App 域协议可用，避免返回半就绪自动化会话。
    */
   waitForAppReady(timeout?: number): Promise<void>;
-  screenshot(options?: IScreenshotOptions): Promise<any>;
+  screenshot(options?: IScreenshotOptions): Promise<string | undefined>;
   testAccounts(): Promise<any>;
   /**
    * @description 获取开发者工具 Tool 域基础信息。
@@ -413,7 +416,7 @@ declare class SmartappApp {
     retry?: number;
     timeout?: number;
   }): Promise<SmartappPage>;
-  screenshot(options?: ScreenshotOptions): Promise<any>;
+  screenshot(options?: ScreenshotOptions): Promise<string | undefined>;
   currentPage(): Promise<SmartappPage>;
   data(): Promise<any>;
   tabs(): Promise<never[]>;
@@ -488,6 +491,7 @@ declare function normalizePlatform(platform?: MiniprogramAutomatorPlatform): Nor
 //#region src/Launcher.d.ts
 interface IConnectOptions {
   wsEndpoint: string;
+  timeout?: number;
   platform?: MiniprogramAutomatorPlatform;
 }
 /** ILaunchOptions 的类型定义。 */

package/dist/index.mjs

@@ -503,6 +503,7 @@ var Transport = class extends EventEmitter {
 const debugProtocol = createDebug("automator:protocol");
 const closeErrTip = "Connection closed, check if wechat web devTools is still running";
 const REQUEST_TIMEOUT = 3e4;
+const CONNECT_TIMEOUT = 3e4;
 /** Connection 的实现。 */
 var Connection = class Connection extends EventEmitter {
 	transport;
@@ -571,20 +572,35 @@ var Connection = class Connection extends EventEmitter {
 		}
 		this.callbacks.clear();
 	};
-	static create(url) {
+	static create(url, timeout = CONNECT_TIMEOUT) {
 		return new Promise((resolve, reject) => {
 			const ws = new WebSocket(url);
+			let settled = false;
+			const timer = setTimeout(() => {
+				if (settled) return;
+				settled = true;
+				ws.close();
+				reject(/* @__PURE__ */ new Error(`Timed out connecting to DevTools websocket ${url} after ${timeout}ms`));
+			}, timeout);
 			ws.on("open", () => {
+				if (settled) return;
+				settled = true;
+				clearTimeout(timer);
 				resolve(new Connection(new Transport(ws)));
 			});
-			ws.on("error", reject);
+			ws.on("error", (error) => {
+				if (settled) return;
+				settled = true;
+				clearTimeout(timer);
+				reject(error);
+			});
 		});
 	}
 };
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-2X75zDRY.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-mRKloPOa.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region src/launcher/portLease.ts
@@ -683,7 +699,7 @@ async function acquireAutomatorPortLease(preferredPort) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.3";
+var version = "1.2.5";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -885,6 +901,8 @@ const CHANGE_ROUTE_POLL_DELAY = 500;
 const APP_READY_TIMEOUT = 2e4;
 const APP_READY_PROBE_TIMEOUT = 3e3;
 const APP_READY_POLL_DELAY = 500;
+const SCREENSHOT_RETRIES = 2;
+const SCREENSHOT_RETRY_DELAY = 500;
 const CHANGE_ROUTE_DEBUG_ENABLED = process.env.WEAPP_VITE_E2E_CHANGE_ROUTE_DEBUG === "1";
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
@@ -920,6 +938,11 @@ function isPageStackProtocolTimeout(error) {
 function isCallWxMethodProtocolTimeout(error) {
 	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.callWxMethod";
 }
+function isCaptureScreenshotRecoverableError(error) {
+	if (!(error instanceof Error)) return false;
+	if ("code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.captureScreenshot") return true;
+	return error.message.includes("fail to capture screenshot") || error.message.includes("App.captureScreenshot");
+}
 function isRouteContextProbeError(error) {
 	return isCurrentPageProtocolTimeout(error) || isPageStackProtocolTimeout(error);
 }
@@ -934,6 +957,7 @@ function logChangeRouteDebug(message) {
 var MiniProgram = class extends EventEmitter {
 	connection;
 	appBindings = /* @__PURE__ */ new Map();
+	logEnabled = false;
 	pageMap = /* @__PURE__ */ new Map();
 	nativeIns;
 	constructor(connection) {
@@ -1098,8 +1122,12 @@ var MiniProgram = class extends EventEmitter {
 	disconnect() {
 		this.connection.dispose();
 	}
+	async enableLog() {
+		await this.send("App.enableLog");
+		this.logEnabled = true;
+	}
 	on(event, listener) {
-		if (event === "console") this.send("App.enableLog").catch(() => {});
+		if (event === "console" && !this.logEnabled) this.enableLog().catch(() => {});
 		super.on(event, listener);
 		return this;
 	}
@@ -1128,9 +1156,20 @@ var MiniProgram = class extends EventEmitter {
 		throw lastError instanceof Error ? lastError : /* @__PURE__ */ new Error(`Timed out waiting App domain readiness after ${timeout}ms`);
 	}
 	async screenshot(options = {}) {
-		const { data } = await this.send("App.captureScreenshot");
-		if (!options.path) return data;
-		await fs.writeFile(options.path, data, "base64");
+		const sendOptions = options.timeout ? { timeout: options.timeout } : void 0;
+		let lastError;
+		let data;
+		for (let attempt = 1; attempt <= SCREENSHOT_RETRIES; attempt += 1) try {
+			data = (await this.send("App.captureScreenshot", {}, sendOptions)).data;
+			if (!options.path) return data;
+			await fs.writeFile(options.path, data, "base64");
+			return;
+		} catch (error) {
+			lastError = error;
+			if (!isCaptureScreenshotRecoverableError(error) || attempt === SCREENSHOT_RETRIES) throw error;
+			await sleep(SCREENSHOT_RETRY_DELAY);
+		}
+		throw lastError;
 	}
 	async testAccounts() {
 		return (await this.send("Tool.getTestAccounts")).accounts;
@@ -1860,7 +1899,10 @@ var Launcher = class {
 			await waitUntil(async () => {
 				try {
 					if (processError) return true;
-					const candidate = await this.connectTool({ wsEndpoint: `ws://127.0.0.1:${port}` });
+					const candidate = await this.connectTool({
+						timeout: 3e3,
+						wsEndpoint: `ws://127.0.0.1:${port}`
+					});
 					try {
 						await candidate.checkVersion();
 						if (typeof candidate.waitForAppReady === "function") await candidate.waitForAppReady(timeout);
@@ -1912,7 +1954,7 @@ var Launcher = class {
 	}
 	async connectTool(options) {
 		try {
-			return new MiniProgram(await Connection.create(options.wsEndpoint));
+			return new MiniProgram(await Connection.create(options.wsEndpoint, options.timeout));
 		} catch {
 			throw new Error(`Failed connecting to ${options.wsEndpoint}, check if target project window is opened with automation enabled`);
 		}

package/dist/{launch-2X75zDRY.mjs → launch-mRKloPOa.mjs}

@@ -437,7 +437,7 @@ function createPageInstance(route, definition, options = {}, pageState = {}) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/entities@8.0.0/node_modules/entities/dist/decode-codepoint.js
-const decodeMap = new Map([
+const decodeMap = /* @__PURE__ */ new Map([
 	[0, 65533],
 	[128, 8364],
 	[130, 8218],
@@ -952,7 +952,7 @@ var QuoteType;
 * sequences with an increased offset.
 */
 const Sequences = {
-	Empty: new Uint8Array(0),
+	Empty: /* @__PURE__ */ new Uint8Array(0),
 	Cdata: new Uint8Array([
 		67,
 		68,
@@ -1081,7 +1081,7 @@ const Sequences = {
 * where index 2 is the first tag-name character, so matching always
 * continues from offset 3.
 */
-const specialStartSequences = new Map([
+const specialStartSequences = /* @__PURE__ */ new Map([
 	[Sequences.IframeEnd[2], Sequences.IframeEnd],
 	[Sequences.NoembedEnd[2], Sequences.NoembedEnd],
 	[Sequences.Plaintext[2], Sequences.Plaintext],
@@ -1773,7 +1773,7 @@ var Tokenizer = class {
 //#endregion
 //#region ../../node_modules/.pnpm/htmlparser2@12.0.0/node_modules/htmlparser2/dist/Parser.js
 const { fromCodePoint } = String;
-const formTags = new Set([
+const formTags = /* @__PURE__ */ new Set([
 	"input",
 	"option",
 	"optgroup",
@@ -1782,8 +1782,8 @@ const formTags = new Set([
 	"datalist",
 	"textarea"
 ]);
-const pTag = new Set(["p"]);
-const headingTags = new Set([
+const pTag = /* @__PURE__ */ new Set(["p"]);
+const headingTags = /* @__PURE__ */ new Set([
 	"h1",
 	"h2",
 	"h3",
@@ -1792,28 +1792,28 @@ const headingTags = new Set([
 	"h6",
 	"p"
 ]);
-const tableSectionTags = new Set(["thead", "tbody"]);
-const ddtTags = new Set(["dd", "dt"]);
-const rtpTags = new Set(["rt", "rp"]);
-const openImpliesClose = new Map([
-	["tr", new Set([
+const tableSectionTags = /* @__PURE__ */ new Set(["thead", "tbody"]);
+const ddtTags = /* @__PURE__ */ new Set(["dd", "dt"]);
+const rtpTags = /* @__PURE__ */ new Set(["rt", "rp"]);
+const openImpliesClose = /* @__PURE__ */ new Map([
+	["tr", /* @__PURE__ */ new Set([
 		"tr",
 		"th",
 		"td"
 	])],
-	["th", new Set(["th"])],
-	["td", new Set([
+	["th", /* @__PURE__ */ new Set(["th"])],
+	["td", /* @__PURE__ */ new Set([
 		"thead",
 		"th",
 		"td"
 	])],
-	["body", new Set([
+	["body", /* @__PURE__ */ new Set([
 		"head",
 		"link",
 		"script"
 	])],
-	["a", new Set(["a"])],
-	["li", new Set(["li"])],
+	["a", /* @__PURE__ */ new Set(["a"])],
+	["li", /* @__PURE__ */ new Set(["li"])],
 	["p", pTag],
 	["h1", headingTags],
 	["h2", headingTags],
@@ -1827,8 +1827,8 @@ const openImpliesClose = new Map([
 	["button", formTags],
 	["datalist", formTags],
 	["textarea", formTags],
-	["option", new Set(["option"])],
-	["optgroup", new Set(["optgroup", "option"])],
+	["option", /* @__PURE__ */ new Set(["option"])],
+	["optgroup", /* @__PURE__ */ new Set(["optgroup", "option"])],
 	["dd", ddtTags],
 	["dt", ddtTags],
 	["address", pTag],
@@ -1858,7 +1858,7 @@ const openImpliesClose = new Map([
 	["tfoot", tableSectionTags]
 ]);
 const DOCUMENT_TYPE = "doctype";
-const voidElements = new Set([
+const voidElements = /* @__PURE__ */ new Set([
 	"area",
 	"base",
 	"basefont",
@@ -1879,14 +1879,14 @@ const voidElements = new Set([
 	"track",
 	"wbr"
 ]);
-const foreignContextElements = new Set(["math", "svg"]);
+const foreignContextElements = /* @__PURE__ */ new Set(["math", "svg"]);
 /**
 * Elements that can be used to integrate HTML content within foreign namespaces (e.g., SVG or MathML).
 *
 * Entries must use the SVG-adjusted casing (e.g. "foreignObject" not
 * "foreignobject") since they are compared against adjusted tag names.
 */
-const htmlIntegrationElements = new Set([
+const htmlIntegrationElements = /* @__PURE__ */ new Set([
 	"mi",
 	"mo",
 	"mn",
@@ -1897,7 +1897,7 @@ const htmlIntegrationElements = new Set([
 	"desc",
 	"title"
 ]);
-const svgTagNameAdjustments = new Map([
+const svgTagNameAdjustments = /* @__PURE__ */ new Map([
 	["altglyph", "altGlyph"],
 	["altglyphdef", "altGlyphDef"],
 	["altglyphitem", "altGlyphItem"],
@@ -2865,7 +2865,7 @@ const STRUCTURAL_ATTRS = [
 	"wx:for-index",
 	"wx:key"
 ];
-const WX_ELSE_ATTRS = new Set(["wx:elif", "wx:else"]);
+const WX_ELSE_ATTRS = /* @__PURE__ */ new Set(["wx:elif", "wx:else"]);
 const CLASS_SPLIT_RE = /\s+/;
 const JS_FILE_RE = /\.js$/;
 function isMustacheOnly(value) {
@@ -5262,7 +5262,7 @@ const SAVED_FILE_PREFIXES = ["headless://saved/", "headless://wxfile/saved/"];
 const textEncoder = new TextEncoder();
 const IMAGE_EXTENSION_RE = /\.([^.?#/]+)(?:[?#].*)?$/;
 const LEADING_DOT_RE = /^\.+/;
-const IMAGE_FILE_EXTENSIONS = new Set([
+const IMAGE_FILE_EXTENSIONS = /* @__PURE__ */ new Set([
 	"bmp",
 	"gif",
 	"heic",
@@ -5271,7 +5271,7 @@ const IMAGE_FILE_EXTENSIONS = new Set([
 	"png",
 	"webp"
 ]);
-const VIDEO_FILE_EXTENSIONS = new Set([
+const VIDEO_FILE_EXTENSIONS = /* @__PURE__ */ new Set([
 	"avi",
 	"m4v",
 	"mov",
@@ -7547,7 +7547,7 @@ var HeadlessSession = class {
 		};
 	}
 	unloadAllPages() {
-		const pagesToUnload = new Set([...this.pages, ...this.tabPages.values()]);
+		const pagesToUnload = /* @__PURE__ */ new Set([...this.pages, ...this.tabPages.values()]);
 		for (const page of [...pagesToUnload].reverse()) this.unloadPage(page);
 		this.pages.length = 0;
 		this.tabPages.clear();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/miniprogram-automator",
   "type": "module",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "完全兼容微信 miniprogram-automator 的现代化替代实现",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
-    "sharp": "^0.35.1"
+    "sharp": "^0.35.2"
   },
   "scripts": {
     "dev": "tsdown -w --sourcemap",