@rebasepro/client 0.9.1-canary.97e305f → 0.9.1-canary.a57c262

package/dist/index.es.js

@@ -1397,11 +1397,9 @@ var ClientStorageSourceRegistry = class ClientStorageSourceRegistry {
 function extractMessageError(message) {
 	const payload = message.payload;
 	const errPayload = payload?.error;
-	const errorMessage = typeof errPayload === "object" ? errPayload.message : payload?.message || (typeof errPayload === "string" ? errPayload : void 0) || message.error || "Unknown error";
-	const errorCode = typeof errPayload === "object" ? errPayload.code : payload?.code;
 	return {
-		errorMessage: typeof errorMessage === "string" ? errorMessage : errorMessage == null ? "Unknown error" : JSON.stringify(errorMessage),
-		errorCode
+		errorMessage: typeof errPayload === "object" ? errPayload.message : payload?.message || (typeof errPayload === "string" ? errPayload : void 0) || message.error || "Unknown error",
+		errorCode: typeof errPayload === "object" ? errPayload.code : payload?.code
 	};
 }
 /**
@@ -1437,7 +1435,6 @@ var RebaseWebSocketClient = class {
 	isConnected = false;
 	messageQueue = [];
 	requestTimeoutMs = 3e4;
-	subscriptionTimeoutMs = 3e4;
 	reconnectTimeout = null;
 	isAuthenticated = false;
 	authPromise = null;
@@ -1543,7 +1540,6 @@ var RebaseWebSocketClient = class {
 				this.emit(wasReconnect ? "reconnect" : "connect");
 				this.processMessageQueue();
 				if (wasReconnect) this.resubscribeAll();
-				this.armPendingSubscribeWatchdogs();
 			};
 			this.ws.onmessage = (event) => {
 				try {
@@ -1558,7 +1554,6 @@ var RebaseWebSocketClient = class {
 				this.isConnected = false;
 				this.isAuthenticated = false;
 				this.authPromise = null;
-				this.suspendSubscribeWatchdogs();
 				this.emit("disconnect");
 				for (const [reqId, request] of this.pendingRequests.entries()) {
 					if (reqId.startsWith("auth_")) request.reject(/* @__PURE__ */ new Error("Connection closed during authentication"));
@@ -1590,7 +1585,6 @@ var RebaseWebSocketClient = class {
 	attemptReconnect() {
 		if (this.reconnectAttempts >= this.maxReconnectAttempts) {
 			console.error("Max reconnection attempts reached");
-			this.failAllPendingSubscriptions(new RebaseApiError$1("Connection lost", { code: "CONNECTION_LOST" }));
 			return;
 		}
 		this.reconnectAttempts++;
@@ -1645,18 +1639,29 @@ var RebaseWebSocketClient = class {
 				subscription.backendSubscriptionId = newBackendId;
 				backendKeyMap.delete(oldBackendId);
 				backendKeyMap.set(newBackendId, subscriptionKey);
-				if (messageType === "subscribe_collection") this.sendCollectionSubscribe(subscriptionKey);
-				else this.sendEntitySubscribe(subscriptionKey);
-				return;
+				this.sendMessage({
+					type: messageType,
+					payload: {
+						...subscription.props,
+						subscriptionId: newBackendId
+					}
+				}).catch((error) => {
+					console.error(`[WS] Failed to re-subscribe ${idPrefix} after auth refresh:`, subscriptionKey, error);
+					subscription.callbacks.forEach((callback) => {
+						if (callback.onError) callback.onError(error);
+					});
+				});
+			} else {
+				const { errorMessage, errorCode } = extractMessageError(message);
+				const error = new RebaseApiError$1(errorMessage, { code: errorCode });
+				subscription.callbacks.forEach((callback) => {
+					if (callback.onError) callback.onError(error);
+				});
 			}
-			const { errorMessage, errorCode } = extractMessageError(message);
-			const error = new RebaseApiError$1(errorMessage, { code: errorCode });
-			if (messageType === "subscribe_collection") this.failCollectionSubscription(subscriptionKey, error);
-			else this.failEntitySubscription(subscriptionKey, error);
 		}).catch((err) => {
-			const error = err instanceof Error ? err : new Error(String(err));
-			if (messageType === "subscribe_collection") this.failCollectionSubscription(subscriptionKey, error);
-			else this.failEntitySubscription(subscriptionKey, error);
+			subscription.callbacks.forEach((callback) => {
+				if (callback.onError) callback.onError(err);
+			});
 		});
 	}
 	handleWebSocketMessage(message) {
@@ -1697,9 +1702,6 @@ var RebaseWebSocketClient = class {
 					collectionSub.latestData = rows;
 					collectionSub.lastUpdated = Date.now();
 					collectionSub.isInitialDataReceived = true;
-					if (collectionSub.subscribeTimeout) clearTimeout(collectionSub.subscribeTimeout);
-					collectionSub.subscribeTimeout = void 0;
-					collectionSub.subscribeInFlight = false;
 					collectionSub.callbacks.forEach((callback) => {
 						try {
 							callback.onUpdate(rows);
@@ -1755,9 +1757,6 @@ var RebaseWebSocketClient = class {
 					entitySub.latestData = row;
 					entitySub.lastUpdated = Date.now();
 					entitySub.isInitialDataReceived = true;
-					if (entitySub.subscribeTimeout) clearTimeout(entitySub.subscribeTimeout);
-					entitySub.subscribeTimeout = void 0;
-					entitySub.subscribeInFlight = false;
 					entitySub.callbacks.forEach((callback) => {
 						try {
 							callback.onUpdate(row);
@@ -1779,9 +1778,6 @@ var RebaseWebSocketClient = class {
 						this.resubscribeAfterAuthRefresh(message, collectionSub, collectionKey, "collection", this.backendToCollectionKey, "subscribe_collection");
 						return;
 					}
-					if (collectionSub.subscribeTimeout) clearTimeout(collectionSub.subscribeTimeout);
-					collectionSub.subscribeTimeout = void 0;
-					collectionSub.subscribeInFlight = false;
 					const { errorMessage, errorCode } = extractMessageError(message);
 					const error = new RebaseApiError$1(errorMessage, { code: errorCode });
 					collectionSub.callbacks.forEach((callback) => {
@@ -1798,9 +1794,6 @@ var RebaseWebSocketClient = class {
 						this.resubscribeAfterAuthRefresh(message, entitySub, entityKey, "row", this.backendToEntityKey, "subscribe_one");
 						return;
 					}
-					if (entitySub.subscribeTimeout) clearTimeout(entitySub.subscribeTimeout);
-					entitySub.subscribeTimeout = void 0;
-					entitySub.subscribeInFlight = false;
 					const { errorMessage, errorCode } = extractMessageError(message);
 					const error = new RebaseApiError$1(errorMessage, { code: errorCode });
 					entitySub.callbacks.forEach((callback) => {
@@ -2149,12 +2142,9 @@ var RebaseWebSocketClient = class {
 				console.error("Error in collection subscription callback:", error);
 				if (onError) onError(error instanceof Error ? error : new Error(String(error)));
 			}
-			else if (!existingSubscription.subscribeInFlight) this.sendCollectionSubscribe(subscriptionKey);
 			return () => {
 				callbackMap.delete(callbackId);
 				if (callbackMap.size === 0) {
-					if (this.collectionSubscriptions.get(subscriptionKey) !== existingSubscription) return;
-					if (existingSubscription.subscribeTimeout) clearTimeout(existingSubscription.subscribeTimeout);
 					this.collectionSubscriptions.delete(subscriptionKey);
 					this.backendToCollectionKey.delete(existingSubscription.backendSubscriptionId);
 					if (this.isConnected && this.ws) this.sendMessage({
@@ -2176,14 +2166,21 @@ var RebaseWebSocketClient = class {
 			props
 		});
 		this.backendToCollectionKey.set(backendSubscriptionId, subscriptionKey);
-		this.sendCollectionSubscribe(subscriptionKey);
+		this.sendMessage({
+			type: "subscribe_collection",
+			payload: {
+				...props,
+				subscriptionId: backendSubscriptionId
+			}
+		}).catch((error) => {
+			if (onError) onError(error);
+		});
 		return () => {
 			const subscription = this.collectionSubscriptions.get(subscriptionKey);
 			if (subscription) {
 				const callbacks = subscription.callbacks;
 				callbacks.delete(callbackId);
 				if (callbacks.size === 0) {
-					if (subscription.subscribeTimeout) clearTimeout(subscription.subscribeTimeout);
 					this.collectionSubscriptions.delete(subscriptionKey);
 					this.backendToCollectionKey.delete(subscription.backendSubscriptionId);
 					if (this.isConnected && this.ws) this.sendMessage({
@@ -2210,12 +2207,9 @@ var RebaseWebSocketClient = class {
 				console.error("Error in row subscription callback:", error);
 				if (onError) onError(error instanceof Error ? error : new Error(String(error)));
 			}
-			else if (!existingSubscription.subscribeInFlight) this.sendEntitySubscribe(subscriptionKey);
 			return () => {
 				callbackMap.delete(callbackId);
 				if (callbackMap.size === 0) {
-					if (this.singleSubscriptions.get(subscriptionKey) !== existingSubscription) return;
-					if (existingSubscription.subscribeTimeout) clearTimeout(existingSubscription.subscribeTimeout);
 					this.singleSubscriptions.delete(subscriptionKey);
 					this.backendToEntityKey.delete(existingSubscription.backendSubscriptionId);
 					if (this.isConnected && this.ws) this.sendMessage({
@@ -2237,7 +2231,15 @@ var RebaseWebSocketClient = class {
 			props
 		});
 		this.backendToEntityKey.set(backendSubscriptionId, subscriptionKey);
-		this.sendEntitySubscribe(subscriptionKey);
+		this.sendMessage({
+			type: "subscribe_one",
+			payload: {
+				...props,
+				subscriptionId: backendSubscriptionId
+			}
+		}).catch((error) => {
+			if (onError) onError(error);
+		});
 		return () => {
 			const subscription = this.singleSubscriptions.get(subscriptionKey);
 			if (subscription) {
@@ -2255,157 +2257,6 @@ var RebaseWebSocketClient = class {
 		};
 	}
 	/**
-	* Send a `subscribe_collection` for an already-registered subscription and
-	* arm its watchdog.
-	*
-	* Every path that registers a collection subscription goes through here, so
-	* that a subscribe which never lands — a rejected send, or a server that
-	* never answers — always ends up in `failCollectionSubscription` rather than
-	* leaving the entry parked with `isInitialDataReceived === false` forever.
-	*/
-	sendCollectionSubscribe(subscriptionKey) {
-		const subscription = this.collectionSubscriptions.get(subscriptionKey);
-		if (!subscription) return;
-		const backendSubscriptionId = subscription.backendSubscriptionId;
-		subscription.subscribeInFlight = true;
-		if (subscription.subscribeTimeout) clearTimeout(subscription.subscribeTimeout);
-		subscription.subscribeTimeout = void 0;
-		if (this.isConnected) this.sendCollectionSubscribeWatchdog(subscriptionKey);
-		this.sendMessage({
-			type: "subscribe_collection",
-			payload: {
-				...subscription.props,
-				subscriptionId: backendSubscriptionId
-			}
-		}).catch((error) => {
-			const current = this.collectionSubscriptions.get(subscriptionKey);
-			if (!current || current.backendSubscriptionId !== backendSubscriptionId) return;
-			this.failCollectionSubscription(subscriptionKey, error instanceof Error ? error : new Error(String(error)));
-		});
-	}
-	/** The `listenOne` counterpart of {@link sendCollectionSubscribe}. */
-	sendEntitySubscribe(subscriptionKey) {
-		const subscription = this.singleSubscriptions.get(subscriptionKey);
-		if (!subscription) return;
-		const backendSubscriptionId = subscription.backendSubscriptionId;
-		subscription.subscribeInFlight = true;
-		if (subscription.subscribeTimeout) clearTimeout(subscription.subscribeTimeout);
-		subscription.subscribeTimeout = void 0;
-		if (this.isConnected) this.sendEntitySubscribeWatchdog(subscriptionKey);
-		this.sendMessage({
-			type: "subscribe_one",
-			payload: {
-				...subscription.props,
-				subscriptionId: backendSubscriptionId
-			}
-		}).catch((error) => {
-			const current = this.singleSubscriptions.get(subscriptionKey);
-			if (!current || current.backendSubscriptionId !== backendSubscriptionId) return;
-			this.failEntitySubscription(subscriptionKey, error instanceof Error ? error : new Error(String(error)));
-		});
-	}
-	/**
-	* Report a subscribe failure to every listener and drop the registration.
-	*
-	* Dropping it is the point: the callbacks stay live (their components are
-	* still mounted and have been told), but the next `listenCollection` for
-	* these params finds no entry and issues a fresh subscribe instead of
-	* silently attaching to a dead one.
-	*/
-	failCollectionSubscription(subscriptionKey, error) {
-		const subscription = this.collectionSubscriptions.get(subscriptionKey);
-		if (!subscription) return;
-		if (subscription.subscribeTimeout) clearTimeout(subscription.subscribeTimeout);
-		subscription.subscribeInFlight = false;
-		this.collectionSubscriptions.delete(subscriptionKey);
-		this.backendToCollectionKey.delete(subscription.backendSubscriptionId);
-		subscription.callbacks.forEach((callback) => {
-			if (callback.onError) try {
-				callback.onError(error);
-			} catch (callbackError) {
-				console.error("Error in collection subscription error callback:", callbackError);
-			}
-		});
-	}
-	/** The `listenOne` counterpart of {@link failCollectionSubscription}. */
-	failEntitySubscription(subscriptionKey, error) {
-		const subscription = this.singleSubscriptions.get(subscriptionKey);
-		if (!subscription) return;
-		if (subscription.subscribeTimeout) clearTimeout(subscription.subscribeTimeout);
-		subscription.subscribeInFlight = false;
-		this.singleSubscriptions.delete(subscriptionKey);
-		this.backendToEntityKey.delete(subscription.backendSubscriptionId);
-		subscription.callbacks.forEach((callback) => {
-			if (callback.onError) try {
-				callback.onError(error);
-			} catch (callbackError) {
-				console.error("Error in row subscription error callback:", callbackError);
-			}
-		});
-	}
-	/**
-	* Stop the watchdogs without failing anything — used when the socket drops,
-	* since the reconnect path re-subscribes everything anyway and a watchdog
-	* firing mid-reconnect would tear down healthy subscriptions.
-	*/
-	suspendSubscribeWatchdogs() {
-		for (const sub of this.collectionSubscriptions.values()) {
-			if (sub.subscribeTimeout) clearTimeout(sub.subscribeTimeout);
-			sub.subscribeTimeout = void 0;
-			sub.subscribeInFlight = false;
-		}
-		for (const sub of this.singleSubscriptions.values()) {
-			if (sub.subscribeTimeout) clearTimeout(sub.subscribeTimeout);
-			sub.subscribeTimeout = void 0;
-			sub.subscribeInFlight = false;
-		}
-	}
-	/**
-	* Arm watchdogs for subscribes that were requested while offline and have
-	* just been flushed to the socket. Their timers were deliberately not set at
-	* request time, so without this they would have no timeout at all.
-	*/
-	armPendingSubscribeWatchdogs() {
-		for (const [key, sub] of this.collectionSubscriptions.entries()) if (sub.subscribeInFlight && !sub.subscribeTimeout) this.sendCollectionSubscribeWatchdog(key);
-		for (const [key, sub] of this.singleSubscriptions.entries()) if (sub.subscribeInFlight && !sub.subscribeTimeout) this.sendEntitySubscribeWatchdog(key);
-	}
-	sendCollectionSubscribeWatchdog(subscriptionKey) {
-		const subscription = this.collectionSubscriptions.get(subscriptionKey);
-		if (!subscription) return;
-		const backendSubscriptionId = subscription.backendSubscriptionId;
-		subscription.subscribeTimeout = setTimeout(() => {
-			const current = this.collectionSubscriptions.get(subscriptionKey);
-			if (!current || current.backendSubscriptionId !== backendSubscriptionId) return;
-			if (!current.subscribeInFlight) return;
-			this.failCollectionSubscription(subscriptionKey, new RebaseApiError$1("Subscription timed out", { code: "SUBSCRIPTION_TIMEOUT" }));
-		}, this.subscriptionTimeoutMs);
-	}
-	sendEntitySubscribeWatchdog(subscriptionKey) {
-		const subscription = this.singleSubscriptions.get(subscriptionKey);
-		if (!subscription) return;
-		const backendSubscriptionId = subscription.backendSubscriptionId;
-		subscription.subscribeTimeout = setTimeout(() => {
-			const current = this.singleSubscriptions.get(subscriptionKey);
-			if (!current || current.backendSubscriptionId !== backendSubscriptionId) return;
-			if (!current.subscribeInFlight) return;
-			this.failEntitySubscription(subscriptionKey, new RebaseApiError$1("Subscription timed out", { code: "SUBSCRIPTION_TIMEOUT" }));
-		}, this.subscriptionTimeoutMs);
-	}
-	/**
-	* Fail every subscription that never received data. Called when reconnection
-	* is given up on, so views surface an error instead of spinning forever.
-	*/
-	failAllPendingSubscriptions(error) {
-		for (const key of [...this.collectionSubscriptions.keys()]) {
-			const sub = this.collectionSubscriptions.get(key);
-			if (sub && !sub.isInitialDataReceived) this.failCollectionSubscription(key, error);
-		}
-		for (const key of [...this.singleSubscriptions.keys()]) {
-			const sub = this.singleSubscriptions.get(key);
-			if (sub && !sub.isInitialDataReceived) this.failEntitySubscription(key, error);
-		}
-	}
-	/**
 	* Re-send all active subscriptions to the backend after a reconnect.
 	* The server wipes subscription state when a client disconnects, so
 	* we need to re-register everything to resume receiving updates.
@@ -2418,7 +2269,15 @@ var RebaseWebSocketClient = class {
 			sub.backendSubscriptionId = newBackendId;
 			this.backendToCollectionKey.delete(oldBackendId);
 			this.backendToCollectionKey.set(newBackendId, key);
-			this.sendCollectionSubscribe(key);
+			this.sendMessage({
+				type: "subscribe_collection",
+				payload: {
+					...sub.props,
+					subscriptionId: newBackendId
+				}
+			}).catch((error) => {
+				console.error("[WS] Failed to re-subscribe collection:", key, error);
+			});
 		}
 		for (const [key, sub] of this.singleSubscriptions.entries()) {
 			const oldBackendId = sub.backendSubscriptionId;
@@ -2426,7 +2285,15 @@ var RebaseWebSocketClient = class {
 			sub.backendSubscriptionId = newBackendId;
 			this.backendToEntityKey.delete(oldBackendId);
 			this.backendToEntityKey.set(newBackendId, key);
-			this.sendEntitySubscribe(key);
+			this.sendMessage({
+				type: "subscribe_one",
+				payload: {
+					...sub.props,
+					subscriptionId: newBackendId
+				}
+			}).catch((error) => {
+				console.error("[WS] Failed to re-subscribe row:", key, error);
+			});
 		}
 	}
 	createCollectionSubscriptionKey(props) {