@weapp-vite/devtools-runtime 0.5.0 → 0.6.0

package/dist/index.d.ts

@@ -114,11 +114,11 @@ export declare function resolveSharedMiniProgramSessionKey(options: SharedMiniPr
  */
 export declare function acquireSharedMiniProgram(hooks: DevtoolsRuntimeHooks, options: DevtoolsRuntimeSessionOptions): Promise<AutomatorMiniProgram>;
 /** 使用创建连接时的精确键释放订阅。 */
-export declare function releaseSharedMiniProgramByKey(sessionKey: string): void;
+export declare function releaseSharedMiniProgramByKey(sessionKey: string): Promise<void>;
 /**
  * @description 释放指定项目的共享会话引用；会话对象会继续缓存，直到显式关闭或重置。
  */
-export declare function releaseSharedMiniProgram(projectPath: string, sessionIdOrPort?: string | number, installation?: Omit<SharedMiniProgramSessionOptions, 'projectPath'>): void;
+export declare function releaseSharedMiniProgram(projectPath: string, sessionIdOrPort?: string | number, installation?: Omit<SharedMiniProgramSessionOptions, 'projectPath'>): Promise<void>;
 /**
  * @description 关闭并移除指定项目的共享 automator 会话。
  */

package/dist/index.js

@@ -838,6 +838,18 @@ function resolveExistingSessionKey(options) {
 	});
 	return matching.length === 1 ? matching[0][0] : void 0;
 }
+/** 确认连接关闭后移除缓存；关闭失败的条目只允许重试清理。 */
+function closeSharedEntry(sessionKey, entry) {
+	entry.closeRequested = true;
+	entry.closing ??= (async () => {
+		await (await entry.session).disconnect();
+		if (sharedMiniProgramSessions.get(sessionKey) === entry) sharedMiniProgramSessions.delete(sessionKey);
+	})().catch((error) => {
+		entry.closing = void 0;
+		throw error;
+	});
+	return entry.closing;
+}
 /**
 * @description 获取指定项目的共享 automator 会话；若不存在则自动创建。
 */
@@ -846,6 +858,10 @@ async function acquireSharedMiniProgram(hooks, options) {
 	const sessionKey = resolveSharedMiniProgramSessionKey(options);
 	const existing = sharedMiniProgramSessions.get(sessionKey);
 	if (existing) {
+		if (existing.closeRequested) {
+			await closeSharedEntry(sessionKey, existing);
+			return await acquireSharedMiniProgram(hooks, options);
+		}
 		existing.refs += 1;
 		return await existing.session;
 	}
@@ -868,11 +884,9 @@ function releaseSharedMiniProgramByKey(sessionKey) {
 	const entry = sharedMiniProgramSessions.get(sessionKey);
 	if (entry) {
 		entry.refs = Math.max(0, entry.refs - 1);
-		if (entry.refs === 0 && entry.closeWhenUnused) {
-			sharedMiniProgramSessions.delete(sessionKey);
-			entry.session.then((program) => program.disconnect()).catch(() => void 0);
-		}
+		if (entry.refs === 0 && entry.closeWhenUnused) return closeSharedEntry(sessionKey, entry);
 	}
+	return Promise.resolve();
 }
 /**
 * @description 释放指定项目的共享会话引用；会话对象会继续缓存，直到显式关闭或重置。
@@ -884,7 +898,8 @@ function releaseSharedMiniProgram(projectPath, sessionIdOrPort, installation = {
 		...typeof sessionIdOrPort === "number" ? { port: sessionIdOrPort } : {},
 		...typeof sessionIdOrPort === "string" ? { sessionId: sessionIdOrPort } : {}
 	});
-	if (key) releaseSharedMiniProgramByKey(key);
+	if (key) return releaseSharedMiniProgramByKey(key);
+	return Promise.resolve();
 }
 /**
 * @description 关闭并移除指定项目的共享 automator 会话。
@@ -898,8 +913,7 @@ async function closeSharedMiniProgram(projectPath, sessionIdOrPort, installation
 	});
 	const entry = sessionKey ? sharedMiniProgramSessions.get(sessionKey) : void 0;
 	if (!entry || !sessionKey) return;
-	sharedMiniProgramSessions.delete(sessionKey);
-	(await entry.session.catch(() => null))?.disconnect();
+	await closeSharedEntry(sessionKey, entry);
 }
 /**
 * @description 获取当前共享会话数量，供测试断言使用。
@@ -915,24 +929,45 @@ async function withMiniProgram(hooks, options, runner) {
 	options = await hooks.resolveSessionOptions?.(options) ?? options;
 	if (options.sharedSession) {
 		const miniProgram = await acquireSharedMiniProgram(hooks, options);
+		let result;
+		let failure;
 		try {
-			return await runner(miniProgram);
+			result = await runner(miniProgram);
 		} catch (error) {
+			failure = normalizeError(hooks, error);
+		}
+		const cleanupErrors = [];
+		if (failure) try {
 			await closeSharedMiniProgram(options.projectPath, options.sessionId || options.port, options);
-			throw normalizeError(hooks, error);
-		} finally {
-			releaseSharedMiniProgram(options.projectPath, options.sessionId || options.port, options);
+		} catch (cleanupError) {
+			cleanupErrors.push(cleanupError);
 		}
+		try {
+			await releaseSharedMiniProgram(options.projectPath, options.sessionId || options.port, options);
+		} catch (cleanupError) {
+			cleanupErrors.push(cleanupError);
+		}
+		if (cleanupErrors.length) throw new AggregateError([...failure ? [failure] : [], ...cleanupErrors], "MiniProgram operation and shared connection cleanup failed", { cause: failure });
+		if (failure) throw failure;
+		return result;
 	}
 	let miniProgram = null;
+	let result;
+	let failure;
 	try {
 		miniProgram = await hooks.connectMiniProgram(options);
-		return await runner(miniProgram);
+		result = await runner(miniProgram);
 	} catch (error) {
-		throw normalizeError(hooks, error);
-	} finally {
-		if (miniProgram) miniProgram.disconnect();
+		failure = normalizeError(hooks, error);
+	}
+	if (miniProgram) try {
+		await miniProgram.disconnect();
+	} catch (cleanupError) {
+		if (failure) throw new AggregateError([failure, cleanupError], "MiniProgram operation and connection cleanup failed", { cause: failure });
+		throw cleanupError;
 	}
+	if (failure) throw failure;
+	return result;
 }
 /** 检查缓存，供调用方记录其实际创建的连接。 */
 function hasSharedMiniProgram(options) {
@@ -943,14 +978,12 @@ async function closeOwnedSharedMiniProgram(options, owned) {
 	const key = resolveSharedMiniProgramSessionKey(options);
 	const entry = sharedMiniProgramSessions.get(key);
 	if (!entry) return;
-	const program = await entry.session.catch(() => null);
-	if (program !== owned || sharedMiniProgramSessions.get(key) !== entry) return;
+	if (await entry.session.catch(() => null) !== owned || sharedMiniProgramSessions.get(key) !== entry) return;
 	if (entry.refs !== 0) {
 		entry.closeWhenUnused = true;
 		return;
 	}
-	sharedMiniProgramSessions.delete(key);
-	program?.disconnect();
+	await closeSharedEntry(key, entry);
 }
 /** 单独保留管理器订阅，避免与正在执行的操作共享引用计数。 */
 function retainSharedMiniProgram(sessionKey) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/devtools-runtime",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Shared WeChat DevTools runtime automation helpers for weapp-vite packages",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@weapp-vite/miniprogram-automator": "1.3.0"
+    "@weapp-vite/miniprogram-automator": "1.4.0"
   },
   "scripts": {
     "dev": "tsdown -w --sourcemap",