@weapp-vite/miniprogram-automator 1.2.2 → 1.2.4

package/dist/index.d.mts

@@ -232,6 +232,7 @@ declare class Page {
 //#region src/MiniProgram.d.ts
 interface IScreenshotOptions {
   path?: string;
+  timeout?: number;
 }
 interface IAuditsOptions {
   path?: string;
@@ -281,7 +282,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 +414,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[]>;
@@ -557,9 +558,9 @@ declare function decodeQrCode(qrCode: string): Promise<string>;
 /** printQrCode 的方法封装。 */
 declare function printQrCode(content: string): Promise<void>;
 /** isPluginPath 的方法封装。 */
-declare function isPluginPath(p: string): boolean;
+declare function isPluginPath(p: unknown): boolean;
 /** extractPluginId 的方法封装。 */
-declare function extractPluginId(p: string): string;
+declare function extractPluginId(p: unknown): string;
 //#endregion
 //#region src/index.d.ts
 declare const SmartappAutomator: {

package/dist/index.mjs

@@ -683,7 +683,7 @@ async function acquireAutomatorPortLease(preferredPort) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.2";
+var version = "1.2.4";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -864,10 +864,12 @@ function printQrCode(content) {
 }
 /** isPluginPath 的方法封装。 */
 function isPluginPath(p) {
+	if (typeof p !== "string") return false;
 	return startWith(p, "plugin-private://");
 }
 /** extractPluginId 的方法封装。 */
 function extractPluginId(p) {
+	if (typeof p !== "string") return "";
 	const match = p.match(regPluginId);
 	return match ? match[1] : "";
 }
@@ -883,6 +885,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));
@@ -918,6 +922,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);
 }
@@ -1126,9 +1135,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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/miniprogram-automator",
   "type": "module",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "完全兼容微信 miniprogram-automator 的现代化替代实现",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -41,9 +41,9 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "dependencies": {
-    "obug": "^2.1.1",
+    "obug": "^2.1.3",
     "ws": "^8.21.0",
-    "@weapp-vite/qr": "1.1.0"
+    "@weapp-vite/qr": "1.1.1"
   },
   "publishConfig": {
     "access": "public",
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
-    "sharp": "^0.34.5"
+    "sharp": "^0.35.1"
   },
   "scripts": {
     "dev": "tsdown -w --sourcemap",