@dxos/client-services 0.3.11-main.3f845e1 → 0.3.11-main.463e5cd

package/dist/types/src/packlets/vault/worker-runtime.d.ts

@@ -5,7 +5,12 @@ import { ClientServicesHost } from '../services';
 export type CreateSessionParams = {
     appPort: RpcPort;
     systemPort: RpcPort;
-    shellPort: RpcPort;
+    shellPort?: RpcPort;
+};
+export type WorkerRuntimeCallbacks = {
+    acquireLock: () => Promise<void>;
+    releaseLock: () => void;
+    onReset: () => Promise<void>;
 };
 /**
  * Runtime for the shared worker.
@@ -14,13 +19,15 @@ export type CreateSessionParams = {
  */
 export declare class WorkerRuntime {
     private readonly _configProvider;
+    private readonly _acquireLock;
+    private readonly _releaseLock;
     private readonly _transportFactory;
     private readonly _ready;
     private readonly _sessions;
     private readonly _clientServices;
     private _sessionForNetworking?;
     private _config;
-    constructor(_configProvider: () => MaybePromise<Config>);
+    constructor(_configProvider: () => MaybePromise<Config>, { acquireLock, releaseLock, onReset }: WorkerRuntimeCallbacks);
     get host(): ClientServicesHost;
     start(): Promise<void>;
     stop(): Promise<void>;
@@ -29,7 +36,7 @@ export declare class WorkerRuntime {
      */
     createSession({ appPort, systemPort, shellPort }: CreateSessionParams): Promise<void>;
     /**
-     * Selects one of the existing session fro WebRTC networking.
+     * Selects one of the existing session for WebRTC networking.
      */
     private _reconnectWebrtc;
 }

package/dist/types/src/packlets/vault/worker-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,aAAa;IAQZ,OAAO,CAAC,QAAQ,CAAC,eAAe;IAP5C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyC;IAC3E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsB;IACtD,OAAO,CAAC,qBAAqB,CAAC,CAAgB;IAC9C,OAAO,CAAC,OAAO,CAAU;gBAEI,eAAe,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC;IAUxE,IAAI,IAAI,uBAEP;IAEK,KAAK;IAsBL,IAAI;IAKV;;OAEG;IACG,aAAa,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,mBAAmB;IAqB3E;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAoBzB"}
+{"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,aAAa;IAWtB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAVlC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAa;IAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyC;IAC3E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsB;IACtD,OAAO,CAAC,qBAAqB,CAAC,CAAgB;IAC9C,OAAO,CAAC,OAAO,CAAU;gBAGN,eAAe,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC,EAC5D,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,sBAAsB;IAW/D,IAAI,IAAI,uBAEP;IAEK,KAAK;IAuBL,IAAI;IAMV;;OAEG;IACG,aAAa,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,mBAAmB;IA0B3E;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAoBzB"}

package/dist/types/src/packlets/vault/worker-session.d.ts

@@ -7,7 +7,7 @@ export type WorkerSessionParams = {
     serviceHost: ClientServicesHost;
     systemPort: RpcPort;
     appPort: RpcPort;
-    shellPort: RpcPort;
+    shellPort?: RpcPort;
     readySignal: Trigger<Error | undefined>;
 };
 /**
@@ -15,7 +15,7 @@ export type WorkerSessionParams = {
  */
 export declare class WorkerSession {
     private readonly _clientRpc;
-    private readonly _shellClientRpc;
+    private readonly _shellClientRpc?;
     private readonly _iframeRpc;
     private readonly _startTrigger;
     private readonly _serviceHost;

package/dist/types/src/packlets/vault/worker-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AASpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAqB,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,KAAK,kBAAkB,EAA+C,MAAM,aAAa,CAAC;AAEnG,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAGvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,mBAAmB;IAgEvF,IAAI;IAeJ,KAAK;YAYG,eAAe;IAQ7B,OAAO,CAAC,kBAAkB;CAO3B"}
+{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AASpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAqB,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,KAAK,kBAAkB,EAA+C,MAAM,aAAa,CAAC;AAEnG,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAGvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,mBAAmB;IAkEvF,IAAI;IAeJ,KAAK;YAYG,eAAe;IAQ7B,OAAO,CAAC,kBAAkB;CAO3B"}

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.3.11-main.3f845e1";
+export declare const DXOS_VERSION = "0.3.11-main.463e5cd";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.3.11-main.3f845e1",
+  "version": "0.3.11-main.463e5cd",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,44 +22,44 @@
   ],
   "dependencies": {
     "platform": "^1.3.6",
-    "@dxos/async": "0.3.11-main.3f845e1",
-    "@dxos/client-protocol": "0.3.11-main.3f845e1",
-    "@dxos/codec-protobuf": "0.3.11-main.3f845e1",
-    "@dxos/config": "0.3.11-main.3f845e1",
-    "@dxos/crypto": "0.3.11-main.3f845e1",
-    "@dxos/context": "0.3.11-main.3f845e1",
-    "@dxos/document-model": "0.3.11-main.3f845e1",
-    "@dxos/credentials": "0.3.11-main.3f845e1",
-    "@dxos/echo-db": "0.3.11-main.3f845e1",
-    "@dxos/debug": "0.3.11-main.3f845e1",
-    "@dxos/echo-pipeline": "0.3.11-main.3f845e1",
-    "@dxos/echo-schema": "0.3.11-main.3f845e1",
-    "@dxos/feed-store": "0.3.11-main.3f845e1",
-    "@dxos/keyring": "0.3.11-main.3f845e1",
-    "@dxos/invariant": "0.3.11-main.3f845e1",
-    "@dxos/lock-file": "0.3.11-main.3f845e1",
-    "@dxos/keys": "0.3.11-main.3f845e1",
-    "@dxos/log": "0.3.11-main.3f845e1",
-    "@dxos/messaging": "0.3.11-main.3f845e1",
-    "@dxos/network-manager": "0.3.11-main.3f845e1",
-    "@dxos/node-std": "0.3.11-main.3f845e1",
-    "@dxos/model-factory": "0.3.11-main.3f845e1",
-    "@dxos/protocols": "0.3.11-main.3f845e1",
-    "@dxos/teleport": "0.3.11-main.3f845e1",
-    "@dxos/rpc": "0.3.11-main.3f845e1",
-    "@dxos/teleport-extension-object-sync": "0.3.11-main.3f845e1",
-    "@dxos/text-model": "0.3.11-main.3f845e1",
-    "@dxos/teleport-extension-gossip": "0.3.11-main.3f845e1",
-    "@dxos/random-access-storage": "0.3.11-main.3f845e1",
-    "@dxos/timeframe": "0.3.11-main.3f845e1",
-    "@dxos/tracing": "0.3.11-main.3f845e1",
-    "@dxos/util": "0.3.11-main.3f845e1",
-    "@dxos/websocket-rpc": "0.3.11-main.3f845e1"
+    "@dxos/async": "0.3.11-main.463e5cd",
+    "@dxos/client-protocol": "0.3.11-main.463e5cd",
+    "@dxos/context": "0.3.11-main.463e5cd",
+    "@dxos/codec-protobuf": "0.3.11-main.463e5cd",
+    "@dxos/credentials": "0.3.11-main.463e5cd",
+    "@dxos/config": "0.3.11-main.463e5cd",
+    "@dxos/crypto": "0.3.11-main.463e5cd",
+    "@dxos/debug": "0.3.11-main.463e5cd",
+    "@dxos/echo-db": "0.3.11-main.463e5cd",
+    "@dxos/echo-pipeline": "0.3.11-main.463e5cd",
+    "@dxos/document-model": "0.3.11-main.463e5cd",
+    "@dxos/feed-store": "0.3.11-main.463e5cd",
+    "@dxos/echo-schema": "0.3.11-main.463e5cd",
+    "@dxos/invariant": "0.3.11-main.463e5cd",
+    "@dxos/keyring": "0.3.11-main.463e5cd",
+    "@dxos/lock-file": "0.3.11-main.463e5cd",
+    "@dxos/keys": "0.3.11-main.463e5cd",
+    "@dxos/messaging": "0.3.11-main.463e5cd",
+    "@dxos/log": "0.3.11-main.463e5cd",
+    "@dxos/model-factory": "0.3.11-main.463e5cd",
+    "@dxos/node-std": "0.3.11-main.463e5cd",
+    "@dxos/network-manager": "0.3.11-main.463e5cd",
+    "@dxos/protocols": "0.3.11-main.463e5cd",
+    "@dxos/random-access-storage": "0.3.11-main.463e5cd",
+    "@dxos/rpc": "0.3.11-main.463e5cd",
+    "@dxos/teleport": "0.3.11-main.463e5cd",
+    "@dxos/teleport-extension-object-sync": "0.3.11-main.463e5cd",
+    "@dxos/teleport-extension-gossip": "0.3.11-main.463e5cd",
+    "@dxos/text-model": "0.3.11-main.463e5cd",
+    "@dxos/timeframe": "0.3.11-main.463e5cd",
+    "@dxos/tracing": "0.3.11-main.463e5cd",
+    "@dxos/util": "0.3.11-main.463e5cd",
+    "@dxos/websocket-rpc": "0.3.11-main.463e5cd"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.3.11-main.3f845e1"
+    "@dxos/signal": "0.3.11-main.463e5cd"
   },
   "publishConfig": {
     "access": "public"

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

@@ -274,7 +274,7 @@ export class IdentityManager {
         genesisFeedKey: spaceRecord.genesisFeedKey,
       },
       swarmIdentity,
-      onNetworkConnection: () => {},
+      onAuthorizedConnection: () => {},
       onAuthFailure: () => {
         log.warn('auth failure');
       },

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

@@ -44,7 +44,7 @@ describe('IdentityService', () => {
     });
 
     test('creates a new identity with a display name', async () => {
-      const identity = await identityService.createIdentity({ displayName: 'Example' });
+      const identity = await identityService.createIdentity({ profile: { displayName: 'Example' } });
 
       expect(identity.identityKey).to.be.instanceof(PublicKey);
       expect(identity.spaceKey).to.be.instanceof(PublicKey);

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

@@ -8,6 +8,7 @@ import { todo } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
 import {
+  type CreateIdentityRequest,
   type Identity,
   type IdentityService,
   type QueryIdentityResponse,
@@ -18,16 +19,18 @@ import { type Presentation, type ProfileDocument } from '@dxos/protocols/proto/d
 
 import { type CreateIdentityOptions, type IdentityManager } from './identity-manager';
 
+const CREATE_PROFILE_WITH_AUTOMERGE_DEFAULT = true;
+
 export class IdentityServiceImpl implements IdentityService {
   constructor(
-    private readonly _createIdentity: (params?: CreateIdentityOptions) => Promise<Identity>,
+    private readonly _createIdentity: (params: CreateIdentityOptions, useAutomerge: boolean) => Promise<Identity>,
     private readonly _identityManager: IdentityManager,
     private readonly _keyring: Keyring,
     private readonly _onProfileUpdate?: (profile: ProfileDocument | undefined) => Promise<void>,
   ) {}
 
-  async createIdentity(request: ProfileDocument): Promise<Identity> {
-    await this._createIdentity(request);
+  async createIdentity(request: CreateIdentityRequest): Promise<Identity> {
+    await this._createIdentity(request.profile ?? {}, request.useAutomerge ?? CREATE_PROFILE_WITH_AUTOMERGE_DEFAULT);
     return this._getIdentity()!;
   }
 

package/src/packlets/invitations/device-invitation-protocol.test.ts

@@ -6,6 +6,7 @@ import { expect } from 'chai';
 
 import { asyncChain } from '@dxos/async';
 import { Context } from '@dxos/context';
+import { AlreadyJoinedError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { describe, test, afterTest } from '@dxos/test';
 
@@ -36,4 +37,17 @@ describe('services/device', () => {
     await Promise.all(performInvitation({ host, guest, options: { kind: Invitation.Kind.DEVICE } }));
     expect(guest.identityManager.identity?.identityKey).to.deep.eq(identity1.identityKey);
   });
+
+  test('invitation when already joined', async () => {
+    const [host, guest] = await asyncChain<ServiceContext>([closeAfterTest])(createPeers(2));
+
+    const identity1 = await host.createIdentity();
+    expect(host.identityManager.identity).to.eq(identity1);
+
+    await Promise.all(performInvitation({ host, guest, options: { kind: Invitation.Kind.DEVICE } }));
+    expect(guest.identityManager.identity?.identityKey).to.deep.eq(identity1.identityKey);
+
+    const [_, result] = performInvitation({ host, guest, options: { kind: Invitation.Kind.DEVICE } });
+    expect((await result).error).to.be.instanceOf(AlreadyJoinedError);
+  });
 });

package/src/packlets/invitations/device-invitation-protocol.ts

@@ -4,6 +4,7 @@
 
 import { invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
+import { AlreadyJoinedError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import {
   type AdmissionRequest,
@@ -46,6 +47,17 @@ export class DeviceInvitationProtocol implements InvitationProtocol {
     };
   }
 
+  checkInvitation(invitation: Partial<Invitation>) {
+    try {
+      const identity = this._getIdentity();
+      if (identity) {
+        return new AlreadyJoinedError('Currently only one identity per client is supported.');
+      }
+    } catch {
+      // No identity.
+    }
+  }
+
   createIntroduction(): IntroductionRequest {
     return {};
   }
@@ -71,6 +83,8 @@ export class DeviceInvitationProtocol implements InvitationProtocol {
     invariant(request.device);
     const { deviceKey, controlFeedKey, dataFeedKey } = request.device;
 
+    // TODO(wittjosiah): When multiple identities are supported, verify identity doesn't already exist before accepting.
+
     await this._acceptIdentity({
       identityKey,
       deviceKey,

package/src/packlets/invitations/invitation-protocol.ts

@@ -2,24 +2,62 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
-import {
-  type AdmissionRequest,
-  type AdmissionResponse,
-  type IntroductionRequest,
+import type { ApiError } from '@dxos/protocols';
+import type { Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import type { ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import type {
+  AdmissionRequest,
+  AdmissionResponse,
+  IntroductionRequest,
 } from '@dxos/protocols/proto/dxos/halo/invitations';
 
 export interface InvitationProtocol {
+  //
   // Debugging
+  //
+
+  /**
+   * Protocol-specific debug info to include in logs.
+   */
   toJSON(): object;
 
+  //
   // Host
+  //
+
+  /**
+   * Protocol-specific information to include in the invitation.
+   */
   getInvitationContext(): Partial<Invitation> & Pick<Invitation, 'kind'>;
+
+  /**
+   * Once authentication is successful, the host can admit the guest to the requested resource.
+   */
   admit(request: AdmissionRequest, guestProfile?: ProfileDocument): Promise<AdmissionResponse>;
 
+  //
   // Guest
+  //
+
+  /**
+   * Check if the invitation is valid.
+   *
+   * For example, the guest may already be a member of the space.
+   */
+  checkInvitation(invitation: Partial<Invitation>): ApiError | undefined;
+
+  /**
+   * Get profile information to send to the host to identify the guest.
+   */
   createIntroduction(): IntroductionRequest;
+
+  /**
+   * Get key information to send to the host in order to create an admission credential for the guest.
+   */
   createAdmissionRequest(): Promise<AdmissionRequest>;
+
+  /**
+   * Redeem the admission credential.
+   */
   accept(response: AdmissionResponse, request: AdmissionRequest): Promise<Partial<Invitation>>;
 }

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

@@ -303,9 +303,6 @@ export class InvitationsHandler {
                     }
                   }
                 }
-              } else {
-                // Notify that introduction is complete even if auth is not required.
-                setState({ state: Invitation.State.READY_FOR_AUTHENTICATION });
               }
 
               // 3. Send admission credentials to host (with local space keys).
@@ -321,7 +318,7 @@ export class InvitationsHandler {
 
               // 5. Success.
               log('admitted by host', { ...protocol.toJSON() });
-              setState({ ...result, state: Invitation.State.SUCCESS });
+              setState({ ...result, target: invitation.target, state: Invitation.State.SUCCESS });
               log.trace('dxos.sdk.invitations-handler.guest.onOpen', trace.end({ id: traceId }));
             } catch (err: any) {
               if (err instanceof TimeoutError) {
@@ -355,20 +352,25 @@ export class InvitationsHandler {
     };
 
     scheduleTask(ctx, async () => {
-      invariant(invitation.swarmKey);
-      const topic = invitation.swarmKey;
-      const swarmConnection = await this._networkManager.joinSwarm({
-        topic,
-        peerId: PublicKey.random(),
-        protocolProvider: createTeleportProtocolFactory(async (teleport) => {
-          teleport.addExtension('dxos.halo.invitations', createExtension());
-        }),
-        topology: new StarTopology(topic),
-        label: 'invitation guest',
-      });
-      ctx.onDispose(() => swarmConnection.close());
-
-      setState({ state: Invitation.State.CONNECTING });
+      const error = protocol.checkInvitation(invitation);
+      if (error) {
+        stream.error(error);
+      } else {
+        invariant(invitation.swarmKey);
+        const topic = invitation.swarmKey;
+        const swarmConnection = await this._networkManager.joinSwarm({
+          topic,
+          peerId: PublicKey.random(),
+          protocolProvider: createTeleportProtocolFactory(async (teleport) => {
+            teleport.addExtension('dxos.halo.invitations', createExtension());
+          }),
+          topology: new StarTopology(topic),
+          label: 'invitation guest',
+        });
+        ctx.onDispose(() => swarmConnection.close());
+
+        setState({ state: Invitation.State.CONNECTING });
+      }
     });
 
     const observable = new AuthenticatingInvitation({

package/src/packlets/invitations/space-invitation-protocol.test.ts

@@ -7,6 +7,7 @@ import { expect } from 'chai';
 import { asyncChain, Trigger } from '@dxos/async';
 import { raise } from '@dxos/debug';
 import { testLocalDatabase } from '@dxos/echo-pipeline/testing';
+import { AlreadyJoinedError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { afterTest, describe, test } from '@dxos/test';
 
@@ -71,6 +72,33 @@ describe('services/space-invitations-protocol', () => {
     }
   });
 
+  test('invitation when already joined', async () => {
+    const [host, guest] = await asyncChain<ServiceContext>([createIdentity, closeAfterTest])(createPeers(2));
+
+    const space1 = await host.dataSpaceManager!.createSpace();
+    const spaceKey = space1.key;
+
+    await Promise.all(performInvitation({ host, guest, options: { kind: Invitation.Kind.SPACE, spaceKey } }));
+
+    {
+      const space1 = host.dataSpaceManager!.spaces.get(spaceKey)!;
+      const space2 = guest.dataSpaceManager!.spaces.get(spaceKey)!;
+      expect(space1).not.to.be.undefined;
+      expect(space2).not.to.be.undefined;
+
+      await host.dataSpaceManager?.waitUntilSpaceReady(space1.key);
+      await guest.dataSpaceManager?.waitUntilSpaceReady(space2.key);
+    }
+
+    const [_, guestResult] = performInvitation({
+      host,
+      guest,
+      options: { kind: Invitation.Kind.SPACE, spaceKey },
+    });
+
+    expect((await guestResult).error).to.be.instanceOf(AlreadyJoinedError);
+  });
+
   test('creates and accepts invitation with retry', async () => {
     const [host, guest] = await asyncChain<ServiceContext>([createIdentity, closeAfterTest])(createPeers(2));
 

package/src/packlets/invitations/space-invitation-protocol.ts

@@ -8,6 +8,7 @@ import { invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
 import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { AlreadyJoinedError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -76,6 +77,12 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
     };
   }
 
+  checkInvitation(invitation: Partial<Invitation>) {
+    if (invitation.spaceKey && this._spaceManager.spaces.has(invitation.spaceKey)) {
+      return new AlreadyJoinedError('Already joined space.');
+    }
+  }
+
   createIntroduction(): IntroductionRequest {
     return {
       profile: this._signingContext.getProfile(),
@@ -104,6 +111,10 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
     invariant(assertion['@type'] === 'dxos.halo.credentials.SpaceMember', 'Invalid credential');
     invariant(credential.subject.id.equals(this._signingContext.identityKey));
 
+    if (this._spaceManager.spaces.has(assertion.spaceKey)) {
+      throw new AlreadyJoinedError('Already joined space.');
+    }
+
     // Create local space.
     await this._spaceManager.acceptSpace({
       spaceKey: assertion.spaceKey,

package/src/packlets/network/network-service.ts

@@ -12,13 +12,17 @@ import {
 } from '@dxos/protocols/proto/dxos/client/services';
 
 export class NetworkServiceImpl implements NetworkService {
-  constructor(private readonly networkManager: NetworkManager, private readonly signalManager: SignalManager) {}
+  constructor(
+    private readonly networkManager: NetworkManager,
+    private readonly signalManager: SignalManager,
+  ) {}
 
   queryStatus() {
     return new Stream<NetworkStatus>(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
+          connectionInfo: this.networkManager.connectionLog?.swarms,
           signaling: this.signalManager.getStatus().map(({ host, state }) => ({ server: host, state })),
         });
       };

package/src/packlets/services/diagnostics.ts

@@ -18,13 +18,17 @@ import {
   type Metrics,
   type NetworkStatus,
   type Space as SpaceProto,
+  type Platform,
   SpaceMember,
+  type LogEntry,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { type SubscribeToFeedsResponse } from '@dxos/protocols/proto/dxos/devtools/host';
 import { type SwarmInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
 import { type Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type Resource, type Span } from '@dxos/protocols/proto/dxos/tracing';
+import { TRACE_PROCESSOR } from '@dxos/tracing';
 
-import { getPlatform, type Platform } from './platform';
+import { getPlatform } from './platform';
 import { type ServiceContext } from './service-context';
 import { DXOS_VERSION } from '../../version';
 import { type DataSpace } from '../spaces';
@@ -32,22 +36,36 @@ import { type DataSpace } from '../spaces';
 const DEFAULT_TIMEOUT = 1_000;
 
 export type Diagnostics = {
-  created: string;
-  platform: Platform;
-  config?: ConfigProto;
   client: {
-    version: string;
-    storage: {
-      version: number;
+    config: ConfigProto;
+    trace: TraceDiagnostic;
+  };
+  services: {
+    trace: TraceDiagnostic;
+    created: string;
+    platform: Platform;
+    config?: ConfigProto;
+    client: {
+      version: string;
+      storage: {
+        version: number;
+      };
     };
+    identity?: Identity;
+    devices?: Device[];
+    spaces?: SpaceStats[];
+    networkStatus?: NetworkStatus;
+    swarms?: SwarmInfo[];
+    feeds?: Partial<SubscribeToFeedsResponse.Feed>[];
+    metrics?: Metrics;
+    storage?: { file: string; count: number }[];
   };
-  identity?: Identity;
-  devices?: Device[];
-  spaces?: SpaceStats[];
-  networkStatus?: NetworkStatus;
-  swarms?: SwarmInfo[];
-  feeds?: Partial<SubscribeToFeedsResponse.Feed>[];
-  metrics?: Metrics;
+};
+
+export type TraceDiagnostic = {
+  resources: Record<string, Resource>;
+  spans: Span[];
+  logs: LogEntry[];
 };
 
 // TODO(burdon): Normalize for ECHO/HALO.
@@ -74,8 +92,8 @@ export const createDiagnostics = async (
   clientServices: Partial<ClientServices>,
   serviceContext: ServiceContext,
   config: Config,
-): Promise<Diagnostics> => {
-  const diagnostics: Diagnostics = {
+): Promise<Diagnostics['services']> => {
+  const diagnostics: Diagnostics['services'] = {
     created: new Date().toISOString(),
     platform: getPlatform(),
     client: {
@@ -84,6 +102,7 @@ export const createDiagnostics = async (
         version: STORAGE_VERSION,
       },
     },
+    trace: TRACE_PROCESSOR.getDiagnostics(),
   };
 
   // Trace metrics.
@@ -95,6 +114,23 @@ export const createDiagnostics = async (
     }).catch(() => undefined);
   }
 
+  if (typeof navigator !== 'undefined' && navigator.storage) {
+    const map = new Map();
+    const dir = await navigator.storage.getDirectory();
+    for await (const filename of (dir as any)?.keys()) {
+      const idx = filename.indexOf('-', filename.indexOf('-') + 1);
+      if (idx === -1) {
+        continue;
+      }
+
+      map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
+    }
+
+    diagnostics.storage = Array.from(map.entries())
+      .sort((a, b) => b[1] - a[1])
+      .map(([file, count]) => ({ file, count }));
+  }
+
   const identity = serviceContext.identityManager.identity;
   if (identity) {
     // Identity.