@neta-art/cohub 1.10.1 → 1.10.2

package/dist/chunks/websocket.d.ts

@@ -185,6 +185,9 @@ type WebsocketClientEvents = {
     clientMessageId?: string | null;
     sessionId?: string | null;
     spaceId?: string | null;
+    turnId?: string | null;
+    userMessageId?: string | null;
+    traceId?: string | null;
   };
   serverError: {
     code?: string;

package/dist/chunks/websocket.js

@@ -404,7 +404,10 @@ var WebsocketClient = class {
 					requestId: envelope.requestId ?? null,
 					sessionId: envelope.sessionId ?? null,
 					spaceId: envelope.spaceId ?? null,
-					clientMessageId: typeof payload.clientMessageId === "string" ? payload.clientMessageId : null
+					clientMessageId: typeof payload.clientMessageId === "string" ? payload.clientMessageId : null,
+					turnId: typeof payload.turnId === "string" ? payload.turnId : null,
+					userMessageId: typeof payload.userMessageId === "string" ? payload.userMessageId : null,
+					traceId: typeof payload.traceId === "string" ? payload.traceId : null
 				});
 				this.emit("event", envelope);
 				return;

package/dist/debugger.js

@@ -91,6 +91,7 @@ function installFetchCollector(state) {
 		const connectionId = nextConnectionId(state, "fetch");
 		const startedAtMs = Date.now();
 		const requestInfo = normalizeFetchRequest(input, init, state.options);
+		state.instrumentedRequestUrls.add(requestInfo.url);
 		appendNetwork(state, {
 			connectionId,
 			kind: "fetch",
@@ -105,19 +106,21 @@ function installFetchCollector(state) {
 		try {
 			const response = await originalFetch(input, init);
 			const durationMs = Date.now() - startedAtMs;
+			const responseUrl = normalizeHarUrl(response.url || requestInfo.url);
+			state.instrumentedRequestUrls.add(responseUrl);
 			const responseHeaders = state.options.captureHeaders ? headersToRecord(response.headers, state.options) : void 0;
 			appendNetwork(state, {
 				connectionId,
 				kind: "fetch",
 				phase: "response",
 				method: requestInfo.method,
-				url: response.url || requestInfo.url,
+				url: responseUrl,
 				status: response.status,
 				statusText: response.statusText,
 				durationMs,
 				responseHeaders
 			});
-			collectFetchResponseBody(state, connectionId, requestInfo.method, response.url || requestInfo.url, response);
+			collectFetchResponseBody(state, connectionId, requestInfo.method, responseUrl, response);
 			return response;
 		} catch (error) {
 			appendNetwork(state, {
@@ -144,15 +147,17 @@ function installXhrCollector(state) {
 	state.originals.xhrSend = originalSend;
 	state.originals.xhrSetRequestHeader = originalSetRequestHeader;
 	XMLHttpRequest.prototype.open = function open(method, url, async, username, password) {
+		const normalizedUrl = normalizeHarUrl(String(url));
 		metadata.set(this, {
 			id: nextConnectionId(state, "xhr"),
 			method: method.toUpperCase(),
-			url: String(url),
+			url: normalizedUrl,
 			requestHeaders: {},
 			responseLineCount: 0,
 			lastResponseLength: 0,
 			pendingResponseLine: ""
 		});
+		state.instrumentedRequestUrls.add(normalizedUrl);
 		return originalOpen.call(this, method, url, async ?? true, username, password);
 	};
 	XMLHttpRequest.prototype.setRequestHeader = function setRequestHeader(name, value) {
@@ -237,10 +242,11 @@ function installEventSourceCollector(state) {
 	state.originals.EventSource = OriginalEventSource;
 	const InstrumentedEventSource = function EventSource(url, eventSourceInitDict) {
 		const connectionId = nextConnectionId(state, "eventsource");
+		const sourceUrl = normalizeHarUrl(String(url));
 		const source = new OriginalEventSource(url, eventSourceInitDict);
-		const sourceUrl = String(url);
 		let lineNumber = 0;
 		const listenerRecords = [];
+		state.instrumentedRequestUrls.add(sourceUrl);
 		const appendEventSourceMessage = (eventName, event) => {
 			appendLines(state, {
 				connectionId,
@@ -322,8 +328,9 @@ function installWebSocketCollector(state) {
 	state.originals.WebSocket = OriginalWebSocket;
 	const InstrumentedWebSocket = function WebSocket(url, protocols) {
 		const connectionId = nextConnectionId(state, "websocket");
+		const socketUrl = normalizeHarUrl(String(url), "websocket");
+		state.instrumentedRequestUrls.add(socketUrl);
 		const socket = protocols === void 0 ? new OriginalWebSocket(url) : new OriginalWebSocket(url, protocols);
-		const socketUrl = String(url);
 		let lineNumber = 0;
 		let userOnOpen = null;
 		let userOnMessage = null;
@@ -472,6 +479,8 @@ function collectPerformanceResources(state, entries) {
 		const key = `${entry.name}:${entry.startTime}:${entry.duration}`;
 		if (state.performanceResourceKeys.has(key)) continue;
 		state.performanceResourceKeys.add(key);
+		const normalizedEntryUrl = normalizeHarUrl(entry.name);
+		if (state.instrumentedRequestUrls.has(normalizedEntryUrl)) continue;
 		const initiatorType = entry.initiatorType || "resource";
 		const kind = resourceKindFromInitiator(initiatorType, entry.name);
 		appendNetwork(state, {
@@ -479,7 +488,7 @@ function collectPerformanceResources(state, entries) {
 			kind,
 			phase: "response",
 			method: "GET",
-			url: entry.name,
+			url: normalizedEntryUrl,
 			status: entry.responseStatus || void 0,
 			durationMs: Math.round(entry.duration),
 			source: "performance",
@@ -592,18 +601,15 @@ function collectXhrResponseLines(state, xhr, meta, flush = false) {
 	meta.lastResponseLength = text.length;
 	const parts = `${meta.pendingResponseLine}${nextChunk}`.split(/\r?\n/);
 	meta.pendingResponseLine = parts.pop() ?? "";
-	for (const line of parts) {
-		if (!line) continue;
-		appendLine(state, {
-			connectionId: meta.id,
-			kind: "xhr",
-			method: meta.method,
-			url: meta.url,
-			direction: "incoming",
-			lineNumber: nextXhrLineNumber(meta),
-			text: line
-		});
-	}
+	for (const line of parts) appendLine(state, {
+		connectionId: meta.id,
+		kind: "xhr",
+		method: meta.method,
+		url: meta.url,
+		direction: "incoming",
+		lineNumber: nextXhrLineNumber(meta),
+		text: line
+	});
 	if (flush && meta.pendingResponseLine) {
 		const line = meta.pendingResponseLine;
 		meta.pendingResponseLine = "";
@@ -674,7 +680,7 @@ function nextXhrLineNumber(meta) {
 function normalizeFetchRequest(input, init, options) {
 	const request = typeof Request !== "undefined" && input instanceof Request ? input : void 0;
 	const method = (init?.method ?? request?.method ?? "GET").toUpperCase();
-	const url = typeof Request !== "undefined" && input instanceof Request ? input.url : typeof URL !== "undefined" && input instanceof URL ? input.href : String(input);
+	const url = typeof Request !== "undefined" && input instanceof Request ? input.url : typeof URL !== "undefined" && input instanceof URL ? input.href : normalizeHarUrl(String(input));
 	const headers = options.captureHeaders ? mergeHeaders(request?.headers, init?.headers, options) : void 0;
 	const bodyPreview = options.captureRequestBody ? serializeBodyPreview(init?.body, options) : void 0;
 	return {
@@ -898,7 +904,10 @@ function createHarEntry(pageId, entries) {
 	const requestBodyEntry = sortedEntries.find((entry) => entry.phase === "request" && entry.payload !== void 0);
 	const responseBodyEntry = [...messageEntries].reverse().find((entry) => entry.direction === "incoming");
 	const durationMs = Math.max(responseEntry.durationMs ?? responseEntry.elapsedMs - requestEntry.elapsedMs, 0);
-	const responseText = responseEntry.kind === "websocket" ? void 0 : messageEntries.filter((entry) => entry.direction !== "outgoing").map((entry) => payloadToText(entry.payload)).filter(Boolean).join("\n");
+	const responseText = responseEntry.kind === "websocket" ? void 0 : messageEntries.length > 0 ? messageEntries.filter((entry) => entry.direction !== "outgoing").map((entry) => payloadToText(entry.payload)).join("\n") : void 0;
+	const contentType = guessMimeType(responseEntry.responseHeaders);
+	const normalizedResponseText = responseText !== void 0 && contentType.toLowerCase().includes("text/event-stream") ? normalizeEventStreamText(responseText) : responseText;
+	const responseContentSize = normalizedResponseText !== void 0 ? byteLength(normalizedResponseText) : responseBodyEntry?.sizeBytes ?? responseEntry.sizeBytes ?? -1;
 	return {
 		pageref: pageId,
 		startedDateTime: requestEntry.at,
@@ -925,13 +934,13 @@ function createHarEntry(pageId, entries) {
 			cookies: [],
 			headers: headersRecordToHarPairs(responseEntry.responseHeaders),
 			content: {
-				size: responseBodyEntry?.sizeBytes ?? responseEntry.sizeBytes ?? -1,
-				mimeType: guessMimeType(responseEntry.responseHeaders),
-				text: responseText || void 0
+				size: responseContentSize,
+				mimeType: contentType,
+				text: normalizedResponseText === void 0 ? void 0 : normalizedResponseText
 			},
 			redirectURL: "",
 			headersSize: -1,
-			bodySize: responseBodyEntry?.sizeBytes ?? responseEntry.sizeBytes ?? -1
+			bodySize: responseContentSize
 		},
 		cache: {},
 		timings: {
@@ -954,6 +963,11 @@ function createHarEntry(pageId, entries) {
 		_webSocketMessages: firstEntry.kind === "websocket" ? createWebSocketMessages(messageEntries) : void 0
 	};
 }
+function normalizeEventStreamText(text) {
+	if (!text) return text;
+	if (text.endsWith("\n\n")) return text;
+	return text.endsWith("\n") ? `${text}\n` : text;
+}
 function headersRecordToHarPairs(headers) {
 	return Object.entries(headers ?? {}).map(([name, value]) => ({
 		name,
@@ -1037,6 +1051,7 @@ function getOrCreateState(options = {}) {
 		startedAt: new Date(startedAtMs).toISOString(),
 		consoleBuffer: createRingBuffer(normalizedOptions.maxConsoleEntries),
 		networkBuffer: createRingBuffer(normalizedOptions.maxNetworkEntries),
+		instrumentedRequestUrls: /* @__PURE__ */ new Set(),
 		performanceResourceKeys: /* @__PURE__ */ new Set(),
 		nextConsoleId: 1,
 		nextNetworkId: 1,
@@ -1062,6 +1077,17 @@ function nextConnectionId(state, kind) {
 	state.nextConnectionId += 1;
 	return id;
 }
+function normalizeHarUrl(url, mode = "http") {
+	if (typeof URL === "undefined") return url;
+	const baseUrl = typeof location !== "undefined" && location.href ? location.href : "http://localhost/";
+	try {
+		const normalizedUrl = new URL(url, baseUrl);
+		if (mode === "websocket" && (normalizedUrl.protocol === "http:" || normalizedUrl.protocol === "https:")) normalizedUrl.protocol = normalizedUrl.protocol === "https:" ? "wss:" : "ws:";
+		return normalizedUrl.href;
+	} catch {
+		return url;
+	}
+}
 function headersToRecord(headers, options) {
 	const record = {};
 	headers.forEach((value, key) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neta-art/cohub",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "Cohub SDK for spaces, sessions, checkpoints, and realtime agent collaboration.",
   "license": "UNLICENSED",
   "private": false,