@abraca/dabra 0.1.6 → 0.2.0

package/dist/abracadabra-provider.cjs

@@ -1381,10 +1381,15 @@ var HocuspocusProviderWebsocket = class extends EventEmitter {
 		if (this.connectionAttempt) this.rejectConnectionAttempt();
 		this.status = WebSocketStatus.Disconnected;
 		this.emit("status", { status: WebSocketStatus.Disconnected });
+		const isRateLimited = event?.code === 4429;
 		this.emit("disconnect", { event });
-		if (!this.cancelWebsocketRetry && this.shouldConnect) setTimeout(() => {
-			this.connect();
-		}, this.configuration.delay);
+		if (isRateLimited) this.emit("rateLimited");
+		if (!this.cancelWebsocketRetry && this.shouldConnect) {
+			const delay = isRateLimited ? 6e4 : this.configuration.delay;
+			setTimeout(() => {
+				this.connect();
+			}, delay);
+		}
 	}
 	destroy() {
 		this.emit("destroy");
@@ -1707,6 +1712,7 @@ var HocuspocusProvider = class extends EventEmitter {
 			forceSyncInterval: false,
 			onAuthenticated: () => null,
 			onAuthenticationFailed: () => null,
+			onRateLimited: () => null,
 			onOpen: () => null,
 			onConnect: () => null,
 			onMessage: () => null,
@@ -1738,6 +1744,7 @@ var HocuspocusProvider = class extends EventEmitter {
 		this.forwardClose = (e) => this.emit("close", e);
 		this.forwardDisconnect = (e) => this.emit("disconnect", e);
 		this.forwardDestroy = () => this.emit("destroy");
+		this.forwardRateLimited = () => this.emit("rateLimited");
 		this.setConfiguration(configuration);
 		this.configuration.document = configuration.document ? configuration.document : new yjs.Doc();
 		this.configuration.awareness = configuration.awareness !== void 0 ? configuration.awareness : new Awareness(this.document);
@@ -1752,6 +1759,7 @@ var HocuspocusProvider = class extends EventEmitter {
 		this.on("unsyncedChanges", this.configuration.onUnsyncedChanges);
 		this.on("authenticated", this.configuration.onAuthenticated);
 		this.on("authenticationFailed", this.configuration.onAuthenticationFailed);
+		this.on("rateLimited", this.configuration.onRateLimited);
 		this.awareness?.on("update", () => {
 			this.emit("awarenessUpdate", { states: (0, _abraca_dabra_common.awarenessStatesToArray)(this.awareness.getStates()) });
 		});
@@ -1944,6 +1952,7 @@ var HocuspocusProvider = class extends EventEmitter {
 		this.configuration.websocketProvider.off("disconnect", this.forwardDisconnect);
 		this.configuration.websocketProvider.off("destroy", this.configuration.onDestroy);
 		this.configuration.websocketProvider.off("destroy", this.forwardDestroy);
+		this.configuration.websocketProvider.off("rateLimited", this.forwardRateLimited);
 		this.configuration.websocketProvider.detach(this);
 		this._isAttached = false;
 	}
@@ -1961,6 +1970,7 @@ var HocuspocusProvider = class extends EventEmitter {
 		this.configuration.websocketProvider.on("disconnect", this.forwardDisconnect);
 		this.configuration.websocketProvider.on("destroy", this.configuration.onDestroy);
 		this.configuration.websocketProvider.on("destroy", this.forwardDestroy);
+		this.configuration.websocketProvider.on("rateLimited", this.forwardRateLimited);
 		this.configuration.websocketProvider.attach(this);
 		this._isAttached = true;
 	}
@@ -2116,6 +2126,10 @@ var SubdocMessage = class extends OutgoingMessage {
 
 //#endregion
 //#region packages/provider/src/AbracadabraProvider.ts
+/** Validate that a string is a UUID acceptable by the server's DocId parser. */
+function isValidDocId(id) {
+	return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(id);
+}
 /**
 * AbracadabraProvider extends HocuspocusProvider with:
 *
@@ -2142,6 +2156,7 @@ var AbracadabraProvider = class AbracadabraProvider extends HocuspocusProvider {
 		super(resolved);
 		this.effectiveRole = null;
 		this.childProviders = /* @__PURE__ */ new Map();
+		this.pendingLoads = /* @__PURE__ */ new Map();
 		this.boundHandleYSubdocsChange = this.handleYSubdocsChange.bind(this);
 		this._client = client;
 		this.abracadabraConfig = configuration;
@@ -2251,7 +2266,10 @@ var AbracadabraProvider = class AbracadabraProvider extends HocuspocusProvider {
 	* We intercept additions to register them with the Abracadabra server.
 	*/
 	handleYSubdocsChange({ added, removed }) {
-		for (const subdoc of added) this.registerSubdoc(subdoc);
+		for (const subdoc of added) {
+			if (!isValidDocId(subdoc.guid)) continue;
+			this.registerSubdoc(subdoc);
+		}
 		for (const subdoc of removed) this.unloadChild(subdoc.guid);
 	}
 	/**
@@ -2275,8 +2293,16 @@ var AbracadabraProvider = class AbracadabraProvider extends HocuspocusProvider {
 	* child document id.  Each child opens its own WebSocket connection because
 	* the server is document-scoped (one WebSocket ↔ one document).
 	*/
-	async loadChild(childId) {
-		if (this.childProviders.has(childId)) return this.childProviders.get(childId);
+	loadChild(childId) {
+		if (!isValidDocId(childId)) return Promise.reject(/* @__PURE__ */ new Error(`loadChild: "${childId}" is not a valid document ID (must be a UUID). If this node was created with an older version of the app, delete it and recreate it.`));
+		if (this.childProviders.has(childId)) return Promise.resolve(this.childProviders.get(childId));
+		if (this.pendingLoads.has(childId)) return this.pendingLoads.get(childId);
+		const load = this._doLoadChild(childId);
+		this.pendingLoads.set(childId, load);
+		load.finally(() => this.pendingLoads.delete(childId));
+		return load;
+	}
+	async _doLoadChild(childId) {
 		const childDoc = new yjs.Doc({ guid: childId });
 		await new Promise((resolve) => {
 			const onRegistered = ({ childId: cid }) => {
@@ -2292,7 +2318,7 @@ var AbracadabraProvider = class AbracadabraProvider extends HocuspocusProvider {
 		const childProvider = new AbracadabraProvider({
 			name: childId,
 			document: childDoc,
-			url: this.abracadabraConfig.url,
+			url: this.abracadabraConfig.url ?? this.configuration.websocketProvider?.url,
 			token: this.configuration.token,
 			subdocLoading: this.subdocLoading,
 			disableOfflineStore: this.abracadabraConfig.disableOfflineStore,