@abraca/dabra 0.1.6 → 0.1.7

package/dist/index.d.ts

@@ -311,6 +311,7 @@ declare class AbracadabraProvider extends HocuspocusProvider {
   private _client;
   private offlineStore;
   private childProviders;
+  private pendingLoads;
   private subdocLoading;
   private abracadabraConfig;
   private readonly boundHandleYSubdocsChange;
@@ -353,6 +354,7 @@ declare class AbracadabraProvider extends HocuspocusProvider {
    * the server is document-scoped (one WebSocket ↔ one document).
    */
   loadChild(childId: string): Promise<AbracadabraProvider>;
+  private _doLoadChild;
   private unloadChild;
   /** Return all currently-loaded child providers. */
   get children(): Map<string, AbracadabraProvider>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abraca/dabra",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "abracadabra provider",
   "keywords": [
     "abracadabra",

package/src/AbracadabraProvider.ts

@@ -61,6 +61,11 @@ export interface AbracadabraProviderConfiguration
 	websocketProvider?: HocuspocusProviderWebsocket;
 }
 
+/** Validate that a string is a UUID acceptable by the server's DocId parser. */
+function isValidDocId(id: string): boolean {
+	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:
  *
@@ -82,6 +87,7 @@ export class AbracadabraProvider extends HocuspocusProvider {
 	private _client: AbracadabraClient | null;
 	private offlineStore: OfflineStore | null;
 	private childProviders = new Map<string, AbracadabraProvider>();
+	private pendingLoads = new Map<string, Promise<AbracadabraProvider>>();
 	private subdocLoading: "lazy" | "eager";
 
 	private abracadabraConfig: AbracadabraProviderConfiguration;
@@ -281,6 +287,7 @@ export class AbracadabraProvider extends HocuspocusProvider {
 		loaded: Set<Y.Doc>;
 	}) {
 		for (const subdoc of added) {
+			if (!isValidDocId(subdoc.guid)) continue;
 			this.registerSubdoc(subdoc);
 		}
 		for (const subdoc of removed) {
@@ -315,11 +322,33 @@ export 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: string): Promise<AbracadabraProvider> {
+	loadChild(childId: string): Promise<AbracadabraProvider> {
+		if (!isValidDocId(childId)) {
+			return Promise.reject(
+				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)!;
+			return Promise.resolve(this.childProviders.get(childId)!);
 		}
 
+		// Deduplicate concurrent calls: return the same Promise so both callers
+		// get the exact same AbracadabraProvider instance.
+		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;
+	}
+
+	private async _doLoadChild(childId: string): Promise<AbracadabraProvider> {
 		const childDoc = new Y.Doc({ guid: childId });
 
 		// Notify the server that this child belongs to the parent document and
@@ -346,7 +375,7 @@ export 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,