@supalive/core 1.14.0 → 1.16.0

package/dist/src/client/index.js

@@ -1,10 +1,10 @@
-import { c as parentConn, i as createActionBuilder, n as getContextRegistry, o as createMutationBuilder, r as router, s as createQueryBuilder, u as primaryOnlyConn } from "../../router-Kgrlci8X.js";
+import { c as parentConn, i as createActionBuilder, l as primaryOnlyConn, n as getContextRegistry, o as createMutationBuilder, r as router, s as createQueryBuilder } from "../../router-DP2ThAwh.js";
 import { r as supaliveStringify } from "../../helper-zdJT5FUc.js";
-import { o as matchesPredicate } from "../../query-Xw2hi6TB.js";
+import { o as matchesPredicate } from "../../query-LJranz0c.js";
 import { n as defineSchema, t as defineComputedField } from "../../schema-DRtz5h5l.js";
 import { C as normalizeIdToBytes, S as bytesFromJson, _ as RawRangeReadSchema, a as DEFAULT_RETRY, b as WriteEntrySchema, c as OccAbortError, d as PointReadSchema, f as PredicateSchema, g as RawPointReadSchema, h as RangeReadSchema, i as CompareOperatorSchema, l as OccConflictError, m as QueryCacheMetadataSchema, n as BigIntSchema, o as LeafPredicateSchema, p as QueryCacheEntrySchema, r as CachedPgMetadataSchema, s as NO_RETRY, t as AndPredicateSchema, u as OrPredicateSchema, v as RawReadEntrySchema, w as normalizeToBytes, x as WriteOpSchema, y as ReadEntrySchema } from "../../types_db-OUou3o2Z.js";
-import { l as ServerMessageSchema } from "../../types_client_rpc-ByGwoRCL.js";
-import { a as TxContext, i as DbWriter, n as sleep, r as DbReader, t as SupaliveDb } from "../../realtime_db-CVze3gM0.js";
+import { l as ServerMessageSchema } from "../../types_client_rpc-CWZmlWmM.js";
+import { a as TxContext, i as DbWriter, n as sleep, r as DbReader, t as SupaliveDb } from "../../realtime_db-B0Tin87E.js";
 import { n as resolveReadRouting, t as makeConnRouting } from "../../read-routing-BUcQAwnd.js";
 import { sha1 } from "hash-wasm";
 //#region src/db/query_definition.ts
@@ -78,6 +78,23 @@ var RPCError = class extends Error {
 		this.code = code;
 	}
 };
+const LEVEL_ORDER = {
+	debug: 10,
+	info: 20,
+	warn: 30,
+	error: 40
+};
+/** Console-backed logger that drops anything below `level`. `"silent"` mutes all. */
+function createConsoleLogger(level = "warn") {
+	const enabled = (l) => level !== "silent" && LEVEL_ORDER[l] >= LEVEL_ORDER[level];
+	const noop = () => {};
+	return {
+		debug: enabled("debug") ? (m, ...a) => console.debug(`[WSClient] ${m}`, ...a) : noop,
+		info: enabled("info") ? (m, ...a) => console.info(`[WSClient] ${m}`, ...a) : noop,
+		warn: enabled("warn") ? (m, ...a) => console.warn(`[WSClient] ${m}`, ...a) : noop,
+		error: enabled("error") ? (m, ...a) => console.error(`[WSClient] ${m}`, ...a) : noop
+	};
+}
 var WsClientManager = class {
 	ws = null;
 	options;
@@ -123,7 +140,9 @@ var WsClientManager = class {
 	throttling = false;
 	visibilityListener = null;
 	onlineListener = null;
+	log;
 	constructor(options) {
+		this.log = options.logger ?? createConsoleLogger(options.logLevel ?? "warn");
 		this.options = {
 			reconnectionTimeout: 18e4,
 			reconnect: {
@@ -166,6 +185,11 @@ var WsClientManager = class {
 		if (this.connectionState == "connected" || this.connectionState == "connecting") return;
 		this.connectionState = "connecting";
 		this.emitState();
+		this.log.debug(`connecting to ${this.options.url}`);
+		this.emitEvent({
+			type: "connecting",
+			detail: this.options.url
+		});
 		return new Promise(async (resolve, reject) => {
 			this.pendingConnectResolve = () => {
 				this.pendingConnectResolve = null;
@@ -337,7 +361,8 @@ var WsClientManager = class {
 				id,
 				procedure,
 				input,
-				minTs: this.highWaterTs > 0n ? this.highWaterTs.toString() : void 0
+				minTs: this.highWaterTs > 0n ? this.highWaterTs.toString() : void 0,
+				trace: this.traceparent()
 			});
 		});
 	}
@@ -420,14 +445,15 @@ var WsClientManager = class {
 						this.subscriptions.delete(pendingKey);
 						this.rejectJoiners(parked, err);
 					}
-					console.error(`[WSClient] Failed to re-subscribe ${sub.procedure}:`, err);
+					this.log.warn(`Failed to re-subscribe ${sub.procedure}:`, err);
 				}
 			});
 			this.send({
 				type: "subscribe",
 				id,
 				procedure: sub.procedure,
-				input: sub.input
+				input: sub.input,
+				trace: this.traceparent()
 			});
 		}
 	}
@@ -529,7 +555,8 @@ var WsClientManager = class {
 				type: "subscribe",
 				id,
 				procedure,
-				input
+				input,
+				trace: this.traceparent()
 			});
 			timeout = setTimeout(() => {
 				if (this.pendingRequests.has(id)) {
@@ -584,11 +611,11 @@ var WsClientManager = class {
 		try {
 			data = JSON.parse(dataValue);
 		} catch {
-			console.error("[WSClient] Failed to parse server message as JSON:", dataValue);
+			this.log.warn("Failed to parse server message as JSON:", dataValue);
 		}
 		const parsed = ServerMessageSchema.safeParse(data);
 		if (!parsed.success) {
-			console.error("[WSClient] Invalid server message:", parsed.error.issues, data);
+			this.log.warn("Invalid server message:", parsed.error.issues, data);
 			return;
 		}
 		const message = parsed.data;
@@ -597,6 +624,8 @@ var WsClientManager = class {
 				this.connectionState = "connected";
 				this.reconnectAttempts = 0;
 				this.lastSuccessfulConnectionTime = Date.now();
+				this.log.info("connected");
+				this.emitEvent({ type: "connected" });
 				const token = await this.options.token?.();
 				if (token) {
 					this.authState = "pending";
@@ -640,7 +669,10 @@ var WsClientManager = class {
 				this.handleSubscriptionGone(message);
 				break;
 			case "ping": break;
-			default: console.warn("[WSClient] Unhandled server message type:", message);
+			default: {
+				const _exhaustive = message;
+				this.log.warn("Unhandled server message type:", _exhaustive);
+			}
 		}
 	}
 	/**
@@ -683,7 +715,7 @@ var WsClientManager = class {
 		try {
 			sub.onGone?.(message.reason);
 		} catch (e) {
-			console.error("[WSClient] onGone listener threw:", e);
+			this.log.error("onGone listener threw:", e);
 		}
 	}
 	handleClose() {
@@ -692,6 +724,8 @@ var WsClientManager = class {
 		this.authState = "pending";
 		this.ws = null;
 		this.stopInactivityWatchdog();
+		this.log.info("disconnected");
+		this.emitEvent({ type: "disconnected" });
 		this.options.onDisconnect?.();
 		this.pendingConnectReject?.(new RPCError("Connection closed before ready", "DISCONNECTED"));
 		for (const pending of this.pendingRequests.values()) pending.reject(new RPCError("Connection closed", "DISCONNECTED"));
@@ -700,6 +734,11 @@ var WsClientManager = class {
 		if (!this.explicitlyClosed && this.options.reconnect?.enabled) this.scheduleReconnect();
 	}
 	handleError(err) {
+		this.log.warn("connection error:", err);
+		this.emitEvent({
+			type: "error",
+			detail: err.message
+		});
 		this.options.onError?.(err);
 	}
 	startInactivityWatchdog() {
@@ -726,7 +765,7 @@ var WsClientManager = class {
 	*/
 	closeAndReconnect(reason) {
 		if (this.connectionState === "disconnected") return;
-		console.warn(`[WSClient] closeAndReconnect: ${reason}`);
+		this.log.warn(`closeAndReconnect: ${reason}`);
 		const oldWs = this.ws;
 		if (oldWs) {
 			oldWs.onmessage = null;
@@ -774,7 +813,7 @@ var WsClientManager = class {
 	}
 	scheduleReconnect() {
 		if (this.reconnectAttempts >= (this.options.reconnect?.maxAttempts ?? 5)) {
-			console.error("[WSClient] Max reconnection attempts reached");
+			this.log.error("Max reconnection attempts reached");
 			const giveUp = new RPCError("Max reconnection attempts reached", "DISCONNECTED");
 			for (const q of this.queuedCalls) q.reject(giveUp);
 			this.queuedCalls = [];
@@ -784,9 +823,14 @@ var WsClientManager = class {
 		const base = (this.options.reconnect?.delay ?? 1e3) * Math.pow(this.options.reconnect?.backoff ?? 1.5, this.reconnectAttempts);
 		const delay = base + base * (Math.random() - .5);
 		this.reconnectAttempts++;
+		this.log.info(`reconnecting (attempt ${this.reconnectAttempts}) in ${Math.round(delay)}ms`);
+		this.emitEvent({
+			type: "reconnecting",
+			attempt: this.reconnectAttempts
+		});
 		this.reconnectTimer = setTimeout(() => {
 			this.connect().catch((err) => {
-				console.error("[WSClient] Reconnection failed:", err);
+				this.log.warn("Reconnection failed:", err);
 			});
 		}, delay);
 	}
@@ -803,7 +847,17 @@ var WsClientManager = class {
 		for (const l of this.stateListeners) try {
 			l(next);
 		} catch (e) {
-			console.error("[WSClient] state listener threw:", e);
+			this.log.error("state listener threw:", e);
+		}
+	}
+	/** Fire the optional structured lifecycle event; never lets a throwing hook
+	*  break the client. */
+	emitEvent(event) {
+		if (!this.options.onEvent) return;
+		try {
+			this.options.onEvent(event);
+		} catch (e) {
+			this.log.error("onEvent listener threw:", e);
 		}
 	}
 	async ensureConnected() {
@@ -812,6 +866,10 @@ var WsClientManager = class {
 	send(message) {
 		if (this.ws && this.ws.readyState === WS_OPEN) this.ws.send(supaliveStringify(message));
 	}
+	/** Current W3C traceparent from the optional hook, or undefined. */
+	traceparent() {
+		return this.options.getTraceparent?.() ?? void 0;
+	}
 	cleanup() {
 		this.connectionState = "disconnected";
 		this.authState = "pending";
@@ -852,6 +910,10 @@ function createClient(options) {
 		reconnect: options.reconnect,
 		heartbeat: options.heartbeat,
 		throttle: options.throttle,
+		logger: options.logger,
+		logLevel: options.logLevel,
+		onEvent: options.onEvent,
+		getTraceparent: options.getTraceparent,
 		onConnect: options.onConnect,
 		onDisconnect: options.onDisConnect
 	});
@@ -1233,6 +1295,6 @@ function createCaller(options) {
 	} });
 }
 //#endregion
-export { AndPredicateSchema, BigIntSchema, CachedPgMetadataSchema, CompareOperatorSchema, DEFAULT_RETRY, DbReader, DbReader as ReadContext, DbWriter, DbWriter as WritableContext, LeafPredicateSchema, NO_RETRY, OccAbortError, OccConflictError, OrPredicateSchema, PointReadSchema, PredicateSchema, QueryCacheEntrySchema, QueryCacheMetadataSchema, RPCError, RangeReadSchema, RawPointReadSchema, RawRangeReadSchema, RawReadEntrySchema, ReadEntrySchema, SupaliveDb, TxContext, WriteEntrySchema, WriteOpSchema, WsClientManager, _resetGlobalDefs, bytesFromJson, createActionBuilder, createCaller, createClient, createMutationBuilder, createQueryBuilder, defineComputedField, defineQuery, defineSchema, matchesPredicate, normalizeIdToBytes, normalizeToBytes, router, sleep };
+export { AndPredicateSchema, BigIntSchema, CachedPgMetadataSchema, CompareOperatorSchema, DEFAULT_RETRY, DbReader, DbReader as ReadContext, DbWriter, DbWriter as WritableContext, LeafPredicateSchema, NO_RETRY, OccAbortError, OccConflictError, OrPredicateSchema, PointReadSchema, PredicateSchema, QueryCacheEntrySchema, QueryCacheMetadataSchema, RPCError, RangeReadSchema, RawPointReadSchema, RawRangeReadSchema, RawReadEntrySchema, ReadEntrySchema, SupaliveDb, TxContext, WriteEntrySchema, WriteOpSchema, WsClientManager, _resetGlobalDefs, bytesFromJson, createActionBuilder, createCaller, createClient, createConsoleLogger, createMutationBuilder, createQueryBuilder, defineComputedField, defineQuery, defineSchema, matchesPredicate, normalizeIdToBytes, normalizeToBytes, router, sleep };
 
 //# sourceMappingURL=index.js.map