@dxos/echo-pipeline 0.4.6-main.e47f68d → 0.4.6

package/src/automerge/automerge-host.ts

@@ -27,6 +27,9 @@ export class AutomergeHost {
   private readonly _clientNetwork: LocalHostNetworkAdapter;
   private readonly _storage: StorageAdapter;
 
+  @trace.info()
+  private readonly _peerId: string;
+
   /**
    * spaceKey -> deviceKey[]
    */
@@ -43,9 +46,9 @@ export class AutomergeHost {
       storageDirectory.type === StorageType.IDB
         ? new IndexedDBStorageAdapter(storageDirectory.path, 'data')
         : new AutomergeStorageAdapter(storageDirectory);
-    const localPeerId = `host-${PublicKey.random().toHex()}` as PeerId;
+    this._peerId = `host-${PublicKey.random().toHex()}` as PeerId;
     this._repo = new Repo({
-      peerId: localPeerId,
+      peerId: this._peerId as PeerId,
       network: [this._clientNetwork, this._meshNetwork],
       storage: this._storage,
 
@@ -68,12 +71,14 @@ export class AutomergeHost {
         }
 
         try {
-          if (!doc.experimental_spaceKey) {
+          // experimental_spaceKey is set on old documents, new ones are created with doc.access.spaceKey
+          const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
+          if (!rawSpaceKey) {
             log('space key not found for share policy check', { peerId, documentId });
             return false;
           }
 
-          const spaceKey = PublicKey.from(doc.experimental_spaceKey);
+          const spaceKey = PublicKey.from(rawSpaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
 
           // TODO(mykola): Hack, stop abusing `peerMetadata` field.
@@ -86,7 +91,7 @@ export class AutomergeHost {
 
           const isAuthorized = authorizedDevices?.has(deviceKey) ?? false;
           log('share policy check', {
-            localPeer: localPeerId,
+            localPeer: this._peerId,
             remotePeer: peerId,
             documentId,
             deviceKey,
@@ -114,6 +119,23 @@ export class AutomergeHost {
       state: handle.state,
       hasDoc: !!handle.docSync(),
       heads: handle.docSync() ? automerge.getHeads(handle.docSync()) : null,
+      data:
+        handle.docSync()?.doc &&
+        mapValues(handle.docSync()?.doc, (value, key) => {
+          try {
+            switch (key) {
+              case 'access':
+              case 'links':
+                return value;
+              case 'objects':
+                return Object.keys(value as any);
+              default:
+                return `${value}`;
+            }
+          } catch (err) {
+            return `${err}`;
+          }
+        }),
     }));
   }