@jshookmcp/jshook 0.2.9 → 0.3.0

package/dist/{handlers-DlCJN4Td.mjs → handlers-BAHPxcch.mjs}

@@ -1,5 +1,5 @@
-import { n as asJsonResponse } from "./response-BQVP-xUn.mjs";
-import { a as argString, t as argBool } from "./parse-args-BlRjqlkL.mjs";
+import { n as asJsonResponse } from "./response-CWhh2aLo.mjs";
+import { a as argString, t as argBool } from "./parse-args-B4cY5Vx5.mjs";
 //#region src/server/domains/cross-domain/handlers/skia-correlator.ts
 function normalizeSkiaToken(value) {
 	return value.toLowerCase().replace(/[^a-z0-9]/g, "");
@@ -133,12 +133,21 @@ function correlateMojoToCDP(bridge, mojoMessages, cdpEvents, networkRequests) {
 	const graphNodeIds = [];
 	const matchedPairs = [];
 	const matchedMojoIds = /* @__PURE__ */ new Set();
+	const requestNodeIds = /* @__PURE__ */ new Map();
+	for (const request of networkRequests) {
+		const { node } = bridge.addNetworkRequest({
+			requestId: request.requestId,
+			url: request.url
+		});
+		requestNodeIds.set(request.requestId, node.id);
+		graphNodeIds.push(node.id);
+	}
 	if (mojoMessages.length === 0) return {
 		mojoMessages: 0,
 		matchedPairs: [],
 		unmatchedMojo: [],
 		confidence: 0,
-		graphNodeIds: []
+		graphNodeIds
 	};
 	const mojoNodeMap = /* @__PURE__ */ new Map();
 	for (const msg of mojoMessages) {
@@ -171,6 +180,14 @@ function correlateMojoToCDP(bridge, mojoMessages, cdpEvents, networkRequests) {
 		if (/URLLoader/i.test(msg.interface)) {
 			const matchingReq = networkRequests.find((req) => Math.abs(req.timestamp - msg.timestamp) <= TIMESTAMP_PROXIMITY_MS);
 			if (matchingReq) {
+				const requestNodeId = requestNodeIds.get(matchingReq.requestId);
+				const mojoNodeId = mojoNodeMap.get(msg.messageId);
+				if (requestNodeId && mojoNodeId) bridge.getGraph().addEdge(requestNodeId, mojoNodeId, "mojo-routed-to", {
+					domain: "cross-domain",
+					relation: "network-request-correlates-to-mojo",
+					matchType: "urlloader",
+					timestampDelta: Math.abs(matchingReq.timestamp - msg.timestamp)
+				});
 				matchedPairs.push({
 					mojoMessageId: msg.messageId,
 					matchType: "urlloader",
@@ -373,6 +390,105 @@ function buildBinaryToJSPipeline(bridge, ghidraOutput, forcedFunctions) {
 	};
 }
 //#endregion
+//#region src/server/domains/cross-domain/handlers/input-extractors.ts
+function isRecord(value) {
+	return value !== null && typeof value === "object";
+}
+function readRecordArray(value) {
+	return Array.isArray(value) ? value.filter(isRecord) : [];
+}
+function readString(value, fallback = "") {
+	return typeof value === "string" ? value : fallback;
+}
+function readOptionalString(value) {
+	return typeof value === "string" ? value : void 0;
+}
+function readNumber(value, fallback = 0) {
+	return typeof value === "number" ? value : fallback;
+}
+function readStringArray(value) {
+	return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+}
+function readOptionalStringArray(value) {
+	return Array.isArray(value) ? value.filter((item) => typeof item === "string") : void 0;
+}
+function readNumberRecord(value) {
+	if (!isRecord(value)) return {};
+	return Object.fromEntries(Object.entries(value).filter((entry) => typeof entry[1] === "number"));
+}
+function extractSkiaSceneTree(value) {
+	if (!isRecord(value)) return {
+		layers: [],
+		drawCommands: []
+	};
+	return {
+		layers: Array.isArray(value["layers"]) ? value["layers"] : [],
+		drawCommands: Array.isArray(value["drawCommands"]) ? value["drawCommands"] : []
+	};
+}
+function extractJSObjectArray(value) {
+	return readRecordArray(value).map((item) => ({
+		objectId: readString(item["objectId"]),
+		className: readString(item["className"]),
+		name: readString(item["name"]),
+		stringProps: readStringArray(item["stringProps"]),
+		numericProps: readNumberRecord(item["numericProps"]),
+		colorProps: readStringArray(item["colorProps"]),
+		urlProps: readStringArray(item["urlProps"])
+	}));
+}
+function extractMojoMessages(value) {
+	return readRecordArray(value).map((item) => ({
+		interface: readString(item["interface"]),
+		method: readString(item["method"]),
+		timestamp: readNumber(item["timestamp"]),
+		messageId: readString(item["messageId"])
+	}));
+}
+function extractCDPEvents(value) {
+	return readRecordArray(value).map((item) => ({
+		eventType: readString(item["eventType"]),
+		timestamp: readNumber(item["timestamp"]),
+		url: readOptionalString(item["url"])
+	}));
+}
+function extractNetworkRequests(value) {
+	return readRecordArray(value).map((item) => ({
+		requestId: readString(item["requestId"]),
+		url: readString(item["url"]),
+		timestamp: readNumber(item["timestamp"])
+	}));
+}
+function extractSyscallEvents(value) {
+	return readRecordArray(value).map((item) => ({
+		pid: readNumber(item["pid"]),
+		tid: readNumber(item["tid"]),
+		syscallName: readString(item["syscallName"]),
+		timestamp: readNumber(item["timestamp"])
+	}));
+}
+function extractJSStacks(value) {
+	return readRecordArray(value).map((item) => ({
+		threadId: readNumber(item["threadId"]),
+		timestamp: readNumber(item["timestamp"]),
+		frames: readRecordArray(item["frames"]).map((frame) => ({ functionName: readString(frame["functionName"]) }))
+	}));
+}
+function extractGhidraOutput(value) {
+	if (!isRecord(value)) return null;
+	const moduleName = readString(value["moduleName"]);
+	if (!moduleName) return null;
+	return {
+		functions: readRecordArray(value["functions"]).map((item) => ({
+			name: readString(item["name"]),
+			moduleName: readString(item["moduleName"]),
+			address: readOptionalString(item["address"]),
+			calledFrom: readOptionalStringArray(item["calledFrom"])
+		})),
+		moduleName
+	};
+}
+//#endregion
 //#region src/server/domains/cross-domain/workflows/missions.ts
 const WORKFLOWS = {
 	WORKFLOW_REVERSE_OBFUSCATED: {
@@ -385,7 +501,7 @@ const WORKFLOWS = {
 			},
 			{
 				tool: "js_heap_search",
-				args: { query: "${previous.cryptoKeys}" }
+				args: { pattern: "${previous.cryptoKeys}" }
 			},
 			{
 				tool: "network_enable",
@@ -423,7 +539,7 @@ const WORKFLOWS = {
 			},
 			{
 				tool: "js_heap_search",
-				args: { query: "${input.searchTerm}" }
+				args: { pattern: "${input.searchTerm}" }
 			}
 		]
 	},
@@ -452,90 +568,6 @@ const WORKFLOWS = {
 };
 //#endregion
 //#region src/server/domains/cross-domain/handlers.impl.ts
-function isRecord(value) {
-	return value !== null && typeof value === "object";
-}
-function extractSkiaSceneTree(value) {
-	if (!isRecord(value)) return {
-		layers: [],
-		drawCommands: []
-	};
-	return {
-		layers: Array.isArray(value["layers"]) ? value["layers"] : [],
-		drawCommands: Array.isArray(value["drawCommands"]) ? value["drawCommands"] : []
-	};
-}
-function extractJSObjectArray(value) {
-	if (!Array.isArray(value)) return [];
-	return value.filter(isRecord).map((item) => ({
-		objectId: typeof item["objectId"] === "string" ? item["objectId"] : "",
-		className: typeof item["className"] === "string" ? item["className"] : "",
-		name: typeof item["name"] === "string" ? item["name"] : "",
-		stringProps: Array.isArray(item["stringProps"]) ? item["stringProps"].filter((s) => typeof s === "string") : [],
-		numericProps: isRecord(item["numericProps"]) ? Object.fromEntries(Object.entries(item["numericProps"]).filter((entry) => typeof entry[1] === "number")) : {},
-		colorProps: Array.isArray(item["colorProps"]) ? item["colorProps"].filter((s) => typeof s === "string") : [],
-		urlProps: Array.isArray(item["urlProps"]) ? item["urlProps"].filter((s) => typeof s === "string") : []
-	}));
-}
-function extractMojoMessages(value) {
-	if (!Array.isArray(value)) return [];
-	return value.filter(isRecord).map((item) => ({
-		interface: typeof item["interface"] === "string" ? item["interface"] : "",
-		method: typeof item["method"] === "string" ? item["method"] : "",
-		timestamp: typeof item["timestamp"] === "number" ? item["timestamp"] : 0,
-		messageId: typeof item["messageId"] === "string" ? item["messageId"] : ""
-	}));
-}
-function extractCDPEvents(value) {
-	if (!Array.isArray(value)) return [];
-	return value.filter(isRecord).map((item) => ({
-		eventType: typeof item["eventType"] === "string" ? item["eventType"] : "",
-		timestamp: typeof item["timestamp"] === "number" ? item["timestamp"] : 0,
-		url: typeof item["url"] === "string" ? item["url"] : void 0
-	}));
-}
-function extractNetworkRequests(value) {
-	if (!Array.isArray(value)) return [];
-	return value.filter(isRecord).map((item) => ({
-		requestId: typeof item["requestId"] === "string" ? item["requestId"] : "",
-		url: typeof item["url"] === "string" ? item["url"] : "",
-		timestamp: typeof item["timestamp"] === "number" ? item["timestamp"] : 0
-	}));
-}
-function extractSyscallEvents(value) {
-	if (!Array.isArray(value)) return [];
-	return value.filter(isRecord).map((item) => ({
-		pid: typeof item["pid"] === "number" ? item["pid"] : 0,
-		tid: typeof item["tid"] === "number" ? item["tid"] : 0,
-		syscallName: typeof item["syscallName"] === "string" ? item["syscallName"] : "",
-		timestamp: typeof item["timestamp"] === "number" ? item["timestamp"] : 0
-	}));
-}
-function extractJSStacks(value) {
-	if (!Array.isArray(value)) return [];
-	return value.filter(isRecord).map((item) => {
-		const frames = Array.isArray(item["frames"]) ? item["frames"].filter(isRecord).map((f) => ({ functionName: typeof f["functionName"] === "string" ? f["functionName"] : "" })) : [];
-		return {
-			threadId: typeof item["threadId"] === "number" ? item["threadId"] : 0,
-			timestamp: typeof item["timestamp"] === "number" ? item["timestamp"] : 0,
-			frames
-		};
-	});
-}
-function extractGhidraOutput(value) {
-	if (!isRecord(value)) return null;
-	const moduleName = typeof value["moduleName"] === "string" ? value["moduleName"] : "";
-	if (!moduleName) return null;
-	return {
-		functions: (Array.isArray(value["functions"]) ? value["functions"] : []).filter(isRecord).map((item) => ({
-			name: typeof item["name"] === "string" ? item["name"] : "",
-			moduleName: typeof item["moduleName"] === "string" ? item["moduleName"] : "",
-			address: typeof item["address"] === "string" ? item["address"] : void 0,
-			calledFrom: Array.isArray(item["calledFrom"]) ? item["calledFrom"].filter((c) => typeof c === "string") : void 0
-		})),
-		moduleName
-	};
-}
 const V5_DOMAIN_NAMES = [
 	"analysis",
 	"browser",
@@ -641,7 +673,7 @@ var CrossDomainWorkflowClassifier = class {
 		if (toolName.startsWith("syscall_")) return ["syscall-hook"];
 		if (toolName.startsWith("adb_")) return ["adb-bridge"];
 		if (toolName.startsWith("ghidra_") || toolName.startsWith("frida_") || toolName.startsWith("generate_hooks") || toolName.startsWith("unidbg_") || toolName.startsWith("export_hook_script")) return ["binary-instrument"];
-		if (toolName.startsWith("extension_") || toolName.startsWith("webhook_")) return ["extension-registry"];
+		if (toolName.startsWith("extension_") || toolName === "webhook") return ["extension-registry"];
 		if (toolName.startsWith("cross_domain_")) return ["cross-domain"];
 		if (toolName.startsWith("evidence_")) return ["evidence"];
 		if (toolName.startsWith("boringssl_")) return ["boringssl-inspector"];