@dxos/echo-pipeline 0.5.9-main.b8d8fee → 0.5.9-main.bd9c8b3

package/dist/lib/browser/index.mjs

@@ -32,7 +32,6 @@ import { Repo } from "@dxos/automerge/automerge-repo";
 import { Context } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
 import { trace } from "@dxos/tracing";
 import { mapValues } from "@dxos/util";
@@ -573,118 +572,6 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
   }
 };
 
-// packages/core/echo/echo-pipeline/src/automerge/migrations.ts
-import { IndexedDBStorageAdapter } from "@dxos/automerge/automerge-repo-storage-indexeddb";
-import { log as log2 } from "@dxos/log";
-import { StorageType } from "@dxos/random-access-storage";
-
-// packages/core/echo/echo-pipeline/src/automerge/automerge-storage-adapter.ts
-import { arrayToBuffer, bufferToArray } from "@dxos/util";
-var AutomergeStorageAdapter = class {
-  constructor(_directory) {
-    this._directory = _directory;
-    this._state = "opened";
-  }
-  async load(key) {
-    if (this._state !== "opened") {
-      return void 0;
-    }
-    const filename = this._getFilename(key);
-    const file = this._directory.getOrCreateFile(filename);
-    const { size } = await file.stat();
-    if (!size || size === 0) {
-      return void 0;
-    }
-    const buffer = await file.read(0, size);
-    return bufferToArray(buffer);
-  }
-  async save(key, data) {
-    if (this._state !== "opened") {
-      return void 0;
-    }
-    const filename = this._getFilename(key);
-    const file = this._directory.getOrCreateFile(filename);
-    await file.write(0, arrayToBuffer(data));
-    await file.truncate?.(data.length);
-    await file.flush?.();
-  }
-  async remove(key) {
-    if (this._state !== "opened") {
-      return void 0;
-    }
-    const filename = this._getFilename(key);
-    const file = this._directory.getOrCreateFile(filename);
-    await file.destroy();
-  }
-  async loadRange(keyPrefix) {
-    if (this._state !== "opened") {
-      return [];
-    }
-    const filename = this._getFilename(keyPrefix);
-    const entries = await this._directory.list();
-    return Promise.all(entries.filter((entry) => entry.startsWith(filename)).map(async (entry) => {
-      const file = this._directory.getOrCreateFile(entry);
-      const { size } = await file.stat();
-      const buffer = await file.read(0, size);
-      return {
-        key: this._getKeyFromFilename(entry),
-        data: bufferToArray(buffer)
-      };
-    }));
-  }
-  async removeRange(keyPrefix) {
-    if (this._state !== "opened") {
-      return void 0;
-    }
-    const filename = this._getFilename(keyPrefix);
-    const entries = await this._directory.list();
-    await Promise.all(entries.filter((entry) => entry.startsWith(filename)).map(async (entry) => {
-      const file = this._directory.getOrCreateFile(entry);
-      await file.destroy();
-    }));
-  }
-  async close() {
-    this._state = "closed";
-  }
-  _getFilename(key) {
-    return key.map((k) => k.replaceAll("%", "%25").replaceAll("-", "%2D")).join("-");
-  }
-  _getKeyFromFilename(filename) {
-    return filename.split("-").map((k) => k.replaceAll("%2D", "-").replaceAll("%25", "%"));
-  }
-};
-
-// packages/core/echo/echo-pipeline/src/automerge/migrations.ts
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/migrations.ts";
-var levelMigration = async ({ db, directory }) => {
-  const isNewLevel = !await db.iterator({
-    ...encodingOptions
-  }).next();
-  if (!isNewLevel) {
-    return;
-  }
-  const oldStorageAdapter = directory.type === StorageType.IDB ? new IndexedDBStorageAdapter(directory.path, "data") : new AutomergeStorageAdapter(directory);
-  const chunks = await oldStorageAdapter.loadRange([]);
-  if (chunks.length === 0) {
-    return;
-  }
-  const batch = db.batch();
-  log2.info("found chunks on old storage adapter", {
-    chunks: chunks.length
-  }, {
-    F: __dxlog_file3,
-    L: 37,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
-  for (const { key, data } of await oldStorageAdapter.loadRange([])) {
-    data && batch.put(key, data, {
-      ...encodingOptions
-    });
-  }
-  await batch.write();
-};
-
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -696,31 +583,24 @@ function _ts_decorate2(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class {
-  constructor({ directory, db, indexMetadataStore }) {
+  constructor({ db, indexMetadataStore }) {
     this._ctx = new Context();
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this)
     });
-    this._requestedDocs = /* @__PURE__ */ new Set();
-    this._directory = directory;
-    this._db = db;
-    this._indexMetadataStore = indexMetadataStore;
-  }
-  async open() {
-    this._peerId = `host-${PublicKey.random().toHex()}`;
-    this._directory && await levelMigration({
-      db: this._db,
-      directory: this._directory
-    });
     this._storage = new LevelDBStorageAdapter({
-      db: this._db,
+      db,
       callbacks: {
         beforeSave: async (params) => this._beforeSave(params),
         afterSave: async () => this._afterSave()
       }
     });
+    this._indexMetadataStore = indexMetadataStore;
+  }
+  async open() {
+    this._peerId = `host-${PublicKey.random().toHex()}`;
     await this._storage.open?.();
     this._clientNetwork = new LocalHostNetworkAdapter();
     this._repo = new Repo({
@@ -765,21 +645,6 @@ var AutomergeHost = class {
     if (!documentId) {
       return false;
     }
-    const doc = this._repo.handles[documentId]?.docSync();
-    if (!doc) {
-      const isRequested = this._requestedDocs.has(`automerge:${documentId}`);
-      log3("doc share policy check", {
-        peerId,
-        documentId,
-        isRequested
-      }, {
-        F: __dxlog_file4,
-        L: 156,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return isRequested;
-    }
     const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
     if (peerMetadata?.dxos_peerSource === "EchoNetworkAdapter") {
       return this._echoNetworkAdapter.shouldAdvertize(peerId, {
@@ -859,8 +724,8 @@ var AutomergeHost = class {
   async flush({ states }) {
     await Promise.all(states?.map(async ({ heads, documentId }) => {
       invariant3(heads, "heads are required for flush", {
-        F: __dxlog_file4,
-        L: 250,
+        F: __dxlog_file3,
+        L: 223,
         S: this,
         A: [
           "heads",
@@ -933,8 +798,9 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 import { Event as Event2 } from "@dxos/async";
 import { cancelWithContext } from "@dxos/context";
 import { warnAfterTimeout } from "@dxos/debug";
+import { SpaceDocVersion } from "@dxos/echo-protocol";
 import { invariant as invariant4 } from "@dxos/invariant";
-import { log as log4 } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { trace as trace2 } from "@dxos/tracing";
 function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -946,7 +812,7 @@ function _ts_decorate3(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts";
 var AutomergeDocumentLoaderImpl = class {
   constructor(_spaceId, _repo, _spaceKey) {
     this._spaceId = _spaceId;
@@ -968,10 +834,10 @@ var AutomergeDocumentLoaderImpl = class {
       return;
     }
     if (!spaceState.rootUrl) {
-      log4.error("Database opened with no rootUrl", {
+      log2.error("Database opened with no rootUrl", {
         spaceId: this._spaceId
       }, {
-        F: __dxlog_file5,
+        F: __dxlog_file4,
         L: 72,
         S: this,
         C: (f, a) => f(...a)
@@ -981,7 +847,7 @@ var AutomergeDocumentLoaderImpl = class {
       const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
       const doc = existingDocHandle.docSync();
       invariant4(doc, void 0, {
-        F: __dxlog_file5,
+        F: __dxlog_file4,
         L: 77,
         S: this,
         A: [
@@ -1003,7 +869,7 @@ var AutomergeDocumentLoaderImpl = class {
     const urlsToLoad = {};
     for (const objectId of objectIds) {
       invariant4(this._spaceRootDocHandle, void 0, {
-        F: __dxlog_file5,
+        F: __dxlog_file4,
         L: 90,
         S: this,
         A: [
@@ -1016,7 +882,7 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
       invariant4(spaceRootDoc, void 0, {
-        F: __dxlog_file5,
+        F: __dxlog_file4,
         L: 95,
         S: this,
         A: [
@@ -1027,10 +893,10 @@ var AutomergeDocumentLoaderImpl = class {
       const documentUrl = (spaceRootDoc.links ?? {})[objectId];
       if (documentUrl == null) {
         this._objectsPendingDocumentLoad.add(objectId);
-        log4.info("loading delayed until object links are initialized", {
+        log2.info("loading delayed until object links are initialized", {
           objectId
         }, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -1054,7 +920,7 @@ var AutomergeDocumentLoaderImpl = class {
   }
   getSpaceRootDocHandle() {
     invariant4(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 122,
       S: this,
       A: [
@@ -1066,7 +932,7 @@ var AutomergeDocumentLoaderImpl = class {
   }
   createDocumentForObject(objectId) {
     invariant4(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 127,
       S: this,
       A: [
@@ -1074,7 +940,9 @@ var AutomergeDocumentLoaderImpl = class {
         ""
       ]
     });
-    const spaceDocHandle = this._repo.create();
+    const spaceDocHandle = this._repo.create({
+      version: SpaceDocVersion.CURRENT
+    });
     this._initDocAccess(spaceDocHandle);
     this.onObjectBoundToDocument(spaceDocHandle, objectId);
     this._spaceRootDocHandle.change((newDoc) => {
@@ -1105,30 +973,30 @@ var AutomergeDocumentLoaderImpl = class {
       };
       const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        log4.warn("object already inlined in a different document, ignoring the link", {
+        log2.warn("object already inlined in a different document, ignoring the link", {
           ...logMeta,
           actualDocumentUrl: objectDocumentHandle.url
         }, {
-          F: __dxlog_file5,
-          L: 157,
+          F: __dxlog_file4,
+          L: 159,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       if (objectDocumentHandle?.url === automergeUrl) {
-        log4.warn("object document was already loaded", logMeta, {
-          F: __dxlog_file5,
-          L: 164,
+        log2.warn("object document was already loaded", logMeta, {
+          F: __dxlog_file4,
+          L: 166,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       const handle = this._repo.find(automergeUrl);
-      log4.debug("document loading triggered", logMeta, {
-        F: __dxlog_file5,
-        L: 168,
+      log2.debug("document loading triggered", logMeta, {
+        F: __dxlog_file4,
+        L: 170,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1146,12 +1014,12 @@ var AutomergeDocumentLoaderImpl = class {
         break;
       } catch (err) {
         if (`${err}`.includes("Timeout")) {
-          log4.info("wraparound", {
+          log2.info("wraparound", {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
-            F: __dxlog_file5,
-            L: 184,
+            F: __dxlog_file4,
+            L: 186,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1191,9 +1059,9 @@ var AutomergeDocumentLoaderImpl = class {
         docUrl: handle.url
       };
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        log4.info("document loaded after all listeners were removed", logMeta, {
-          F: __dxlog_file5,
-          L: 220,
+        log2.info("document loaded after all listeners were removed", logMeta, {
+          F: __dxlog_file4,
+          L: 222,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1201,9 +1069,9 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
-        log4.warn("object was rebound while a document was loading, discarding handle", logMeta, {
-          F: __dxlog_file5,
-          L: 225,
+        log2.warn("object was rebound while a document was loading, discarding handle", logMeta, {
+          F: __dxlog_file4,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1215,14 +1083,14 @@ var AutomergeDocumentLoaderImpl = class {
       });
     } catch (err) {
       const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      log4.warn("failed to load a document", {
+      log2.warn("failed to load a document", {
         objectId,
         automergeUrl: handle.url,
         retryLoading: shouldRetryLoading,
         err
       }, {
-        F: __dxlog_file5,
-        L: 231,
+        F: __dxlog_file4,
+        L: 233,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1246,10 +1114,10 @@ import { cbor as cbor2 } from "@dxos/automerge/automerge-repo";
 import { Resource as Resource2 } from "@dxos/context";
 import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log5 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
 import { ComplexMap, ComplexSet, defaultMap } from "@dxos/util";
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
 var MeshEchoReplicator = class {
   constructor() {
     this._connections = /* @__PURE__ */ new Set();
@@ -1276,7 +1144,7 @@ var MeshEchoReplicator = class {
   }
   createExtension() {
     invariant5(this._context, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file5,
       L: 54,
       S: this,
       A: [
@@ -1287,16 +1155,16 @@ var MeshEchoReplicator = class {
     const connection = new MeshReplicatorConnection({
       ownPeerId: this._context.peerId,
       onRemoteConnected: async () => {
-        log5("onRemoteConnected", {
+        log3("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file6,
+          F: __dxlog_file5,
           L: 59,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant5(this._context, void 0, {
-          F: __dxlog_file6,
+          F: __dxlog_file5,
           L: 60,
           S: this,
           A: [
@@ -1313,10 +1181,10 @@ var MeshEchoReplicator = class {
         }
       },
       onRemoteDisconnected: async () => {
-        log5("onRemoteDisconnected", {
+        log3("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file6,
+          F: __dxlog_file5,
           L: 71,
           S: this,
           C: (f, a) => f(...a)
@@ -1327,17 +1195,17 @@ var MeshEchoReplicator = class {
         this._connections.delete(connection);
       },
       shouldAdvertize: async (params) => {
-        log5("shouldAdvertize", {
+        log3("shouldAdvertize", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
-          F: __dxlog_file6,
+          F: __dxlog_file5,
           L: 78,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant5(this._context, void 0, {
-          F: __dxlog_file6,
+          F: __dxlog_file5,
           L: 79,
           S: this,
           A: [
@@ -1348,11 +1216,11 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            log5("space key not found for share policy check", {
+            log3("space key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file6,
+              F: __dxlog_file5,
               L: 83,
               S: this,
               C: (f, a) => f(...a)
@@ -1361,11 +1229,11 @@ var MeshEchoReplicator = class {
           }
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           if (!connection.remoteDeviceKey) {
-            log5("device key not found for share policy check", {
+            log3("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file6,
+              F: __dxlog_file5,
               L: 93,
               S: this,
               C: (f, a) => f(...a)
@@ -1373,7 +1241,7 @@ var MeshEchoReplicator = class {
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          log5("share policy check", {
+          log3("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1381,15 +1249,15 @@ var MeshEchoReplicator = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file6,
+            F: __dxlog_file5,
             L: 101,
             S: this,
             C: (f, a) => f(...a)
           });
           return isAuthorized;
         } catch (err) {
-          log5.catch(err, void 0, {
-            F: __dxlog_file6,
+          log3.catch(err, void 0, {
+            F: __dxlog_file5,
             L: 111,
             S: this,
             C: (f, a) => f(...a)
@@ -1402,16 +1270,21 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   authorizeDevice(spaceKey, deviceKey) {
-    log5("authorizeDevice", {
+    log3("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file5,
       L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
     defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey2.hash)).add(deviceKey);
+    for (const connection of this._connections) {
+      if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
+        this._context?.onConnectionAuthScopeChanged(connection);
+      }
+    }
   }
 };
 var MeshReplicatorConnection = class extends Resource2 {
@@ -1443,13 +1316,13 @@ var MeshReplicatorConnection = class extends Resource2 {
       onStartReplication: async (info, remotePeerId) => {
         this.remoteDeviceKey = remotePeerId;
         this._remotePeerId = info.id;
-        log5("onStartReplication", {
+        log3("onStartReplication", {
           id: info.id,
           thisPeerId: this.peerId,
           remotePeerId: remotePeerId.toHex()
         }, {
-          F: __dxlog_file6,
-          L: 187,
+          F: __dxlog_file5,
+          L: 192,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1472,8 +1345,8 @@ var MeshReplicatorConnection = class extends Resource2 {
   }
   get peerId() {
     invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file6,
-      L: 210,
+      F: __dxlog_file5,
+      L: 215,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1491,8 +1364,8 @@ var MeshReplicatorConnection = class extends Resource2 {
   */
   async enable() {
     invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file6,
-      L: 223,
+      F: __dxlog_file5,
+      L: 228,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1513,7 +1386,6 @@ export {
   AuthStatus,
   AutomergeDocumentLoaderImpl,
   AutomergeHost,
-  AutomergeStorageAdapter,
   DataServiceImpl,
   LevelDBStorageAdapter,
   LocalHostNetworkAdapter,