@abraca/dabra 0.1.6 → 0.1.7

package/dist/abracadabra-provider.esm.js

@@ -2086,6 +2086,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:
 *
@@ -2112,6 +2116,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;
@@ -2221,7 +2226,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);
 	}
 	/**
@@ -2246,7 +2254,15 @@ var AbracadabraProvider = class AbracadabraProvider extends HocuspocusProvider {
 	* the server is document-scoped (one WebSocket ↔ one document).
 	*/
 	async loadChild(childId) {
+		if (!isValidDocId(childId)) throw 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 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 Y.Doc({ guid: childId });
 		await new Promise((resolve) => {
 			const onRegistered = ({ childId: cid }) => {
@@ -2262,7 +2278,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,