@automerge/automerge-repo 1.2.1 → 2.0.0-alpha.0

package/test/Repo.test.ts

@@ -47,6 +47,7 @@ describe("Repo", () => {
         storage: storageAdapter,
         network: [networkAdapter],
       })
+      repo.saveDebounceRate = 1
       return { repo, storageAdapter, networkAdapter }
     }
 
@@ -61,7 +62,11 @@ describe("Repo", () => {
       const { repo } = setup()
       const handle = repo.create()
       assert.notEqual(handle.documentId, null)
-      assert.equal(handle.isReady(), true)
+      assert.equal(
+        handle.isReady(),
+        true,
+        `handle is in ${handle.state}, not ready`
+      )
     })
 
     it("can create a document with an initial value", async () => {
@@ -197,8 +202,11 @@ describe("Repo", () => {
     it("doesn't find a document that doesn't exist", async () => {
       const { repo } = setup()
       const handle = repo.find<TestDoc>(generateAutomergeUrl())
-      assert.equal(handle.isReady(), false)
 
+      await handle.whenReady(["ready", "unavailable"])
+
+      assert.equal(handle.isReady(), false)
+      assert.equal(handle.state, "unavailable")
       const doc = await handle.doc()
       assert.equal(doc, undefined)
     })
@@ -220,10 +228,11 @@ describe("Repo", () => {
       handle.on("unavailable", () => {
         wasUnavailable = true
       })
+
       await pause(50)
       assert.equal(wasUnavailable, false)
 
-      networkAdapter.emit("ready", { network: networkAdapter })
+      networkAdapter.forceReady()
       await eventPromise(handle, "unavailable")
     })
 
@@ -252,6 +261,8 @@ describe("Repo", () => {
         storage: storageAdapter,
       })
 
+      await repo.flush()
+
       const bobHandle = repo2.find<TestDoc>(handle.url)
       await bobHandle.whenReady()
       assert.equal(bobHandle.isReady(), true)
@@ -267,7 +278,7 @@ describe("Repo", () => {
 
       assert.equal(handle.isReady(), true)
 
-      await pause(150)
+      await repo.flush()
 
       const repo2 = new Repo({
         storage: storageAdapter,
@@ -397,6 +408,8 @@ describe("Repo", () => {
         d.count = 1
       })
 
+      await repo.flush()
+
       for (let i = 0; i < 3; i++) {
         const repo2 = new Repo({
           storage,
@@ -419,8 +432,17 @@ describe("Repo", () => {
         })
       }
 
+      await repo.flush()
+
       const storageKeyTypes = storageAdapter.keys().map(k => k.split(".")[1])
-      assert(storageKeyTypes.filter(k => k === "snapshot").length === 1)
+      const storedSnapshotCount = storageKeyTypes.filter(
+        k => k === "snapshot"
+      ).length
+      assert.equal(
+        storedSnapshotCount,
+        1,
+        `found ${storedSnapshotCount} snapshots in storage instead of 1`
+      )
     })
 
     it("can import an existing document", async () => {
@@ -613,15 +635,14 @@ describe("Repo", () => {
           networkAdapters.push(pair)
 
           if (idx > 0) {
-            network.push(networkAdapters[idx - 1][1])
-            networkReady.push(
-              eventPromise(networkAdapters[idx - 1][1], "ready")
-            )
+            const a = networkAdapters[idx - 1][1]
+            network.push(a)
+            networkReady.push(a.whenReady())
           }
 
           if (idx < numberOfPeers - 1) {
             network.push(pair[0])
-            networkReady.push(eventPromise(pair[0], "ready"))
+            pair[0].whenReady()
           }
 
           const repo = new Repo({
@@ -636,7 +657,7 @@ describe("Repo", () => {
         await Promise.all(networkReady)
 
         const connectedPromise = Promise.all(
-          repos.map(repo => eventPromise(repo.networkSubsystem, "peer"))
+          repos.map(repo => repo.networkSubsystem.whenReady)
         )
 
         // Initialize the network.
@@ -944,6 +965,7 @@ describe("Repo", () => {
       })
       const unsyncedHandle = isolatedRepo.create<TestDoc>()
       const url = unsyncedHandle.url
+      await isolatedRepo.flush()
 
       // Now create a message channel to connect two repos
       const abChannel = new MessageChannel()
@@ -1127,8 +1149,10 @@ describe("Repo", () => {
       })
       await pause(500)
 
-      // repo has no stored sync state for charlie so we should see 3 sync messages
-      assert.strictEqual(bobSyncMessages, 3)
+      // repo has no stored sync state for charlie so we should see 2 sync messages
+      assert.strictEqual(bobSyncMessages, 2)
+
+      await bobRepo.flush()
 
       // setup new repo which uses bob's storage
       const bob2Repo = new Repo({
@@ -1235,12 +1259,10 @@ describe("Repo", () => {
       network: [bobAdapter],
       peerId: bob,
     })
-
     const aliceDoc = aliceRepo.create()
     aliceDoc.change((doc: any) => (doc.text = "Hello world"))
 
     const bobDoc = bobRepo.find(aliceDoc.url)
-    bobDoc.unavailable()
     await eventPromise(bobDoc, "unavailable")
 
     aliceAdapter.peerCandidate(bob)

package/test/remoteHeads.test.ts

@@ -1,7 +1,7 @@
 import * as A from "@automerge/automerge/next"
 import assert from "assert"
 import { describe, it } from "vitest"
-import { MessageChannelNetworkAdapter } from "../../automerge-repo-network-messagechannel/dist/index.js"
+import { MessageChannelNetworkAdapter } from "../../automerge-repo-network-messagechannel/src/index.js"
 import { generateAutomergeUrl, parseAutomergeUrl } from "../src/AutomergeUrl.js"
 import { eventPromise } from "../src/helpers/eventPromise.js"
 import {
@@ -270,7 +270,7 @@ async function connectRepos(a: Repo, b: Repo) {
   a.networkSubsystem.addNetworkAdapter(aAdapter)
   b.networkSubsystem.addNetworkAdapter(bAdapter)
   await Promise.all([
-    eventPromise(a.networkSubsystem, "ready"),
-    eventPromise(b.networkSubsystem, "ready"),
+    a.networkSubsystem.whenReady(),
+    a.networkSubsystem.whenReady(),
   ])
 }

package/test/Network.test.ts

@@ -1,14 +0,0 @@
-import assert from "assert"
-import { describe, it } from "vitest"
-import { NetworkSubsystem } from "../src/network/NetworkSubsystem.js"
-
-// Note: The sync tests in `Repo.test.ts` exercise the network subsystem, and the suite in
-// `automerge-repo` provides test utilities that individual adapters can
-// use to ensure that they work correctly.
-
-describe("Network subsystem", () => {
-  it("Can be instantiated", () => {
-    const network = new NetworkSubsystem([])
-    assert(network !== null)
-  })
-})