@dxos/echo-pipeline 0.5.6 → 0.5.7-main.1b7f312

package/dist/types/src/testing/test-agent-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-agent-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-agent-builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test-agent-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-agent-builder.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.5.6",
+  "version": "0.5.7-main.1b7f312",
   "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.6",
-    "@dxos/automerge": "0.5.6",
-    "@dxos/codec-protobuf": "0.5.6",
-    "@dxos/context": "0.5.6",
-    "@dxos/credentials": "0.5.6",
-    "@dxos/crypto": "0.5.6",
-    "@dxos/debug": "0.5.6",
-    "@dxos/echo-protocol": "0.5.6",
-    "@dxos/feed-store": "0.5.6",
-    "@dxos/echo-schema": "0.5.6",
-    "@dxos/hypercore": "0.5.6",
-    "@dxos/indexing": "0.5.6",
-    "@dxos/invariant": "0.5.6",
-    "@dxos/keyring": "0.5.6",
-    "@dxos/keys": "0.5.6",
-    "@dxos/kv-store": "0.5.6",
-    "@dxos/messaging": "0.5.6",
-    "@dxos/network-manager": "0.5.6",
-    "@dxos/log": "0.5.6",
-    "@dxos/node-std": "0.5.6",
-    "@dxos/random-access-storage": "0.5.6",
-    "@dxos/rpc": "0.5.6",
-    "@dxos/teleport": "0.5.6",
-    "@dxos/protocols": "0.5.6",
-    "@dxos/teleport-extension-automerge-replicator": "0.5.6",
-    "@dxos/teleport-extension-gossip": "0.5.6",
-    "@dxos/teleport-extension-object-sync": "0.5.6",
-    "@dxos/teleport-extension-replicator": "0.5.6",
-    "@dxos/tracing": "0.5.6",
-    "@dxos/timeframe": "0.5.6",
-    "@dxos/typings": "0.5.6",
-    "@dxos/util": "0.5.6"
+    "@dxos/automerge": "0.5.7-main.1b7f312",
+    "@dxos/codec-protobuf": "0.5.7-main.1b7f312",
+    "@dxos/async": "0.5.7-main.1b7f312",
+    "@dxos/credentials": "0.5.7-main.1b7f312",
+    "@dxos/context": "0.5.7-main.1b7f312",
+    "@dxos/crypto": "0.5.7-main.1b7f312",
+    "@dxos/debug": "0.5.7-main.1b7f312",
+    "@dxos/echo-protocol": "0.5.7-main.1b7f312",
+    "@dxos/echo-schema": "0.5.7-main.1b7f312",
+    "@dxos/feed-store": "0.5.7-main.1b7f312",
+    "@dxos/hypercore": "0.5.7-main.1b7f312",
+    "@dxos/invariant": "0.5.7-main.1b7f312",
+    "@dxos/keyring": "0.5.7-main.1b7f312",
+    "@dxos/indexing": "0.5.7-main.1b7f312",
+    "@dxos/kv-store": "0.5.7-main.1b7f312",
+    "@dxos/log": "0.5.7-main.1b7f312",
+    "@dxos/keys": "0.5.7-main.1b7f312",
+    "@dxos/messaging": "0.5.7-main.1b7f312",
+    "@dxos/network-manager": "0.5.7-main.1b7f312",
+    "@dxos/protocols": "0.5.7-main.1b7f312",
+    "@dxos/node-std": "0.5.7-main.1b7f312",
+    "@dxos/random-access-storage": "0.5.7-main.1b7f312",
+    "@dxos/rpc": "0.5.7-main.1b7f312",
+    "@dxos/teleport": "0.5.7-main.1b7f312",
+    "@dxos/teleport-extension-automerge-replicator": "0.5.7-main.1b7f312",
+    "@dxos/teleport-extension-gossip": "0.5.7-main.1b7f312",
+    "@dxos/teleport-extension-object-sync": "0.5.7-main.1b7f312",
+    "@dxos/teleport-extension-replicator": "0.5.7-main.1b7f312",
+    "@dxos/tracing": "0.5.7-main.1b7f312",
+    "@dxos/timeframe": "0.5.7-main.1b7f312",
+    "@dxos/typings": "0.5.7-main.1b7f312",
+    "@dxos/util": "0.5.7-main.1b7f312"
   },
   "devDependencies": {
     "fast-check": "^3.19.0",

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

@@ -8,6 +8,7 @@ import { sleep } from '@dxos/async';
 import { Repo } from '@dxos/automerge/automerge-repo';
 import { Context } from '@dxos/context';
 import { type SpaceDoc } from '@dxos/echo-protocol';
+import { generateEchoId } from '@dxos/echo-schema';
 import { PublicKey } from '@dxos/keys';
 import { describe, test } from '@dxos/test';
 
@@ -19,7 +20,7 @@ import {
 
 const ctx = new Context();
 const SPACE_KEY = PublicKey.random();
-const randomId = () => PublicKey.random().toHex();
+const randomId = () => generateEchoId();
 describe('AutomergeDocumentLoader', () => {
   test('space access is set on root doc handle and it is accessible', async () => {
     const { loader, spaceRootDocHandle } = await setupTest();

package/src/automerge/automerge-host.ts

@@ -76,6 +76,9 @@ export class AutomergeHost {
   }
 
   async open() {
+    // TODO(burdon): Should this be stable?
+    this._peerId = `host-${PublicKey.random().toHex()}` as PeerId;
+
     // TODO(mykola): remove this before 0.6 release.
     this._directory && (await levelMigration({ db: this._db, directory: this._directory }));
     this._storage = new LevelDBStorageAdapter({
@@ -86,20 +89,24 @@ export class AutomergeHost {
       },
     });
     await this._storage.open?.();
-    this._peerId = `host-${PublicKey.random().toHex()}` as PeerId;
 
     this._clientNetwork = new LocalHostNetworkAdapter();
 
+    // Construct the automerge repo.
     this._repo = new Repo({
       peerId: this._peerId as PeerId,
-      network: [this._clientNetwork, this._echoNetworkAdapter],
-      storage: this._storage,
-
       sharePolicy: this._sharePolicy.bind(this),
+      storage: this._storage,
+      network: [
+        // Downstream client.
+        this._clientNetwork,
+        // Upstream swarm.
+        this._echoNetworkAdapter,
+      ],
     });
+
     this._clientNetwork.ready();
     await this._echoNetworkAdapter.open();
-
     await this._clientNetwork.whenConnected();
     await this._echoNetworkAdapter.whenConnected();
   }

package/src/automerge/migrations.ts

@@ -12,7 +12,7 @@ import { AutomergeStorageAdapter } from './automerge-storage-adapter';
 import { encodingOptions } from './leveldb-storage-adapter';
 
 export const levelMigration = async ({ db, directory }: { db: SublevelDB; directory: Directory }) => {
-  // Note: Make automigration from previous storage to leveldb here.
+  // Note: Make auto-migration from previous storage to leveldb here.
   const isNewLevel = !(await db
     .iterator<StorageKey, Uint8Array>({
       ...encodingOptions,
@@ -32,6 +32,7 @@ export const levelMigration = async ({ db, directory }: { db: SublevelDB; direct
   if (chunks.length === 0) {
     return;
   }
+
   const batch = db.batch();
   log.info('found chunks on old storage adapter', { chunks: chunks.length });
   for (const { key, data } of await oldStorageAdapter.loadRange([])) {

package/src/space/space-manager.ts

@@ -8,7 +8,7 @@ import { failUndefined } from '@dxos/debug';
 import { type FeedStore } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { type NetworkManager } from '@dxos/network-manager';
+import { type SwarmNetworkManager } from '@dxos/network-manager';
 import { trace } from '@dxos/protocols';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
@@ -16,14 +16,14 @@ import { type Teleport } from '@dxos/teleport';
 import { type BlobStore } from '@dxos/teleport-extension-object-sync';
 import { ComplexMap } from '@dxos/util';
 
-import { Space } from './space';
+import { Space, createIdFromSpaceKey } from './space';
 import { SpaceProtocol, type SwarmIdentity } from './space-protocol';
 import { SnapshotManager, type SnapshotStore } from '../db-host';
 import { type MetadataStore } from '../metadata';
 
 export type SpaceManagerParams = {
   feedStore: FeedStore<FeedMessage>;
-  networkManager: NetworkManager;
+  networkManager: SwarmNetworkManager;
   metadataStore: MetadataStore;
 
   /**
@@ -54,7 +54,7 @@ export type ConstructSpaceParams = {
 export class SpaceManager {
   private readonly _spaces = new ComplexMap<PublicKey, Space>(PublicKey.hash);
   private readonly _feedStore: FeedStore<FeedMessage>;
-  private readonly _networkManager: NetworkManager;
+  private readonly _networkManager: SwarmNetworkManager;
   private readonly _metadataStore: MetadataStore;
   private readonly _snapshotStore: SnapshotStore;
   private readonly _blobStore: BlobStore;
@@ -98,6 +98,7 @@ export class SpaceManager {
     const genesisFeed = await this._feedStore.openFeed(metadata.genesisFeedKey ?? failUndefined());
 
     const spaceKey = metadata.key;
+    const spaceId = await createIdFromSpaceKey(spaceKey);
     const protocol = new SpaceProtocol({
       topic: spaceKey,
       swarmIdentity,
@@ -109,6 +110,7 @@ export class SpaceManager {
     const snapshotManager = new SnapshotManager(this._snapshotStore, this._blobStore, protocol.blobSync);
 
     const space = new Space({
+      id: spaceId,
       spaceKey,
       protocol,
       genesisFeed,

package/src/space/space-protocol.test.ts

@@ -7,7 +7,7 @@ import waitForExpect from 'wait-for-expect';
 
 import { PublicKey } from '@dxos/keys';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
-import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
+import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manager';
 import { StorageType, createStorage } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 import { describe, test, afterTest } from '@dxos/test';
@@ -56,7 +56,7 @@ describe('space/space-protocol', () => {
         credentialAuthenticator: async () => false, // Reject everyone.
       },
       blobStore: new BlobStore(createStorage({ type: StorageType.RAM }).createDirectory()),
-      networkManager: new NetworkManager({
+      networkManager: new SwarmNetworkManager({
         signalManager: new MemorySignalManager(signalContext),
         transportFactory: MemoryTransportFactory,
       }),
@@ -70,7 +70,7 @@ describe('space/space-protocol', () => {
         credentialAuthenticator: MOCK_AUTH_VERIFIER,
       },
       blobStore: new BlobStore(createStorage({ type: StorageType.RAM }).createDirectory()),
-      networkManager: new NetworkManager({
+      networkManager: new SwarmNetworkManager({
         signalManager: new MemorySignalManager(signalContext),
         transportFactory: MemoryTransportFactory,
       }),

package/src/space/space-protocol.ts

@@ -9,7 +9,7 @@ import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
 import {
   MMSTTopology,
-  type NetworkManager,
+  type SwarmNetworkManager,
   type SwarmConnection,
   type WireProtocol,
   type WireProtocolParams,
@@ -37,7 +37,7 @@ export interface SwarmIdentity {
 export type SpaceProtocolOptions = {
   topic: PublicKey; // TODO(burdon): Rename?
   swarmIdentity: SwarmIdentity;
-  networkManager: NetworkManager;
+  networkManager: SwarmNetworkManager;
 
   blobStore: BlobStore;
 
@@ -54,7 +54,7 @@ export type SpaceProtocolOptions = {
  */
 @trace.resource()
 export class SpaceProtocol {
-  private readonly _networkManager: NetworkManager;
+  private readonly _networkManager: SwarmNetworkManager;
   private readonly _swarmIdentity: SwarmIdentity;
   private readonly _onSessionAuth?: (session: Teleport) => void;
   private readonly _onAuthFailure?: (session: Teleport) => void;

package/src/space/space.ts

@@ -5,9 +5,10 @@
 import { Event, Mutex, synchronized, trackLeaks } from '@dxos/async';
 import { type Context, LifecycleState, Resource } from '@dxos/context';
 import { type DelegateInvitationCredential, type FeedInfo, type MemberInfo } from '@dxos/credentials';
+import { subtleCrypto } from '@dxos/crypto';
 import { type FeedOptions, type FeedWrapper } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
-import { type PublicKey } from '@dxos/keys';
+import { SpaceId, type PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { AdmittedFeed, type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -25,6 +26,7 @@ import { type PipelineAccessor } from '../pipeline';
 type FeedProvider = (feedKey: PublicKey, opts?: FeedOptions) => Promise<FeedWrapper<FeedMessage>>;
 
 export type SpaceParams = {
+  id: SpaceId;
   spaceKey: PublicKey;
   protocol: SpaceProtocol;
   genesisFeed: FeedWrapper<FeedMessage>;
@@ -59,6 +61,7 @@ export class Space extends Resource {
   @trace.info()
   public readonly protocol: SpaceProtocol;
 
+  private readonly _id: SpaceId;
   private readonly _key: PublicKey;
   private readonly _genesisFeedKey: PublicKey;
   private readonly _feedProvider: FeedProvider;
@@ -73,6 +76,7 @@ export class Space extends Resource {
   constructor(params: SpaceParams) {
     super();
     invariant(params.spaceKey && params.feedProvider);
+    this._id = params.id;
     this._key = params.spaceKey;
     this._genesisFeedKey = params.genesisFeed.key;
     this._feedProvider = params.feedProvider;
@@ -120,6 +124,12 @@ export class Space extends Resource {
     this.protocol.addFeed(params.genesisFeed);
   }
 
+  @logInfo
+  @trace.info()
+  get id() {
+    return this._id;
+  }
+
   @logInfo
   @trace.info()
   get key() {
@@ -199,3 +209,22 @@ export class Space extends Resource {
     log('closed');
   }
 }
+
+/**
+ * Space keys are generated by creating a keypair, and then taking the first 20 bytes of the SHA-256 hash of the public key and encoding them to multibase RFC4648 base-32 format (prefixed with B, see Multibase Table).
+ * Inspired by how ethereum addresses are derived.
+ */
+export const createIdFromSpaceKey = async (spaceKey: PublicKey): Promise<SpaceId> => {
+  // Sanity check.
+  invariant(spaceKey.length === EXPECTED_SPACE_KEY_LENGTH);
+
+  const digest = await subtleCrypto.digest('SHA-256', spaceKey.asUint8Array());
+
+  const bytes = new Uint8Array(digest).slice(0, SpaceId.byteLength);
+  return SpaceId.encode(bytes);
+};
+
+/**
+ * Length of the ECDSA P-256 public key from WebCrypto exported as "raw".
+ */
+const EXPECTED_SPACE_KEY_LENGTH = 65;

package/src/testing/test-agent-builder.ts

@@ -8,7 +8,7 @@ import { type FeedStore } from '@dxos/feed-store';
 import { type Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from '@dxos/messaging';
-import { MemoryTransportFactory, NetworkManager, createSimplePeerTransportFactory } from '@dxos/network-manager';
+import { MemoryTransportFactory, SwarmNetworkManager, createSimplePeerTransportFactory } from '@dxos/network-manager';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { AdmittedFeed } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -22,12 +22,12 @@ import { SnapshotStore } from '../db-host';
 import { MetadataStore } from '../metadata';
 import { MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, SpaceManager, SpaceProtocol, type Space } from '../space';
 
-export type NetworkManagerProvider = () => NetworkManager;
+export type NetworkManagerProvider = () => SwarmNetworkManager;
 
 export const MemoryNetworkManagerProvider =
   (signalContext: MemorySignalManagerContext): NetworkManagerProvider =>
   () =>
-    new NetworkManager({
+    new SwarmNetworkManager({
       signalManager: new MemorySignalManager(signalContext),
       transportFactory: MemoryTransportFactory,
     });
@@ -35,7 +35,7 @@ export const MemoryNetworkManagerProvider =
 export const WebsocketNetworkManagerProvider =
   (signalUrl: string): NetworkManagerProvider =>
   () =>
-    new NetworkManager({
+    new SwarmNetworkManager({
       signalManager: new WebsocketSignalManager([{ server: signalUrl }]),
       transportFactory: createSimplePeerTransportFactory(),
     });