@dxos/edge-client 0.13.0 → 0.14.0

package/dist/lib/index.mjs

@@ -1,5 +1,5 @@
 import { proxyFetchLegacy } from "./cors-proxy.mjs";
-import { _ as parseChallengeHeader, a as HttpConfig, c as withRetry, d as EdgeConnectionClosedError, f as EdgeIdentityChangedError, g as handleAuthChallenge, h as fetchAuthChallengeInfo, i as getEdgeUrlWithProtocol, l as withRetryConfig, m as fetchAuthChallenge, n as EdgeHttpClientService, o as encodeAuthHeader, p as authenticateViaChallengeEndpoint, r as BaseHttpClient, s as withLogging, t as EdgeHttpClient, u as EdgeClientError, v as presentCredentialsForChallenge, y as readAuthChallenge } from "./chunk-edge-http-client.mjs";
+import { S as clientVersionProtocol, _ as parseChallengeHeader, a as HttpConfig, b as assertClientSupported, c as withRetry, d as EdgeConnectionClosedError, f as EdgeIdentityChangedError, g as handleAuthChallenge, h as fetchAuthChallengeInfo, i as getEdgeUrlWithProtocol, l as withRetryConfig, m as fetchAuthChallenge, n as EdgeHttpClientService, o as encodeAuthHeader, p as authenticateViaChallengeEndpoint, r as BaseHttpClient, s as withLogging, t as EdgeHttpClient, u as EdgeClientError, v as presentCredentialsForChallenge, x as clientVersionHeaders, y as readAuthChallenge } from "./chunk-edge-http-client.mjs";
 import { a as MAX_INBOUND_TOTAL_BYTES, c as WebSocketClosedError, d as Protocol, f as getTypename, i as MAX_INBOUND_MESSAGE_BYTES, l as WebSocketMuxer, n as CLOUDFLARE_RPC_MAX_BYTES, o as MessageTooLargeError, p as toUint8Array, r as MAX_INBOUND_CHUNK_COUNT, s as SegmentedMessageLimitError, t as CLOUDFLARE_MESSAGE_MAX_BYTES, u as protocol } from "./chunk-edge-ws-muxer.mjs";
 import * as EffectContext from "effect/Context";
 import * as Effect from "effect/Effect";
@@ -9,7 +9,7 @@ import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
 import { invariant } from "@dxos/invariant";
 import { log, logInfo } from "@dxos/log";
-import { BYOK_HEADER, EDGE_CLIENT_VERSION_PROTOCOL_PREFIX, EdgeCredentialsHeaderCodec, EdgeWebsocketProtocol } from "@dxos/protocols";
+import { BYOK_HEADER, EdgeClientTooOldError, EdgeCredentialsHeaderCodec, EdgeWebsocketProtocol } from "@dxos/protocols";
 import { createUrl } from "@dxos/util";
 import { Event, Mutex, PersistentLifecycle, Trigger, TriggerState, scheduleMicroTask, scheduleTask, scheduleTaskInterval } from "@dxos/async";
 import { Context, Resource, TRACE_SPAN_ATTRIBUTE } from "@dxos/context";
@@ -124,9 +124,6 @@ var createStubEdgeIdentity = () => {
 	};
 };
 //#endregion
-//#region package.json
-var version = "0.13.0";
-//#endregion
 //#region src/reconnect-reason.ts
 /**
 * Classifies a close event.
@@ -397,7 +394,7 @@ var EdgeWsConnection = class extends Resource {
 		}
 	}
 	async _open() {
-		const baseProtocols = [...Object.values(EdgeWebsocketProtocol), `${EDGE_CLIENT_VERSION_PROTOCOL_PREFIX}${version}`];
+		const baseProtocols = [...Object.values(EdgeWebsocketProtocol), clientVersionProtocol()];
 		this._ws = new WebSocket(this._connectionInfo.url.toString(), this._connectionInfo.protocolHeader ? [...baseProtocols, this._connectionInfo.protocolHeader] : [...baseProtocols], this._connectionInfo.headers ? { headers: this._connectionInfo.headers } : void 0);
 		this._ws.binaryType = "arraybuffer";
 		const muxer = new WebSocketMuxer(this._ws);
@@ -407,7 +404,7 @@ var EdgeWsConnection = class extends Resource {
 				log("connected", void 0, {
 					"~LogMeta": "~LogMeta",
 					F: __dxlog_file$2,
-					L: 202,
+					L: 201,
 					S: this
 				});
 				this._openTimestamp = Date.now();
@@ -420,7 +417,7 @@ var EdgeWsConnection = class extends Resource {
 				log.verbose("connected after becoming inactive", { currentIdentity: this._identity }, {
 					"~LogMeta": "~LogMeta",
 					F: __dxlog_file$2,
-					L: 210,
+					L: 209,
 					S: this
 				});
 			}
@@ -435,7 +432,7 @@ var EdgeWsConnection = class extends Resource {
 				}, {
 					"~LogMeta": "~LogMeta",
 					F: __dxlog_file$2,
-					L: 216,
+					L: 215,
 					S: this
 				});
 				this._pendingMessages = [];
@@ -451,14 +448,14 @@ var EdgeWsConnection = class extends Resource {
 				}, {
 					"~LogMeta": "~LogMeta",
 					F: __dxlog_file$2,
-					L: 224,
+					L: 223,
 					S: this
 				});
 				this._callbacks.onRestartRequired(classifySocketError(isOnline()));
 			} else log.verbose("error ignored on closed connection", { error: event.error }, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$2,
-				L: 227,
+				L: 226,
 				S: this
 			});
 		};
@@ -470,7 +467,7 @@ var EdgeWsConnection = class extends Resource {
 				log.verbose("message ignored on closed connection", { event: event.type }, {
 					"~LogMeta": "~LogMeta",
 					F: __dxlog_file$2,
-					L: 235,
+					L: 234,
 					S: this
 				});
 				return;
@@ -488,7 +485,7 @@ var EdgeWsConnection = class extends Resource {
 			this._receiveMessage(event.data, muxer).catch((err) => log.catch(err, void 0, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$2,
-				L: 252,
+				L: 251,
 				S: this
 			}));
 		};
@@ -515,7 +512,7 @@ var EdgeWsConnection = class extends Resource {
 				}, {
 					"~LogMeta": "~LogMeta",
 					F: __dxlog_file$2,
-					L: 283,
+					L: 282,
 					S: this
 				});
 				this._callbacks.onMessage(message);
@@ -539,7 +536,7 @@ var EdgeWsConnection = class extends Resource {
 			log.warn("error closing websocket", { err }, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$2,
-				L: 301,
+				L: 300,
 				S: this
 			});
 		}
@@ -548,7 +545,7 @@ var EdgeWsConnection = class extends Resource {
 		invariant(this._ws, void 0, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file$2,
-			L: 306,
+			L: 305,
 			S: this,
 			A: ["this._ws", ""]
 		});
@@ -582,7 +579,7 @@ var EdgeWsConnection = class extends Resource {
 		this._inactivityTimeoutCtx = new Context(void 0, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file$2,
-			L: 351
+			L: 350
 		});
 		const armedAt = Date.now();
 		scheduleTask(this._inactivityTimeoutCtx, () => {
@@ -606,7 +603,7 @@ var EdgeWsConnection = class extends Resource {
 				}, {
 					"~LogMeta": "~LogMeta",
 					F: __dxlog_file$2,
-					L: 375,
+					L: 374,
 					S: this
 				});
 				this._callbacks.onRestartRequired("inactivity_timeout");
@@ -621,7 +618,7 @@ var EdgeWsConnection = class extends Resource {
 			}, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$2,
-				L: 386,
+				L: 385,
 				S: this
 			});
 			this._unansweredProbes++;
@@ -703,6 +700,8 @@ var EdgeClient = class extends Resource {
 	_baseHttpUrl;
 	_currentConnection = void 0;
 	_ready = new Trigger();
+	/** Set when EDGE refused this SDK as outdated; a retry would carry the same version, so none is made. */
+	#refusal = void 0;
 	constructor(_identity, _config) {
 		super();
 		this._identity = _identity;
@@ -743,7 +742,7 @@ var EdgeClient = class extends Resource {
 			}, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$1,
-				L: 168,
+				L: 171,
 				S: this
 			});
 			this._identity = identity;
@@ -756,11 +755,12 @@ var EdgeClient = class extends Resource {
 	* NOTE: The message is guaranteed to be delivered but the service must respond with a message to confirm processing.
 	*/
 	async send(ctx, message) {
+		if (this.#refusal) throw this.#refusal;
 		if (this._ready.state !== TriggerState.RESOLVED) {
 			log("waiting for websocket", void 0, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$1,
-				L: 181,
+				L: 187,
 				S: this
 			});
 			await this._ready.wait({ timeout: this._config.timeout ?? DEFAULT_TIMEOUT });
@@ -788,7 +788,7 @@ var EdgeClient = class extends Resource {
 				log.catch(error, void 0, {
 					"~LogMeta": "~LogMeta",
 					F: __dxlog_file$1,
-					L: 224,
+					L: 230,
 					S: this
 				});
 			}
@@ -806,7 +806,7 @@ var EdgeClient = class extends Resource {
 			log.warn("Error while opening connection", { err }, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$1,
-				L: 243,
+				L: 249,
 				S: this
 			});
 		});
@@ -818,14 +818,14 @@ var EdgeClient = class extends Resource {
 		log("opening...", { info: this.info }, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file$1,
-			L: 251,
+			L: 257,
 			S: this
 		});
 		this.#registerMetrics();
 		if (this._config.deferConnect) log("deferring connection until startNetworking", void 0, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file$1,
-			L: 254,
+			L: 260,
 			S: this
 		});
 		else this.startNetworking();
@@ -841,7 +841,7 @@ var EdgeClient = class extends Resource {
 		log("closing...", { peerKey: this._identity.peerKey }, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file$1,
-			L: 276,
+			L: 282,
 			S: this
 		});
 		for (const cleanup of this.#metricsCleanup) cleanup();
@@ -853,12 +853,29 @@ var EdgeClient = class extends Resource {
 		if (this._ctx.disposed) return;
 		const identity = this._identity;
 		const path = `/ws/${identity.identityDid}/${identity.peerKey}`;
-		const protocolHeader = this._config.disableAuth ? void 0 : await this._createAuthHeader(path);
+		this.#refusal = void 0;
+		let protocolHeader;
+		try {
+			protocolHeader = this._config.disableAuth ? void 0 : await this._createAuthHeader(path);
+		} catch (err) {
+			if (!(err instanceof EdgeClientTooOldError)) throw err;
+			log.warn("EDGE refused this SDK as outdated; not reconnecting until the app is updated", { data: err.data }, {
+				"~LogMeta": "~LogMeta",
+				F: __dxlog_file$1,
+				L: 307,
+				S: this
+			});
+			this.#refusal = err;
+			this._ready.throw(err);
+			this._ready.reset();
+			this.statusChanged.emit(this.status);
+			return;
+		}
 		if (this._identity !== identity) {
 			log("identity changed during auth header request", void 0, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$1,
-				L: 294,
+				L: 315,
 				S: this
 			});
 			return;
@@ -871,7 +888,7 @@ var EdgeClient = class extends Resource {
 		}, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file$1,
-			L: 300,
+			L: 321,
 			S: this
 		});
 		const connection = new EdgeWsConnection(identity, {
@@ -887,13 +904,13 @@ var EdgeClient = class extends Resource {
 					log.verbose("closing a connection that connected after it was replaced", void 0, {
 						"~LogMeta": "~LogMeta",
 						F: __dxlog_file$1,
-						L: 315,
+						L: 336,
 						S: this
 					});
 					connection.close().catch((err) => log.catch(err, void 0, {
 						"~LogMeta": "~LogMeta",
 						F: __dxlog_file$1,
-						L: 316,
+						L: 337,
 						S: this
 					}));
 				}
@@ -906,7 +923,7 @@ var EdgeClient = class extends Resource {
 				} else log.verbose("restart requested by inactive connection", void 0, {
 					"~LogMeta": "~LogMeta",
 					F: __dxlog_file$1,
-					L: 325,
+					L: 346,
 					S: this
 				});
 				restartRequired.wake();
@@ -920,13 +937,13 @@ var EdgeClient = class extends Resource {
 					}, {
 						"~LogMeta": "~LogMeta",
 						F: __dxlog_file$1,
-						L: 333,
+						L: 354,
 						S: this
 					});
 					connection.close().catch((err) => log.catch(err, void 0, {
 						"~LogMeta": "~LogMeta",
 						F: __dxlog_file$1,
-						L: 337,
+						L: 358,
 						S: this
 					}));
 				}
@@ -969,7 +986,7 @@ var EdgeClient = class extends Resource {
 		}, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file$1,
-			L: 403,
+			L: 424,
 			S: this
 		});
 		trace.metrics.increment("dxos.edge.ws.reconnect.count", 1, {
@@ -985,7 +1002,7 @@ var EdgeClient = class extends Resource {
 			log.error("ws reconnect listener failed", { err }, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$1,
-				L: 416,
+				L: 437,
 				S: this
 			});
 		}
@@ -1000,7 +1017,7 @@ var EdgeClient = class extends Resource {
 			}, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file$1,
-				L: 426,
+				L: 447,
 				S: this
 			});
 		}
@@ -1020,7 +1037,11 @@ var EdgeClient = class extends Resource {
 	async _createAuthHeader(path) {
 		const authentication = await authenticateViaChallengeEndpoint(this._baseHttpUrl, this._identity);
 		if (authentication) return encodePresentationWsAuthHeader(authentication.presentation);
-		const response = await fetch(new URL(path, this._baseHttpUrl), { method: "GET" });
+		const response = await fetch(new URL(path, this._baseHttpUrl), {
+			method: "GET",
+			headers: clientVersionHeaders()
+		});
+		await assertClientSupported(response);
 		const challenge = response.status === 401 ? await readAuthChallenge(response) : void 0;
 		if (challenge) return encodePresentationWsAuthHeader(await presentCredentialsForChallenge(this._identity, challenge));
 		log.warn("no auth challenge from edge", {
@@ -1029,7 +1050,7 @@ var EdgeClient = class extends Resource {
 		}, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file$1,
-			L: 457,
+			L: 479,
 			S: this
 		});
 	}