@weapp-vite/devtools-runtime 0.3.1 → 0.4.0

package/dist/index.d.ts

@@ -5,6 +5,7 @@ interface MiniProgramEventMap {
   console: (payload: unknown) => void;
   exception: (payload: unknown) => void;
 }
+declare function resolveSharedMiniProgramSessionKey(options: Pick<DevtoolsRuntimeSessionOptions, 'port' | 'projectPath' | 'sessionId'>): string;
 /**
  * @description 获取指定项目的共享 automator 会话；若不存在则自动创建。
  */
@@ -12,11 +13,11 @@ declare function acquireSharedMiniProgram(hooks: DevtoolsRuntimeHooks, options:
 /**
  * @description 释放指定项目的共享会话引用；会话对象会继续缓存，直到显式关闭或重置。
  */
-declare function releaseSharedMiniProgram(projectPath: string): void;
+declare function releaseSharedMiniProgram(projectPath: string, sessionIdOrPort?: string | number): void;
 /**
  * @description 关闭并移除指定项目的共享 automator 会话。
  */
-declare function closeSharedMiniProgram(projectPath: string): Promise<void>;
+declare function closeSharedMiniProgram(projectPath: string, sessionIdOrPort?: string | number): Promise<void>;
 /**
  * @description 获取当前共享会话数量，供测试断言使用。
  */
@@ -26,4 +27,4 @@ declare function getSharedMiniProgramSessionCount(): number;
  */
 declare function withMiniProgram<T>(hooks: DevtoolsRuntimeHooks, options: DevtoolsRuntimeSessionOptions, runner: (miniProgram: AutomatorMiniProgram) => Promise<T>): Promise<T>;
 //#endregion
-export { type AutomatorElement, type AutomatorMiniProgram, type AutomatorPage, type DevtoolsConnectionInput, type DevtoolsContext, type DevtoolsElementSnapshot, type DevtoolsPageSnapshot, type DevtoolsRuntimeHooks, type DevtoolsRuntimeSessionOptions, type DevtoolsToolResult, type MiniProgramElementLike, MiniProgramEventMap, acquireSharedMiniProgram, closeSharedMiniProgram, getSharedMiniProgramSessionCount, readDevtoolsElementSnapshot, releaseSharedMiniProgram, resolveDevtoolsProjectPath, resolveDevtoolsWorkspacePath, toDevtoolsSerializableValue, withMiniProgram };
+export { type AutomatorElement, type AutomatorMiniProgram, type AutomatorPage, type DevtoolsConnectionInput, type DevtoolsContext, type DevtoolsElementSnapshot, type DevtoolsPageSnapshot, type DevtoolsRuntimeHooks, type DevtoolsRuntimeSessionOptions, type DevtoolsToolResult, type MiniProgramElementLike, MiniProgramEventMap, acquireSharedMiniProgram, closeSharedMiniProgram, getSharedMiniProgramSessionCount, readDevtoolsElementSnapshot, releaseSharedMiniProgram, resolveDevtoolsProjectPath, resolveDevtoolsWorkspacePath, resolveSharedMiniProgramSessionKey, toDevtoolsSerializableValue, withMiniProgram };

package/dist/index.js

@@ -5,11 +5,16 @@ function normalizeError(hooks, error) {
 	const normalized = hooks.normalizeConnectionError?.(error) ?? error;
 	return normalized instanceof Error ? normalized : new Error(String(normalized));
 }
+function resolveSharedMiniProgramSessionKey(options) {
+	const sessionSuffix = options.sessionId || (options.port ? `port:${options.port}` : "default");
+	return `${options.projectPath}#${sessionSuffix}`;
+}
 /**
 * @description 获取指定项目的共享 automator 会话；若不存在则自动创建。
 */
 async function acquireSharedMiniProgram(hooks, options) {
-	const existing = sharedMiniProgramSessions.get(options.projectPath);
+	const sessionKey = resolveSharedMiniProgramSessionKey(options);
+	const existing = sharedMiniProgramSessions.get(sessionKey);
 	if (existing) {
 		existing.refs += 1;
 		return await existing.session;
@@ -19,29 +24,38 @@ async function acquireSharedMiniProgram(hooks, options) {
 		refs: 1,
 		session
 	};
-	sharedMiniProgramSessions.set(options.projectPath, entry);
+	sharedMiniProgramSessions.set(sessionKey, entry);
 	try {
 		return await session;
 	} catch (error) {
-		sharedMiniProgramSessions.delete(options.projectPath);
+		sharedMiniProgramSessions.delete(sessionKey);
 		throw normalizeError(hooks, error);
 	}
 }
 /**
 * @description 释放指定项目的共享会话引用；会话对象会继续缓存，直到显式关闭或重置。
 */
-function releaseSharedMiniProgram(projectPath) {
-	const entry = sharedMiniProgramSessions.get(projectPath);
+function releaseSharedMiniProgram(projectPath, sessionIdOrPort) {
+	const entry = sharedMiniProgramSessions.get(resolveSharedMiniProgramSessionKey({
+		projectPath,
+		...typeof sessionIdOrPort === "number" ? { port: sessionIdOrPort } : {},
+		...typeof sessionIdOrPort === "string" ? { sessionId: sessionIdOrPort } : {}
+	}));
 	if (!entry) return;
 	entry.refs = Math.max(0, entry.refs - 1);
 }
 /**
 * @description 关闭并移除指定项目的共享 automator 会话。
 */
-async function closeSharedMiniProgram(projectPath) {
-	const entry = sharedMiniProgramSessions.get(projectPath);
+async function closeSharedMiniProgram(projectPath, sessionIdOrPort) {
+	const sessionKey = resolveSharedMiniProgramSessionKey({
+		projectPath,
+		...typeof sessionIdOrPort === "number" ? { port: sessionIdOrPort } : {},
+		...typeof sessionIdOrPort === "string" ? { sessionId: sessionIdOrPort } : {}
+	});
+	const entry = sharedMiniProgramSessions.get(sessionKey);
 	if (!entry) return;
-	sharedMiniProgramSessions.delete(projectPath);
+	sharedMiniProgramSessions.delete(sessionKey);
 	(await entry.session.catch(() => null))?.disconnect();
 }
 /**
@@ -60,10 +74,10 @@ async function withMiniProgram(hooks, options, runner) {
 		try {
 			return await runner(miniProgram);
 		} catch (error) {
-			await closeSharedMiniProgram(options.projectPath);
+			await closeSharedMiniProgram(options.projectPath, options.sessionId || options.port);
 			throw normalizeError(hooks, error);
 		} finally {
-			releaseSharedMiniProgram(options.projectPath);
+			releaseSharedMiniProgram(options.projectPath, options.sessionId || options.port);
 		}
 	}
 	let miniProgram = null;
@@ -77,4 +91,4 @@ async function withMiniProgram(hooks, options, runner) {
 	}
 }
 //#endregion
-export { acquireSharedMiniProgram, closeSharedMiniProgram, getSharedMiniProgramSessionCount, readDevtoolsElementSnapshot, releaseSharedMiniProgram, resolveDevtoolsProjectPath, resolveDevtoolsWorkspacePath, toDevtoolsSerializableValue, withMiniProgram };
+export { acquireSharedMiniProgram, closeSharedMiniProgram, getSharedMiniProgramSessionCount, readDevtoolsElementSnapshot, releaseSharedMiniProgram, resolveDevtoolsProjectPath, resolveDevtoolsWorkspacePath, resolveSharedMiniProgramSessionKey, toDevtoolsSerializableValue, withMiniProgram };

package/dist/mcp.d.ts

@@ -9,8 +9,10 @@ type AutomatorElement = InstanceType<typeof Element> & {
 interface DevtoolsRuntimeSessionOptions {
   miniProgram?: AutomatorMiniProgram;
   preferOpenedSession?: boolean;
+  port?: number;
   projectPath: string;
   sharedSession?: boolean;
+  sessionId?: string;
   timeout?: number;
 }
 interface DevtoolsRuntimeHooks {
@@ -20,7 +22,9 @@ interface DevtoolsRuntimeHooks {
 interface DevtoolsConnectionInput {
   projectPath: string;
   timeout?: number;
+  port?: number;
   preferOpenedSession?: boolean;
+  sessionId?: string;
 }
 interface DevtoolsElementSnapshot {
   selector: string;

package/package.json

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