@jshookmcp/jshook 0.2.9 → 0.3.0

package/dist/{handlers-Bl8zkwz1.mjs → handlers-Dz9PYsCa.mjs}

@@ -1,5 +1,5 @@
-import { n as asJsonResponse } from "./response-BQVP-xUn.mjs";
-import { r as argNumber } from "./parse-args-BlRjqlkL.mjs";
+import { n as asJsonResponse } from "./response-CWhh2aLo.mjs";
+import { r as argNumber } from "./parse-args-B4cY5Vx5.mjs";
 //#region src/server/domains/canvas/adapters/cocos-adapter.ts
 /**
 * Generates a self-contained JS string that traverses the Cocos Creator scene graph
@@ -1193,7 +1193,7 @@ var LayaCanvasAdapter = class {
 			instrumentedPrototypes: patchResult?.instrumented ?? []
 		});
 		try {
-			traceRecorder.stop();
+			await traceRecorder.stop();
 		} catch {}
 		return {
 			inputFlow: domEventChain,
@@ -2571,8 +2571,16 @@ async function handleTraceClick(pageController, debuggerManager, evidenceStore,
 	await debuggerManager.ensureAdvancedFeatures();
 	const eventMgr = debuggerManager.getEventManager();
 	const breakpointId = await eventMgr.setEventListenerBreakpoint(breakpointType);
+	let cleanupToken;
+	let pendingDispatch;
+	let primaryError;
+	let cleanupError;
+	let traceResult;
 	try {
-		const dispatchResult = await dispatchCanvasClick(pageController, x, y, canvasId, breakpointType);
+		const dispatch = await dispatchCanvasClick(pageController, x, y, canvasId, breakpointType);
+		const dispatchResult = dispatch.result;
+		pendingDispatch = dispatch.completion;
+		cleanupToken = dispatchResult.cleanupToken;
 		const pausedState = await debuggerManager.waitForPaused(5e3);
 		let stackFrames = [];
 		if (pausedState?.callFrames) stackFrames = pausedState.callFrames.slice(0, maxFrames).map((frame) => ({
@@ -2587,7 +2595,7 @@ async function handleTraceClick(pageController, debuggerManager, evidenceStore,
 			y,
 			handlerCount: stackFrames.length
 		});
-		return {
+		traceResult = {
 			inputFlow: dispatchResult.domEventChain ?? [],
 			hitTarget: null,
 			domEventChain: stackFrames.map((f) => ({
@@ -2604,16 +2612,80 @@ async function handleTraceClick(pageController, debuggerManager, evidenceStore,
 			})),
 			networkEmitted: []
 		};
+	} catch (error) {
+		primaryError = error;
 	} finally {
 		try {
 			await debuggerManager.resume();
 		} catch {}
+		if (pendingDispatch) try {
+			await pendingDispatch;
+		} catch (error) {
+			if (!primaryError) cleanupError = error;
+		}
+		await cleanupCanvasTraceTarget(pageController, cleanupToken);
 		if (typeof eventMgr.removeEventListenerBreakpoint === "function") try {
 			await eventMgr.removeEventListenerBreakpoint(breakpointId);
 		} catch {}
 	}
+	if (primaryError) throw primaryError;
+	if (cleanupError) throw cleanupError;
+	if (!traceResult) throw new Error("Canvas trace did not produce a result.");
+	return traceResult;
 }
 async function dispatchCanvasClick(pageController, x, y, canvasId, breakpointType = "click") {
+	if (breakpointType === "click" && typeof pageController.click === "function") return dispatchRealCanvasClick(pageController, x, y, canvasId, breakpointType);
+	return dispatchSyntheticCanvasClick(pageController, x, y, canvasId, breakpointType);
+}
+async function dispatchRealCanvasClick(pageController, x, y, canvasId, breakpointType = "click") {
+	const dispatchSequence = getDispatchSequence(breakpointType);
+	const cleanupToken = `jshook-trace-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
+	const prepared = await pageController.evaluate(`
+    (function() {
+      var canvases = ${canvasId ? `[document.getElementById(${JSON.stringify(canvasId)})]` : "Array.from(document.querySelectorAll(\"canvas\"))"};
+      var target = null;
+      if (${!!canvasId}) {
+        target = document.getElementById(${JSON.stringify(canvasId)});
+      } else {
+        for (var i = canvases.length - 1; i >= 0; i--) {
+          var r = canvases[i].getBoundingClientRect();
+          if (${x} >= r.left && ${x} <= r.right && ${y} >= r.top && ${y} <= r.bottom) {
+            target = canvases[i];
+            break;
+          }
+        }
+      }
+      if (!target) return { domEventChain: [], pickedNode: null, engine: undefined, engineChain: [] };
+
+      target.setAttribute('data-jshook-trace-token', ${JSON.stringify(cleanupToken)});
+      var rect = target.getBoundingClientRect();
+      var offsetX = Math.max(0, Math.min(${x} - rect.left, Math.max(rect.width - 1, 0)));
+      var offsetY = Math.max(0, Math.min(${y} - rect.top, Math.max(rect.height - 1, 0)));
+      return {
+        domEventChain: ${JSON.stringify(dispatchSequence)},
+        pickedNode: target.id ? { id: String(target.id) } : null,
+        engine: window.Laya ? 'LayaAir' : (window.PIXI ? 'PixiJS' : undefined),
+        engineChain: [],
+        cleanupToken: ${JSON.stringify(cleanupToken)},
+        selector: 'canvas[data-jshook-trace-token="${cleanupToken}"]',
+        offset: { x: offsetX, y: offsetY }
+      };
+    })()
+  `);
+	if (!prepared.selector || !prepared.offset) return {
+		result: prepared,
+		completion: Promise.resolve()
+	};
+	return {
+		result: prepared,
+		completion: pageController.click?.(prepared.selector, {
+			button: "left",
+			clickCount: 1,
+			offset: prepared.offset
+		}) ?? Promise.resolve()
+	};
+}
+async function dispatchSyntheticCanvasClick(pageController, x, y, canvasId, breakpointType = "click") {
 	const dispatchSequence = getDispatchSequence(breakpointType);
 	const script = `
     (function() {
@@ -2662,7 +2734,24 @@ async function dispatchCanvasClick(pageController, x, y, canvasId, breakpointTyp
       };
     })()
   `;
-	return pageController.evaluate(script);
+	return {
+		result: await pageController.evaluate(script),
+		completion: Promise.resolve()
+	};
+}
+async function cleanupCanvasTraceTarget(pageController, cleanupToken) {
+	if (!cleanupToken) return;
+	try {
+		await pageController.evaluate(`
+      (function() {
+        var target = document.querySelector('canvas[data-jshook-trace-token="${cleanupToken}"]');
+        if (target) {
+          target.removeAttribute('data-jshook-trace-token');
+        }
+        return true;
+      })()
+    `);
+	} catch {}
 }
 function getDispatchSequence(breakpointType) {
 	if (breakpointType === "mousedown") return ["pointerdown", "mousedown"];