@dxos/echo-pipeline 0.5.9-main.a2de4fa → 0.5.9-main.af4882d

package/dist/types/src/automerge/automerge-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"automerge-host.d.ts","sourceRoot":"","sources":["../../../../src/automerge/automerge-host.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,IAAI,EAGJ,KAAK,UAAU,EAGhB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGzD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACtB,MAAM,yCAAyC,CAAC;AAKjD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKxD,YAAY,EAAE,UAAU,EAAE,CAAC;AAE3B,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,UAAU,CAAC;IAEf,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,CAAC;AAEF,qBACa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IACzD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAEjC;IAEH,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,QAAQ,CAAuC;IAGvD,OAAO,CAAC,OAAO,CAAU;gBAEb,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE,mBAAmB;IAWrD,IAAI;IA0BJ,KAAK;IAOX,IAAI,IAAI,IAAI,IAAI,CAEf;IAEK,aAAa,CAAC,UAAU,EAAE,cAAc;IAIxC,gBAAgB,CAAC,UAAU,EAAE,cAAc;YAQnC,YAAY;YAoBZ,WAAW;IAsBzB;;OAEG;YACW,UAAU;IAKxB,OAAO,CAAC,cAAc;IA0BtB,OAAO,CAAC,eAAe;YAIT,8BAA8B;IAkBtC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAI5D,eAAe,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;CAGvC;AAED,eAAO,MAAM,kBAAkB,QAAS,GAAG,KAAG,MAAM,GAAG,IAQtD,CAAC"}
+{"version":3,"file":"automerge-host.d.ts","sourceRoot":"","sources":["../../../../src/automerge/automerge-host.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,IAAI,EAGJ,KAAK,UAAU,EAGhB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGzD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACtB,MAAM,yCAAyC,CAAC;AAKjD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKxD,YAAY,EAAE,UAAU,EAAE,CAAC;AAE3B,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,UAAU,CAAC;IAEf,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,CAAC;AAEF,qBACa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IACzD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAEjC;IAEH,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,QAAQ,CAAuC;IAGvD,OAAO,CAAC,OAAO,CAAU;IAElB,cAAc,cAAqB;gBAE9B,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE,mBAAmB;IAWrD,IAAI;IA0BJ,KAAK;IAOX,IAAI,IAAI,IAAI,IAAI,CAEf;IAEK,aAAa,CAAC,UAAU,EAAE,cAAc;IAIxC,gBAAgB,CAAC,UAAU,EAAE,cAAc;YAQnC,YAAY;YA+BZ,WAAW;IAsBzB;;OAEG;YACW,UAAU;IAKxB,OAAO,CAAC,cAAc;IA0BtB,OAAO,CAAC,eAAe;YAIT,8BAA8B;IAkBtC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAI5D,eAAe,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;CAGvC;AAED,eAAO,MAAM,kBAAkB,QAAS,GAAG,KAAG,MAAM,GAAG,IAQtD,CAAC"}

package/dist/types/src/automerge/mesh-echo-replicator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-echo-replicator.d.ts","sourceRoot":"","sources":["../../../../src/automerge/mesh-echo-replicator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAGpF,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAG3B,MAAM,mBAAmB,CAAC;AAI3B;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuC;IACpE;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA+C;IAEnF;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoE;IAEvG,OAAO,CAAC,QAAQ,CAAsC;IAEhD,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,UAAU;IAUhB,eAAe,IAAI,mBAAmB;IAoEtC,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS;CAS1D"}
+{"version":3,"file":"mesh-echo-replicator.d.ts","sourceRoot":"","sources":["../../../../src/automerge/mesh-echo-replicator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAGpF,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAG3B,MAAM,mBAAmB,CAAC;AAI3B;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuC;IACpE;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA+C;IAEnF;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoE;IAEvG,OAAO,CAAC,QAAQ,CAAsC;IAEhD,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,UAAU;IAUhB,eAAe,IAAI,mBAAmB;IAoEtC,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS;CAI1D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.5.9-main.a2de4fa",
+  "version": "0.5.9-main.af4882d",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -39,38 +39,38 @@
     "crc-32": "^1.2.2",
     "level": "^8.0.1",
     "level-transcoder": "^1.0.1",
-    "@dxos/async": "0.5.9-main.a2de4fa",
-    "@dxos/automerge": "0.5.9-main.a2de4fa",
-    "@dxos/context": "0.5.9-main.a2de4fa",
-    "@dxos/codec-protobuf": "0.5.9-main.a2de4fa",
-    "@dxos/credentials": "0.5.9-main.a2de4fa",
-    "@dxos/crypto": "0.5.9-main.a2de4fa",
-    "@dxos/debug": "0.5.9-main.a2de4fa",
-    "@dxos/echo-protocol": "0.5.9-main.a2de4fa",
-    "@dxos/echo-schema": "0.5.9-main.a2de4fa",
-    "@dxos/hypercore": "0.5.9-main.a2de4fa",
-    "@dxos/indexing": "0.5.9-main.a2de4fa",
-    "@dxos/feed-store": "0.5.9-main.a2de4fa",
-    "@dxos/invariant": "0.5.9-main.a2de4fa",
-    "@dxos/keyring": "0.5.9-main.a2de4fa",
-    "@dxos/keys": "0.5.9-main.a2de4fa",
-    "@dxos/kv-store": "0.5.9-main.a2de4fa",
-    "@dxos/log": "0.5.9-main.a2de4fa",
-    "@dxos/messaging": "0.5.9-main.a2de4fa",
-    "@dxos/network-manager": "0.5.9-main.a2de4fa",
-    "@dxos/node-std": "0.5.9-main.a2de4fa",
-    "@dxos/rpc": "0.5.9-main.a2de4fa",
-    "@dxos/teleport": "0.5.9-main.a2de4fa",
-    "@dxos/protocols": "0.5.9-main.a2de4fa",
-    "@dxos/random-access-storage": "0.5.9-main.a2de4fa",
-    "@dxos/teleport-extension-gossip": "0.5.9-main.a2de4fa",
-    "@dxos/teleport-extension-automerge-replicator": "0.5.9-main.a2de4fa",
-    "@dxos/teleport-extension-object-sync": "0.5.9-main.a2de4fa",
-    "@dxos/timeframe": "0.5.9-main.a2de4fa",
-    "@dxos/teleport-extension-replicator": "0.5.9-main.a2de4fa",
-    "@dxos/tracing": "0.5.9-main.a2de4fa",
-    "@dxos/typings": "0.5.9-main.a2de4fa",
-    "@dxos/util": "0.5.9-main.a2de4fa"
+    "@dxos/async": "0.5.9-main.af4882d",
+    "@dxos/codec-protobuf": "0.5.9-main.af4882d",
+    "@dxos/context": "0.5.9-main.af4882d",
+    "@dxos/automerge": "0.5.9-main.af4882d",
+    "@dxos/credentials": "0.5.9-main.af4882d",
+    "@dxos/debug": "0.5.9-main.af4882d",
+    "@dxos/crypto": "0.5.9-main.af4882d",
+    "@dxos/echo-schema": "0.5.9-main.af4882d",
+    "@dxos/echo-protocol": "0.5.9-main.af4882d",
+    "@dxos/feed-store": "0.5.9-main.af4882d",
+    "@dxos/hypercore": "0.5.9-main.af4882d",
+    "@dxos/indexing": "0.5.9-main.af4882d",
+    "@dxos/invariant": "0.5.9-main.af4882d",
+    "@dxos/keys": "0.5.9-main.af4882d",
+    "@dxos/keyring": "0.5.9-main.af4882d",
+    "@dxos/kv-store": "0.5.9-main.af4882d",
+    "@dxos/log": "0.5.9-main.af4882d",
+    "@dxos/messaging": "0.5.9-main.af4882d",
+    "@dxos/network-manager": "0.5.9-main.af4882d",
+    "@dxos/node-std": "0.5.9-main.af4882d",
+    "@dxos/protocols": "0.5.9-main.af4882d",
+    "@dxos/random-access-storage": "0.5.9-main.af4882d",
+    "@dxos/rpc": "0.5.9-main.af4882d",
+    "@dxos/teleport": "0.5.9-main.af4882d",
+    "@dxos/teleport-extension-gossip": "0.5.9-main.af4882d",
+    "@dxos/teleport-extension-object-sync": "0.5.9-main.af4882d",
+    "@dxos/teleport-extension-automerge-replicator": "0.5.9-main.af4882d",
+    "@dxos/teleport-extension-replicator": "0.5.9-main.af4882d",
+    "@dxos/timeframe": "0.5.9-main.af4882d",
+    "@dxos/tracing": "0.5.9-main.af4882d",
+    "@dxos/typings": "0.5.9-main.af4882d",
+    "@dxos/util": "0.5.9-main.af4882d"
   },
   "devDependencies": {
     "fast-check": "^3.19.0",

package/src/automerge/automerge-doc-loader.test.ts

@@ -22,7 +22,6 @@ import { createIdFromSpaceKey } from '../space';
 const ctx = new Context();
 const SPACE_KEY = PublicKey.random();
 const randomId = () => generateEchoId();
-
 describe('AutomergeDocumentLoader', () => {
   test('space access is set on root doc handle and it is accessible', async () => {
     const { loader, spaceRootDocHandle } = await setupTest();
@@ -78,7 +77,9 @@ describe('AutomergeDocumentLoader', () => {
     const repo = new Repo({ network: [] });
     const loader = new AutomergeDocumentLoaderImpl(spaceId, repo, SPACE_KEY);
     const spaceRootDocHandle = repo.create<SpaceDoc>();
-    await loader.loadSpaceRootDocHandle(ctx, { rootUrl: spaceRootDocHandle.url });
+    await loader.loadSpaceRootDocHandle(ctx, {
+      rootUrl: spaceRootDocHandle.url,
+    });
     return { loader, spaceRootDocHandle, repo };
   };
 

package/src/automerge/automerge-host.ts

@@ -19,6 +19,7 @@ import { type IndexMetadataStore } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { type SublevelDB } from '@dxos/kv-store';
+import { log } from '@dxos/log';
 import { objectPointerCodec } from '@dxos/protocols';
 import {
   type FlushRequest,
@@ -58,6 +59,8 @@ export class AutomergeHost {
   @trace.info()
   private _peerId!: string;
 
+  public _requestedDocs = new Set<string>();
+
   constructor({ db, indexMetadataStore }: AutomergeHostParams) {
     this._storage = new LevelDBStorageAdapter({
       db,
@@ -130,6 +133,17 @@ export class AutomergeHost {
       return false;
     }
 
+    // Workaround for https://github.com/automerge/automerge-repo/pull/292
+    // NOTE: This must override the per-connection policy.
+    const doc = this._repo.handles[documentId]?.docSync();
+    if (!doc) {
+      // TODO(dmaretskyi): Verify that this works as intended.
+      // TODO(dmaretskyi): Move to MESH replicator?
+      const isRequested = this._requestedDocs.has(`automerge:${documentId}`);
+      log('doc share policy check', { peerId, documentId, isRequested });
+      return isRequested;
+    }
+
     const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
     if ((peerMetadata as any)?.dxos_peerSource === 'EchoNetworkAdapter') {
       return this._echoNetworkAdapter.shouldAdvertize(peerId, { documentId });

package/src/automerge/mesh-echo-replicator.ts

@@ -121,11 +121,6 @@ export class MeshEchoReplicator implements EchoReplicator {
   authorizeDevice(spaceKey: PublicKey, deviceKey: PublicKey) {
     log('authorizeDevice', { spaceKey, deviceKey });
     defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey.hash)).add(deviceKey);
-    for (const connection of this._connections) {
-      if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
-        this._context?.onConnectionAuthScopeChanged(connection);
-      }
-    }
   }
 }