await for collab to be RDY before we pop off

chee · Oct 3, 2024 · b62b40d · b62b40d
1 parent 26a744d
commit b62b40d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/public/automerge/collab.js b/public/automerge/collab.js
@@ -67,9 +67,14 @@ async function withAutomergeRepo(fn) {
 }
 
 export function fancy() {
-	return !!repo
+	return Boolean(repo?.networkSubsystem.isReady())
 }
 
+/**
+ *
+ * @param {SharedArrayBuffer} sab
+ * @returns
+ */
 export async function init(sab) {
 	if (repo) return
 	sharedarraybuffer = sab

diff --git a/public/bento.js b/public/bento.js
@@ -65,7 +65,7 @@ async function getFancy() {
 				await sounds.loadDefaultKit()
 			}
 		}
-		if (isAutomerge) {
+		if (isAutomerge && !collab.fancy()) {
 			await collab.init(sharedarraybuffer)
 			await collab.start(
 				/** @type {import("@automerge/automerge-repo").AutomergeUrl}*/ (slug),
@@ -652,15 +652,15 @@ party.settings.when("jam", async () => {
 	collab.stop()
 	party.slug = slug
 	party.tree = memtree
-	collab.start(slug, memtree)
+	await collab.start(slug, memtree)
 })
 
 addEventListener("popstate", async () => {
 	let slug = history.state?.slug || "bento"
 	collab.stop()
 	if (isValidAutomergeUrl(slug)) {
 		await collab.init()
-		collab.start(slug, memtree)
+		await collab.start(slug, memtree)
 	} else {
 		await db.load(slug)
 	}