@automerge/automerge-repo 1.0.0-alpha.3 → 1.0.0-alpha.5

package/dist/synchronizer/DocSynchronizer.js

@@ -1,4 +1,4 @@
-import * as A from "@automerge/automerge";
+import * as A from "@automerge/automerge/next";
 import { READY, REQUESTING, UNAVAILABLE, } from "../DocHandle.js";
 import { Synchronizer } from "./Synchronizer.js";
 import debug from "debug";
@@ -124,7 +124,7 @@ export class DocSynchronizer extends Synchronizer {
         this.#log(logText, decoded);
         // expanding is expensive, so only do it if we're logging at this level
         const expanded = this.#opsLog.enabled
-            ? decoded.changes.flatMap(change => A.decodeChange(change).ops.map(op => JSON.stringify(op)))
+            ? decoded.changes.flatMap((change) => A.decodeChange(change).ops.map((op) => JSON.stringify(op)))
             : null;
         this.#opsLog(logText, expanded);
     };
@@ -134,19 +134,18 @@ export class DocSynchronizer extends Synchronizer {
     }
     beginSync(peerIds) {
         this.#log(`beginSync: ${peerIds.join(", ")}`);
+        // HACK: if we have a sync state already, we round-trip it through the encoding system to make
+        // sure state is preserved. This prevents an infinite loop caused by failed attempts to send
+        // messages during disconnection.
+        // TODO: cover that case with a test and remove this hack
+        peerIds.forEach(peerId => {
+            const syncStateRaw = this.#getSyncState(peerId);
+            const syncState = A.decodeSyncState(A.encodeSyncState(syncStateRaw));
+            this.#setSyncState(peerId, syncState);
+        });
         // At this point if we don't have anything in our storage, we need to use an empty doc to sync
         // with; but we don't want to surface that state to the front end
         void this.handle.doc([READY, REQUESTING, UNAVAILABLE]).then(doc => {
-            // if we don't have any peers, then we can say the document is unavailable
-            // HACK: if we have a sync state already, we round-trip it through the encoding system to make
-            // sure state is preserved. This prevents an infinite loop caused by failed attempts to send
-            // messages during disconnection.
-            // TODO: cover that case with a test and remove this hack
-            peerIds.forEach(peerId => {
-                const syncStateRaw = this.#getSyncState(peerId);
-                const syncState = A.decodeSyncState(A.encodeSyncState(syncStateRaw));
-                this.#setSyncState(peerId, syncState);
-            });
             // we register out peers first, then say that sync has started
             this.#syncStarted = true;
             this.#checkDocUnavailable();

package/dist/synchronizer/Synchronizer.d.ts

@@ -1,4 +1,4 @@
-import EventEmitter from "eventemitter3";
+import { EventEmitter } from "eventemitter3";
 import { Message, MessageContents } from "../network/messages.js";
 export declare abstract class Synchronizer extends EventEmitter<SynchronizerEvents> {
     abstract receiveMessage(message: Message): void;

package/dist/synchronizer/Synchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/Synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAEjE,8BAAsB,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IACzE,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAChD;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAA;CACxC"}
+{"version":3,"file":"Synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/Synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAEjE,8BAAsB,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IACzE,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAChD;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAA;CACxC"}

package/dist/synchronizer/Synchronizer.js

@@ -1,3 +1,3 @@
-import EventEmitter from "eventemitter3";
+import { EventEmitter } from "eventemitter3";
 export class Synchronizer extends EventEmitter {
 }

package/fuzz/fuzz.ts

@@ -1,6 +1,6 @@
 import assert from "assert"
 import { MessageChannelNetworkAdapter } from "@automerge/automerge-repo-network-messagechannel"
-import * as Automerge from "@automerge/automerge"
+import * as Automerge from "@automerge/automerge/next"
 
 import { DocHandle, DocumentId, PeerId, SharePolicy } from "../src"
 import { eventPromise } from "../src/helpers/eventPromise.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "description": "A repository object to manage a collection of automerge documents",
   "repository": "https://github.com/automerge/automerge-repo",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
@@ -31,7 +31,7 @@
     "typescript": "^5.1.6"
   },
   "peerDependencies": {
-    "@automerge/automerge": "^2.1.0-alpha.10"
+    "@automerge/automerge": "^2.1.0-alpha.13"
   },
   "dependencies": {
     "bs58check": "^3.0.1",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0ed108273084319aeea64ceccb49c3d58709f107"
+  "gitHead": "9cd9be160ebda37c8f0d70f2d5cadea5b951a3c3"
 }

package/src/DocCollection.ts

@@ -1,4 +1,4 @@
-import EventEmitter from "eventemitter3"
+import { EventEmitter } from "eventemitter3"
 import { DocHandle } from "./DocHandle.js"
 import { DocumentId, type BinaryDocumentId, AutomergeUrl } from "./types.js"
 import { type SharePolicy } from "./Repo.js"
@@ -74,7 +74,7 @@ export class DocCollection extends EventEmitter<DocCollectionEvents> {
     // Generate a new UUID and store it in the buffer
     const { documentId } = parseAutomergeUrl(generateAutomergeUrl())
     const handle = this.#getHandle<T>(documentId, true) as DocHandle<T>
-    this.emit("document", { handle })
+    this.emit("document", { handle, isNew: true })
     return handle
   }
 
@@ -105,7 +105,7 @@ export class DocCollection extends EventEmitter<DocCollectionEvents> {
     }
 
     const handle = this.#getHandle<T>(documentId, false) as DocHandle<T>
-    this.emit("document", { handle })
+    this.emit("document", { handle, isNew: false })
     return handle
   }
 
@@ -136,6 +136,7 @@ interface DocCollectionEvents {
 
 interface DocumentPayload {
   handle: DocHandle<any>
+  isNew: boolean
 }
 
 interface DeleteDocumentPayload {

package/src/DocHandle.ts

@@ -1,6 +1,6 @@
-import * as A from "@automerge/automerge"
+import * as A from "@automerge/automerge/next"
 import debug from "debug"
-import EventEmitter from "eventemitter3"
+import { EventEmitter } from "eventemitter3"
 import {
   assign,
   BaseActionObject,
@@ -19,7 +19,7 @@ import { pause } from "./helpers/pause.js"
 import { TimeoutError, withTimeout } from "./helpers/withTimeout.js"
 import type { DocumentId, PeerId, AutomergeUrl } from "./types.js"
 import { stringifyAutomergeUrl } from "./DocUrl.js"
-import { encode } from "cbor-x"
+import { encode } from "./helpers/cbor.js"
 
 /** DocHandle is a wrapper around a single Automerge document that lets us listen for changes. */
 export class DocHandle<T> //
@@ -43,7 +43,12 @@ export class DocHandle<T> //
     this.#log = debug(`automerge-repo:dochandle:${this.documentId.slice(0, 5)}`)
 
     // initial doc
-    const doc = A.init<T>()
+    let doc = A.init<T>()
+
+    // Make an empty change so that we have something to save to disk
+    if (isNew) {
+      doc = A.emptyChange(doc, {})
+    }
 
     /**
      * Internally we use a state machine to orchestrate document loading and/or syncing, in order to
@@ -82,6 +87,8 @@ export class DocHandle<T> //
                 UPDATE: { actions: "onUpdate", target: READY },
                 // REQUEST is called by the Repo if the document is not found in storage
                 REQUEST: { target: REQUESTING },
+                // AWAIT_NETWORK is called by the repo if the document is not found in storage but the network is not yet ready
+                AWAIT_NETWORK: { target: AWAITING_NETWORK },
                 DELETE: { actions: "onDelete", target: DELETED },
               },
               after: [
@@ -91,6 +98,11 @@ export class DocHandle<T> //
                 },
               ],
             },
+            awaitingNetwork: {
+              on: {
+                NETWORK_READY: { target: REQUESTING },
+              },
+            },
             requesting: {
               on: {
                 MARK_UNAVAILABLE: {
@@ -342,6 +354,14 @@ export class DocHandle<T> //
     if (this.#state === LOADING) this.#machine.send(REQUEST)
   }
 
+  awaitNetwork() {
+    if (this.#state === LOADING) this.#machine.send(AWAIT_NETWORK)
+  }
+
+  networkReady() {
+    if (this.#state === AWAITING_NETWORK) this.#machine.send(NETWORK_READY)
+  }
+
   /** `delete` is called by the repo when the document is deleted */
   delete() {
     this.#machine.send(DELETE)
@@ -419,6 +439,7 @@ export interface DocHandleEvents<T> {
 export const HandleState = {
   IDLE: "idle",
   LOADING: "loading",
+  AWAITING_NETWORK: "awaitingNetwork",
   REQUESTING: "requesting",
   READY: "ready",
   FAILED: "failed",
@@ -448,6 +469,8 @@ export const Event = {
   FIND: "FIND",
   REQUEST: "REQUEST",
   REQUEST_COMPLETE: "REQUEST_COMPLETE",
+  AWAIT_NETWORK: "AWAIT_NETWORK",
+  NETWORK_READY: "NETWORK_READY",
   UPDATE: "UPDATE",
   TIMEOUT: "TIMEOUT",
   DELETE: "DELETE",
@@ -466,6 +489,8 @@ type UpdateEvent<T> = {
 }
 type TimeoutEvent = { type: typeof TIMEOUT }
 type MarkUnavailableEvent = { type: typeof MARK_UNAVAILABLE }
+type AwaitNetworkEvent = { type: typeof AWAIT_NETWORK }
+type NetworkReadyEvent = { type: typeof NETWORK_READY }
 
 type DocHandleEvent<T> =
   | CreateEvent
@@ -476,6 +501,8 @@ type DocHandleEvent<T> =
   | TimeoutEvent
   | DeleteEvent
   | MarkUnavailableEvent
+  | AwaitNetworkEvent
+  | NetworkReadyEvent
 
 type DocHandleXstateMachine<T> = Interpreter<
   DocHandleContext<T>,
@@ -497,6 +524,7 @@ type DocHandleXstateMachine<T> = Interpreter<
 export const {
   IDLE,
   LOADING,
+  AWAITING_NETWORK,
   REQUESTING,
   READY,
   FAILED,
@@ -512,4 +540,6 @@ const {
   DELETE,
   REQUEST_COMPLETE,
   MARK_UNAVAILABLE,
+  AWAIT_NETWORK,
+  NETWORK_READY,
 } = Event

package/src/DocUrl.ts

@@ -2,7 +2,7 @@ import {
   type AutomergeUrl,
   type BinaryDocumentId,
   type DocumentId,
-} from "./types"
+} from "./types.js"
 import { v4 as uuid } from "uuid"
 import bs58check from "bs58check"
 

package/src/Repo.ts

@@ -23,17 +23,22 @@ export class Repo extends DocCollection {
 
     // The `document` event is fired by the DocCollection any time we create a new document or look
     // up a document by ID. We listen for it in order to wire up storage and network synchronization.
-    this.on("document", async ({ handle }) => {
+    this.on("document", async ({ handle, isNew }) => {
       if (storageSubsystem) {
         // Save when the document changes
         handle.on("heads-changed", async ({ handle, doc }) => {
           await storageSubsystem.saveDoc(handle.documentId, doc)
         })
 
-        // Try to load from disk
-        const loadedDoc = await storageSubsystem.loadDoc(handle.documentId)
-        if (loadedDoc) {
-          handle.update(() => loadedDoc)
+        if (isNew) {
+          // this is a new document, immediately save it
+          await storageSubsystem.saveDoc(handle.documentId, handle.docSync()!)
+        } else {
+          // Try to load from disk
+          const loadedDoc = await storageSubsystem.loadDoc(handle.documentId)
+          if (loadedDoc) {
+            handle.update(() => loadedDoc)
+          }
         }
       }
 
@@ -44,7 +49,16 @@ export class Repo extends DocCollection {
         })
       })
 
-      handle.request()
+      if (this.networkSubsystem.isReady()) {
+        handle.request()
+      } else {
+        handle.awaitNetwork()
+        this.networkSubsystem.whenReady().then(() => {
+          handle.networkReady()
+        }).catch(err => {
+          this.#log("error waiting for network", { err })
+        })
+      }
 
       // Register the document with the synchronizer. This advertises our interest in the document.
       synchronizer.addDocument(handle.documentId)
@@ -55,7 +69,9 @@ export class Repo extends DocCollection {
       // synchronizer.removeDocument(documentId)
 
       if (storageSubsystem) {
-        storageSubsystem.remove(documentId)
+        storageSubsystem.remove(documentId).catch(err => {
+          this.#log("error deleting document", { documentId, err })
+        })
       }
     })
 

package/src/helpers/cbor.ts

@@ -0,0 +1,10 @@
+import { Encoder, decode as cborXdecode } from "cbor-x";
+
+export function encode(obj: any): Buffer {
+  let encoder = new Encoder({tagUint8Array: false})
+  return encoder.encode(obj)
+}
+
+export function decode(buf: Buffer | Uint8Array): any {
+  return cborXdecode(buf)
+}

package/src/helpers/eventPromise.ts

@@ -1,4 +1,4 @@
-import EventEmitter from "eventemitter3"
+import { EventEmitter } from "eventemitter3"
 
 /** Returns a promise that resolves when the given event is emitted on the given emitter. */
 export const eventPromise = (emitter: EventEmitter, event: string) =>

package/src/helpers/headsAreSame.ts

@@ -1,4 +1,4 @@
-import {Heads} from "@automerge/automerge"
+import {Heads} from "@automerge/automerge/next"
 import { arraysAreEqual } from "./arraysAreEqual.js"
 
 export const headsAreSame = (a: Heads, b: Heads) => {

package/src/index.ts

@@ -30,3 +30,5 @@ export {
   stringifyAutomergeUrl as generateAutomergeUrl,
 } from "./DocUrl.js"
 export * from "./types.js"
+
+export * as cbor from "./helpers/cbor.js"

package/src/network/NetworkAdapter.ts

@@ -1,23 +1,21 @@
-import EventEmitter from "eventemitter3"
+import { EventEmitter } from "eventemitter3"
 import { PeerId } from "../types.js"
 import { Message } from "./messages.js"
 
 export abstract class NetworkAdapter extends EventEmitter<NetworkAdapterEvents> {
   peerId?: PeerId // hmmm, maybe not
 
-  abstract connect(url?: string): void
+  abstract connect(peerId: PeerId): void
 
   abstract send(message: Message): void
 
-  abstract join(): void
-
-  abstract leave(): void
+  abstract disconnect(): void
 }
 
 // events & payloads
 
 export interface NetworkAdapterEvents {
-  open: (payload: OpenPayload) => void
+  ready: (payload: OpenPayload) => void
   close: () => void
   "peer-candidate": (payload: PeerCandidatePayload) => void
   "peer-disconnected": (payload: PeerDisconnectedPayload) => void

package/src/network/NetworkSubsystem.ts

@@ -1,4 +1,4 @@
-import EventEmitter from "eventemitter3"
+import { EventEmitter } from "eventemitter3"
 import { PeerId } from "../types.js"
 import { NetworkAdapter, PeerDisconnectedPayload } from "./NetworkAdapter.js"
 
@@ -25,18 +25,29 @@ export class NetworkSubsystem extends EventEmitter<NetworkSubsystemEvents> {
   #count = 0
   #sessionId: SessionId = Math.random().toString(36).slice(2) as SessionId
   #ephemeralSessionCounts: Record<EphemeralMessageSource, number> = {}
+  #readyAdapterCount = 0
+  #adapters: NetworkAdapter[] = []
 
-  constructor(
-    private adapters: NetworkAdapter[],
-    public peerId = randomPeerId()
-  ) {
+  constructor(adapters: NetworkAdapter[], public peerId = randomPeerId()) {
     super()
     this.#log = debug(`automerge-repo:network:${this.peerId}`)
-    this.adapters.forEach(a => this.addNetworkAdapter(a))
+    adapters.forEach(a => this.addNetworkAdapter(a))
   }
 
   addNetworkAdapter(networkAdapter: NetworkAdapter) {
-    networkAdapter.connect(this.peerId)
+    this.#adapters.push(networkAdapter)
+    networkAdapter.once("ready", () => {
+      this.#readyAdapterCount++
+      this.#log(
+        "Adapters ready: ",
+        this.#readyAdapterCount,
+        "/",
+        this.#adapters.length
+      )
+      if (this.#readyAdapterCount === this.#adapters.length) {
+        this.emit("ready")
+      }
+    })
 
     networkAdapter.on("peer-candidate", ({ peerId }) => {
       this.#log(`peer candidate: ${peerId} `)
@@ -90,7 +101,7 @@ export class NetworkSubsystem extends EventEmitter<NetworkSubsystemEvents> {
       })
     })
 
-    networkAdapter.join()
+    networkAdapter.connect(this.peerId)
   }
 
   send(message: MessageContents) {
@@ -106,11 +117,11 @@ export class NetworkSubsystem extends EventEmitter<NetworkSubsystemEvents> {
         "count" in message
           ? message
           : {
-              ...message,
-              count: ++this.#count,
-              sessionId: this.#sessionId,
-              senderId: this.peerId,
-            }
+            ...message,
+            count: ++this.#count,
+            sessionId: this.#sessionId,
+            senderId: this.peerId,
+          }
       this.#log("Ephemeral message", outbound)
       peer.send(outbound)
     } else {
@@ -120,14 +131,20 @@ export class NetworkSubsystem extends EventEmitter<NetworkSubsystemEvents> {
     }
   }
 
-  join() {
-    this.#log(`Joining network`)
-    this.adapters.forEach(a => a.join())
+  isReady = () => {
+    return this.#readyAdapterCount === this.#adapters.length
   }
 
-  leave() {
-    this.#log(`Leaving network`)
-    this.adapters.forEach(a => a.leave())
+  whenReady = async () => {
+    if (this.isReady()) {
+      return
+    } else {
+      return new Promise<void>(resolve => {
+        this.once("ready", () => {
+          resolve()
+        })
+      })
+    }
   }
 }
 
@@ -141,6 +158,7 @@ export interface NetworkSubsystemEvents {
   peer: (payload: PeerPayload) => void
   "peer-disconnected": (payload: PeerDisconnectedPayload) => void
   message: (payload: Message) => void
+  ready: () => void
 }
 
 export interface PeerPayload {

package/src/network/messages.ts

@@ -1,6 +1,6 @@
 // utilities
-import { SessionId } from "../EphemeralData"
-import { DocumentId, PeerId } from "../types"
+import { SessionId } from "../EphemeralData.js"
+import { DocumentId, PeerId } from "../types.js"
 
 export function isValidMessage(
   message: NetworkAdapterMessage

package/src/storage/StorageSubsystem.ts

@@ -1,4 +1,4 @@
-import * as A from "@automerge/automerge"
+import * as A from "@automerge/automerge/next"
 import { StorageAdapter, StorageKey } from "./StorageAdapter.js"
 import * as sha256 from "fast-sha256"
 import { type DocumentId } from "../types.js"
@@ -25,7 +25,7 @@ function keyHash(binary: Uint8Array) {
 
 function headsHash(heads: A.Heads): string {
   let encoder = new TextEncoder()
-  let headsbinary = mergeArrays(heads.map(h => encoder.encode(h)))
+  let headsbinary = mergeArrays(heads.map((h: string) => encoder.encode(h)))
   return keyHash(headsbinary)
 }
 
@@ -35,6 +35,8 @@ export class StorageSubsystem {
   #storedHeads: Map<DocumentId, A.Heads> = new Map()
   #log = debug(`automerge-repo:storage-subsystem`)
 
+  #snapshotting = false
+
   constructor(storageAdapter: StorageAdapter) {
     this.#storageAdapter = storageAdapter
   }
@@ -67,6 +69,7 @@ export class StorageSubsystem {
     doc: A.Doc<unknown>,
     sourceChunks: StorageChunkInfo[]
   ): Promise<void> {
+    this.#snapshotting = true
     const binary = A.save(doc)
     const snapshotHash = headsHash(A.getHeads(doc))
     const key = [documentId, "snapshot", snapshotHash]
@@ -86,6 +89,7 @@ export class StorageSubsystem {
       this.#chunkInfos.get(documentId)?.filter(c => !oldKeys.has(c.key)) ?? []
     newChunkInfos.push({ key, type: "snapshot", size: binary.length })
     this.#chunkInfos.set(documentId, newChunkInfos)
+    this.#snapshotting = false
   }
 
   async loadDoc(documentId: DocumentId): Promise<A.Doc<unknown> | null> {
@@ -128,7 +132,7 @@ export class StorageSubsystem {
   }
 
   async remove(documentId: DocumentId) {
-    this.#storageAdapter.remove([documentId, "snapshot"])
+    this.#storageAdapter.removeRange([documentId, "snapshot"])
     this.#storageAdapter.removeRange([documentId, "incremental"])
   }
 
@@ -147,6 +151,9 @@ export class StorageSubsystem {
   }
 
   #shouldCompact(sourceChunks: StorageChunkInfo[]) {
+    if (this.#snapshotting) {
+      return false
+    }
     // compact if the incremental size is greater than the snapshot size
     let snapshotSize = 0
     let incrementalSize = 0
@@ -157,7 +164,7 @@ export class StorageSubsystem {
         incrementalSize += chunk.size
       }
     }
-    return incrementalSize > snapshotSize
+    return incrementalSize >= snapshotSize
   }
 }
 

package/src/synchronizer/DocSynchronizer.ts

@@ -1,5 +1,6 @@
-import * as A from "@automerge/automerge"
+import * as A from "@automerge/automerge/next"
 import {
+  AWAITING_NETWORK,
   DocHandle,
   DocHandleOutboundEphemeralMessagePayload,
   READY,
@@ -174,8 +175,8 @@ export class DocSynchronizer extends Synchronizer {
 
     // expanding is expensive, so only do it if we're logging at this level
     const expanded = this.#opsLog.enabled
-      ? decoded.changes.flatMap(change =>
-        A.decodeChange(change).ops.map(op => JSON.stringify(op))
+      ? decoded.changes.flatMap((change: A.Change) =>
+        A.decodeChange(change).ops.map((op: any) => JSON.stringify(op))
       )
       : null
     this.#opsLog(logText, expanded)
@@ -190,20 +191,19 @@ export class DocSynchronizer extends Synchronizer {
   beginSync(peerIds: PeerId[]) {
     this.#log(`beginSync: ${peerIds.join(", ")}`)
 
+    // HACK: if we have a sync state already, we round-trip it through the encoding system to make
+    // sure state is preserved. This prevents an infinite loop caused by failed attempts to send
+    // messages during disconnection.
+    // TODO: cover that case with a test and remove this hack
+    peerIds.forEach(peerId => {
+      const syncStateRaw = this.#getSyncState(peerId)
+      const syncState = A.decodeSyncState(A.encodeSyncState(syncStateRaw))
+      this.#setSyncState(peerId, syncState)
+    })
+
     // At this point if we don't have anything in our storage, we need to use an empty doc to sync
     // with; but we don't want to surface that state to the front end
     void this.handle.doc([READY, REQUESTING, UNAVAILABLE]).then(doc => {
-      // if we don't have any peers, then we can say the document is unavailable
-
-      // HACK: if we have a sync state already, we round-trip it through the encoding system to make
-      // sure state is preserved. This prevents an infinite loop caused by failed attempts to send
-      // messages during disconnection.
-      // TODO: cover that case with a test and remove this hack
-      peerIds.forEach(peerId => {
-        const syncStateRaw = this.#getSyncState(peerId)
-        const syncState = A.decodeSyncState(A.encodeSyncState(syncStateRaw))
-        this.#setSyncState(peerId, syncState)
-      })
 
       // we register out peers first, then say that sync has started
       this.#syncStarted = true

package/src/synchronizer/Synchronizer.ts

@@ -1,4 +1,4 @@
-import EventEmitter from "eventemitter3"
+import { EventEmitter } from "eventemitter3"
 import { Message, MessageContents } from "../network/messages.js"
 
 export abstract class Synchronizer extends EventEmitter<SynchronizerEvents> {

package/test/CollectionSynchronizer.test.ts

@@ -1,6 +1,6 @@
 import assert from "assert"
 import { beforeEach } from "mocha"
-import { DocCollection, PeerId } from "../src"
+import { DocCollection, PeerId } from "../src/index.js"
 import { CollectionSynchronizer } from "../src/synchronizer/CollectionSynchronizer.js"
 
 describe("CollectionSynchronizer", () => {

package/test/DocCollection.test.ts

@@ -1,7 +1,7 @@
 import assert from "assert"
-import { DocCollection, BinaryDocumentId } from "../src"
+import { DocCollection, BinaryDocumentId } from "../src/index.js"
 import { TestDoc } from "./types.js"
-import { generateAutomergeUrl, stringifyAutomergeUrl } from "../src/DocUrl"
+import { generateAutomergeUrl, stringifyAutomergeUrl } from "../src/DocUrl.js"
 
 const MISSING_DOCID = generateAutomergeUrl()
 

package/test/DocHandle.test.ts

@@ -1,11 +1,11 @@
-import * as A from "@automerge/automerge"
+import * as A from "@automerge/automerge/next"
 import assert from "assert"
 import { it } from "mocha"
-import { DocHandle, DocHandleChangePayload } from "../src"
-import { pause } from "../src/helpers/pause"
+import { DocHandle, DocHandleChangePayload } from "../src/index.js"
+import { pause } from "../src/helpers/pause.js"
 import { TestDoc } from "./types.js"
-import { generateAutomergeUrl, parseAutomergeUrl } from "../src/DocUrl"
-import { eventPromise } from "../src/helpers/eventPromise"
+import { generateAutomergeUrl, parseAutomergeUrl } from "../src/DocUrl.js"
+import { eventPromise } from "../src/helpers/eventPromise.js"
 import { decode } from "cbor-x"
 
 describe("DocHandle", () => {