@weapp-vite/miniprogram-automator 1.2.1 → 1.2.3

package/dist/index.d.mts

@@ -557,9 +557,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.1";
+var version = "1.2.3";
 //#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] : "";
 }
@@ -1706,7 +1708,7 @@ 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";
 const EXTENSION_CONTEXT_INVALIDATED_RE = /Extension context invalidated/i;
-const RETRYABLE_LAUNCH_PORT_RE = /Wait timed out after \d+ ms|Failed connecting to ws:\/\/127\.0\.0\.1:\d+|Failed connecting to devtools websocket endpoint/i;
+const RETRYABLE_LAUNCH_PORT_RE = /Wait timed out after \d+ ms|Failed connecting to ws:\/\/127\.0\.0\.1:\d+|Failed connecting to devtools websocket endpoint|Failed to launch wechat web devTools, please make sure cliPath is correctly specified/i;
 const WINDOWS_BATCH_CLI_RE = /\.(?:bat|cmd)$/i;
 let localhostListenPatched = false;
 function isExtensionContextInvalidatedError(error) {
@@ -1715,6 +1717,33 @@ function isExtensionContextInvalidatedError(error) {
 function isRetryableAutomatorPortLaunchError(error) {
 	return error instanceof Error && RETRYABLE_LAUNCH_PORT_RE.test(error.message);
 }
+function retainPortLeaseUntilSessionClose(miniProgram, portLease) {
+	let released = false;
+	const release = async () => {
+		if (released) return;
+		released = true;
+		await portLease.release();
+	};
+	const target = miniProgram;
+	const rawClose = target.close;
+	const rawDisconnect = target.disconnect;
+	if (typeof rawClose !== "function" && typeof rawDisconnect !== "function") return false;
+	if (typeof rawDisconnect === "function") target.disconnect = function disconnectWithPortLeaseRelease() {
+		try {
+			return rawDisconnect.call(this);
+		} finally {
+			release();
+		}
+	};
+	if (typeof rawClose === "function") target.close = async function closeWithPortLeaseRelease() {
+		try {
+			return await rawClose.call(this);
+		} finally {
+			await release();
+		}
+	};
+	return true;
+}
 function patchNetListenToLoopback() {
 	if (localhostListenPatched) return;
 	localhostListenPatched = true;
@@ -1777,6 +1806,7 @@ var Launcher = class {
 		const { cliPath = await this.resolveCliPath(), timeout = DEFAULT_TIMEOUT, projectConfig = {}, ticket = "", cwd = "", account = "", trustProject = false } = options;
 		let { args = [], projectPath } = options;
 		const portLease = await acquireAutomatorPortLease(options.port);
+		let releasePortLeaseOnExit = true;
 		try {
 			const port = portLease.port;
 			if (!cliPath) throw new Error("Wechat web devTools not found, please specify cliPath option");
@@ -1859,10 +1889,11 @@ var Launcher = class {
 				projectPath: resolvedProjectPath,
 				wsEndpoint: `ws://127.0.0.1:${port}`
 			});
+			releasePortLeaseOnExit = !retainPortLeaseUntilSessionClose(resolvedMiniProgram, portLease);
 			await sleep$1(5e3);
 			return resolvedMiniProgram;
 		} finally {
-			await portLease.release();
+			if (releasePortLeaseOnExit) await portLease.release();
 		}
 	}
 	async connect(options) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/miniprogram-automator",
   "type": "module",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "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",