@abraca/dabra 0.1.4 → 0.1.5

package/package.json

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

package/src/AbracadabraProvider.ts

@@ -312,7 +312,8 @@ export class AbracadabraProvider extends HocuspocusProvider {
 
 	/**
 	 * Create (or return cached) a child AbracadabraProvider for a given
-	 * child document id.  The child shares the parent's WebSocket connection.
+	 * 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> {
 		if (this.childProviders.has(childId)) {
@@ -321,12 +322,31 @@ export class AbracadabraProvider extends HocuspocusProvider {
 
 		const childDoc = new Y.Doc({ guid: childId });
 
-		const parentWsp = this.configuration.websocketProvider as HocuspocusProviderWebsocket;
+		// Notify the server that this child belongs to the parent document and
+		// wait for server confirmation before opening the child WebSocket.
+		// Without waiting, the child's SyncStep1 may race against subdoc
+		// creation and get a NotFound error on first sync.
+		await new Promise<void>((resolve) => {
+			const onRegistered = ({ childId: cid }: onSubdocRegisteredParameters) => {
+				if (cid === childId) {
+					this.off("subdocRegistered", onRegistered);
+					resolve();
+				}
+			};
+			this.on("subdocRegistered", onRegistered);
+			this.registerSubdoc(childDoc);
+			// Fallback: don't block forever if the server is slow or the
+			// doc was already registered in a previous session.
+			setTimeout(resolve, 3000);
+		});
+
+		// Each child gets its own WebSocket connection.  Omitting
+		// websocketProvider lets HocuspocusProvider create one automatically
+		// (manageSocket = true), so we do NOT call attach() manually.
 		const childProvider = new AbracadabraProvider({
 			name: childId,
 			document: childDoc,
-			url: parentWsp.configuration.url,
-			WebSocketPolyfill: parentWsp.configuration.WebSocketPolyfill,
+			url: this.abracadabraConfig.url,
 			token: this.configuration.token,
 			subdocLoading: this.subdocLoading,
 			disableOfflineStore: this.abracadabraConfig.disableOfflineStore,
@@ -334,6 +354,7 @@ export class AbracadabraProvider extends HocuspocusProvider {
 			cryptoIdentity: this.abracadabraConfig.cryptoIdentity,
 			signChallenge: this.abracadabraConfig.signChallenge,
 		});
+
 		this.childProviders.set(childId, childProvider);
 
 		this.emit("subdocLoaded", { childId, provider: childProvider });