@dxos/client-services 0.1.5 → 0.1.6

package/src/packlets/services/service-context.ts

@@ -22,7 +22,7 @@ import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { Storage } from '@dxos/random-access-storage';
 
 import { IdentityManager } from '../identity';
-import { HaloInvitations, SpaceInvitationsHandler } from '../invitations';
+import { HaloInvitationsHandler, SpaceInvitationsHandler } from '../invitations';
 
 /**
  * Shared backend for all client services.
@@ -35,7 +35,7 @@ export class ServiceContext {
   public readonly feedStore: FeedStore<FeedMessage>;
   public readonly keyring: Keyring;
   public readonly identityManager: IdentityManager;
-  public readonly haloInvitations: HaloInvitations;
+  public readonly haloInvitations: HaloInvitationsHandler;
 
   // Initialized after identity is initialized.
   public spaceManager?: SpaceManager;
@@ -69,9 +69,8 @@ export class ServiceContext {
     );
 
     // TODO(burdon): _initialize called in multiple places.
-    this.haloInvitations = new HaloInvitations(this.identityManager, this.networkManager, async () => {
-      await this._initialize();
-    });
+    // TODO(burdon): Call _initialize on success.
+    this.haloInvitations = new HaloInvitationsHandler(this.networkManager, this.identityManager);
   }
 
   async open() {
@@ -100,6 +99,7 @@ export class ServiceContext {
     return identity;
   }
 
+  // Called when identity is created.
   private async _initialize() {
     const identity = this.identityManager.identity ?? failUndefined();
     const signingContext: SigningContext = {
@@ -123,7 +123,7 @@ export class ServiceContext {
 
     await spaceManager.open();
     this.spaceManager = spaceManager;
-    this.spaceInvitations = new SpaceInvitationsHandler(this.spaceManager, this.networkManager, signingContext);
+    this.spaceInvitations = new SpaceInvitationsHandler(this.networkManager, this.spaceManager, signingContext);
     this.initialized.wake();
   }
 }

package/src/packlets/services/service-definitions.ts

@@ -4,7 +4,12 @@
 
 import { schema } from '@dxos/protocols';
 import { ProfileService, SystemService, SpaceService } from '@dxos/protocols/proto/dxos/client';
-import { SpacesService, InvitationsService, DevicesService } from '@dxos/protocols/proto/dxos/client/services';
+import {
+  HaloInvitationsService,
+  SpaceInvitationsService,
+  SpacesService,
+  DevicesService
+} from '@dxos/protocols/proto/dxos/client/services';
 import { DevtoolsHost, TracingService } from '@dxos/protocols/proto/dxos/devtools/host';
 import { DataService } from '@dxos/protocols/proto/dxos/echo/service';
 import { createServiceBundle, ServiceBundle } from '@dxos/rpc';
@@ -14,16 +19,19 @@ import { createServiceBundle, ServiceBundle } from '@dxos/rpc';
 //
 
 export type ClientServices = {
+  HaloInvitationsService: HaloInvitationsService;
+  DevicesService: DevicesService;
+
+  SpaceInvitationsService: SpaceInvitationsService;
+  SpacesService: SpacesService;
+
+  // TODO(burdon): Deprecated.
   SpaceService: SpaceService;
   DataService: DataService;
   ProfileService: ProfileService;
   SystemService: SystemService;
   DevtoolsHost: DevtoolsHost;
   TracingService: TracingService;
-
-  SpacesService: SpacesService;
-  SpaceInvitationsService: InvitationsService;
-  DevicesService: DevicesService;
 };
 
 /**
@@ -41,14 +49,16 @@ export interface ClientServicesProvider {
  * Services supported by host.
  */
 export const clientServiceBundle = createServiceBundle<ClientServices>({
+  HaloInvitationsService: schema.getService('dxos.client.services.HaloInvitationsService'),
+  DevicesService: schema.getService('dxos.client.services.DevicesService'),
+  SpaceInvitationsService: schema.getService('dxos.client.services.SpaceInvitationsService'),
+  SpacesService: schema.getService('dxos.client.services.SpacesService'),
+
+  // TODO(burdon): Deprecated.
   SpaceService: schema.getService('dxos.client.SpaceService'),
   DataService: schema.getService('dxos.echo.service.DataService'),
   ProfileService: schema.getService('dxos.client.ProfileService'),
   SystemService: schema.getService('dxos.client.SystemService'),
   DevtoolsHost: schema.getService('dxos.devtools.host.DevtoolsHost'),
-  TracingService: schema.getService('dxos.devtools.host.TracingService'),
-
-  SpacesService: schema.getService('dxos.client.services.SpacesService'),
-  SpaceInvitationsService: schema.getService('dxos.client.services.InvitationsService'),
-  DevicesService: schema.getService('dxos.client.services.DevicesService')
+  TracingService: schema.getService('dxos.devtools.host.TracingService')
 });

package/src/packlets/services/service-host.ts

@@ -14,7 +14,7 @@ import { TextModel } from '@dxos/text-model';
 import { SpaceServiceImpl, ProfileServiceImpl, SystemServiceImpl, TracingServiceImpl } from '../deprecated';
 import { DevtoolsServiceImpl, DevtoolsHostEvents } from '../devtools';
 import { DevicesServiceImpl } from '../identity/devices-service-impl';
-import { SpaceInvitationsServiceImpl } from '../invitations';
+import { HaloInvitationsServiceImpl, SpaceInvitationsServiceImpl } from '../invitations';
 import { SpacesServiceImpl } from '../spaces';
 import { createStorageObjects } from '../storage';
 import { ServiceContext } from './service-context';
@@ -55,25 +55,33 @@ export class ClientServicesHost implements ClientServicesProvider {
 
     // TODO(burdon): Start to think of DMG (dynamic services).
     this._serviceRegistry = new ServiceRegistry<ClientServices>(clientServiceBundle, {
-      SpacesService: new SpacesServiceImpl(),
+      HaloInvitationsService: new HaloInvitationsServiceImpl(
+        this._serviceContext.identityManager,
+        this._serviceContext.haloInvitations
+      ),
+
+      DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
+
       SpaceInvitationsService: new SpaceInvitationsServiceImpl(
         this._serviceContext.identityManager,
-        () => this._serviceContext.spaceManager ?? raise(new Error('SpaceManager not initialized')),
-        () => this._serviceContext.spaceInvitations ?? raise(new Error('SpaceInvitations not initialized'))
+        () => this._serviceContext.spaceInvitations ?? raise(new Error('SpaceInvitations not initialized')),
+        () => this._serviceContext.spaceManager ?? raise(new Error('SpaceManager not initialized'))
       ),
 
-      SpaceService: new SpaceServiceImpl(this._serviceContext),
+      SpacesService: new SpacesServiceImpl(),
+
       DataService: new DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
 
+      // TODO(burdon): Move to new protobuf definitions.
       ProfileService: new ProfileServiceImpl(this._serviceContext),
+      SpaceService: new SpaceServiceImpl(this._serviceContext),
       SystemService: new SystemServiceImpl(config),
       TracingService: new TracingServiceImpl(config),
       DevtoolsHost: new DevtoolsServiceImpl({
         events: new DevtoolsHostEvents(),
         config,
         context: this._serviceContext
-      }),
-      DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager)
+      })
     });
   }
 

package/src/packlets/services/service-proxy.ts

@@ -22,7 +22,7 @@ export class ClientServicesProxy implements ClientServicesProvider {
     port: RpcPort,
     // NOTE: With lower timeout the shared worker does not have enough time to start.
     // TODO(dmaretskyi): Find better ways to detected when the worker has finished loading. It might take a while on slow connections.
-    private readonly _timeout = 1000
+    private readonly _timeout = 3000
   ) {
     this._proxy = createProtoRpcPeer({
       requested: clientServiceBundle,

package/src/packlets/services/service-registry.test.ts

@@ -7,7 +7,7 @@ import assert from 'assert';
 import { Trigger } from '@dxos/async';
 import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols';
-import { Invitation, InvitationsService } from '@dxos/protocols/proto/dxos/client/services';
+import { Invitation, SpaceInvitationsService } from '@dxos/protocols/proto/dxos/client/services';
 import { createLinkedPorts, createProtoRpcPeer, createServiceBundle } from '@dxos/rpc';
 
 import { SpaceInvitationsProxy, SpaceInvitationsServiceImpl } from '../invitations';
@@ -17,11 +17,11 @@ import { ServiceRegistry } from './service-registry';
 // TODO(burdon): Create TestService (that doesn't require peers).
 
 type TestServices = {
-  SpaceInvitationsService: InvitationsService;
+  SpaceInvitationsService: SpaceInvitationsService;
 };
 
 const serviceBundle = createServiceBundle<TestServices>({
-  SpaceInvitationsService: schema.getService('dxos.client.services.InvitationsService')
+  SpaceInvitationsService: schema.getService('dxos.client.services.SpaceInvitationsService')
 });
 
 describe('service registry', function () {
@@ -37,8 +37,8 @@ describe('service registry', function () {
     const serviceRegistry = new ServiceRegistry(serviceBundle, {
       SpaceInvitationsService: new SpaceInvitationsServiceImpl(
         serviceContext.identityManager,
-        () => serviceContext.spaceManager!,
-        () => serviceContext.spaceInvitations!
+        () => serviceContext.spaceInvitations!,
+        () => serviceContext.spaceManager!
       )
     });
 

package/src/packlets/vault/iframe-runtime.ts

@@ -5,12 +5,14 @@
 import { WebRTCTransportService } from '@dxos/network-manager';
 import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
-import { PortMuxer } from '@dxos/rpc-tunnel';
 
 import { iframeServiceBundle, WorkerServiceBundle, workerServiceBundle } from './services';
 
+// NOTE: Keep as RpcPorts to avoid dependency on @dxos/rpc-tunnel so we don't depend on browser-specific apis.
 export type IframeRuntimeParams = {
-  portMuxer: PortMuxer;
+  systemPort: RpcPort;
+  workerAppPort: RpcPort;
+  windowAppPort: RpcPort;
 };
 
 /**
@@ -23,13 +25,10 @@ export class IFrameRuntime {
   private readonly _systemRpc: ProtoRpcPeer<WorkerServiceBundle>;
   private readonly _transportService = new WebRTCTransportService();
 
-  constructor({ portMuxer }: IframeRuntimeParams) {
-    this._systemPort = portMuxer.createWorkerPort({ channel: 'dxos:system' });
-    this._workerAppPort = portMuxer.createWorkerPort({ channel: 'dxos:app' });
-    this._windowAppPort = portMuxer.createIFramePort({
-      channel: 'dxos:app',
-      onOrigin: (origin) => this.open(origin)
-    });
+  constructor({ systemPort, workerAppPort, windowAppPort }: IframeRuntimeParams) {
+    this._systemPort = systemPort;
+    this._windowAppPort = windowAppPort;
+    this._workerAppPort = workerAppPort;
 
     this._systemRpc = createProtoRpcPeer({
       requested: workerServiceBundle,
@@ -45,15 +44,9 @@ export class IFrameRuntime {
       port: this._systemPort,
       timeout: 200
     });
-  }
 
-  start() {
     this._workerAppPort.subscribe((msg) => this._windowAppPort.send(msg));
     this._windowAppPort.subscribe((msg) => this._workerAppPort.send(msg));
-
-    window.addEventListener('beforeunload', () => {
-      this.close().catch((err) => console.error(err));
-    });
   }
 
   async open(origin: string) {

package/src/packlets/vault/worker-runtime.ts

@@ -2,20 +2,20 @@
 // Copyright 2022 DXOS.org
 //
 
-import assert from 'node:assert';
-
 import { Trigger } from '@dxos/async';
 import { Config } from '@dxos/config';
-import { WebsocketSignalManager } from '@dxos/messaging';
+import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from '@dxos/messaging';
 import { NetworkManager, WebRTCTransportProxyFactory } from '@dxos/network-manager';
-import { PortMuxer } from '@dxos/rpc-tunnel';
+import { RpcPort } from '@dxos/rpc';
 import { MaybePromise } from '@dxos/util';
 
 import { ClientServicesHost } from '../services';
 import { WorkerSession } from './worker-session';
 
+// NOTE: Keep as RpcPorts to avoid dependency on @dxos/rpc-tunnel so we don't depend on browser-specific apis.
 export type CreateSessionParams = {
-  portMuxer: PortMuxer;
+  appPort: RpcPort;
+  systemPort: RpcPort;
 };
 
 /**
@@ -25,7 +25,7 @@ export type CreateSessionParams = {
  */
 export class WorkerRuntime {
   private readonly _transportFactory = new WebRTCTransportProxyFactory();
-  private readonly _ready = new Trigger();
+  private readonly _ready = new Trigger<Error | undefined>();
   private readonly sessions = new Set<WorkerSession>();
   private _sessionForNetworking?: WorkerSession;
   private _clientServices!: ClientServicesHost;
@@ -34,24 +34,28 @@ export class WorkerRuntime {
   // prettier-ignore
   constructor(
     private readonly _configProvider: () => MaybePromise<Config>
-  ) {}
+  ) { }
 
   async start() {
-    this._config = await this._configProvider();
-    const signalServer = this._config.get('runtime.services.signal.server');
-    // TODO(wittjosiah): Networking shouldn't be required.
-    assert(signalServer);
-    this._clientServices = new ClientServicesHost({
-      config: this._config,
-      networkManager: new NetworkManager({
-        log: true,
-        signalManager: new WebsocketSignalManager([signalServer]),
-        transportFactory: this._transportFactory
-      })
-    });
-
-    await this._clientServices.open();
-    this._ready.wake();
+    try {
+      this._config = await this._configProvider();
+      const signalServer = this._config.get('runtime.services.signal.server');
+      this._clientServices = new ClientServicesHost({
+        config: this._config,
+        networkManager: new NetworkManager({
+          log: true,
+          signalManager: signalServer
+            ? new WebsocketSignalManager([signalServer])
+            : new MemorySignalManager(new MemorySignalManagerContext()), // TODO(dmaretskyi): Inject this context.
+          transportFactory: this._transportFactory
+        })
+      });
+
+      await this._clientServices.open();
+      this._ready.wake(undefined);
+    } catch (err: any) {
+      this._ready.wake(err);
+    }
   }
 
   async stop() {
@@ -62,16 +66,18 @@ export class WorkerRuntime {
   /**
    * Create a new session.
    */
-  async createSession({ portMuxer }: CreateSessionParams) {
-    const appPort = portMuxer.createWorkerPort({ channel: 'dxos:app' });
-    const systemPort = portMuxer.createWorkerPort({ channel: 'dxos:system' });
-
-    await this._ready.wait();
-
+  async createSession({ appPort, systemPort }: CreateSessionParams) {
     const session = new WorkerSession({
-      clientServices: this._clientServices,
+      getServices: async () => {
+        const error = await this._ready.wait();
+        if (error !== undefined) {
+          throw error;
+        }
+        return this._clientServices;
+      },
       appPort,
-      systemPort
+      systemPort,
+      readySignal: this._ready
     });
 
     // When tab is closed.

package/src/packlets/vault/worker-session.ts

@@ -8,13 +8,14 @@ import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
 import { Callback } from '@dxos/util';
 
-import { ClientServicesHost } from '../services';
+import { clientServiceBundle, ClientServicesHost } from '../services';
 import { IframeServiceBundle, iframeServiceBundle, workerServiceBundle } from './services';
 
 export type WorkerSessionParams = {
-  clientServices: ClientServicesHost;
+  getServices: () => Promise<ClientServicesHost>;
   systemPort: RpcPort;
   appPort: RpcPort;
+  readySignal: Trigger<Error | undefined>;
   options?: {
     heartbeatInterval: number;
   };
@@ -27,6 +28,7 @@ export class WorkerSession {
   private readonly _clientRpc: ProtoRpcPeer<{}>;
   private readonly _systemRpc: ProtoRpcPeer<IframeServiceBundle>;
   private readonly _startTrigger = new Trigger();
+  private readonly _getServices: () => Promise<ClientServicesHost>;
   private readonly _options: NonNullable<WorkerSessionParams['options']>;
   private _heartbeatTimer?: NodeJS.Timeout;
 
@@ -36,7 +38,7 @@ export class WorkerSession {
   public bridgeService?: BridgeService;
 
   constructor({
-    clientServices,
+    getServices,
     systemPort,
     appPort,
     options = {
@@ -44,10 +46,22 @@ export class WorkerSession {
     }
   }: WorkerSessionParams) {
     this._options = options;
+    this._getServices = getServices;
 
     this._clientRpc = createProtoRpcPeer({
-      exposed: clientServices.descriptors,
-      handlers: clientServices.services,
+      exposed: clientServiceBundle,
+      handlers: {
+        HaloInvitationsService: async () => (await this._getServices()).services.HaloInvitationsService,
+        DevicesService: async () => (await this._getServices()).services.DevicesService,
+        SpaceInvitationsService: async () => (await this._getServices()).services.SpaceInvitationsService,
+        SpacesService: async () => (await this._getServices()).services.SpacesService,
+        SpaceService: async () => (await this._getServices()).services.SpaceService,
+        DataService: async () => (await this._getServices()).services.DataService,
+        ProfileService: async () => (await this._getServices()).services.ProfileService,
+        SystemService: async () => (await this._getServices()).services.SystemService,
+        DevtoolsHost: async () => (await this._getServices()).services.DevtoolsHost,
+        TracingService: async () => (await this._getServices()).services.TracingService
+      },
       port: appPort
     });
 
@@ -82,7 +96,7 @@ export class WorkerSession {
   async open() {
     await Promise.all([this._clientRpc.open(), this._systemRpc.open()]);
 
-    await this._startTrigger.wait(); // TODO(dmaretskyi): Timeout.
+    await this._startTrigger.wait({ timeout: 3_000 });
 
     this._heartbeatTimer = setInterval(async () => {
       try {

package/dist/src/packlets/invitations/halo-invitations.d.ts

@@ -1,23 +0,0 @@
-import { NetworkManager } from '@dxos/network-manager';
-import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { Identity, IdentityManager } from '../identity';
-/**
- * Creates and processes Halo invitations between devices.
- */
-export declare class HaloInvitations {
-    private readonly _identityManager;
-    private readonly _networkManager;
-    private readonly _onInitialize;
-    constructor(_identityManager: IdentityManager, _networkManager: NetworkManager, _onInitialize: () => Promise<void>);
-    /**
-     * Sends a HALO admission offer and waits for guest to accept.
-     */
-    createInvitation({ onFinish }?: {
-        onFinish?: () => void;
-    }): Promise<Invitation>;
-    /**
-     * Joins an existing identity HALO by invitation.
-     */
-    acceptInvitation(invitation: Invitation): Promise<Identity>;
-}
-//# sourceMappingURL=halo-invitations.d.ts.map

package/dist/src/packlets/invitations/halo-invitations.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"halo-invitations.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/halo-invitations.ts"],"names":[],"mappings":"AAUA,OAAO,EAAyB,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAG5F,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAGxE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAExD;;GAEG;AACH,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,gBAAgB,EAAE,eAAe,EACjC,eAAe,EAAE,cAAc,EAC/B,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAGrD;;OAEG;IACG,gBAAgB,CAAC,EAAE,QAAQ,EAAE,GAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;KAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAoEzF;;OAEG;IACG,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC;CA6DlE"}

package/dist/src/packlets/invitations/halo-invitations.js

@@ -1,154 +0,0 @@
-"use strict";
-//
-// Copyright 2022 DXOS.org
-//
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HaloInvitations = void 0;
-const assert_1 = __importDefault(require("assert"));
-const async_1 = require("@dxos/async");
-const debug_1 = require("@dxos/debug");
-const keys_1 = require("@dxos/keys");
-const log_1 = require("@dxos/log");
-const network_manager_1 = require("@dxos/network-manager");
-const protocol_plugin_rpc_1 = require("@dxos/protocol-plugin-rpc");
-const protocols_1 = require("@dxos/protocols");
-const services_1 = require("@dxos/protocols/proto/dxos/client/services");
-const rpc_1 = require("@dxos/rpc");
-/**
- * Creates and processes Halo invitations between devices.
- */
-class HaloInvitations {
-    constructor(_identityManager, _networkManager, _onInitialize // TODO(burdon): ???
-    ) {
-        this._identityManager = _identityManager;
-        this._networkManager = _networkManager;
-        this._onInitialize = _onInitialize;
-    }
-    /**
-     * Sends a HALO admission offer and waits for guest to accept.
-     */
-    async createInvitation({ onFinish } = {}) {
-        var _a;
-        const identity = (_a = this._identityManager.identity) !== null && _a !== void 0 ? _a : (0, debug_1.failUndefined)();
-        const plugin = (0, protocol_plugin_rpc_1.createRpcPlugin)(async (port) => {
-            const peer = (0, rpc_1.createProtoRpcPeer)({
-                requested: {
-                    HaloGuestService: protocols_1.schema.getService('dxos.halo.invitations.HaloGuestService')
-                },
-                exposed: {
-                    HaloHostService: protocols_1.schema.getService('dxos.halo.invitations.HaloHostService')
-                },
-                handlers: {
-                    HaloHostService: {
-                        presentAdmissionCredentials: async ({ deviceKey, controlFeedKey, dataFeedKey }) => {
-                            (0, log_1.log)('processing admission request', { identityKey: identity.identityKey, deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations.ts", line: 46 });
-                            // TODO(burdon): Use CredentialGenerator.
-                            const signer = identity.getIdentityCredentialSigner();
-                            await identity.controlPipeline.writer.write({
-                                '@type': 'dxos.echo.feed.CredentialsMessage',
-                                credential: await signer.createCredential({
-                                    subject: deviceKey,
-                                    assertion: {
-                                        '@type': 'dxos.halo.credentials.AuthorizedDevice',
-                                        identityKey: identity.identityKey,
-                                        deviceKey
-                                    }
-                                })
-                            });
-                            // TODO(dmaretskyi): Admit guest's feeds otherwise messages from them won't be processed by the pipeline.
-                        }
-                    }
-                },
-                port
-            });
-            await peer.open();
-            {
-                (0, log_1.log)('sending admission offer', { identityKey: identity.identityKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations.ts", line: 71 });
-                await peer.rpc.HaloGuestService.presentAdmissionOffer({
-                    identityKey: identity.identityKey,
-                    haloSpaceKey: identity.haloSpaceKey,
-                    genesisFeedKey: identity.haloGenesisFeedKey
-                });
-                onFinish === null || onFinish === void 0 ? void 0 : onFinish();
-            }
-            await peer.close();
-            await connection.close();
-        });
-        const topic = keys_1.PublicKey.random();
-        const peerId = keys_1.PublicKey.random(); // TODO(burdon): Fails if using the actual peer key.
-        const connection = await this._networkManager.openSwarmConnection({
-            topic,
-            peerId: topic,
-            // peerId,
-            protocol: (0, network_manager_1.createProtocolFactory)(topic, peerId, [plugin]),
-            topology: new network_manager_1.StarTopology(topic)
-        });
-        return {
-            type: services_1.Invitation.Type.INTERACTIVE,
-            swarmKey: topic
-        };
-    }
-    /**
-     * Joins an existing identity HALO by invitation.
-     */
-    async acceptInvitation(invitation) {
-        const admitted = new async_1.Trigger(); // TODO(burdon): Must not share across multiple connections.
-        const plugin = (0, protocol_plugin_rpc_1.createRpcPlugin)(async (port) => {
-            const peer = (0, rpc_1.createProtoRpcPeer)({
-                requested: {
-                    // TODO(burdon): Rename in-bound.
-                    HaloHostService: protocols_1.schema.getService('dxos.halo.invitations.HaloHostService')
-                },
-                exposed: {
-                    // TODO(burdon): Rename out-bound?
-                    HaloGuestService: protocols_1.schema.getService('dxos.halo.invitations.HaloGuestService')
-                },
-                handlers: {
-                    // TODO(burdon): Factory to create handlers and open/close handlers.
-                    HaloGuestService: {
-                        presentAdmissionOffer: async ({ identityKey, haloSpaceKey, genesisFeedKey }) => {
-                            (0, log_1.log)('processing admission offer', { identityKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations.ts", line: 120 });
-                            const identity = await this._identityManager.acceptIdentity({
-                                identityKey,
-                                haloSpaceKey,
-                                haloGenesisFeedKey: genesisFeedKey
-                            });
-                            (0, log_1.log)('sending admission request', { identityKey: invitation.identityKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations.ts", line: 127 });
-                            await peer.rpc.HaloHostService.presentAdmissionCredentials({
-                                deviceKey: identity.deviceKey,
-                                controlFeedKey: keys_1.PublicKey.random(),
-                                dataFeedKey: keys_1.PublicKey.random()
-                            });
-                            // TODO(burdon): Document.
-                            await identity.ready();
-                            admitted.wake(identity);
-                        }
-                    }
-                },
-                port
-            });
-            await peer.open();
-            await admitted.wait();
-            await peer.close();
-        });
-        (0, assert_1.default)(invitation.swarmKey);
-        const topic = keys_1.PublicKey.from(invitation.swarmKey);
-        const peerId = keys_1.PublicKey.random(); // TODO(burdon): Fails if using the actual peer key.
-        const connection = await this._networkManager.openSwarmConnection({
-            topic,
-            peerId: keys_1.PublicKey.random(),
-            // peerId,
-            protocol: (0, network_manager_1.createProtocolFactory)(topic, peerId, [plugin]),
-            topology: new network_manager_1.StarTopology(topic)
-        });
-        const identity = await admitted.wait();
-        await this._onInitialize();
-        await connection.close();
-        return identity;
-    }
-}
-exports.HaloInvitations = HaloInvitations;
-//# sourceMappingURL=halo-invitations.js.map

package/dist/src/packlets/invitations/halo-invitations.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"halo-invitations.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/halo-invitations.ts"],"names":[],"mappings":"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"}

package/dist/src/packlets/invitations/halo-invitations.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=halo-invitations.test.d.ts.map

package/dist/src/packlets/invitations/halo-invitations.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"halo-invitations.test.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/halo-invitations.test.ts"],"names":[],"mappings":""}