@dxos/echo-pipeline 0.8.3 → 0.8.4-main.05e74ebcff

package/src/space/admission-discovery-extension.ts

@@ -2,15 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import { scheduleTask, type Trigger } from '@dxos/async';
+import { type Trigger, scheduleTask } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { ProtocolError } from '@dxos/protocols';
 import { schema } from '@dxos/protocols/proto';
 import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import {
   type AdmissionDiscoveryService,
-  type GetAdmissionCredentialResponse,
   type GetAdmissionCredentialRequest,
+  type GetAdmissionCredentialResponse,
 } from '@dxos/protocols/proto/dxos/mesh/teleport';
 import { type ExtensionContext, RpcExtension } from '@dxos/teleport';
 
@@ -81,7 +81,7 @@ export class CredentialServerExtension extends RpcExtension<
         ): Promise<GetAdmissionCredentialResponse> => {
           const memberInfo = this._space.spaceState.members.get(request.memberKey);
           if (!memberInfo?.credential) {
-            throw new ProtocolError('Space member not found.', request);
+            throw new ProtocolError({ message: 'Space member not found.', context: { ...request } });
           }
           return { admissionCredential: memberInfo.credential };
         },

package/src/space/auth.ts

@@ -15,7 +15,7 @@ export type AuthProvider = (nonce: Uint8Array) => Promise<Uint8Array | undefined
 
 export type AuthVerifier = (nonce: Uint8Array, credential: Uint8Array) => Promise<boolean>;
 
-export type AuthExtensionParams = {
+export type AuthExtensionProps = {
   provider: AuthProvider;
   verifier: AuthVerifier;
   onAuthSuccess: () => void;
@@ -29,7 +29,7 @@ export class AuthExtension extends RpcExtension<Services, Services> {
     },
   });
 
-  constructor(private readonly _authParams: AuthExtensionParams) {
+  constructor(private readonly _authProps: AuthExtensionProps) {
     super({
       requested: {
         AuthService: schema.getService('dxos.mesh.teleport.auth.AuthService'),
@@ -46,7 +46,7 @@ export class AuthExtension extends RpcExtension<Services, Services> {
       AuthService: {
         authenticate: async ({ challenge }) => {
           try {
-            const credential = await this._authParams.provider(challenge);
+            const credential = await this._authProps.provider(challenge);
             if (!credential) {
               throw new Error('auth rejected');
             }
@@ -67,13 +67,13 @@ export class AuthExtension extends RpcExtension<Services, Services> {
         const challenge = randomBytes(32);
         const { credential } = await this.rpc.AuthService.authenticate({ challenge });
         invariant(credential?.length > 0, 'invalid credential');
-        const success = await this._authParams.verifier(challenge, credential);
+        const success = await this._authProps.verifier(challenge, credential);
         invariant(success, 'credential not verified');
-        runInContext(this._ctx, () => this._authParams.onAuthSuccess());
+        runInContext(this._ctx, () => this._authProps.onAuthSuccess());
       } catch (err) {
         log('auth failed', err);
         this.close();
-        this._authParams.onAuthFailure();
+        this._authProps.onAuthFailure();
       }
     });
   }

package/src/space/control-pipeline.test.ts

@@ -2,8 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
+import { Context } from '@dxos/context';
 import { CredentialGenerator, createCredential } from '@dxos/credentials';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
@@ -11,12 +12,12 @@ import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { AdmittedFeed } from '@dxos/protocols/proto/dxos/halo/credentials';
-import { createStorage, StorageType } from '@dxos/random-access-storage';
+import { StorageType, createStorage } from '@dxos/random-access-storage';
 import { Timeframe } from '@dxos/timeframe';
 
-import { ControlPipeline } from './control-pipeline';
 import { valueEncoding } from '../common';
 import { MetadataStore } from '../metadata';
+import { ControlPipeline } from './control-pipeline';
 
 describe('space/control-pipeline', () => {
   test('admits feeds', async () => {
@@ -59,7 +60,7 @@ describe('space/control-pipeline', () => {
     expect(admittedFeeds).toEqual([]);
 
     await controlPipeline.setWriteFeed(genesisFeed);
-    await controlPipeline.start();
+    await controlPipeline.start(Context.default());
 
     onTestFinished(() => controlPipeline.stop());
 

package/src/space/control-pipeline.ts

@@ -2,14 +2,14 @@
 // Copyright 2022 DXOS.org
 //
 
-import { DeferredTask, sleepWithContext, trackLeaks } from '@dxos/async';
+import { DeferredTask, scheduleMicroTask, sleepWithContext, trackLeaks } from '@dxos/async';
 import { Context } from '@dxos/context';
 import {
-  SpaceStateMachine,
-  type SpaceState,
-  type MemberInfo,
-  type FeedInfo,
   type DelegateInvitationCredential,
+  type FeedInfo,
+  type MemberInfo,
+  type SpaceState,
+  SpaceStateMachine,
 } from '@dxos/credentials';
 import { type FeedWrapper } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
@@ -25,7 +25,7 @@ import { type AsyncCallback, Callback, tracer } from '@dxos/util';
 import { type MetadataStore } from '../metadata';
 import { Pipeline, type PipelineAccessor } from '../pipeline';
 
-export type ControlPipelineParams = {
+export type ControlPipelineProps = {
   spaceKey: PublicKey;
   genesisFeed: FeedWrapper<FeedMessage>;
   feedProvider: (feedKey: PublicKey) => Promise<FeedWrapper<FeedMessage>>;
@@ -48,6 +48,7 @@ export class ControlPipeline {
   private readonly _pipeline: Pipeline;
   private readonly _spaceStateMachine: SpaceStateMachine;
 
+  @trace.info({ spanAttribute: true })
   private readonly _spaceKey: PublicKey;
   private readonly _metadata: MetadataStore;
   private _targetTimeframe?: Timeframe;
@@ -70,7 +71,7 @@ export class ControlPipeline {
     await this._saveSnapshot();
   });
 
-  constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }: ControlPipelineParams) {
+  constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }: ControlPipelineProps) {
     this._spaceKey = spaceKey;
     this._metadata = metadataStore;
     this._pipeline = new Pipeline();
@@ -83,9 +84,12 @@ export class ControlPipeline {
 
       // TODO(burdon): Check not stopping.
       if (info.assertion.designation === AdmittedFeed.Designation.CONTROL && !info.key.equals(genesisFeed.key)) {
-        queueMicrotask(async () => {
+        scheduleMicroTask(this._ctx, async () => {
           try {
             const feed = await feedProvider(info.key);
+            if (this._ctx.disposed) {
+              return;
+            }
             if (!this._pipeline.hasFeed(feed.key)) {
               await this._pipeline.addFeed(feed);
             }
@@ -117,8 +121,8 @@ export class ControlPipeline {
     this._pipeline.setWriteFeed(feed);
   }
 
-  @trace.span({ showInBrowserTimeline: true })
-  async start(): Promise<void> {
+  @trace.span({ showInBrowserTimeline: true, op: 'lifecycle' })
+  async start(ctx: Context): Promise<void> {
     const snapshot = this._metadata.getSpaceControlPipelineSnapshot(this._spaceKey);
     log('load snapshot', { key: this._spaceKey, present: !!snapshot, tf: snapshot?.timeframe });
     if (USE_SNAPSHOTS && snapshot) {
@@ -127,7 +131,7 @@ export class ControlPipeline {
 
     log('starting...');
     setTimeout(async () => {
-      void this._consumePipeline(new Context());
+      void this._consumePipeline(ctx);
     });
 
     await this._pipeline.start();
@@ -164,7 +168,6 @@ export class ControlPipeline {
     await this._metadata.setSpaceControlPipelineSnapshot(this._spaceKey, snapshot);
   }
 
-  @trace.span()
   private async _consumePipeline(ctx: Context): Promise<void> {
     for await (const msg of this._pipeline.consume()) {
       const span = this._usage.beginRecording();
@@ -180,7 +183,7 @@ export class ControlPipeline {
     }
   }
 
-  @trace.span()
+  @trace.span({ showInBrowserTimeline: true, showInRemoteTracing: false })
   private async _processMessage(ctx: Context, msg: FeedMessageBlock): Promise<void> {
     log('processing', { key: msg.feedKey, seq: msg.seq });
     if (msg.data.payload.credential) {

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

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, test, onTestFinished } from 'vitest';
+import { describe, onTestFinished, test } from 'vitest';
 
 import { createStorage } from '@dxos/random-access-storage';
 

package/src/space/space-manager.ts

@@ -4,14 +4,14 @@
 
 import { type AutomergeUrl, parseAutomergeUrl } from '@automerge/automerge-repo';
 
-import { synchronized, trackLeaks, Trigger } from '@dxos/async';
-import { getCredentialAssertion, type DelegateInvitationCredential, type MemberInfo } from '@dxos/credentials';
+import { Trigger, synchronized, trackLeaks } from '@dxos/async';
+import { Context } from '@dxos/context';
+import { type DelegateInvitationCredential, type MemberInfo, getCredentialAssertion } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
 import { type FeedStore } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 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';
 import type { Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -19,13 +19,13 @@ import { type Teleport } from '@dxos/teleport';
 import { type BlobStore } from '@dxos/teleport-extension-object-sync';
 import { ComplexMap } from '@dxos/util';
 
+import { createIdFromSpaceKey } from '../common/space-id';
+import { type MetadataStore } from '../metadata';
 import { CredentialRetrieverExtension } from './admission-discovery-extension';
 import { Space } from './space';
 import { SpaceProtocol, type SwarmIdentity } from './space-protocol';
-import { createIdFromSpaceKey } from '../common/space-id';
-import { type MetadataStore } from '../metadata';
 
-export type SpaceManagerParams = {
+export type SpaceManagerProps = {
   feedStore: FeedStore<FeedMessage>;
   networkManager: SwarmNetworkManager;
   metadataStore: MetadataStore;
@@ -35,7 +35,7 @@ export type SpaceManagerParams = {
   disableP2pReplication?: boolean;
 };
 
-export type ConstructSpaceParams = {
+export type ConstructSpaceProps = {
   metadata: SpaceMetadata;
   swarmIdentity: SwarmIdentity;
   memberKey: PublicKey;
@@ -48,7 +48,7 @@ export type ConstructSpaceParams = {
   onMemberRolesChanged: (member: MemberInfo[]) => Promise<void>;
 };
 
-export type RequestSpaceAdmissionCredentialParams = {
+export type RequestSpaceAdmissionCredentialProps = {
   spaceKey: PublicKey;
   identityKey: PublicKey;
   swarmIdentity: SwarmIdentity;
@@ -65,10 +65,9 @@ export class SpaceManager {
   private readonly _networkManager: SwarmNetworkManager;
   private readonly _metadataStore: MetadataStore;
   private readonly _blobStore: BlobStore;
-  private readonly _instanceId = PublicKey.random().toHex();
   private readonly _disableP2pReplication: boolean;
 
-  constructor({ feedStore, networkManager, metadataStore, blobStore, disableP2pReplication }: SpaceManagerParams) {
+  constructor({ feedStore, networkManager, metadataStore, blobStore, disableP2pReplication }: SpaceManagerProps) {
     // TODO(burdon): Assert.
     this._feedStore = feedStore;
     this._networkManager = networkManager;
@@ -98,8 +97,7 @@ export class SpaceManager {
     onDelegatedInvitationStatusChange,
     onMemberRolesChanged,
     memberKey,
-  }: ConstructSpaceParams): Promise<Space> {
-    log.trace('dxos.echo.space-manager.construct-space', trace.begin({ id: this._instanceId }));
+  }: ConstructSpaceProps): Promise<Space> {
     log('constructing space...', { spaceKey: metadata.genesisFeedKey });
 
     // The genesis feed will be the same as the control feed if the space was created by the local agent.
@@ -130,13 +128,13 @@ export class SpaceManager {
     });
     this._spaces.set(space.key, space);
 
-    log.trace('dxos.echo.space-manager.construct-space', trace.end({ id: this._instanceId }));
     return space;
   }
 
-  public async requestSpaceAdmissionCredential(params: RequestSpaceAdmissionCredentialParams): Promise<Credential> {
-    const traceKey = 'dxos.echo.space-manager.request-space-admission';
-    log.trace(traceKey, trace.begin({ id: this._instanceId }));
+  public async requestSpaceAdmissionCredential(
+    ctx: Context,
+    params: RequestSpaceAdmissionCredentialProps,
+  ): Promise<Credential> {
     log('requesting space admission credential...', { spaceKey: params.spaceKey });
 
     const onCredentialResolved = new Trigger<Credential>();
@@ -159,15 +157,13 @@ export class SpaceManager {
     });
 
     try {
-      await protocol.start();
+      await protocol.start(ctx);
       const credential = await onCredentialResolved.wait({ timeout: params.timeout });
-      log.trace(traceKey, trace.end({ id: this._instanceId }));
       return credential;
     } catch (err: any) {
-      log.trace(traceKey, trace.error({ id: this._instanceId, error: err }));
       throw err;
     } finally {
-      await protocol.stop();
+      await protocol.stop(ctx);
     }
   }
 

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

@@ -2,14 +2,15 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
+import { Context } from '@dxos/context';
 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.
@@ -35,11 +36,11 @@ describe('space/space-protocol', () => {
     const presence2 = peer2.createPresence(gossip2);
     const protocol2 = peer2.createSpaceProtocol(topic, gossip2);
 
-    await protocol1.start();
-    await protocol2.start();
+    await protocol1.start(Context.default());
+    await protocol2.start(Context.default());
 
-    onTestFinished(() => protocol1.stop());
-    onTestFinished(() => protocol2.stop());
+    onTestFinished(() => protocol1.stop(Context.default()));
+    onTestFinished(() => protocol2.stop(Context.default()));
 
     await expect
       .poll(() => presence1.getPeersOnline().some(({ identityKey }) => identityKey.equals(peer2.identityKey)))
@@ -62,11 +63,11 @@ describe('space/space-protocol', () => {
     const peer2 = await builder.createPeer();
     const protocol2 = peer2.createSpaceProtocol(topic);
 
-    await protocol1.start();
-    await protocol2.start();
+    await protocol1.start(Context.default());
+    await protocol2.start(Context.default());
 
-    onTestFinished(() => protocol1.stop());
-    onTestFinished(() => protocol2.stop());
+    onTestFinished(() => protocol1.stop(Context.default()));
+    onTestFinished(() => protocol2.stop(Context.default()));
 
     const builder1 = new TestFeedBuilder();
     const feedStore1 = builder1.createFeedStore();
@@ -109,11 +110,11 @@ describe('space/space-protocol', () => {
     const peer2 = await builder.createPeer();
     const protocol2 = peer2.createSpaceProtocol(topic);
 
-    await protocol1.start();
-    await protocol2.start();
+    await protocol1.start(Context.default());
+    await protocol2.start(Context.default());
 
-    onTestFinished(() => protocol1.stop());
-    onTestFinished(() => protocol2.stop());
+    onTestFinished(() => protocol1.stop(Context.default()));
+    onTestFinished(() => protocol2.stop(Context.default()));
 
     const feedKey = await peer1.keyring.createKey();
 

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

@@ -2,8 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
+import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
 import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manager';
@@ -11,8 +12,8 @@ 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.
@@ -35,11 +36,11 @@ describe('space/space-protocol', () => {
     await presence2.open();
     const protocol2 = peer2.createSpaceProtocol(topic, gossip2);
 
-    await protocol1.start();
-    onTestFinished(() => protocol1.stop());
+    await protocol1.start(Context.default());
+    onTestFinished(() => protocol1.stop(Context.default()));
 
-    await protocol2.start();
-    onTestFinished(() => protocol2.stop());
+    await protocol2.start(Context.default());
+    onTestFinished(() => protocol2.stop(Context.default()));
 
     await expect
       .poll(() => presence1.getPeersOnline().some(({ identityKey }) => identityKey.equals(peer2.identityKey)), {
@@ -95,11 +96,11 @@ describe('space/space-protocol', () => {
       }),
     });
 
-    await protocol1.start();
-    onTestFinished(() => protocol1.stop());
+    await protocol1.start(Context.default());
+    onTestFinished(() => protocol1.stop(Context.default()));
 
-    await protocol2.start();
-    onTestFinished(() => protocol2.stop());
+    await protocol2.start(Context.default());
+    onTestFinished(() => protocol2.stop(Context.default()));
 
     await expect.poll(() => protocol1.sessions.get(peerId2)?.authStatus).toEqual(AuthStatus.FAILURE);
   });
@@ -118,11 +119,11 @@ describe('space/space-protocol', () => {
     const peer2 = await builder.createPeer();
     const protocol2 = peer2.createSpaceProtocol(topic);
 
-    await protocol1.start();
-    await protocol2.start();
+    await protocol1.start(Context.default());
+    await protocol2.start(Context.default());
 
-    onTestFinished(() => protocol1.stop());
-    onTestFinished(() => protocol2.stop());
+    onTestFinished(() => protocol1.stop(Context.default()));
+    onTestFinished(() => protocol2.stop(Context.default()));
 
     //
     // Create feeds.

package/src/space/space-protocol.ts

@@ -3,16 +3,17 @@
 //
 
 import { type Event } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { discoveryKey, subtleCrypto } from '@dxos/crypto';
 import { type FeedWrapper } from '@dxos/feed-store';
 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 +21,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 +119,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;
   }
@@ -136,7 +140,7 @@ export class SpaceProtocol {
   }
 
   // TODO(burdon): Rename open? Common open/close interfaces for all services?
-  async start(): Promise<void> {
+  async start(ctx: Context): Promise<void> {
     if (this._connection) {
       return;
     }
@@ -148,7 +152,7 @@ export class SpaceProtocol {
 
     log('starting...');
     const topic = await this._topic;
-    this._connection = await this._networkManager.joinSwarm({
+    this._connection = await this._networkManager.joinSwarm(ctx, {
       protocolProvider: this._createProtocolProvider(credentials),
       topic,
       topology: this._topology,
@@ -162,27 +166,27 @@ export class SpaceProtocol {
     this._topology.forceUpdate();
   }
 
-  async stop(): Promise<void> {
+  async stop(ctx: Context): Promise<void> {
     await this.blobSync.close();
 
     if (this._connection) {
       log('stopping...');
-      await this._connection.close();
+      await this._connection.close(ctx);
       log('stopped');
     }
   }
 
   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 +197,8 @@ export class SpaceProtocol {
   }
 }
 
-export type SpaceProtocolSessionParams = {
-  wireParams: WireProtocolParams;
+export type SpaceProtocolSessionProps = {
+  wireProps: WireProtocolProps;
   swarmIdentity: SwarmIdentity;
 
   blobSync: BlobSync;
@@ -222,7 +226,7 @@ export enum AuthStatus {
  */
 export class SpaceProtocolSession implements WireProtocol {
   @logInfo
-  private readonly _wireParams: WireProtocolParams;
+  private readonly _wireProps: WireProtocolProps;
 
   private readonly _disableP2pReplication: boolean;
 
@@ -249,20 +253,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';
@@ -49,7 +49,7 @@ describe('space/space', () => {
       const space = await agent.createSpace(agent.identityKey);
 
       await space.open(Context.default());
-      await space.startProtocol();
+      await space.startProtocol(Context.default());
       expect(space.isOpen).toBeTruthy();
       onTestFinished(async () => {
         await space.close();
@@ -71,7 +71,7 @@ describe('space/space', () => {
       const space = await agent.createSpace(agent.identityKey, space1.key, space1.genesisFeedKey, undefined, true);
 
       await space.open(Context.default());
-      await space.startProtocol();
+      await space.startProtocol(Context.default());
       expect(space.isOpen).toBeTruthy();
       onTestFinished(async () => {
         await space.close();