@dxos/echo-pipeline 0.7.2 → 0.7.3-staging.971cd8d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.7.2",
+  "version": "0.7.3-staging.971cd8d",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -37,43 +37,43 @@
     "crc-32": "^1.2.2",
     "level-transcoder": "^1.0.1",
     "lodash.isequal": "^4.5.0",
-    "@dxos/async": "0.7.2",
-    "@dxos/automerge": "0.7.2",
-    "@dxos/codec-protobuf": "0.7.2",
-    "@dxos/crypto": "0.7.2",
-    "@dxos/credentials": "0.7.2",
-    "@dxos/debug": "0.7.2",
-    "@dxos/context": "0.7.2",
-    "@dxos/echo-protocol": "0.7.2",
-    "@dxos/echo-schema": "0.7.2",
-    "@dxos/edge-client": "0.7.2",
-    "@dxos/feed-store": "0.7.2",
-    "@dxos/hypercore": "0.7.2",
-    "@dxos/indexing": "0.7.2",
-    "@dxos/invariant": "0.7.2",
-    "@dxos/keyring": "0.7.2",
-    "@dxos/kv-store": "0.7.2",
-    "@dxos/log": "0.7.2",
-    "@dxos/keys": "0.7.2",
-    "@dxos/network-manager": "0.7.2",
-    "@dxos/messaging": "0.7.2",
-    "@dxos/node-std": "0.7.2",
-    "@dxos/protocols": "0.7.2",
-    "@dxos/random-access-storage": "0.7.2",
-    "@dxos/teleport-extension-automerge-replicator": "0.7.2",
-    "@dxos/teleport": "0.7.2",
-    "@dxos/teleport-extension-gossip": "0.7.2",
-    "@dxos/teleport-extension-object-sync": "0.7.2",
-    "@dxos/teleport-extension-replicator": "0.7.2",
-    "@dxos/timeframe": "0.7.2",
-    "@dxos/tracing": "0.7.2",
-    "@dxos/typings": "0.7.2",
-    "@dxos/util": "0.7.2"
+    "@dxos/async": "0.7.3-staging.971cd8d",
+    "@dxos/automerge": "0.7.3-staging.971cd8d",
+    "@dxos/context": "0.7.3-staging.971cd8d",
+    "@dxos/credentials": "0.7.3-staging.971cd8d",
+    "@dxos/crypto": "0.7.3-staging.971cd8d",
+    "@dxos/debug": "0.7.3-staging.971cd8d",
+    "@dxos/codec-protobuf": "0.7.3-staging.971cd8d",
+    "@dxos/echo-schema": "0.7.3-staging.971cd8d",
+    "@dxos/echo-protocol": "0.7.3-staging.971cd8d",
+    "@dxos/edge-client": "0.7.3-staging.971cd8d",
+    "@dxos/indexing": "0.7.3-staging.971cd8d",
+    "@dxos/hypercore": "0.7.3-staging.971cd8d",
+    "@dxos/feed-store": "0.7.3-staging.971cd8d",
+    "@dxos/invariant": "0.7.3-staging.971cd8d",
+    "@dxos/keyring": "0.7.3-staging.971cd8d",
+    "@dxos/kv-store": "0.7.3-staging.971cd8d",
+    "@dxos/log": "0.7.3-staging.971cd8d",
+    "@dxos/messaging": "0.7.3-staging.971cd8d",
+    "@dxos/keys": "0.7.3-staging.971cd8d",
+    "@dxos/network-manager": "0.7.3-staging.971cd8d",
+    "@dxos/node-std": "0.7.3-staging.971cd8d",
+    "@dxos/protocols": "0.7.3-staging.971cd8d",
+    "@dxos/teleport": "0.7.3-staging.971cd8d",
+    "@dxos/random-access-storage": "0.7.3-staging.971cd8d",
+    "@dxos/teleport-extension-automerge-replicator": "0.7.3-staging.971cd8d",
+    "@dxos/teleport-extension-gossip": "0.7.3-staging.971cd8d",
+    "@dxos/teleport-extension-object-sync": "0.7.3-staging.971cd8d",
+    "@dxos/teleport-extension-replicator": "0.7.3-staging.971cd8d",
+    "@dxos/timeframe": "0.7.3-staging.971cd8d",
+    "@dxos/typings": "0.7.3-staging.971cd8d",
+    "@dxos/tracing": "0.7.3-staging.971cd8d",
+    "@dxos/util": "0.7.3-staging.971cd8d"
   },
   "devDependencies": {
     "@types/lodash.isequal": "^4.5.0",
     "fast-check": "^3.19.0",
-    "@dxos/test-utils": "0.7.2"
+    "@dxos/test-utils": "0.7.3-staging.971cd8d"
   },
   "publishConfig": {
     "access": "public"

package/src/automerge/automerge-host.ts

@@ -42,11 +42,18 @@ import { type EchoReplicator, type RemoteDocumentExistenceCheckParams } from './
 import { HeadsStore } from './heads-store';
 import { LevelDBStorageAdapter, type BeforeSaveParams } from './leveldb-storage-adapter';
 
+export type PeerIdProvider = () => string | undefined;
+
 export type AutomergeHostParams = {
   db: LevelDB;
 
   indexMetadataStore: IndexMetadataStore;
   dataMonitor?: EchoDataMonitor;
+
+  /**
+   * Used for creating stable ids. A random key is generated on open, if no value is provided.
+   */
+  peerIdProvider?: PeerIdProvider;
 };
 
 export type LoadDocOptions = {
@@ -82,9 +89,11 @@ export class AutomergeHost extends Resource {
   @trace.info()
   private _peerId!: PeerId;
 
+  private readonly _peerIdProvider?: PeerIdProvider;
+
   public readonly collectionStateUpdated = new Event<{ collectionId: CollectionId }>();
 
-  constructor({ db, indexMetadataStore, dataMonitor }: AutomergeHostParams) {
+  constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider }: AutomergeHostParams) {
     super();
     this._db = db;
     this._storage = new LevelDBStorageAdapter({
@@ -104,11 +113,11 @@ export class AutomergeHost extends Resource {
     });
     this._headsStore = new HeadsStore({ db: db.sublevel('heads') });
     this._indexMetadataStore = indexMetadataStore;
+    this._peerIdProvider = peerIdProvider;
   }
 
   protected override async _open() {
-    // TODO(burdon): Should this be stable?
-    this._peerId = `host-${PublicKey.random().toHex()}` as PeerId;
+    this._peerId = `host-${this._peerIdProvider?.() ?? PublicKey.random().toHex()}` as PeerId;
 
     await this._storage.open?.();
 

package/src/db-host/echo-host.ts

@@ -33,6 +33,7 @@ import {
   type EchoReplicator,
   type CollectionSyncState,
   type EchoDataStats,
+  type PeerIdProvider,
 } from '../automerge';
 
 const INDEXER_CONFIG: IndexConfig = {
@@ -42,6 +43,7 @@ const INDEXER_CONFIG: IndexConfig = {
 
 export type EchoHostParams = {
   kv: LevelDB;
+  peerIdProvider?: PeerIdProvider;
 };
 
 /**
@@ -59,7 +61,7 @@ export class EchoHost extends Resource {
   private readonly _spaceStateManager = new SpaceStateManager();
   private readonly _echoDataMonitor: EchoDataMonitor;
 
-  constructor({ kv }: EchoHostParams) {
+  constructor({ kv, peerIdProvider }: EchoHostParams) {
     super();
 
     this._indexMetadataStore = new IndexMetadataStore({ db: kv.sublevel('index-metadata') });
@@ -70,6 +72,7 @@ export class EchoHost extends Resource {
       db: kv,
       dataMonitor: this._echoDataMonitor,
       indexMetadataStore: this._indexMetadataStore,
+      peerIdProvider,
     });
 
     this._indexer = new Indexer({

package/src/db-host/index.ts

@@ -5,7 +5,6 @@
 export * from './data-service';
 export * from './documents-synchronizer';
 export * from './echo-host';
-export * from './migration';
 export * from './database-root';
 export * from './query-state';
 export * from './query-service';

package/src/edge/echo-edge-replicator.ts

@@ -97,6 +97,9 @@ export class EchoEdgeReplicator implements EchoReplicator {
   async connectToSpace(spaceId: SpaceId) {
     using _guard = await this._mutex.acquire();
 
+    if (this._connectedSpaces.has(spaceId)) {
+      return;
+    }
     this._connectedSpaces.add(spaceId);
 
     // Check if AM-repo requested that we connect to remote peers.

package/src/index.ts

@@ -9,3 +9,4 @@ export * from './pipeline';
 export * from './space';
 export * from './automerge';
 export * from './edge';
+export * from './util';

package/src/space/space.ts

@@ -48,6 +48,7 @@ export type CreatePipelineParams = {
  * Spaces are globally addressable databases with access control.
  */
 // TODO(dmaretskyi): Extract database stuff.
+// TODO(dmaretskyi): Rename HaloGraph move to HALO.
 @trackLeaks('open', 'close')
 @trace.resource()
 export class Space extends Resource {

package/src/util.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { decodeReference, type ObjectStructure, type SpaceDoc } from '@dxos/echo-protocol';
+
+/**
+ * Assumes properties are at root.
+ */
+export const findInlineObjectOfType = (spaceDoc: SpaceDoc, typename: string): [string, ObjectStructure] | undefined => {
+  for (const id in spaceDoc.objects ?? {}) {
+    const obj = spaceDoc.objects![id];
+    if (obj.system.type && decodeReference(obj.system.type).objectId === typename) {
+      return [id, obj];
+    }
+  }
+
+  return undefined;
+};

package/dist/types/src/db-host/migration.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../../../../src/db-host/migration.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,eAAe,EAEpB,KAAK,QAAQ,EAEd,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,uBAAuB,QAAe,QAAQ,KAAG,OAAO,CAAC,QAAQ,CAU7E,CAAC;AAEF,eAAO,MAAM,yBAAyB,SAAgB,QAAQ,KAAG,OAAO,CAAC,QAAQ,CAYhF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,aAAc,QAAQ,YAAY,MAAM,KAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,SASzG,CAAC"}

package/src/db-host/migration.ts

@@ -1,57 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { convertLegacyReference } from '@dxos/echo-protocol';
-import {
-  decodeReference,
-  encodeReference,
-  isLegacyReference,
-  LEGACY_TYPE_PROPERTIES,
-  type ObjectStructure,
-  Reference,
-  type SpaceDoc,
-  SpaceDocVersion,
-} from '@dxos/echo-protocol';
-import { TYPE_PROPERTIES } from '@dxos/echo-schema';
-import { deepMapValuesAsync } from '@dxos/util';
-
-export const convertLegacyReferences = async (doc: SpaceDoc): Promise<SpaceDoc> => {
-  const newDoc = await deepMapValuesAsync(doc, async (value, recurse) => {
-    if (isLegacyReference(value)) {
-      return convertLegacyReference(value);
-    }
-    return recurse(value);
-  });
-
-  newDoc.version = SpaceDocVersion.CURRENT;
-  return newDoc;
-};
-
-export const convertLegacySpaceRootDoc = async (root: SpaceDoc): Promise<SpaceDoc> => {
-  // Convert references.
-  const newDoc: SpaceDoc = await convertLegacyReferences(root);
-
-  // Update properties type.
-  const properties = findInlineObjectOfType(newDoc, LEGACY_TYPE_PROPERTIES);
-  if (properties) {
-    const [_, obj] = properties;
-    obj.system.type = encodeReference(Reference.fromLegacyTypename(TYPE_PROPERTIES));
-  }
-
-  return newDoc;
-};
-
-/**
- * Assumes properties are at root.
- */
-export const findInlineObjectOfType = (spaceDoc: SpaceDoc, typename: string): [string, ObjectStructure] | undefined => {
-  for (const id in spaceDoc.objects ?? {}) {
-    const obj = spaceDoc.objects![id];
-    if (obj.system.type && decodeReference(obj.system.type).objectId === typename) {
-      return [id, obj];
-    }
-  }
-
-  return undefined;
-};