@dxos/echo-pipeline 0.8.3 → 0.8.4-main.1068cf700f

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

@@ -2,14 +2,14 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { createStorage } from '@dxos/random-access-storage';
 import { Timeframe } from '@dxos/timeframe';
 
-import { TestFeedBuilder, TestAgentBuilder, WebsocketNetworkManagerProvider } from '../testing';
+import { TestAgentBuilder, TestFeedBuilder, WebsocketNetworkManagerProvider } from '../testing';
 
 // TODO(burdon): Config.
 // Signal server will be started by the setup script.

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

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { PublicKey } from '@dxos/keys';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
@@ -11,9 +11,10 @@ import { StorageType, createStorage } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 import { Timeframe } from '@dxos/timeframe';
 
-import { AuthStatus, MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, SpaceProtocol } from './space-protocol';
 import { TestAgentBuilder, TestFeedBuilder } from '../testing';
 
+import { AuthStatus, MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, SpaceProtocol } from './space-protocol';
+
 describe('space/space-protocol', () => {
   // Flaky.
   test('two peers discover each other via presence', async () => {

package/src/space/space-protocol.ts

@@ -9,10 +9,10 @@ import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
 import {
   MMSTTopology,
-  type SwarmNetworkManager,
   type SwarmConnection,
+  type SwarmNetworkManager,
   type WireProtocol,
-  type WireProtocolParams,
+  type WireProtocolProps,
   type WireProtocolProvider,
 } from '@dxos/network-manager';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
@@ -20,7 +20,7 @@ import { type MuxerStats, Teleport } from '@dxos/teleport';
 import { type BlobStore, BlobSync } from '@dxos/teleport-extension-object-sync';
 import { ReplicatorExtension } from '@dxos/teleport-extension-replicator';
 import { trace } from '@dxos/tracing';
-import { CallbackCollection, ComplexMap, type AsyncCallback } from '@dxos/util';
+import { type AsyncCallback, CallbackCollection, ComplexMap } from '@dxos/util';
 
 import { AuthExtension, type AuthProvider, type AuthVerifier } from './auth';
 
@@ -118,7 +118,10 @@ export class SpaceProtocol {
     this.blobSync = new BlobSync({ blobStore });
 
     // TODO(burdon): Async race condition? Move to start?
-    this._topic = subtleCrypto.digest('SHA-256', topic.asBuffer()).then(discoveryKey).then(PublicKey.from);
+    this._topic = subtleCrypto
+      .digest('SHA-256', topic.asBuffer() as ArrayBufferView<ArrayBuffer>)
+      .then(discoveryKey)
+      .then(PublicKey.from);
 
     this._disableP2pReplication = disableP2pReplication ?? false;
   }
@@ -173,16 +176,16 @@ export class SpaceProtocol {
   }
 
   private _createProtocolProvider(credentials: Uint8Array | undefined): WireProtocolProvider {
-    return (wireParams) => {
+    return (wireProps) => {
       const session = new SpaceProtocolSession({
-        wireParams,
+        wireProps,
         swarmIdentity: this._swarmIdentity,
         onSessionAuth: this._onSessionAuth,
         onAuthFailure: this._onAuthFailure,
         blobSync: this.blobSync,
         disableP2pReplication: this._disableP2pReplication,
       });
-      this._sessions.set(wireParams.remotePeerId, session);
+      this._sessions.set(wireProps.remotePeerId, session);
 
       for (const feed of this._feeds) {
         session.replicator.addFeed(feed);
@@ -193,8 +196,8 @@ export class SpaceProtocol {
   }
 }
 
-export type SpaceProtocolSessionParams = {
-  wireParams: WireProtocolParams;
+export type SpaceProtocolSessionProps = {
+  wireProps: WireProtocolProps;
   swarmIdentity: SwarmIdentity;
 
   blobSync: BlobSync;
@@ -222,7 +225,7 @@ export enum AuthStatus {
  */
 export class SpaceProtocolSession implements WireProtocol {
   @logInfo
-  private readonly _wireParams: WireProtocolParams;
+  private readonly _wireProps: WireProtocolProps;
 
   private readonly _disableP2pReplication: boolean;
 
@@ -249,20 +252,20 @@ export class SpaceProtocolSession implements WireProtocol {
 
   // TODO(dmaretskyi): Allow to pass in extra extensions.
   constructor({
-    wireParams,
+    wireProps,
     swarmIdentity,
     onSessionAuth,
     onAuthFailure,
     blobSync,
     disableP2pReplication,
-  }: SpaceProtocolSessionParams) {
-    this._wireParams = wireParams;
+  }: SpaceProtocolSessionProps) {
+    this._wireProps = wireProps;
     this._swarmIdentity = swarmIdentity;
     this._onSessionAuth = onSessionAuth;
     this._onAuthFailure = onAuthFailure;
     this._blobSync = blobSync;
 
-    this._teleport = new Teleport(wireParams);
+    this._teleport = new Teleport(wireProps);
 
     this._disableP2pReplication = disableP2pReplication ?? false;
   }

package/src/space/space.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Context } from '@dxos/context';
 import { CredentialGenerator } from '@dxos/credentials';

package/src/space/space.ts

@@ -15,15 +15,16 @@ import { type Timeframe } from '@dxos/timeframe';
 import { trace } from '@dxos/tracing';
 import { type AsyncCallback, Callback } from '@dxos/util';
 
-import { ControlPipeline } from './control-pipeline';
-import { type SpaceProtocol } from './space-protocol';
 import { type MetadataStore } from '../metadata';
 import { type PipelineAccessor } from '../pipeline';
 
+import { ControlPipeline } from './control-pipeline';
+import { type SpaceProtocol } from './space-protocol';
+
 // TODO(burdon): Factor out?
 type FeedProvider = (feedKey: PublicKey, opts?: FeedOptions) => Promise<FeedWrapper<FeedMessage>>;
 
-export type SpaceParams = {
+export type SpaceProps = {
   id: SpaceId;
   spaceKey: PublicKey;
   protocol: SpaceProtocol;
@@ -39,7 +40,7 @@ export type SpaceParams = {
   onMemberRolesChanged: (member: MemberInfo[]) => Promise<void>;
 };
 
-export type CreatePipelineParams = {
+export type CreatePipelineProps = {
   start: Timeframe;
   // designation: AdmittedFeed.Designation;
 };
@@ -67,7 +68,7 @@ export class Space extends Resource {
   private _controlFeed?: FeedWrapper<FeedMessage>;
   private _dataFeed?: FeedWrapper<FeedMessage>;
 
-  constructor(params: SpaceParams) {
+  constructor(params: SpaceProps) {
     super();
     invariant(params.spaceKey && params.feedProvider);
     this._id = params.id;

package/src/testing/index.ts

@@ -7,5 +7,3 @@ export * from './test-agent-builder';
 export * from './test-feed-builder';
 export * from './test-network-adapter';
 export * from './test-replicator';
-export * as TestSchema from './test-schema';
-export * as TestData from './test-data';

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

@@ -12,14 +12,15 @@ import { MemoryTransportFactory, SwarmNetworkManager, createRtcTransportFactory
 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';
-import { StorageType, createStorage, type Storage } from '@dxos/random-access-storage';
+import { type Storage, StorageType, createStorage } from '@dxos/random-access-storage';
 import { Gossip, Presence } from '@dxos/teleport-extension-gossip';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 import { ComplexMap } from '@dxos/util';
 
-import { TestFeedBuilder } from './test-feed-builder';
 import { MetadataStore } from '../metadata';
-import { MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, SpaceManager, SpaceProtocol, type Space } from '../space';
+import { MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, type Space, SpaceManager, SpaceProtocol } from '../space';
+
+import { TestFeedBuilder } from './test-feed-builder';
 
 export type NetworkManagerProvider = () => SwarmNetworkManager;
 

package/src/testing/test-network-adapter.ts

@@ -11,12 +11,25 @@ import { log } from '@dxos/log';
 export type TestConnectionStateProvider = () => 'on' | 'off';
 
 export class TestAdapter extends NetworkAdapter {
-  static createPair(connectionStateProvider: TestConnectionStateProvider = () => 'on'): TestAdapter[] {
+  static createPair(
+    connectionStateProvider: TestConnectionStateProvider = () => 'on',
+    onMessage?: (message: Message) => void,
+  ): TestAdapter[] {
     const adapter1: TestAdapter = new TestAdapter({
-      send: (message: Message) => connectionStateProvider() === 'on' && sleep(10).then(() => adapter2.receive(message)),
+      send: (message: Message) => {
+        onMessage?.(message);
+        if (connectionStateProvider() === 'on') {
+          void sleep(10).then(() => adapter2.receive(message));
+        }
+      },
     });
     const adapter2: TestAdapter = new TestAdapter({
-      send: (message: Message) => connectionStateProvider() === 'on' && sleep(10).then(() => adapter1.receive(message)),
+      send: (message: Message) => {
+        onMessage?.(message);
+        if (connectionStateProvider() === 'on') {
+          void sleep(10).then(() => adapter1.receive(message));
+        }
+      },
     });
 
     return [adapter1, adapter2];

package/src/testing/test-replicator.ts

@@ -7,14 +7,14 @@ import { type Context, LifecycleState, Resource } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import type { AutomergeProtocolMessage } from '@dxos/protocols';
-import { AutomergeReplicator, type AutomergeReplicatorFactory } from '@dxos/teleport-extension-automerge-replicator';
+import * as TeleportAutomergeReplicator from '@dxos/teleport-extension-automerge-replicator';
 
 import type {
-  EchoReplicator,
-  EchoReplicatorContext,
-  ReplicatorConnection,
-  ShouldAdvertiseParams,
-  ShouldSyncCollectionParams,
+  AutomergeReplicator,
+  AutomergeReplicatorConnection,
+  AutomergeReplicatorContext,
+  ShouldAdvertiseProps,
+  ShouldSyncCollectionProps,
 } from '../automerge';
 
 export type TestReplicatorNetworkOptions = {
@@ -30,7 +30,7 @@ export class TestReplicationNetwork extends Resource {
     this._latency = options.latency;
   }
 
-  protected override async _close(ctx: Context): Promise<void> {
+  protected override async _close(_ctx: Context): Promise<void> {
     for (const replicator of this._replicators) {
       for (const connection of replicator.connections) {
         void connection.writable.abort();
@@ -115,19 +115,19 @@ export class TestReplicationNetwork extends Resource {
   }
 }
 
-type TestReplicatorParams = {
+type TestReplicatorProps = {
   onConnect: () => Promise<void>;
   onDisconnect: () => Promise<void>;
 };
 
-export class TestReplicator implements EchoReplicator {
-  constructor(private readonly _params: TestReplicatorParams) {}
+export class TestReplicator implements AutomergeReplicator {
+  constructor(private readonly _params: TestReplicatorProps) {}
 
   public connected = false;
-  public context: EchoReplicatorContext | undefined = undefined;
+  public context: AutomergeReplicatorContext | undefined = undefined;
   public connections = new Set<TestReplicatorConnection>();
 
-  async connect(context: EchoReplicatorContext): Promise<void> {
+  async connect(context: AutomergeReplicatorContext): Promise<void> {
     log('connect', { peerId: context.peerId });
     this.context = context;
     this.connected = true;
@@ -153,7 +153,7 @@ export class TestReplicator implements EchoReplicator {
   }
 }
 
-export class TestReplicatorConnection implements ReplicatorConnection {
+export class TestReplicatorConnection implements AutomergeReplicatorConnection {
   public otherSide: TestReplicatorConnection | undefined = undefined;
   public owningReplicator: TestReplicator | undefined = undefined;
 
@@ -163,17 +163,21 @@ export class TestReplicatorConnection implements ReplicatorConnection {
     public readonly writable: WritableStream<AutomergeProtocolMessage>,
   ) {}
 
-  async shouldAdvertise(params: ShouldAdvertiseParams): Promise<boolean> {
+  get bundleSyncEnabled(): boolean {
+    return false;
+  }
+
+  async shouldAdvertise(_params: ShouldAdvertiseProps): Promise<boolean> {
     return true;
   }
 
-  shouldSyncCollection(params: ShouldSyncCollectionParams): boolean {
+  shouldSyncCollection(_params: ShouldSyncCollectionProps): boolean {
     return true;
   }
 }
 
-export const testAutomergeReplicatorFactory: AutomergeReplicatorFactory = (params) => {
-  return new AutomergeReplicator(
+export const testAutomergeReplicatorFactory: TeleportAutomergeReplicator.AutomergeReplicatorFactory = (params) => {
+  return new TeleportAutomergeReplicator.AutomergeReplicator(
     {
       ...params[0],
       sendSyncRetryPolicy: {
@@ -186,9 +190,10 @@ export const testAutomergeReplicatorFactory: AutomergeReplicatorFactory = (param
   );
 };
 
-export const brokenAutomergeReplicatorFactory: AutomergeReplicatorFactory = (params) => {
+export const brokenAutomergeReplicatorFactory: TeleportAutomergeReplicator.AutomergeReplicatorFactory = (params) => {
   params[1]!.onSyncMessage = () => {
     throw new Error();
   };
+
   return testAutomergeReplicatorFactory(params);
 };

package/src/util.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { decodeReference, ObjectStructure, type DatabaseDirectory } from '@dxos/echo-protocol';
+import { type DatabaseDirectory, EncodedReference, ObjectStructure } from '@dxos/echo-protocol';
 
 /**
  * Assumes properties are at root.
@@ -14,8 +14,12 @@ export const findInlineObjectOfType = (
   for (const id in spaceDoc.objects ?? {}) {
     const obj = spaceDoc.objects![id];
     const objType = ObjectStructure.getTypeReference(obj);
-    if (objType && decodeReference(objType).objectId === typename) {
-      return [id, obj];
+    if (objType) {
+      const typeDXN = EncodedReference.toDXN(objType);
+      const typeDXNInfo = typeDXN.asTypeDXN();
+      if (typeDXNInfo?.type === typename) {
+        return [id, obj];
+      }
     }
   }