@decartai/sdk 0.1.5 → 0.1.7

package/dist/realtime/signaling-channel.js

@@ -3,10 +3,43 @@ import { createConsoleLogger } from "../utils/logger.js";
 import { REALTIME_CONFIG } from "./config-realtime.js";
 import mitt from "mitt";
 //#region src/realtime/signaling-channel.ts
+function buildInitialStateRequest(initialState) {
+	if (!initialState) return null;
+	if (initialState.imageRef !== void 0 || initialState.image !== void 0) {
+		const message = initialState.imageRef !== void 0 ? {
+			type: "set_image",
+			image_ref: initialState.imageRef
+		} : {
+			type: "set_image",
+			image_data: initialState.image ?? null
+		};
+		if (initialState.prompt !== void 0) message.prompt = initialState.prompt;
+		if (initialState.enhance !== void 0) message.enhance_prompt = initialState.enhance;
+		return {
+			message,
+			matchAck: (msg) => msg.type === "set_image_ack",
+			label: "Image send"
+		};
+	}
+	if (initialState.prompt !== void 0 && initialState.prompt !== null) {
+		const text = initialState.prompt;
+		return {
+			message: {
+				type: "prompt",
+				prompt: text,
+				enhance_prompt: initialState.enhance ?? true
+			},
+			matchAck: (msg) => msg.type === "prompt_ack" && msg.prompt === text,
+			label: "Prompt send"
+		};
+	}
+	return null;
+}
 var SignalingChannel = class {
 	ws = null;
 	events = mitt();
 	pendingAcks = [];
+	bufferedAcks = [];
 	pendingRoomInfo = null;
 	connected = false;
 	closing = false;
@@ -29,7 +62,12 @@ var SignalingChannel = class {
 		this.config.observability?.endPhase("websocket-open", { success: true });
 		this.config.observability?.startPhase("room-join");
 		const roomInfoWait = this.waitForRoomInfo(handshakeTimeout);
-		if (!this.writeMessage({ type: "livekit_join" })) {
+		const initialStateRequest = buildInitialStateRequest(opts.initialState);
+		const joinMessage = {
+			type: "livekit_join",
+			initial_state: initialStateRequest ? initialStateRequest.message : null
+		};
+		if (!this.writeMessage(joinMessage)) {
 			roomInfoWait.cancel();
 			throw new Error("WebSocket is not open");
 		}
@@ -42,18 +80,24 @@ var SignalingChannel = class {
 		}
 		this.config.observability?.endPhase("room-join", { success: true });
 		this.connected = true;
-		const initialStateAck = this.sendInitialStateTracked(opts.initialState);
+		const initialStateAck = initialStateRequest ? this.flushInitialState(initialStateRequest) : Promise.resolve();
 		initialStateAck.catch(() => {});
 		return {
 			roomInfo,
 			initialStateAck
 		};
 	}
-	async sendInitialStateTracked(initialState) {
-		if (!initialState) return;
+	async flushInitialState(request) {
 		this.config.observability?.startPhase("initial-state-handshake");
-		await this.sendInitialState(initialState);
+		const ack = await this.request({
+			message: request.message,
+			matchAck: request.matchAck,
+			timeoutMs: REALTIME_CONFIG.signaling.requestTimeoutMs,
+			label: request.label,
+			write: false
+		});
 		this.config.observability?.endPhase("initial-state-handshake", { success: true });
+		if (!ack.success) throw new Error(ack.error ?? `Failed: ${request.label}`);
 	}
 	close() {
 		this.closing = true;
@@ -180,32 +224,14 @@ var SignalingChannel = class {
 			cancel: cleanup
 		};
 	}
-	async sendInitialState(initialState) {
-		if (!initialState) return;
-		if (initialState.imageRef !== void 0) {
-			await this.setImage({
-				kind: "ref",
-				ref: initialState.imageRef
-			}, {
-				prompt: initialState.prompt,
-				enhance: initialState.enhance
-			});
-			return;
-		}
-		if (initialState.image !== void 0) {
-			await this.setImage({
-				kind: "data",
-				data: initialState.image
-			}, {
-				prompt: initialState.prompt,
-				enhance: initialState.enhance
-			});
-			return;
-		}
-		if (initialState.prompt !== void 0 && initialState.prompt !== null) await this.sendPrompt(initialState.prompt, { enhance: initialState.enhance });
-	}
-	async request({ message, matchAck, timeoutMs, label }) {
+	async request({ message, matchAck, timeoutMs, label, write = true }) {
 		return new Promise((resolve, reject) => {
+			const buffered = this.bufferedAcks.findIndex((m) => matchAck(m));
+			if (buffered !== -1) {
+				const [claimed] = this.bufferedAcks.splice(buffered, 1);
+				resolve(claimed);
+				return;
+			}
 			const timer = setTimeout(() => {
 				cleanup();
 				this.logger.warn("signaling: ack timed out", {
@@ -230,7 +256,7 @@ var SignalingChannel = class {
 				this.pendingAcks = this.pendingAcks.filter((e) => e !== entry);
 			};
 			this.pendingAcks.push(entry);
-			if (!this.writeMessage(message)) {
+			if (write && !this.writeMessage(message)) {
 				cleanup();
 				reject(/* @__PURE__ */ new Error("WebSocket is not open"));
 			}
@@ -244,7 +270,11 @@ var SignalingChannel = class {
 	handleMessage(msg) {
 		for (const ack of [...this.pendingAcks]) if (ack.matches(msg)) {
 			ack.onMatch(msg);
-			break;
+			return;
+		}
+		if (!this.connected && (msg.type === "set_image_ack" || msg.type === "prompt_ack")) {
+			this.bufferedAcks.push(msg);
+			return;
 		}
 		switch (msg.type) {
 			case "livekit_room_info":
@@ -298,6 +328,7 @@ var SignalingChannel = class {
 	rejectAllPending(error) {
 		const pending = this.pendingAcks;
 		this.pendingAcks = [];
+		this.bufferedAcks = [];
 		for (const entry of pending) entry.reject(error);
 	}
 };

package/dist/realtime/stream-session.js

@@ -1,6 +1,5 @@
 import { createConsoleLogger } from "../utils/logger.js";
 import { REALTIME_CONFIG } from "./config-realtime.js";
-import { InitialStateGate } from "./initial-state-gate.js";
 import { MediaChannel } from "./media-channel.js";
 import { SignalingChannel } from "./signaling-channel.js";
 import mitt from "mitt";
@@ -25,7 +24,7 @@ var StreamSession = class {
 	queue = null;
 	disposed = false;
 	currentAttempt = 0;
-	initialStateGate = new InitialStateGate();
+	teardownGeneration = 0;
 	logger;
 	constructor(config) {
 		this.config = config;
@@ -101,11 +100,12 @@ var StreamSession = class {
 			this.resetHandshakeState();
 			const initialState = this.getInitialState();
 			this.config.observability?.beginConnectionBreakdown(attempt, getInitialImageSizeKb(initialState?.image));
-			const gateAttempt = this.initialStateGate.startAttempt(initialState);
+			this.config.observability?.markGlassToGlassStart();
 			const { roomInfo, initialStateAck } = await this.signaling.openAndJoin({
 				connectTimeout: REALTIME_CONFIG.session.connectionTimeoutMs,
 				initialState
 			});
+			this.watchInitialStateAck(initialStateAck, attempt);
 			if (this.disposed || this.currentAttempt !== attempt) {
 				this.tearDown();
 				throw new AbortError("Stale connect attempt");
@@ -116,7 +116,6 @@ var StreamSession = class {
 					url: roomInfo.livekitUrl,
 					token: roomInfo.token
 				});
-				if (!await gateAttempt.waitForReadiness(initialStateAck)) throw new AbortError("Stale connect attempt");
 				await this.media.publishLocalTracks();
 			} catch (error) {
 				this.tearDown();
@@ -140,6 +139,13 @@ var StreamSession = class {
 			throw error;
 		}
 	}
+	watchInitialStateAck(initialStateAck, attempt) {
+		const generation = this.teardownGeneration;
+		initialStateAck.catch((error) => {
+			if (this.disposed || this.currentAttempt !== attempt || this.teardownGeneration !== generation) return;
+			this.events.emit("error", error instanceof Error ? error : new Error(String(error)));
+		});
+	}
 	getInitialState() {
 		if (this.config.initialImageRef !== void 0) return {
 			imageRef: this.config.initialImageRef,
@@ -239,9 +245,9 @@ var StreamSession = class {
 		this.wireMediaEvents();
 	}
 	tearDown() {
+		this.teardownGeneration++;
 		this.signaling.close();
 		this.media.disconnect();
-		this.initialStateGate.reset();
 		this.resetHandshakeState();
 	}
 	resetHandshakeState() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decartai/sdk",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Decart's JavaScript SDK",
   "type": "module",
   "license": "MIT",

package/dist/realtime/initial-state-gate.js

@@ -1,21 +0,0 @@
-//#region src/realtime/initial-state-gate.ts
-var InitialStateGate = class {
-	attemptId = 0;
-	startAttempt(initialState) {
-		const attemptId = ++this.attemptId;
-		const shouldWait = hasCallerProvidedInitialState(initialState);
-		return { waitForReadiness: async (initialStateAck) => {
-			if (shouldWait) await initialStateAck;
-			return this.attemptId === attemptId;
-		} };
-	}
-	reset() {
-		this.attemptId++;
-	}
-};
-function hasCallerProvidedInitialState(state) {
-	if (!state) return false;
-	return state.image !== void 0 && state.image !== null || state.prompt !== void 0 && state.prompt !== null;
-}
-//#endregion
-export { InitialStateGate };