@dxos/client-services 0.1.23 → 0.1.24

package/src/packlets/devtools/network.ts

@@ -3,15 +3,15 @@
 //
 
 import { Stream } from '@dxos/codec-protobuf';
+import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
-import { CommandTrace } from '@dxos/messaging';
 import { NetworkManager } from '@dxos/network-manager';
 import {
   GetNetworkPeersRequest,
   GetNetworkPeersResponse,
   SubscribeToNetworkTopicsResponse,
   SubscribeToSignalStatusResponse,
-  SubscribeToSignalTraceResponse,
+  SignalResponse,
   SubscribeToSwarmInfoResponse
 } from '@dxos/protocols/proto/dxos/devtools/host';
 
@@ -30,14 +30,25 @@ export const subscribeToNetworkStatus = ({ networkManager }: { networkManager: N
     update();
   });
 
-export const subscribeToSignalTrace = ({ networkManager }: { networkManager: NetworkManager }) =>
-  new Stream<SubscribeToSignalTraceResponse>(({ next }) => {
-    next({ events: [] });
-    const trace: CommandTrace[] = [];
-    networkManager.signalManager.commandTrace.on((msg) => {
-      trace.push(msg);
-      next({ events: trace.map((msg) => JSON.stringify(msg)) });
+export const subscribeToSignal = ({ networkManager }: { networkManager: NetworkManager }) =>
+  new Stream<SignalResponse>(({ next }) => {
+    const ctx = new Context();
+    networkManager.signalManager.onMessage.on(ctx, (message) => {
+      next({
+        message: {
+          author: message.author.asUint8Array(),
+          recipient: message.recipient.asUint8Array(),
+          payload: message.payload
+        },
+        receivedAt: new Date()
+      });
     });
+    networkManager.signalManager.swarmEvent.on(ctx, (swarmEvent) => {
+      next({ swarmEvent: swarmEvent.swarmEvent, receivedAt: new Date() });
+    });
+    return () => {
+      return ctx.dispose();
+    };
   });
 
 export const subscribeToNetworkTopics = ({ networkManager }: { networkManager: NetworkManager }) =>

package/src/packlets/devtools/spaces.ts

@@ -9,8 +9,8 @@ import { SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
 
 import { ServiceContext } from '../services';
 
-export const subscribeToSpaces = (context: ServiceContext, { spaceKeys = [] }: SubscribeToSpacesRequest) =>
-  new Stream<SubscribeToSpacesResponse>(({ next }) => {
+export const subscribeToSpaces = (context: ServiceContext, { spaceKeys = [] }: SubscribeToSpacesRequest) => {
+  return new Stream<SubscribeToSpacesResponse>(({ next }) => {
     let unsubscribe: () => void;
 
     const update = async () => {
@@ -20,7 +20,7 @@ export const subscribeToSpaces = (context: ServiceContext, { spaceKeys = [] }: S
       );
 
       next({
-        spaces: filteredSpaces.map((space) => {
+        spaces: filteredSpaces.map((space): SubscribeToSpacesResponse.SpaceInfo => {
           const spaceMetadata = context.metadataStore.spaces.find((spaceMetadata: SpaceMetadata) =>
             spaceMetadata.key.equals(space.key)
           );
@@ -28,10 +28,10 @@ export const subscribeToSpaces = (context: ServiceContext, { spaceKeys = [] }: S
           return {
             key: space.key,
             isOpen: space.isOpen,
-            timeframe: spaceMetadata?.latestTimeframe,
+            timeframe: spaceMetadata?.dataTimeframe,
             genesisFeed: space.genesisFeedKey,
-            controlFeed: space.controlFeedKey,
-            dataFeed: space.dataFeedKey
+            controlFeed: space.controlFeedKey!, // TODO(dmaretskyi): Those keys may be missing.
+            dataFeed: space.dataFeedKey!
           };
         })
       });
@@ -50,3 +50,4 @@ export const subscribeToSpaces = (context: ServiceContext, { spaceKeys = [] }: S
       clearTimeout(timeout);
     };
   });
+};

package/src/packlets/identity/authenticator.ts

@@ -42,17 +42,15 @@ export type TrustedKeySetAuthVerifierParams = {
 export class TrustedKeySetAuthVerifier {
   private _ctx = new Context();
 
-  constructor(private readonly _params: TrustedKeySetAuthVerifierParams) {}
+  // prettier-ignore
+  constructor(
+    private readonly _params: TrustedKeySetAuthVerifierParams
+  ) {}
 
   async close() {
     await this._ctx.dispose();
   }
 
-  private _isTrustedKey(deviceKey: PublicKey) {
-    const deviceSet = this._params.trustedKeysProvider();
-    return deviceSet.has(deviceKey);
-  }
-
   get verifier(): AuthVerifier {
     return async (nonce, auth) => {
       const credential = schema.getCodecForType('dxos.halo.credentials.Credential').decode(auth);
@@ -78,6 +76,7 @@ export class TrustedKeySetAuthVerifier {
       this._ctx.onDispose(() => {
         trigger.wake(false);
       });
+
       const clear = this._params.update.on(this._ctx, () => {
         if (this._isTrustedKey(credential.issuer)) {
           log('auth success', { key: credential.issuer });
@@ -86,6 +85,7 @@ export class TrustedKeySetAuthVerifier {
           log('key is not currently in trusted set, waiting...', { key: credential.issuer });
         }
       });
+
       try {
         return await trigger.wait({ timeout: this._params.authTimeout });
       } catch {
@@ -95,4 +95,9 @@ export class TrustedKeySetAuthVerifier {
       }
     };
   }
+
+  private _isTrustedKey(deviceKey: PublicKey) {
+    const deviceSet = this._params.trustedKeysProvider();
+    return deviceSet.has(deviceKey);
+  }
 }

package/src/packlets/identity/identity-manager.test.ts

@@ -46,11 +46,12 @@ describe('identity/identity-manager', () => {
       feedStore,
       networkManager
     });
-    const identityManager = new IdentityManager(metadataStore, keyring, spaceManager);
+    const identityManager = new IdentityManager(metadataStore, keyring, feedStore, spaceManager);
 
     return {
       identityManager,
-      feedStore
+      feedStore,
+      keyring
     };
   };
 
@@ -90,23 +91,31 @@ describe('identity/identity-manager', () => {
 
     const peer2 = await setupPeer({ signalContext });
 
+    const deviceKey = await peer2.keyring.createKey();
+    const controlFeedKey = await peer2.keyring.createKey();
+    const dataFeedKey = await peer2.keyring.createKey();
+
+    await identity1.controlPipeline.writer.write({
+      credential: {
+        credential: await identity1.getIdentityCredentialSigner().createCredential({
+          subject: deviceKey,
+          assertion: {
+            '@type': 'dxos.halo.credentials.AuthorizedDevice',
+            identityKey: identity1.identityKey,
+            deviceKey
+          }
+        })
+      }
+    });
+
     // Identity2 is not yet ready at this point. Peer1 needs to admit peer2 device key and feed keys.
     const identity2 = await peer2.identityManager.acceptIdentity({
       identityKey: identity1.identityKey,
+      deviceKey,
       haloSpaceKey: identity1.haloSpaceKey,
-      haloGenesisFeedKey: identity1.haloGenesisFeedKey
-    });
-
-    await identity1.controlPipeline.writer.write({
-      '@type': 'dxos.echo.feed.CredentialsMessage',
-      credential: await identity1.getIdentityCredentialSigner().createCredential({
-        subject: identity2.deviceKey,
-        assertion: {
-          '@type': 'dxos.halo.credentials.AuthorizedDevice',
-          identityKey: identity2.identityKey,
-          deviceKey: identity2.deviceKey
-        }
-      })
+      haloGenesisFeedKey: identity1.haloGenesisFeedKey,
+      controlFeedKey,
+      dataFeedKey
     });
 
     // TODO(dmaretskyi): We'd also need to admit device2's feeds otherwise messages from them won't be processed by the pipeline.

package/src/packlets/identity/identity-manager.ts

@@ -7,9 +7,11 @@ import assert from 'node:assert';
 import { Event } from '@dxos/async';
 import { createCredentialSignerWithKey, CredentialGenerator } from '@dxos/credentials';
 import { MetadataStore, SpaceManager, SwarmIdentity } from '@dxos/echo-db';
+import { FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { AdmittedFeed, IdentityRecord, SpaceRecord } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { deferFunction } from '@dxos/util';
 
@@ -24,8 +26,11 @@ interface ConstructSpaceParams {
 
 export type JoinIdentityParams = {
   identityKey: PublicKey;
+  deviceKey: PublicKey;
   haloSpaceKey: PublicKey;
   haloGenesisFeedKey: PublicKey;
+  controlFeedKey: PublicKey;
+  dataFeedKey: PublicKey;
 };
 
 export type CreateIdentityOptions = {
@@ -43,6 +48,7 @@ export class IdentityManager {
   constructor(
     private readonly _metadataStore: MetadataStore,
     private readonly _keyring: Keyring,
+    private readonly _feedStore: FeedStore<FeedMessage>,
     private readonly _spaceManager: SpaceManager
   ) {}
 
@@ -113,8 +119,7 @@ export class IdentityManager {
 
       for (const credential of credentials) {
         await identity.controlPipeline.writer.write({
-          '@type': 'dxos.echo.feed.CredentialsMessage',
-          credential
+          credential: { credential }
         });
       }
     }
@@ -141,12 +146,12 @@ export class IdentityManager {
 
     const identityRecord: IdentityRecord = {
       identityKey: params.identityKey,
-      deviceKey: await this._keyring.createKey(),
+      deviceKey: params.deviceKey,
       haloSpace: {
         spaceKey: params.haloSpaceKey,
         genesisFeedKey: params.haloGenesisFeedKey,
-        writeControlFeedKey: await this._keyring.createKey(),
-        writeDataFeedKey: await this._keyring.createKey()
+        writeControlFeedKey: params.controlFeedKey,
+        writeDataFeedKey: params.dataFeedKey
       }
     };
     const identity = await this._constructIdentity(identityRecord);
@@ -154,7 +159,9 @@ export class IdentityManager {
     await identity.open();
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
+    await this._identity.ready();
     this.stateUpdate.emit();
+    log('accepted identity', { identityKey: identity.identityKey, deviceKey: identity.deviceKey });
     return identity;
   }
 
@@ -162,6 +169,12 @@ export class IdentityManager {
     assert(!this._identity);
     log('constructing identity', { identityRecord });
 
+    // Must be created before the space so the feeds are writable.
+    const controlFeed = await this._feedStore.openFeed(identityRecord.haloSpace.writeControlFeedKey, {
+      writable: true
+    });
+    const dataFeed = await this._feedStore.openFeed(identityRecord.haloSpace.writeDataFeedKey, { writable: true });
+
     const space = await this._constructSpace({
       spaceRecord: identityRecord.haloSpace,
       swarmIdentity: {
@@ -171,6 +184,9 @@ export class IdentityManager {
       },
       identityKey: identityRecord.identityKey
     });
+    space.setControlFeed(controlFeed);
+    space.setDataFeed(dataFeed);
+
     const identity: Identity = new Identity({
       space,
       signer: this._keyring,
@@ -186,9 +202,7 @@ export class IdentityManager {
     return this._spaceManager.constructSpace({
       metadata: {
         key: spaceRecord.spaceKey,
-        genesisFeedKey: spaceRecord.genesisFeedKey,
-        controlFeedKey: spaceRecord.writeControlFeedKey,
-        dataFeedKey: spaceRecord.writeDataFeedKey
+        genesisFeedKey: spaceRecord.genesisFeedKey
       },
       swarmIdentity,
       onNetworkConnection: () => {}

package/src/packlets/identity/identity.test.ts

@@ -60,10 +60,10 @@ describe('identity/identity', () => {
       spaceKey,
       protocol,
       genesisFeed: controlFeed,
-      controlFeed,
-      dataFeed,
       feedProvider: (feedKey) => feedStore.openFeed(feedKey)
-    });
+    })
+      .setControlFeed(controlFeed)
+      .setDataFeed(dataFeed);
 
     const identity = new Identity({
       signer: keyring,
@@ -88,8 +88,7 @@ describe('identity/identity', () => {
 
       for (const credential of credentials) {
         await identity.controlPipeline.writer.write({
-          '@type': 'dxos.echo.feed.CredentialsMessage',
-          credential
+          credential: { credential }
         });
       }
     }
@@ -166,10 +165,10 @@ describe('identity/identity', () => {
         spaceKey,
         protocol,
         genesisFeed: controlFeed,
-        controlFeed,
-        dataFeed,
         feedProvider: (feedKey) => feedStore.openFeed(feedKey)
-      });
+      })
+        .setControlFeed(controlFeed)
+        .setDataFeed(dataFeed);
 
       const identity = (identity1 = new Identity({
         signer: keyring,
@@ -194,8 +193,7 @@ describe('identity/identity', () => {
 
         for (const credential of credentials) {
           await identity.controlPipeline.writer.write({
-            '@type': 'dxos.echo.feed.CredentialsMessage',
-            credential
+            credential: { credential }
           });
         }
       }
@@ -246,10 +244,10 @@ describe('identity/identity', () => {
         spaceKey,
         protocol,
         genesisFeed: await feedStore.openFeed(genesisFeedKey),
-        controlFeed,
-        dataFeed,
         feedProvider: (feedKey) => feedStore.openFeed(feedKey)
-      });
+      })
+        .setControlFeed(controlFeed)
+        .setDataFeed(dataFeed);
 
       const identity = (identity2 = new Identity({
         signer: keyring,
@@ -268,15 +266,16 @@ describe('identity/identity', () => {
     {
       const signer = identity1.getIdentityCredentialSigner();
       void identity1.controlPipeline.writer.write({
-        '@type': 'dxos.echo.feed.CredentialsMessage',
-        credential: await signer.createCredential({
-          subject: identity2.deviceKey,
-          assertion: {
-            '@type': 'dxos.halo.credentials.AuthorizedDevice',
-            identityKey: identity1.identityKey,
-            deviceKey: identity2.deviceKey
-          }
-        })
+        credential: {
+          credential: await signer.createCredential({
+            subject: identity2.deviceKey,
+            assertion: {
+              '@type': 'dxos.halo.credentials.AuthorizedDevice',
+              identityKey: identity1.identityKey,
+              deviceKey: identity2.deviceKey
+            }
+          })
+        }
       });
 
       await identity2.ready();

package/src/packlets/identity/identity.ts

@@ -14,11 +14,12 @@ import {
   CredentialConsumer
 } from '@dxos/credentials';
 import { Signer } from '@dxos/crypto';
+import { failUndefined } from '@dxos/debug';
 import { Space } from '@dxos/echo-db';
 import { writeMessages } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { TypedMessage } from '@dxos/protocols';
+import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { AdmittedFeed, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { HaloAdmissionCredentials } from '@dxos/protocols/proto/dxos/halo/invitations';
 import { ComplexSet } from '@dxos/util';
@@ -101,7 +102,7 @@ export class Identity {
   async ready() {
     await this._deviceStateMachine.processor.deviceChainReady.wait();
 
-    // TODO(dmaretskyi): Should we also wait for our feeds to be admitted?
+    await this.controlPipeline.state.waitUntilReachedTargetTimeframe({ timeout: 3_000 });
   }
 
   get profileDocument(): ProfileDocument | undefined {
@@ -123,11 +124,15 @@ export class Identity {
     return this.space.genesisFeedKey;
   }
 
+  get deviceCredentialChain() {
+    return this._deviceStateMachine.processor.deviceCredentialChain;
+  }
+
   getAdmissionCredentials(): HaloAdmissionCredentials {
     return {
       deviceKey: this.deviceKey,
-      controlFeedKey: this.space.controlFeedKey,
-      dataFeedKey: this.space.dataFeedKey
+      controlFeedKey: this.space.controlFeedKey ?? failUndefined(),
+      dataFeedKey: this.space.dataFeedKey ?? failUndefined()
     };
   }
 
@@ -191,7 +196,7 @@ export class Identity {
             designation: AdmittedFeed.Designation.DATA
           }
         })
-      ].map((credential): TypedMessage => ({ '@type': 'dxos.echo.feed.CredentialsMessage', credential }))
+      ].map((credential): FeedMessage.Payload => ({ credential: { credential } }))
     );
   }
 }

package/src/packlets/invitations/halo-invitations-handler.test.ts

@@ -3,16 +3,13 @@
 //
 
 import { expect } from 'chai';
-import assert from 'node:assert';
 
-import { asyncChain, Trigger } from '@dxos/async';
-import { raise } from '@dxos/debug';
-import { PublicKey } from '@dxos/keys';
-import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import { asyncChain } from '@dxos/async';
 import { describe, test, afterTest } from '@dxos/test';
 
 import { ServiceContext } from '../services';
 import { createPeers, createServiceContext } from '../testing';
+import { performInvitation } from '../testing/invitation-utils';
 
 const closeAfterTest = async (peer: ServiceContext) => {
   afterTest(() => peer.close());
@@ -35,45 +32,7 @@ describe('services/halo', () => {
     const identity1 = await host.createIdentity();
     expect(host.identityManager.identity).to.eq(identity1);
 
-    const observable1 = await host.haloInvitations.createInvitation();
-
-    const complete1 = new Trigger<PublicKey>();
-    const complete2 = new Trigger<PublicKey>();
-
-    const authenticationCode = new Trigger<string>();
-
-    observable1.subscribe({
-      onConnecting: async (invitation1: Invitation) => {
-        const observable2 = guest.haloInvitations!.acceptInvitation(invitation1);
-        observable2.subscribe({
-          onConnecting: async () => {},
-          onConnected: async (invitation2: Invitation) => {
-            expect(invitation1.swarmKey).to.eq(invitation2.swarmKey);
-          },
-          onAuthenticating: async () => {
-            await observable2.authenticate(await authenticationCode.wait());
-          },
-          onSuccess: (invitation: Invitation) => {
-            complete2.wake(invitation.identityKey!);
-          },
-          onCancelled: () => raise(new Error()),
-          onTimeout: (err: Error) => raise(new Error(err.message)),
-          onError: (err: Error) => raise(new Error(err.message))
-        });
-      },
-      onConnected: (invitation: Invitation) => {
-        assert(invitation.authenticationCode);
-        authenticationCode.wake(invitation.authenticationCode);
-      },
-      onSuccess: (invitation: Invitation) => {
-        complete1.wake(host.identityManager.identity!.identityKey);
-      },
-      onCancelled: () => raise(new Error()),
-      onTimeout: (err: Error) => raise(new Error(err.message)),
-      onError: (err: Error) => raise(new Error(err.message))
-    });
-
-    const [identityKey1, identityKey2] = await Promise.all([complete1.wait(), complete2.wait()]);
-    expect(identityKey1).to.deep.eq(identityKey2);
+    await performInvitation(host.haloInvitations, guest.haloInvitations, undefined);
+    expect(guest.identityManager.identity?.identityKey).to.deep.eq(identity1.identityKey);
   });
 });

package/src/packlets/invitations/halo-invitations-handler.ts

@@ -7,7 +7,7 @@ import assert from 'node:assert';
 import { scheduleTask, sleep, Trigger } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { generatePasscode } from '@dxos/credentials';
-import { failUndefined } from '@dxos/debug';
+import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { createTeleportProtocolFactory, NetworkManager, StarTopology } from '@dxos/network-manager';
@@ -22,7 +22,7 @@ import {
 } from '@dxos/protocols/proto/dxos/halo/invitations';
 import { ExtensionContext, RpcExtension } from '@dxos/teleport';
 
-import { IdentityManager } from '../identity';
+import { Identity, JoinIdentityParams } from '../identity';
 import {
   AuthenticatingInvitationProvider,
   AUTHENTICATION_CODE_LENGTH,
@@ -33,6 +33,14 @@ import {
 } from './invitations';
 import { AbstractInvitationsHandler, InvitationsOptions } from './invitations-handler';
 
+type HaloInvitationsHandlerParams = {
+  networkManager: NetworkManager;
+  keyring: Keyring;
+
+  getIdentity: () => Identity;
+  acceptIdentity: (identity: JoinIdentityParams) => Promise<Identity>;
+};
+
 /**
  * Handles the life-cycle of Halo invitations between peers.
  */
@@ -40,10 +48,9 @@ import { AbstractInvitationsHandler, InvitationsOptions } from './invitations-ha
 export class HaloInvitationsHandler extends AbstractInvitationsHandler {
   // prettier-ignore
   constructor(
-    networkManager: NetworkManager,
-    private readonly _identityManager: IdentityManager
+    private readonly _params: HaloInvitationsHandlerParams
   ) {
-    super(networkManager);
+    super(_params.networkManager);
   }
 
   /**
@@ -52,7 +59,7 @@ export class HaloInvitationsHandler extends AbstractInvitationsHandler {
   createInvitation(context: void, options?: InvitationsOptions): CancellableInvitationObservable {
     const { type, timeout = INVITATION_TIMEOUT, swarmKey } = options ?? {};
     assert(type !== Invitation.Type.OFFLINE);
-    const identity = this._identityManager.identity ?? failUndefined();
+    const identity = this._params.getIdentity();
 
     // TODO(dmaretskyi): Add invitation kind: halo/space.
     const invitation: Invitation = {
@@ -78,8 +85,8 @@ export class HaloInvitationsHandler extends AbstractInvitationsHandler {
     const complete = new Trigger<PublicKey>();
 
     // Called for every connecting peer.
-    const createExtension = (): HostHaloInvitationExtension => {
-      const hostInvitationExtension = new HostHaloInvitationExtension({
+    const createExtension = () =>
+      new HostHaloInvitationExtension({
         requestAdmission: async () => {
           log('responding with admission offer', {
             host: identity.deviceKey
@@ -145,8 +152,6 @@ export class HaloInvitationsHandler extends AbstractInvitationsHandler {
           });
         }
       });
-      return hostInvitationExtension;
-    };
 
     scheduleTask(ctx, async () => {
       const topic = invitation.swarmKey!;
@@ -224,18 +229,29 @@ export class HaloInvitationsHandler extends AbstractInvitationsHandler {
                 await extension.rpc.HaloHostService.authenticate({ authenticationCode });
               }
 
-              // 3. Create local identity.
+              const deviceKey = await this._params.keyring.createKey();
+              const controlFeedKey = await this._params.keyring.createKey();
+              const dataFeedKey = await this._params.keyring.createKey();
+
+              // 3. Send admission credentials to host (with local identity keys).
+              log('presenting admission credentials', { identityKey, deviceKey, controlFeedKey, dataFeedKey });
+              await extension.rpc.HaloHostService.presentAdmissionCredentials({
+                deviceKey,
+                controlFeedKey,
+                dataFeedKey
+              });
+
+              // 4. Create local identity.
               // TODO(burdon): Abandon if does not complete (otherwise retry will fail).
-              const identity = await this._identityManager.acceptIdentity({
+              const identity = await this._params.acceptIdentity({
                 identityKey,
+                deviceKey,
                 haloSpaceKey,
-                haloGenesisFeedKey: genesisFeedKey
+                haloGenesisFeedKey: genesisFeedKey,
+                controlFeedKey,
+                dataFeedKey
               });
 
-              // 4. Send admission credentials to host (with local identity keys).
-              log('presenting admission credentials', { guest: identity.deviceKey, identityKey });
-              await extension.rpc.HaloHostService.presentAdmissionCredentials(identity.getAdmissionCredentials());
-
               // 5. Success.
               log('admitted by host', { guest: identity.deviceKey, identityKey });
               complete.wake(identityKey);

package/src/packlets/invitations/invitations.ts

@@ -18,7 +18,7 @@ export const AUTHENTICATION_CODE_LENGTH = 6;
 export const INVITATION_TIMEOUT = 3 * 60_000; // 3 mins.
 
 // TODO(burdon): Don't close until RPC has complete (bug).
-export const ON_CLOSE_DELAY = 500;
+export const ON_CLOSE_DELAY = 1000;
 
 export interface InvitationsService {
   createInvitation(invitation: Invitation): Stream<Invitation>;
@@ -46,6 +46,7 @@ export interface CancellableInvitationObservable extends CancellableObservable<I
   get invitation(): Invitation | undefined;
 }
 
+// TODO(wittjosiah): Update with Observable.value.
 export class InvitationObservableProvider
   extends CancellableObservableProvider<InvitationEvents>
   implements CancellableInvitationObservable