zlient 3.3.2 → 3.3.4

package/dist/index.js

@@ -507,7 +507,8 @@ var SSEConnectionImpl = class {
 	}
 	async start() {
 		try {
-			const { method = "GET", data, headers = {}, withCredentials, signal } = this.options;
+			let { method = "GET", data, headers = {}, withCredentials, signal, auth, logger } = this.options;
+			let url = this.url;
 			const init = {
 				method,
 				headers: {
@@ -516,48 +517,107 @@ var SSEConnectionImpl = class {
 				},
 				signal: signal || this.abortController.signal
 			};
+			if (auth) {
+				await auth.apply({
+					url,
+					init
+				});
+				if (init.__urlOverride) url = init.__urlOverride;
+			}
 			if (withCredentials) init.credentials = "include";
 			if (data) {
 				init.body = typeof data === "object" ? JSON.stringify(data) : String(data);
 				if (!init.headers || !("Content-Type" in init.headers)) init.headers["Content-Type"] = "application/json";
 			}
-			const response = await fetch(this.url, init);
-			if (!response.ok) throw new Error(`SSE request failed with status ${response.status}`);
+			if (logger) logger.debug("SSE connection initiated", {
+				method,
+				url,
+				hasData: !!data
+			});
+			const response = await fetch(url, init);
+			if (!response.ok) {
+				if (logger) logger.error(`SSE request failed with status ${response.status}`, /* @__PURE__ */ new Error("SSE Error"), {
+					url,
+					status: response.status
+				});
+				throw new Error(`SSE request failed with status ${response.status}`);
+			}
 			this._readyState = 1;
 			this.emit("open", { type: "open" });
 			const reader = response.body?.getReader();
 			if (!reader) throw new Error("Response body is not readable");
 			const decoder = new TextDecoder();
-			let buffer = "";
+			let lineBuffer = "";
+			let eventData = "";
+			let eventName = "message";
+			let lastCharWasCR = false;
+			const processLine = (line) => {
+				if (line === "") {
+					if (eventData) {
+						this.handleEvent(eventName, eventData.endsWith("\n") ? eventData.slice(0, -1) : eventData);
+						eventData = "";
+					}
+					eventName = "message";
+					return;
+				}
+				if (line.startsWith(":")) return;
+				const colonIndex = line.indexOf(":");
+				let field;
+				let value;
+				if (colonIndex === -1) {
+					field = line;
+					value = "";
+				} else {
+					field = line.slice(0, colonIndex);
+					value = line.slice(colonIndex + 1);
+					if (value.startsWith(" ")) value = value.slice(1);
+				}
+				if (field === "event") eventName = value;
+				else if (field === "data") eventData += value + "\n";
+			};
 			while (true) {
 				const { done, value } = await reader.read();
-				if (done) break;
-				buffer += decoder.decode(value, { stream: true });
-				const parts = buffer.split(/\r\n|\r|\n/);
-				buffer = parts.pop() || "";
-				let eventData = "";
-				let eventName = "message";
-				for (const line of parts) {
-					if (line === "") {
-						if (eventData) {
-							this.handleEvent(eventName, eventData.trim());
-							eventData = "";
-							eventName = "message";
-						}
-						continue;
+				const chunk = decoder.decode(value, { stream: true });
+				for (let i = 0; i < chunk.length; i++) {
+					const char = chunk[i];
+					if (char === "\n") if (lastCharWasCR) lastCharWasCR = false;
+					else {
+						processLine(lineBuffer);
+						lineBuffer = "";
 					}
-					if (line.startsWith(":")) continue;
-					const colonIndex = line.indexOf(":");
-					if (colonIndex === -1) this.processField(line, "", (name, data) => {
-						eventName = name || eventName;
-						eventData += data;
-					});
+					else if (char === "\r") {
+						processLine(lineBuffer);
+						lineBuffer = "";
+						lastCharWasCR = true;
+					} else {
+						if (lastCharWasCR) lastCharWasCR = false;
+						lineBuffer += char;
+					}
+				}
+				if (done) {
+					const finalChunk = decoder.decode();
+					for (const char of finalChunk) if (char === "\n") if (lastCharWasCR) lastCharWasCR = false;
 					else {
-						const field = line.slice(0, colonIndex);
-						const value = line.slice(colonIndex + 1).trim();
-						if (field === "event") eventName = value;
-						else if (field === "data") eventData += (eventData ? "\n" : "") + value;
+						processLine(lineBuffer);
+						lineBuffer = "";
+					}
+					else if (char === "\r") {
+						processLine(lineBuffer);
+						lineBuffer = "";
+						lastCharWasCR = true;
+					} else {
+						if (lastCharWasCR) lastCharWasCR = false;
+						lineBuffer += char;
+					}
+					if (lineBuffer) {
+						processLine(lineBuffer);
+						lineBuffer = "";
 					}
+					if (eventData) {
+						this.handleEvent(eventName, eventData.endsWith("\n") ? eventData.slice(0, -1) : eventData);
+						eventData = "";
+					}
+					break;
 				}
 			}
 		} catch (error) {
@@ -568,15 +628,11 @@ var SSEConnectionImpl = class {
 			this._readyState = 2;
 		}
 	}
-	processField(field, value, callback) {
-		if (field === "event") callback(value, "");
-		else if (field === "data") callback("", value);
-	}
 	async handleEvent(event, data) {
 		let parsedData = data;
 		try {
-			if (typeof data === "string") try {
-				parsedData = JSON.parse(data);
+			if (typeof data === "string" && data.length > 0) try {
+				if (data.startsWith("{") && data.endsWith("}") || data.startsWith("[") && data.endsWith("]") || data.startsWith("\"") && data.endsWith("\"")) parsedData = JSON.parse(data);
 			} catch {}
 			const schema = this.getSchema(event);
 			if (!this.options.skipResponseValidation && schema) parsedData = await parseOrThrow(schema, parsedData);
@@ -640,10 +696,13 @@ var SSEEndpointImpl = class {
 				method: this.config.method,
 				data,
 				headers: {
+					...this.client.getHeaders(),
 					...this.config.advanced?.headers || {},
 					...headers || {}
 				},
-				signal
+				signal,
+				auth: this.config.advanced?.skipAuth ? void 0 : this.client.getAuth(),
+				logger: this.client.getLogger()
 			});
 		};
 	}
@@ -864,6 +923,18 @@ var HttpClient = class {
 	getBaseUrl(key) {
 		return this.resolveBaseUrl(key);
 	}
+	/** @internal */
+	getAuth() {
+		return this.auth;
+	}
+	/** @internal */
+	getHeaders() {
+		return this.headers;
+	}
+	/** @internal */
+	getLogger() {
+		return this.logger;
+	}
 	/**
 	* Make an HTTP request with automatic retry, authentication, and validation.
 	*