@dxos/echo-pipeline 0.5.0 → 0.5.1-main.140276b

package/dist/lib/node/index.cjs

@@ -58,6 +58,7 @@ var import_async = require("@dxos/async");
 var import_automerge = require("@dxos/automerge/automerge");
 var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_context = require("@dxos/context");
+var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
 var import_tracing = require("@dxos/tracing");
@@ -66,10 +67,10 @@ var import_context2 = require("@dxos/context");
 var import_async2 = require("@dxos/async");
 var import_automerge_repo2 = require("@dxos/automerge/automerge-repo");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
-var import_invariant = require("@dxos/invariant");
+var import_invariant2 = require("@dxos/invariant");
 var import_async3 = require("@dxos/async");
 var import_automerge_repo3 = require("@dxos/automerge/automerge-repo");
-var import_invariant2 = require("@dxos/invariant");
+var import_invariant3 = require("@dxos/invariant");
 var import_log2 = require("@dxos/log");
 var import_teleport_extension_automerge_replicator = require("@dxos/teleport-extension-automerge-replicator");
 var import_automerge_repo_storage_indexeddb = require("@dxos/automerge/automerge-repo-storage-indexeddb");
@@ -79,7 +80,7 @@ var import_util2 = require("@dxos/util");
 var import_async4 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
 var import_debug = require("@dxos/debug");
-var import_invariant3 = require("@dxos/invariant");
+var import_invariant4 = require("@dxos/invariant");
 var import_log4 = require("@dxos/log");
 var import_tracing2 = require("@dxos/tracing");
 var import_echo_schema = require("@dxos/echo-schema");
@@ -168,7 +169,8 @@ var LevelDBStorageAdapter = class extends import_context2.Resource {
 };
 var keyEncoder = {
   encode: (key) => Buffer.from(key.map((k) => k.replaceAll("%", "%25").replaceAll("-", "%2D")).join("-")),
-  decode: (key) => Buffer.from(key).toString().split("-").map((k) => k.replaceAll("%2D", "-").replaceAll("%25", "%"))
+  decode: (key) => Buffer.from(key).toString().split("-").map((k) => k.replaceAll("%2D", "-").replaceAll("%25", "%")),
+  format: "buffer"
 };
 var encodingOptions = {
   keyEncoding: keyEncoder,
@@ -203,7 +205,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapte
   }
   send(message) {
     const peer = this._peers.get(message.targetId);
-    (0, import_invariant.invariant)(peer, "Peer not found.", {
+    (0, import_invariant2.invariant)(peer, "Peer not found.", {
       F: __dxlog_file,
       L: 51,
       S: this,
@@ -228,7 +230,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapte
   syncRepo({ id, syncMessage }) {
     const peerId = this._getPeerId(id);
     return new import_codec_protobuf.Stream(({ next, close }) => {
-      (0, import_invariant.invariant)(!this._peers.has(peerId), "Peer already connected.", {
+      (0, import_invariant2.invariant)(!this._peers.has(peerId), "Peer already connected.", {
         F: __dxlog_file,
         L: 73,
         S: this,
@@ -252,7 +254,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapte
           });
         }
       });
-      (0, import_invariant.invariant)(this._isConnected, void 0, {
+      (0, import_invariant2.invariant)(this._isConnected, void 0, {
         F: __dxlog_file,
         L: 90,
         S: this,
@@ -268,7 +270,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapte
     });
   }
   async sendSyncMessage({ id, syncMessage }) {
-    (0, import_invariant.invariant)(this._isConnected, void 0, {
+    (0, import_invariant2.invariant)(this._isConnected, void 0, {
       F: __dxlog_file,
       L: 99,
       S: this,
@@ -281,7 +283,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapte
     this.emit("message", message);
   }
   async getHostInfo() {
-    (0, import_invariant.invariant)(this._isConnected, void 0, {
+    (0, import_invariant2.invariant)(this._isConnected, void 0, {
       F: __dxlog_file,
       L: 105,
       S: this,
@@ -290,7 +292,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapte
         ""
       ]
     });
-    (0, import_invariant.invariant)(this.peerId, "Peer id not set.", {
+    (0, import_invariant2.invariant)(this.peerId, "Peer id not set.", {
       F: __dxlog_file,
       L: 106,
       S: this,
@@ -329,7 +331,7 @@ var MeshNetworkAdapter = class extends import_automerge_repo3.NetworkAdapter {
   send(message) {
     const receiverId = message.targetId;
     const extension = this._extensions.get(receiverId);
-    (0, import_invariant2.invariant)(extension, "Extension not found.", {
+    (0, import_invariant3.invariant)(extension, "Extension not found.", {
       F: __dxlog_file2,
       L: 38,
       S: this,
@@ -350,7 +352,7 @@ var MeshNetworkAdapter = class extends import_automerge_repo3.NetworkAdapter {
   disconnect() {
   }
   createExtension() {
-    (0, import_invariant2.invariant)(this.peerId, "Peer id not set.", {
+    (0, import_invariant3.invariant)(this.peerId, "Peer id not set.", {
       F: __dxlog_file2,
       L: 47,
       S: this,
@@ -577,7 +579,7 @@ var AutomergeHost = class {
             isRequested
           }, {
             F: __dxlog_file4,
-            L: 100,
+            L: 108,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -591,7 +593,7 @@ var AutomergeHost = class {
               documentId
             }, {
               F: __dxlog_file4,
-              L: 107,
+              L: 115,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -605,7 +607,7 @@ var AutomergeHost = class {
               documentId
             }, {
               F: __dxlog_file4,
-              L: 116,
+              L: 124,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -622,7 +624,7 @@ var AutomergeHost = class {
             isAuthorized
           }, {
             F: __dxlog_file4,
-            L: 122,
+            L: 130,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -630,7 +632,7 @@ var AutomergeHost = class {
         } catch (err) {
           import_log.log.catch(err, void 0, {
             F: __dxlog_file4,
-            L: 132,
+            L: 140,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -678,21 +680,21 @@ var AutomergeHost = class {
   //
   // Methods for client-services.
   //
-  async flush({ documentIds }) {
-    await Promise.all(documentIds?.map((id) => this._repo.find(id).whenReady()) ?? []);
-    try {
-      await (0, import_async.asyncTimeout)(this._repo.flush(documentIds), 500);
-    } catch (err) {
-      import_log.log.warn("flush error", {
-        documentIds,
-        err
-      }, {
+  async flush({ states }) {
+    await Promise.all(states?.map(async ({ heads, documentId }) => {
+      (0, import_invariant.invariant)(heads, "heads are required for flush", {
         F: __dxlog_file4,
-        L: 196,
+        L: 200,
         S: this,
-        C: (f, a) => f(...a)
+        A: [
+          "heads",
+          "'heads are required for flush'"
+        ]
       });
-    }
+      const handle = this.repo.handles[documentId] ?? this._repo.find(documentId);
+      await waitForHeads(handle, heads);
+    }) ?? []);
+    await this._repo.flush(states?.map(({ documentId }) => documentId));
   }
   syncRepo(request) {
     return this._clientNetwork.syncRepo(request);
@@ -715,7 +717,7 @@ var AutomergeHost = class {
       deviceKey
     }, {
       F: __dxlog_file4,
-      L: 221,
+      L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -750,6 +752,24 @@ var getSpaceKeyFromDoc = (doc) => {
   }
   return String(rawSpaceKey);
 };
+var waitForHeads = async (handle, heads) => {
+  await handle.whenReady();
+  const unavailableHeads = new Set(heads);
+  await import_async.Event.wrap(handle, "change").waitForCondition(() => {
+    for (const changeHash of unavailableHeads.values()) {
+      if (changeIsPresentInDoc(handle.docSync(), changeHash)) {
+        unavailableHeads.delete(changeHash);
+      }
+    }
+    if (unavailableHeads.size === 0) {
+      return true;
+    }
+    return false;
+  });
+};
+var changeIsPresentInDoc = (doc, changeHash) => {
+  return !!(0, import_automerge.getBackend)(doc).getChangeByHash(changeHash);
+};
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -792,7 +812,7 @@ var AutomergeDocumentLoaderImpl = class {
     } else {
       const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
       const doc = existingDocHandle.docSync();
-      (0, import_invariant3.invariant)(doc, void 0, {
+      (0, import_invariant4.invariant)(doc, void 0, {
         F: __dxlog_file5,
         L: 74,
         S: this,
@@ -807,45 +827,54 @@ var AutomergeDocumentLoaderImpl = class {
       this._spaceRootDocHandle = existingDocHandle;
     }
   }
-  loadObjectDocument(objectId) {
-    (0, import_invariant3.invariant)(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file5,
-      L: 83,
-      S: this,
-      A: [
-        "this._spaceRootDocHandle",
-        ""
-      ]
-    });
-    if (this._objectDocumentHandles.has(objectId) || this._objectsPendingDocumentLoad.has(objectId)) {
-      return;
-    }
-    const spaceRootDoc = this._spaceRootDocHandle.docSync();
-    (0, import_invariant3.invariant)(spaceRootDoc, void 0, {
-      F: __dxlog_file5,
-      L: 88,
-      S: this,
-      A: [
-        "spaceRootDoc",
-        ""
-      ]
-    });
-    const documentUrl = (spaceRootDoc.links ?? {})[objectId];
-    if (documentUrl == null) {
-      this._objectsPendingDocumentLoad.add(objectId);
-      import_log4.log.info("loading delayed until object links are initialized", {
-        objectId
-      }, {
+  loadObjectDocument(objectIdOrMany) {
+    const objectIds = Array.isArray(objectIdOrMany) ? objectIdOrMany : [
+      objectIdOrMany
+    ];
+    let hasUrlsToLoad = false;
+    const urlsToLoad = {};
+    for (const objectId of objectIds) {
+      (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
+        F: __dxlog_file5,
+        L: 87,
+        S: this,
+        A: [
+          "this._spaceRootDocHandle",
+          ""
+        ]
+      });
+      if (this._objectDocumentHandles.has(objectId) || this._objectsPendingDocumentLoad.has(objectId)) {
+        continue;
+      }
+      const spaceRootDoc = this._spaceRootDocHandle.docSync();
+      (0, import_invariant4.invariant)(spaceRootDoc, void 0, {
         F: __dxlog_file5,
         L: 92,
         S: this,
-        C: (f, a) => f(...a)
+        A: [
+          "spaceRootDoc",
+          ""
+        ]
       });
-      return;
+      const documentUrl = (spaceRootDoc.links ?? {})[objectId];
+      if (documentUrl == null) {
+        this._objectsPendingDocumentLoad.add(objectId);
+        import_log4.log.info("loading delayed until object links are initialized", {
+          objectId
+        }, {
+          F: __dxlog_file5,
+          L: 96,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      } else {
+        urlsToLoad[objectId] = documentUrl;
+        hasUrlsToLoad = true;
+      }
+    }
+    if (hasUrlsToLoad) {
+      this._loadLinkedObjects(urlsToLoad);
     }
-    this._loadLinkedObjects({
-      [objectId]: documentUrl
-    });
   }
   onObjectLinksUpdated(links) {
     if (!links) {
@@ -856,9 +885,9 @@ var AutomergeDocumentLoaderImpl = class {
     linksAwaitingLoad.forEach(([objectId]) => this._objectsPendingDocumentLoad.delete(objectId));
   }
   getSpaceRootDocHandle() {
-    (0, import_invariant3.invariant)(this._spaceRootDocHandle, void 0, {
+    (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file5,
-      L: 110,
+      L: 119,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -868,9 +897,9 @@ var AutomergeDocumentLoaderImpl = class {
     return this._spaceRootDocHandle;
   }
   createDocumentForObject(objectId) {
-    (0, import_invariant3.invariant)(this._spaceRootDocHandle, void 0, {
+    (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file5,
-      L: 115,
+      L: 124,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -913,7 +942,7 @@ var AutomergeDocumentLoaderImpl = class {
           actualDocumentUrl: objectDocumentHandle.url
         }, {
           F: __dxlog_file5,
-          L: 145,
+          L: 154,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -922,7 +951,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (objectDocumentHandle?.url === automergeUrl) {
         import_log4.log.warn("object document was already loaded", logMeta, {
           F: __dxlog_file5,
-          L: 152,
+          L: 161,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -931,7 +960,7 @@ var AutomergeDocumentLoaderImpl = class {
       const handle = this._repo.find(automergeUrl);
       import_log4.log.debug("document loading triggered", logMeta, {
         F: __dxlog_file5,
-        L: 156,
+        L: 165,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -954,7 +983,7 @@ var AutomergeDocumentLoaderImpl = class {
             state: docHandle.state
           }, {
             F: __dxlog_file5,
-            L: 172,
+            L: 181,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -996,7 +1025,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
         import_log4.log.info("document loaded after all listeners were removed", logMeta, {
           F: __dxlog_file5,
-          L: 208,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1006,7 +1035,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (objectDocHandle?.url !== handle.url) {
         import_log4.log.warn("object was rebound while a document was loading, discarding handle", logMeta, {
           F: __dxlog_file5,
-          L: 213,
+          L: 222,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1025,7 +1054,7 @@ var AutomergeDocumentLoaderImpl = class {
         err
       }, {
         F: __dxlog_file5,
-        L: 219,
+        L: 228,
         S: this,
         C: (f, a) => f(...a)
       });