@weapp-vite/devtools-runtime 0.5.0 → 0.7.0

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { AutomatorElement, AutomatorMiniProgram, AutomatorPage, DevtoolsConnectionInput, DevtoolsContext, DevtoolsElementSnapshot, DevtoolsInstallationContext, DevtoolsPageSnapshot, DevtoolsRuntimeHooks, DevtoolsRuntimeSessionOptions, DevtoolsToolResult, MiniProgramElementLike, readDevtoolsElementSnapshot, resolveDevtoolsProjectPath, resolveDevtoolsWorkspacePath, toDevtoolsSerializableValue } from "./mcp.js";
-//#region src/lease.d.ts
 export interface RuntimeLease {
   root: string;
   token: string;
@@ -10,8 +9,6 @@ export interface RuntimeLease {
 export declare function acquireRuntimeLease(projectRoot: string): Promise<RuntimeLease>;
 export declare function runWithRuntimeLease<T>(lease: RuntimeLease, run: () => Promise<T>): Promise<T>;
 export declare function withRuntimeLease<T>(projectRoot: string, run: () => Promise<T>): Promise<T>;
-//#endregion
-//#region src/lease/directory.d.ts
 interface LeaseOwner {
   pid: number;
   token: string;
@@ -20,8 +17,6 @@ interface LeaseOwner {
 export declare function mutateLease<T>(directory: string, run: () => Promise<T>, options?: {
   timeoutMs?: number;
 }): Promise<T>;
-//#endregion
-//#region src/lease/machineRecoveryState.d.ts
 interface MachineE2ELeaseRecoveryScope {
   readonly id: string;
   readonly owner: Readonly<LeaseOwner>;
@@ -39,13 +34,9 @@ interface MachineE2ELeaseSnapshot {
     readonly scopes: readonly string[];
   }[];
 }
-//#endregion
-//#region src/lease/machineScopeRecovery.d.ts
 interface MachineE2ERecoverableDescendantScope extends MachineE2ELeaseRecoveryScope {
   readonly cleanupKey: string;
 }
-//#endregion
-//#region src/lease/machineScope.d.ts
 interface MachineE2EChildScopeOptions {
   /** 创建时绑定的清理标识；资源含义及准确归属由调用方核验，创建后不能更改。 */
   cleanupKey?: string;
@@ -59,8 +50,6 @@ interface MachineE2EChildScope {
   /** 仅接管已停止且有清理绑定的后代；回调成功后逐个完成，不代替本 scope 的清理。 */
   recoverStoppedDescendants: (run: (scope: MachineE2ERecoverableDescendantScope) => Promise<void>) => Promise<void>;
 }
-//#endregion
-//#region src/lease/machine.d.ts
 export interface MachineE2ELeaseOptions {
   /** 仅供隔离测试或嵌入方显式选择；不从工作目录或用户配置环境变量推导。 */
   stateDirectory?: string;
@@ -77,8 +66,6 @@ export interface MachineE2ELease {
 export declare function acquireMachineE2ELease(options?: MachineE2ELeaseOptions): Promise<MachineE2ELease>;
 /** 入口持有租约到清理完成；执行与释放同时失败时保留两者，嵌套入口仅释放自己的登记。 */
 export declare function withMachineE2ELease<T>(run: (lease: MachineE2ELease) => Promise<T>, options?: MachineE2ELeaseOptions): Promise<T>;
-//#endregion
-//#region src/lease/machineRecovery.d.ts
 export interface MachineE2ELeaseRecoveryOptions extends MachineE2ELeaseOptions {
   expected: MachineE2ELeaseSnapshot;
   /** 必须绑定已核验的资源日志并完成清理；仅此回调成功才允许完成对应 scope。 */
@@ -101,8 +88,6 @@ export declare function withMachineE2ELeaseRecoveryOperation<T>(scope: MachineE2
  * 接管中断保留原快照审计；进程崩溃留下的变更锁或混合归属不自动修复。
  */
 export declare function recoverMachineE2ELease(options: MachineE2ELeaseRecoveryOptions): Promise<MachineE2ELeaseRecoveryResult>;
-//#endregion
-//#region src/index.d.ts
 export interface MiniProgramEventMap {
   console: (payload: unknown) => void;
   exception: (payload: unknown) => void;
@@ -114,11 +99,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 会话。
  */
@@ -137,5 +122,4 @@ export declare function hasSharedMiniProgram(options: SharedMiniProgramSessionOp
 export declare function closeOwnedSharedMiniProgram(options: SharedMiniProgramSessionOptions, owned: unknown): Promise<void>;
 /** 单独保留管理器订阅，避免与正在执行的操作共享引用计数。 */
 export declare function retainSharedMiniProgram(sessionKey: string): void;
-//#endregion
 export { type AutomatorElement, type AutomatorMiniProgram, type AutomatorPage, type DevtoolsConnectionInput, type DevtoolsContext, type DevtoolsElementSnapshot, type DevtoolsInstallationContext, type DevtoolsPageSnapshot, type DevtoolsRuntimeHooks, type DevtoolsRuntimeSessionOptions, type DevtoolsToolResult, type MachineE2EChildScope, type MachineE2EChildScopeOptions, type MachineE2ELeaseRecoveryScope, type MachineE2ELeaseSnapshot, type MachineE2ERecoverableDescendantScope, type MiniProgramElementLike, readDevtoolsElementSnapshot, resolveDevtoolsProjectPath, resolveDevtoolsWorkspacePath, toDevtoolsSerializableValue };

package/dist/index.js

@@ -7,7 +7,7 @@ import path from "node:path";
 import process from "node:process";
 import { setTimeout } from "node:timers/promises";
 import { isDeepStrictEqual } from "node:util";
-//#region src/lease/machineScopeState.ts
+// src/lease/machineScopeState.ts
 /** 未完成的本租约命令不能因持有进程退出而被新验收直接接管。 */
 async function assertNoIncompleteMachineScopes(directory) {
 	const scopes = path.join(directory, "scopes");
@@ -20,8 +20,7 @@ async function assertNoIncompleteMachineScopes(directory) {
 		if (!record || typeof record !== "object" || !("sealed" in record) || record.sealed !== true || !("completed" in record) || record.completed !== true) throw new Error("Runtime busy: an E2E command scope has unfinished cleanup; preserve the machine lease and its journals.");
 	}
 }
-//#endregion
-//#region src/lease/directory.ts
+// src/lease/directory.ts
 function isProcessAlive(pid) {
 	try {
 		process.kill(pid, 0);
@@ -134,8 +133,7 @@ async function acquireDirectoryLease(directory, busyMessage) {
 	};
 	return lease;
 }
-//#endregion
-//#region src/lease.ts
+// src/lease.ts
 const currentLease = new AsyncLocalStorage();
 /** 同一真实工程跨进程互斥；未知持有者不自动回收。 */
 async function acquireRuntimeLease(projectRoot) {
@@ -166,8 +164,7 @@ async function withRuntimeLease(projectRoot, run) {
 		await lease.release();
 	}
 }
-//#endregion
-//#region src/lease/machineRecoveryState.ts
+// src/lease/machineRecoveryState.ts
 async function assertRecoveryNode(file, kind) {
 	const stat = await lstat(file);
 	if (stat.isSymbolicLink() || (kind === "directory" ? !stat.isDirectory() : !stat.isFile() || stat.nlink !== 1)) throw new Error("Machine lease recovery refuses redirected or non-regular filesystem entries.");
@@ -254,8 +251,7 @@ function recoveryScopeCopy(scope) {
 		ancestors: Object.freeze([...scope.ancestors])
 	});
 }
-//#endregion
-//#region src/lease/machineScopeRecovery.ts
+// src/lease/machineScopeRecovery.ts
 const activeRecoveries = /* @__PURE__ */ new Map();
 /** 活借用登记阻止跨进程接管；进程内保留的父子能力还需防止重叠回调。 */
 function claimSubtree(directory, credential) {
@@ -345,8 +341,7 @@ async function recoverStoppedDescendantScopes(directory, credential, run) {
 		releaseClaim();
 	}
 }
-//#endregion
-//#region src/lease/machineScope.ts
+// src/lease/machineScope.ts
 const INHERITED_LEASE_ENV = "WEAPP_VITE_E2E_MACHINE_LEASE";
 const UUID = /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/i;
 function invalid() {
@@ -485,8 +480,7 @@ async function createMachineChildScope(directory, credential, isHeld, options =
 		})
 	};
 }
-//#endregion
-//#region src/lease/machineContext.ts
+// src/lease/machineContext.ts
 const currentMachineLease = new AsyncLocalStorage();
 const publishedCredentials = /* @__PURE__ */ new WeakMap();
 function machineStateDirectory(options) {
@@ -541,8 +535,7 @@ async function withMachineLeaseContext(lease, run, options) {
 		restore();
 	}
 }
-//#endregion
-//#region src/lease/machine.ts
+// src/lease/machine.ts
 /** 同机同用户的所有 E2E 共用一个租约，子进程凭磁盘核验过的能力票据借用。 */
 async function acquireMachineE2ELease(options = {}) {
 	const state = machineStateDirectory(options);
@@ -643,8 +636,7 @@ async function withMachineE2ELease(run, options = {}) {
 		if (!entered) await release();
 	}
 }
-//#endregion
-//#region src/lease/machineRecovery.ts
+// src/lease/machineRecovery.ts
 const currentRecovery = new AsyncLocalStorage();
 /** 读取供显式恢复核对的精确登记快照，不修改租约或推导资源清理权限。 */
 async function readMachineE2ELeaseSnapshot(options = {}) {
@@ -814,8 +806,7 @@ async function recoverMachineE2ELease(options) {
 		throw error;
 	}
 }
-//#endregion
-//#region src/index.ts
+// src/index.ts
 const sharedMiniProgramSessions = /* @__PURE__ */ new Map();
 function normalizeError(hooks, error) {
 	const normalized = hooks.normalizeConnectionError?.(error) ?? error;
@@ -838,6 +829,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 +849,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 +875,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 +889,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 +904,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 +920,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,19 +969,16 @@ 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) {
 	const entry = sharedMiniProgramSessions.get(sessionKey);
 	if (entry) entry.refs += 1;
 }
-//#endregion
 export { acquireMachineE2ELease, acquireRuntimeLease, acquireSharedMiniProgram, assertMachineE2ELeaseRecoveryScope, closeOwnedSharedMiniProgram, closeSharedMiniProgram, getSharedMiniProgramSessionCount, hasSharedMiniProgram, mutateLease, readDevtoolsElementSnapshot, readMachineE2ELeaseSnapshot, recoverMachineE2ELease, releaseSharedMiniProgram, releaseSharedMiniProgramByKey, resolveDevtoolsProjectPath, resolveDevtoolsWorkspacePath, resolveSharedMiniProgramSessionKey, retainSharedMiniProgram, runWithRuntimeLease, toDevtoolsSerializableValue, withMachineE2ELease, withMachineE2ELeaseRecoveryOperation, withMiniProgram, withRuntimeLease };

package/dist/mcp.d.ts

@@ -1,5 +1,4 @@
 import { Element, MiniProgram, Page } from "@weapp-vite/miniprogram-automator";
-//#region src/mcp.d.ts
 export type AutomatorMiniProgram = InstanceType<typeof MiniProgram> & {
   callWxMethod?: (method: string, ...args: unknown[]) => Promise<unknown>;
   enableLog?: (timeout?: number) => Promise<void>;
@@ -84,5 +83,4 @@ export interface MiniProgramElementLike {
 export declare function resolveDevtoolsProjectPath(workspaceRoot: string, projectPath: string): string;
 export declare function resolveDevtoolsWorkspacePath(workspaceRoot: string, filePath: string): string;
 export declare function toDevtoolsSerializableValue(value: unknown): unknown;
-export declare function readDevtoolsElementSnapshot(element: MiniProgramElementLike, selector: string, attributeNames?: readonly string[], styleNames?: readonly string[]): Promise<DevtoolsElementSnapshot>;
-//#endregion
+export declare function readDevtoolsElementSnapshot(element: MiniProgramElementLike, selector: string, attributeNames?: readonly string[], styleNames?: readonly string[]): Promise<DevtoolsElementSnapshot>;

package/dist/mcp.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { Buffer } from "node:buffer";
-//#region src/mcp.ts
+// src/mcp.ts
 function resolveDevtoolsProjectPath(workspaceRoot, projectPath) {
 	return path.isAbsolute(projectPath) ? path.normalize(projectPath) : path.resolve(workspaceRoot, projectPath);
 }
@@ -58,5 +58,4 @@ async function readDevtoolsElementSnapshot(element, selector, attributeNames = [
 		outerWxml: typeof outerWxml === "string" ? outerWxml : null
 	};
 }
-//#endregion
 export { readDevtoolsElementSnapshot, resolveDevtoolsProjectPath, resolveDevtoolsWorkspacePath, toDevtoolsSerializableValue };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/devtools-runtime",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Shared WeChat DevTools runtime automation helpers for weapp-vite packages",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -42,14 +42,14 @@
     "dist"
   ],
   "engines": {
-    "node": "^20.19.0 || >=22.12.0"
+    "node": "^22.23.4 || ^24.22.1 || >=26.12.1"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@weapp-vite/miniprogram-automator": "1.3.0"
+    "@weapp-vite/miniprogram-automator": "1.5.0"
   },
   "scripts": {
     "dev": "tsdown -w --sourcemap",