@dxos/client-services 0.1.20 → 0.1.22

package/dist/lib/browser/index.mjs

@@ -41,7 +41,7 @@ var SpaceServiceImpl = class {
                 identityKey: member.key,
                 displayName: (_b = (_a = member.assertion.profile) == null ? void 0 : _a.displayName) != null ? _b : humanize(member.key)
               },
-              presenceState: ((_c = this.serviceContext.identityManager.identity) == null ? void 0 : _c.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE
+              presence: ((_c = this.serviceContext.identityManager.identity) == null ? void 0 : _c.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE
             };
           })
         }));
@@ -164,11 +164,13 @@ var SystemServiceImpl = class {
     this._config = _config;
     this._serviceContext = _serviceContext;
   }
+  // TODO(burdon): Remove.
   async initSession() {
   }
   async getConfig(request) {
     return this._config.values;
   }
+  // TODO(burdon): Connect to iframe RPC heartbeat for network status?
   async getStatus(request) {
     return {
       message: `ok: ${Date.now()}`
@@ -372,7 +374,7 @@ var subscribeToSpaces = (context, { spaceKeys = [] }) => new Stream6(({ next })
         return {
           key: space.key,
           isOpen: space.isOpen,
-          timeframe: spaceMetadata.latestTimeframe,
+          timeframe: spaceMetadata == null ? void 0 : spaceMetadata.latestTimeframe,
           genesisFeed: space.genesisFeedKey,
           controlFeed: space.controlFeedKey,
           dataFeed: space.dataFeedKey
@@ -574,35 +576,45 @@ var Identity = class {
     this._signer = signer;
     this.identityKey = identityKey;
     this.deviceKey = deviceKey;
-    this._deviceStateMachine = new DeviceStateMachine(this.identityKey, this.deviceKey);
-    this._profileStateMachine = new ProfileStateMachine(this.identityKey);
-    this.space.onCredentialProcessed.set(async (credential) => {
-      await this._deviceStateMachine.process(credential);
-      await this._profileStateMachine.process(credential);
-      this.stateUpdate.emit();
-    });
+    this._deviceStateMachine = this.space.spaceState.registerProcessor(new DeviceStateMachine({
+      identityKey: this.identityKey,
+      deviceKey: this.deviceKey,
+      onUpdate: () => this.stateUpdate.emit()
+    }));
+    this._profileStateMachine = this.space.spaceState.registerProcessor(new ProfileStateMachine({
+      identityKey: this.identityKey,
+      onUpdate: () => this.stateUpdate.emit()
+    }));
     this.authVerifier = new HaloAuthVerifier({
       trustedDevicesProvider: () => this.authorizedDeviceKeys,
       update: this.stateUpdate,
       authTimeout: AUTH_TIMEOUT
     });
   }
+  // TODO(burdon): Expose state object?
   get authorizedDeviceKeys() {
-    return this._deviceStateMachine.authorizedDeviceKeys;
+    return this._deviceStateMachine.processor.authorizedDeviceKeys;
   }
   async open() {
+    await this._deviceStateMachine.open();
+    await this._profileStateMachine.open();
     await this.space.open();
   }
   async close() {
     await this.authVerifier.close();
+    await this._deviceStateMachine.close();
+    await this._profileStateMachine.close();
     await this.space.close();
   }
   async ready() {
-    await this._deviceStateMachine.deviceChainReady.wait();
+    await this._deviceStateMachine.processor.deviceChainReady.wait();
   }
   get profileDocument() {
-    return this._profileStateMachine.profile;
+    return this._profileStateMachine.processor.profile;
   }
+  /**
+  * @test-only
+  */
   get controlPipeline() {
     return this.space.controlPipeline;
   }
@@ -619,10 +631,17 @@ var Identity = class {
       dataFeedKey: this.space.dataFeedKey
     };
   }
+  /**
+  * Issues credentials as identity.
+  * Requires identity to be ready.
+  */
   getIdentityCredentialSigner() {
-    assert2(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.");
-    return createCredentialSignerWithChain(this._signer, this._deviceStateMachine.deviceCredentialChain, this.deviceKey);
+    assert2(this._deviceStateMachine.processor.deviceCredentialChain, "Device credential chain is not ready.");
+    return createCredentialSignerWithChain(this._signer, this._deviceStateMachine.processor.deviceCredentialChain, this.deviceKey);
   }
+  /**
+  * Issues credentials as device.
+  */
   getDeviceCredentialSigner() {
     return createCredentialSignerWithKey(this._signer, this.deviceKey);
   }
@@ -635,7 +654,7 @@ var Identity = class {
       dataFeedKey
     }, {
       file: "identity.ts",
-      line: 147,
+      line: 155,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -680,12 +699,12 @@ var Identity = class {
 import assert3 from "@dxos/node-std/assert";
 import { Event as Event2 } from "@dxos/async";
 import { createCredentialSignerWithKey as createCredentialSignerWithKey2, CredentialGenerator } from "@dxos/credentials";
-import { NoopDataPipelineController } from "@dxos/echo-db";
 import { log as log4 } from "@dxos/log";
 import { AdmittedFeed as AdmittedFeed2 } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { Presence } from "@dxos/teleport-extension-presence";
 import { deferFunction } from "@dxos/util";
 var IdentityManager = class {
+  // TODO(burdon): IdentityManagerParams.
+  // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
   constructor(_metadataStore, _keyring, _spaceManager) {
     this._metadataStore = _metadataStore;
     this._keyring = _keyring;
@@ -698,6 +717,14 @@ var IdentityManager = class {
   async open() {
     await this._metadataStore.load();
     const identityRecord = this._metadataStore.getIdentityRecord();
+    log4("identity record", {
+      identityRecord
+    }, {
+      file: "identity-manager.ts",
+      line: 57,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     if (identityRecord) {
       this._identity = await this._constructIdentity(identityRecord);
       await this._identity.open();
@@ -733,7 +760,9 @@ var IdentityManager = class {
     {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       const credentials = [
+        // Space genesis.
         ...await generator.createSpaceGenesis(identityRecord.haloSpace.spaceKey, identityRecord.haloSpace.genesisFeedKey),
+        // Feed admission.
         await generator.createFeedAdmission(identityRecord.haloSpace.spaceKey, identityRecord.haloSpace.writeDataFeedKey, AdmittedFeed2.Designation.DATA)
       ];
       if (displayName) {
@@ -764,6 +793,9 @@ var IdentityManager = class {
     });
     return identity;
   }
+  /**
+  * Accept an existing identity. Expects it's device key to be authorized (now or later).
+  */
   async acceptIdentity(params) {
     log4("accepting identity", {
       params
@@ -834,14 +866,9 @@ var IdentityManager = class {
         controlFeedKey: spaceRecord.writeControlFeedKey,
         dataFeedKey: spaceRecord.writeDataFeedKey
       },
-      dataPipelineControllerProvider: () => new NoopDataPipelineController(),
       swarmIdentity,
-      presence: new Presence({
-        localPeerId: swarmIdentity.peerKey,
-        announceInterval: 1e3,
-        offlineTimeout: 3e4,
-        identityKey
-      })
+      onNetworkConnection: () => {
+      }
     });
   }
 };
@@ -890,6 +917,7 @@ var InvitationObservableProvider = class extends CancellableObservableProvider {
   }
 };
 var AuthenticatingInvitationProvider = class extends InvitationObservableProvider {
+  // prettier-ignore
   constructor(_actions) {
     super(() => this._actions.onCancel());
     this._actions = _actions;
@@ -916,6 +944,7 @@ var wrapObservable = async (observable) => {
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
 var AbstractInvitationsHandler = class {
+  // prettier-ignore
   constructor(_networkManager) {
     this._networkManager = _networkManager;
   }
@@ -923,10 +952,14 @@ var AbstractInvitationsHandler = class {
 
 // packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts
 var HaloInvitationsHandler = class extends AbstractInvitationsHandler {
+  // prettier-ignore
   constructor(networkManager, _identityManager) {
     super(networkManager);
     this._identityManager = _identityManager;
   }
+  /**
+  * Creates an invitation and listens for a join request from the invited (guest) peer.
+  */
   createInvitation(context, options) {
     var _a;
     const { type, timeout = INVITATION_TIMEOUT, swarmKey } = options != null ? options : {};
@@ -982,6 +1015,7 @@ var HaloInvitationsHandler = class extends AbstractInvitationsHandler {
             status: AuthenticationResponse.Status.OK
           };
         },
+        // TODO(burdon): Not used: controlFeedKey, dataFeedKey.
         presentAdmissionCredentials: async (credentials) => {
           try {
             if (invitation.type !== Invitation2.Type.INTERACTIVE_TESTING) {
@@ -1066,6 +1100,11 @@ var HaloInvitationsHandler = class extends AbstractInvitationsHandler {
     });
     return observable;
   }
+  /**
+  * Waits for the host peer (inviter) to accept our join request.
+  * The local guest peer (invitee) then sends the local halo invitation to the host,
+  * which then writes the guest's credentials to the halo.
+  */
   acceptInvitation(invitation, options) {
     const { timeout = INVITATION_TIMEOUT } = options != null ? options : {};
     const ctx = new Context2({
@@ -1079,6 +1118,7 @@ var HaloInvitationsHandler = class extends AbstractInvitationsHandler {
       onCancel: async () => {
         await ctx.dispose();
       },
+      // TODO(burdon): Consider retry.
       onAuthenticate: async (code) => {
         authenticated.wake(code);
       }
@@ -1204,6 +1244,8 @@ var HostHaloInvitationExtension = class extends RpcExtension {
   }
   async getHandlers() {
     return {
+      // TODO(dmaretskyi): For now this is just forwarding the data to callbacks since we don't have session-specific logic.
+      // Perhaps in the future we will have more complex logic here.
       HaloHostService: {
         requestAdmission: async () => {
           return this._callbacks.requestAdmission();
@@ -1211,6 +1253,7 @@ var HostHaloInvitationExtension = class extends RpcExtension {
         authenticate: async (credentials) => {
           return this._callbacks.authenticate(credentials);
         },
+        // TODO(burdon): Not used: controlFeedKey, dataFeedKey.
         presentAdmissionCredentials: async (credentials) => {
           return this._callbacks.presentAdmissionCredentials(credentials);
         }
@@ -1246,6 +1289,7 @@ import { observableError } from "@dxos/async";
 import { log as log6 } from "@dxos/log";
 import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/services";
 var AbstractInvitationsProxy = class {
+  // prettier-ignore
   constructor(_invitationsService) {
     this._invitationsService = _invitationsService;
   }
@@ -1386,12 +1430,14 @@ import { Stream as Stream8 } from "@dxos/codec-protobuf";
 import { log as log7 } from "@dxos/log";
 import { Invitation as Invitation4 } from "@dxos/protocols/proto/dxos/client/services";
 var AbstractInvitationsService = class {
+  // prettier-ignore
   constructor(_identityManager, _getInvitationsHandler) {
     this._identityManager = _identityManager;
     this._getInvitationsHandler = _getInvitationsHandler;
     this._createInvitations = /* @__PURE__ */ new Map();
     this._acceptInvitations = /* @__PURE__ */ new Map();
   }
+  // TODO(burdon): Guest/host label.
   getLoggingContext() {
     var _a;
     return {
@@ -1601,6 +1647,7 @@ var AbstractInvitationsService = class {
 
 // packages/sdk/client-services/src/packlets/invitations/halo-invitations-service.ts
 var HaloInvitationsServiceImpl = class extends AbstractInvitationsService {
+  // prettier-ignore
   constructor(identityManager, invitationsHandler) {
     super(identityManager, () => invitationsHandler);
     this.invitationsHandler = invitationsHandler;
@@ -1630,6 +1677,9 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
     this._signingContext = _signingContext;
     this._keyring = _keyring;
   }
+  /**
+  * Creates an invitation and listens for a join request from the invited (guest) peer.
+  */
   createInvitation(space, options) {
     let swarmConnection;
     const { type, timeout = INVITATION_TIMEOUT, swarmKey } = options != null ? options : {};
@@ -1653,8 +1703,8 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
     });
     let authenticationCode;
     let authenticationRetry = 0;
-    const complete = new Trigger3();
     const createExtension = () => {
+      const complete = new Trigger3();
       let guestProfile;
       const hostInvitationExtension = new HostSpaceInvitationExtension({
         introduce: async ({ profile }) => {
@@ -1665,7 +1715,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
             spaceKey: space.key
           }, {
             file: "space-invitations-handler.ts",
-            line: 98,
+            line: 97,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1677,7 +1727,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
             authenticationCode: code
           }, {
             file: "space-invitations-handler.ts",
-            line: 112,
+            line: 111,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1697,7 +1747,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
         },
         requestAdmission: async ({ identityKey, deviceKey, controlFeedKey, dataFeedKey }) => {
           try {
-            if (invitation.type !== Invitation5.Type.INTERACTIVE_TESTING) {
+            if (invitation.type !== Invitation5.Type.INTERACTIVE_TESTING && invitation.type !== Invitation5.Type.MULTIUSE_TESTING) {
               if (invitation.authenticationCode === void 0 || invitation.authenticationCode !== authenticationCode) {
                 throw new Error(`invalid authentication code: ${authenticationCode}`);
               }
@@ -1707,7 +1757,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               guest: deviceKey
             }, {
               file: "space-invitations-handler.ts",
-              line: 136,
+              line: 138,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1733,7 +1783,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 host: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 170,
+                line: 172,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1746,7 +1796,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 guest: deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 173,
+                line: 175,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1755,15 +1805,17 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               if (!observable.cancelled) {
                 log8.error("failed", err, {
                   file: "space-invitations-handler.ts",
-                  line: 177,
+                  line: 179,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
                 observable.callback.onError(err);
               }
             } finally {
-              await sleep2(ON_CLOSE_DELAY);
-              await ctx.dispose();
+              if (type !== Invitation5.Type.MULTIUSE_TESTING) {
+                await sleep2(ON_CLOSE_DELAY);
+                await ctx.dispose();
+              }
             }
           });
         }
@@ -1786,6 +1838,11 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
     });
     return observable;
   }
+  /**
+  * Waits for the host peer (inviter) to accept our join request.
+  * The local guest peer (invitee) then sends the local space invitation to the host,
+  * which then writes the guest's credentials to the space.
+  */
   acceptInvitation(invitation, options) {
     const { timeout = INVITATION_TIMEOUT } = options != null ? options : {};
     const ctx = new Context3({
@@ -1818,7 +1875,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 guest: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 248,
+                line: 252,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1827,7 +1884,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 guest: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 252,
+                line: 256,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1838,7 +1895,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   log8("guest waiting for authentication code...", {}, {
                     file: "space-invitations-handler.ts",
-                    line: 261,
+                    line: 265,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1848,7 +1905,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                   });
                   log8("sending authentication request", {}, {
                     file: "space-invitations-handler.ts",
-                    line: 265,
+                    line: 269,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1866,7 +1923,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                         attempt
                       }, {
                         file: "space-invitations-handler.ts",
-                        line: 275,
+                        line: 279,
                         scope: this,
                         callSite: (f, a) => f(...a)
                       });
@@ -1881,7 +1938,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 guest: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 286,
+                line: 290,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1905,7 +1962,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 spaceKey: space.key
               }, {
                 file: "space-invitations-handler.ts",
-                line: 309,
+                line: 313,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1914,7 +1971,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               if (!observable.cancelled) {
                 log8.warn("auth failed", err, {
                   file: "space-invitations-handler.ts",
-                  line: 313,
+                  line: 317,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1960,6 +2017,8 @@ var HostSpaceInvitationExtension = class extends RpcExtension2 {
   }
   async getHandlers() {
     return {
+      // TODO(dmaretskyi): For now this is just forwarding the data to callbacks since we don't have session-specific logic.
+      // Perhaps in the future we will have more complex logic here.
       SpaceHostService: {
         introduce: async (params) => {
           return this._callbacks.introduce(params);
@@ -2008,6 +2067,7 @@ var SpaceInvitationsProxy = class extends AbstractInvitationsProxy {
 // packages/sdk/client-services/src/packlets/invitations/space-invitations-service.ts
 import assert9 from "@dxos/node-std/assert";
 var SpaceInvitationsServiceImpl = class extends AbstractInvitationsService {
+  // prettier-ignore
   constructor(identityManager, invitationsHandler, _getSpaceManager) {
     super(identityManager, invitationsHandler);
     this.invitationsHandler = invitationsHandler;
@@ -2025,31 +2085,49 @@ var SpaceInvitationsServiceImpl = class extends AbstractInvitationsService {
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 import { Trigger as Trigger4 } from "@dxos/async";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
-import { MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, valueEncoding, DataServiceSubscriptions, MetadataStore, SpaceManager } from "@dxos/echo-db";
+import { MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, valueEncoding, DataServiceSubscriptions, MetadataStore, SpaceManager, SnapshotStore } from "@dxos/echo-db";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { Keyring } from "@dxos/keyring";
 import { log as log10 } from "@dxos/log";
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-import { Event as Event3, synchronized } from "@dxos/async";
-import { spaceGenesis } from "@dxos/echo-db";
+import { Event as Event3, synchronized, trackLeaks as trackLeaks2 } from "@dxos/async";
+import { Context as Context5 } from "@dxos/context";
+import { spaceGenesis, SnapshotManager } from "@dxos/echo-db";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
-import { Presence as Presence2 } from "@dxos/teleport-extension-presence";
+import { Presence } from "@dxos/teleport-extension-presence";
 import { ComplexMap as ComplexMap2 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
 import assert10 from "@dxos/node-std/assert";
+import { trackLeaks } from "@dxos/async";
 import { Context as Context4 } from "@dxos/context";
 import { DataPipelineControllerImpl } from "@dxos/echo-db";
-var DataSpace = class {
-  constructor(_inner, _modelFactory, _memberKey, _presence) {
-    this._inner = _inner;
-    this._modelFactory = _modelFactory;
-    this._memberKey = _memberKey;
-    this._presence = _presence;
+var __decorate = function(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var DataSpace = class DataSpace2 {
+  constructor(params) {
     this._ctx = new Context4();
-    this._dataPipelineController = new DataPipelineControllerImpl(_modelFactory, _memberKey, (feedKey) => _inner.spaceState.feeds.get(feedKey));
+    this._inner = params.inner;
+    this._presence = params.presence;
+    this._dataPipelineController = new DataPipelineControllerImpl({
+      modelFactory: params.modelFactory,
+      metadataStore: params.metadataStore,
+      snapshotManager: params.snapshotManager,
+      memberKey: params.memberKey,
+      spaceKey: this._inner.key,
+      feedInfoProvider: (feedKey) => this._inner.spaceState.feeds.get(feedKey),
+      snapshotId: params.snapshotId
+    });
   }
   get key() {
     return this._inner.key;
@@ -2075,6 +2153,7 @@ var DataSpace = class {
   }
   async open() {
     await this._inner.open();
+    await this._inner.initDataPipeline(this._dataPipelineController);
   }
   async close() {
     await this._ctx.dispose();
@@ -2082,9 +2161,12 @@ var DataSpace = class {
     await this._presence.destroy();
   }
 };
+DataSpace = __decorate([
+  trackLeaks("open", "close")
+], DataSpace);
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-var __decorate = function(decorators, target, key, desc) {
+var __decorate2 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -2094,28 +2176,65 @@ var __decorate = function(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var DataSpaceManager = class {
-  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _modelFactory) {
+var DataSpaceManager = class DataSpaceManager2 {
+  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _modelFactory, _snapshotStore) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
     this._dataServiceSubscriptions = _dataServiceSubscriptions;
     this._keyring = _keyring;
     this._signingContext = _signingContext;
     this._modelFactory = _modelFactory;
+    this._snapshotStore = _snapshotStore;
+    this._ctx = new Context5();
     this.updated = new Event3();
     this._spaces = new ComplexMap2(PublicKey5.hash);
   }
+  // TODO(burdon): Remove.
   get spaces() {
     return this._spaces;
   }
   async open() {
     await this._metadataStore.load();
+    log9("metadata loaded", {
+      spaces: this._metadataStore.spaces.length
+    }, {
+      file: "data-space-manager.ts",
+      line: 54,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     for (const spaceMetadata of this._metadataStore.spaces) {
-      await this._constructSpace(spaceMetadata);
+      log9("load space", {
+        spaceMetadata
+      }, {
+        file: "data-space-manager.ts",
+        line: 57,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      const space = await this._constructSpace(spaceMetadata);
+      if (spaceMetadata.latestTimeframe) {
+        log9("waiting for latest timeframe", {
+          spaceMetadata
+        }, {
+          file: "data-space-manager.ts",
+          line: 60,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+        await space.dataPipelineController.waitUntilTimeframe(spaceMetadata.latestTimeframe);
+      }
     }
   }
   async close() {
+    await this._ctx.dispose();
+    for (const space of this._spaces.values()) {
+      await space.close();
+    }
   }
+  /**
+  * Creates a new space writing the genesis credentials to the control feed.
+  */
   async createSpace() {
     const spaceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
@@ -2130,7 +2249,7 @@ var DataSpaceManager = class {
       spaceKey
     }, {
       file: "data-space-manager.ts",
-      line: 70,
+      line: 89,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2140,6 +2259,7 @@ var DataSpaceManager = class {
     this.updated.emit();
     return space;
   }
+  // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
     const metadata = {
       key: opts.spaceKey,
@@ -2153,12 +2273,13 @@ var DataSpaceManager = class {
     return space;
   }
   async _constructSpace(metadata) {
-    const presence = new Presence2({
+    const presence = new Presence({
       localPeerId: this._signingContext.deviceKey,
       announceInterval: 1e3,
       offlineTimeout: 3e4,
       identityKey: this._signingContext.identityKey
     });
+    const snapshotManager = new SnapshotManager(this._snapshotStore);
     const space = await this._spaceManager.constructSpace({
       metadata,
       swarmIdentity: {
@@ -2166,25 +2287,47 @@ var DataSpaceManager = class {
         credentialProvider: this._signingContext.credentialProvider,
         credentialAuthenticator: this._signingContext.credentialAuthenticator
       },
-      dataPipelineControllerProvider: () => dataSpace.dataPipelineController,
-      presence
+      onNetworkConnection: (session) => {
+        session.addExtension("dxos.mesh.teleport.presence", presence.createExtension({
+          remotePeerId: session.remotePeerId
+        }));
+        session.addExtension("dxos.mesh.teleport.objectsync", snapshotManager.objectSync.createExtension());
+      }
     });
-    const dataSpace = new DataSpace(space, this._modelFactory, this._signingContext.identityKey, presence);
-    await space.open();
+    const dataSpace = new DataSpace({
+      inner: space,
+      modelFactory: this._modelFactory,
+      metadataStore: this._metadataStore,
+      snapshotManager,
+      presence,
+      memberKey: this._signingContext.identityKey,
+      snapshotId: metadata.snapshot
+    });
+    await dataSpace.open();
     this._dataServiceSubscriptions.registerSpace(space.key, dataSpace.database.createDataServiceHost());
     this._spaces.set(metadata.key, dataSpace);
     return dataSpace;
   }
 };
-__decorate([
+__decorate2([
   synchronized
 ], DataSpaceManager.prototype, "open", null);
-__decorate([
+__decorate2([
   synchronized
 ], DataSpaceManager.prototype, "close", null);
+__decorate2([
+  synchronized
+], DataSpaceManager.prototype, "createSpace", null);
+__decorate2([
+  synchronized
+], DataSpaceManager.prototype, "acceptSpace", null);
+DataSpaceManager = __decorate2([
+  trackLeaks2("open", "close")
+], DataSpaceManager);
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 var ServiceContext = class {
+  // prettier-ignore
   constructor(storage, networkManager, modelFactory) {
     this.storage = storage;
     this.networkManager = networkManager;
@@ -2192,6 +2335,7 @@ var ServiceContext = class {
     this.initialized = new Trigger4();
     this.dataServiceSubscriptions = new DataServiceSubscriptions();
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new SnapshotStore(storage.createDirectory("snapshots"));
     this.keyring = new Keyring(storage.createDirectory("keyring"));
     this.feedStore = new FeedStore({
       factory: new FeedFactory({
@@ -2212,10 +2356,11 @@ var ServiceContext = class {
   async open() {
     log10("opening...", {}, {
       file: "service-context.ts",
-      line: 81,
+      line: 85,
       scope: this,
       callSite: (f, a) => f(...a)
     });
+    await this.networkManager.open();
     await this.spaceManager.open();
     await this.identityManager.open();
     if (this.identityManager.identity) {
@@ -2223,7 +2368,7 @@ var ServiceContext = class {
     }
     log10("opened", {}, {
       file: "service-context.ts",
-      line: 87,
+      line: 92,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2232,7 +2377,7 @@ var ServiceContext = class {
     var _a;
     log10("closing...", {}, {
       file: "service-context.ts",
-      line: 91,
+      line: 96,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2244,7 +2389,7 @@ var ServiceContext = class {
     this.dataServiceSubscriptions.clear();
     log10("closed", {}, {
       file: "service-context.ts",
-      line: 98,
+      line: 103,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2252,7 +2397,7 @@ var ServiceContext = class {
   async reset() {
     log10("resetting...", {}, {
       file: "service-context.ts",
-      line: 102,
+      line: 107,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2260,7 +2405,7 @@ var ServiceContext = class {
     await this.storage.reset();
     log10("reset", {}, {
       file: "service-context.ts",
-      line: 105,
+      line: 110,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2270,8 +2415,15 @@ var ServiceContext = class {
     await this._initialize();
     return identity;
   }
+  // Called when identity is created.
   async _initialize() {
     var _a;
+    log10("initializing spaces...", {}, {
+      file: "service-context.ts",
+      line: 122,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     const identity = (_a = this.identityManager.identity) != null ? _a : failUndefined2();
     const signingContext = {
       credentialProvider: MOCK_AUTH_PROVIDER,
@@ -2281,7 +2433,7 @@ var ServiceContext = class {
       deviceKey: identity.deviceKey,
       profile: identity.profileDocument
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.modelFactory);
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.modelFactory, this.snapshotStore);
     await this.dataSpaceManager.open();
     this.spaceInvitations = new SpaceInvitationsHandler(this.networkManager, this.dataSpaceManager, signingContext, this.keyring);
     this.initialized.wake();
@@ -2296,6 +2448,8 @@ var clientServiceBundle = createServiceBundle({
   DevicesService: schema5.getService("dxos.client.services.DevicesService"),
   SpaceInvitationsService: schema5.getService("dxos.client.services.SpaceInvitationsService"),
   SpacesService: schema5.getService("dxos.client.services.SpacesService"),
+  NetworkService: schema5.getService("dxos.client.services.NetworkService"),
+  // TODO(burdon): Deprecated.
   SpaceService: schema5.getService("dxos.client.SpaceService"),
   DataService: schema5.getService("dxos.echo.service.DataService"),
   ProfileService: schema5.getService("dxos.client.ProfileService"),
@@ -2305,7 +2459,7 @@ var clientServiceBundle = createServiceBundle({
 });
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-import { raise } from "@dxos/debug";
+import { raise as raise2 } from "@dxos/debug";
 import { DataServiceImpl } from "@dxos/echo-db";
 import { log as log11 } from "@dxos/log";
 import { ModelFactory } from "@dxos/model-factory";
@@ -2354,8 +2508,37 @@ var DevicesServiceImpl = class {
   }
 };
 
+// packages/sdk/client-services/src/packlets/network/network-service.ts
+import { Stream as Stream10 } from "@dxos/codec-protobuf";
+var NetworkServiceImpl = class {
+  constructor(networkManager) {
+    this.networkManager = networkManager;
+  }
+  subscribeToNetworkStatus() {
+    return new Stream10(({ next }) => {
+      const unsubscribe = this.networkManager.connectionStateChanged.on((state) => next({
+        state
+      }));
+      next({
+        state: this.networkManager.connectionState
+      });
+      return unsubscribe;
+    });
+  }
+  async setNetworkOptions(request) {
+    await this.networkManager.setConnectionState(request.state);
+  }
+};
+
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
+import { scheduleTask as scheduleTask3 } from "@dxos/async";
+import { Stream as Stream11 } from "@dxos/codec-protobuf";
+import { raise } from "@dxos/debug";
+import { SpaceNotFoundError } from "@dxos/echo-db";
 var SpacesServiceImpl = class {
+  constructor(_spaceManager) {
+    this._spaceManager = _spaceManager;
+  }
   async createSpace() {
     throw new Error();
   }
@@ -2365,16 +2548,25 @@ var SpacesServiceImpl = class {
   queryMembers(query) {
     throw new Error();
   }
+  queryCredentials({ spaceKey }) {
+    return new Stream11(({ ctx, next }) => {
+      var _a;
+      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : raise(new SpaceNotFoundError(spaceKey));
+      const processor = space.spaceState.registerProcessor({
+        process: async (credential) => {
+          next(credential);
+        }
+      });
+      ctx.onDispose(() => processor.close());
+      scheduleTask3(ctx, () => processor.open());
+    });
+  }
 };
 
 // packages/sdk/client-services/src/packlets/storage/storage.ts
-import jsondown from "jsondown";
-import leveljs from "level-js";
-import memdown from "memdown";
 import { InvalidConfigError } from "@dxos/errors";
 import { Runtime } from "@dxos/protocols/proto/dxos/config";
 import { createStorage, StorageType } from "@dxos/random-access-storage";
-import { isNode } from "@dxos/util";
 var StorageDriver = Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
   const { path = "dxos/storage", storageType, keyStorage, persistent = false } = config != null ? config : {};
@@ -2394,23 +2586,9 @@ var createStorageObjects = (config) => {
     storage: createStorage({
       type: persistent ? toStorageType(storageType) : StorageType.RAM,
       root: `${path}/`
-    }),
-    keyStorage: createKeyStorage(`${path}/keystore`, persistent ? toKeyStorageType(keyStorage) : "ram")
+    })
   };
 };
-var createKeyStorage = (path, type) => {
-  const defaultedType = type != null ? type : isNode() ? "jsondown" : "leveljs";
-  switch (defaultedType) {
-    case "leveljs":
-      return leveljs(path);
-    case "jsondown":
-      return jsondown(path);
-    case "ram":
-      return memdown();
-    default:
-      throw new InvalidConfigError(`Invalid key storage type: ${defaultedType}`);
-  }
-};
 var toStorageType = (type) => {
   switch (type) {
     case void 0:
@@ -2429,23 +2607,10 @@ var toStorageType = (type) => {
       throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
   }
 };
-var toKeyStorageType = (type) => {
-  switch (type) {
-    case void 0:
-      return void 0;
-    case StorageDriver.RAM:
-      return "ram";
-    case StorageDriver.LEVELJS:
-      return "leveljs";
-    case StorageDriver.JSONDOWN:
-      return "jsondown";
-    default:
-      throw new Error(`Invalid key storage type: ${StorageDriver[type]}`);
-  }
-};
 
 // packages/sdk/client-services/src/packlets/services/service-registry.ts
 var ServiceRegistry = class {
+  // prettier-ignore
   constructor(_serviceBundle, _handlers) {
     this._serviceBundle = _serviceBundle;
     this._handlers = _handlers;
@@ -2466,11 +2631,14 @@ var ClientServicesHost = class {
   constructor({
     config,
     modelFactory = createDefaultModelFactory(),
-    networkManager
+    // TODO(burdon): Create ApolloLink abstraction (see Client).
+    networkManager,
+    storage = createStorageObjects(config.get("runtime.client.storage", {})).storage
   }) {
     this._config = config;
     this._modelFactory = modelFactory;
     this._networkManager = networkManager;
+    this._storage = storage;
   }
   get descriptors() {
     return this._serviceRegistry.descriptors;
@@ -2480,23 +2648,20 @@ var ClientServicesHost = class {
   }
   async open() {
     var _a;
-    await this._initialize();
-    const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    log11("opening...", {
-      deviceKey
-    }, {
+    log11("opening...", {}, {
       file: "service-host.ts",
-      line: 69,
+      line: 73,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._initialize();
     await this._serviceContext.open();
+    const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
     log11("opened", {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 72,
+      line: 77,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2508,7 +2673,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 77,
+      line: 82,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2517,26 +2682,28 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 79,
+      line: 84,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
+  // TODO(burdon): Move into open.
   async _initialize() {
-    const { storage } = createStorageObjects(this._config.get("runtime.client.storage", {}));
-    this._serviceContext = new ServiceContext(storage, this._networkManager, this._modelFactory);
+    this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._modelFactory);
     this._serviceRegistry = new ServiceRegistry(clientServiceBundle, {
       HaloInvitationsService: new HaloInvitationsServiceImpl(this._serviceContext.identityManager, this._serviceContext.haloInvitations),
       DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
       SpaceInvitationsService: new SpaceInvitationsServiceImpl(this._serviceContext.identityManager, () => {
         var _a;
-        return (_a = this._serviceContext.spaceInvitations) != null ? _a : raise(new Error("SpaceInvitations not initialized"));
+        return (_a = this._serviceContext.spaceInvitations) != null ? _a : raise2(new Error("SpaceInvitations not initialized"));
       }, () => {
         var _a;
-        return (_a = this._serviceContext.dataSpaceManager) != null ? _a : raise(new Error("SpaceManager not initialized"));
+        return (_a = this._serviceContext.dataSpaceManager) != null ? _a : raise2(new Error("SpaceManager not initialized"));
       }),
-      SpacesService: new SpacesServiceImpl(),
+      SpacesService: new SpacesServiceImpl(this._serviceContext.spaceManager),
       DataService: new DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
+      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager),
+      // TODO(burdon): Move to new protobuf definitions.
       ProfileService: new ProfileServiceImpl(this._serviceContext),
       SpaceService: new SpaceServiceImpl(this._serviceContext),
       SystemService: new SystemServiceImpl(this._config, this._serviceContext),
@@ -2555,6 +2722,7 @@ import { asyncTimeout } from "@dxos/async";
 import { RemoteServiceConnectionTimeout } from "@dxos/errors";
 import { createProtoRpcPeer } from "@dxos/rpc";
 var ClientServicesProxy = class {
+  // prettier-ignore
   constructor(port, _timeout = 3e4) {
     this._timeout = _timeout;
     this._proxy = createProtoRpcPeer({
@@ -2641,7 +2809,7 @@ import { Trigger as Trigger5 } from "@dxos/async";
 import { log as log12, logInfo } from "@dxos/log";
 import { createProtoRpcPeer as createProtoRpcPeer3 } from "@dxos/rpc";
 import { Callback } from "@dxos/util";
-var __decorate2 = function(decorators, target, key, desc) {
+var __decorate3 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -2668,6 +2836,7 @@ var WorkerSession = class {
         DevicesService: async () => (await this._getServices()).services.DevicesService,
         SpaceInvitationsService: async () => (await this._getServices()).services.SpaceInvitationsService,
         SpacesService: async () => (await this._getServices()).services.SpacesService,
+        NetworkService: async () => (await this._getServices()).services.NetworkService,
         SpaceService: async () => (await this._getServices()).services.SpaceService,
         DataService: async () => (await this._getServices()).services.DataService,
         ProfileService: async () => (await this._getServices()).services.ProfileService,
@@ -2693,7 +2862,7 @@ var WorkerSession = class {
               } catch (err) {
                 log12.catch(err, {}, {
                   file: "worker-session.ts",
-                  line: 89,
+                  line: 90,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -2704,13 +2873,14 @@ var WorkerSession = class {
       },
       port: systemPort,
       timeout: 1e3
+      // With low timeout heartbeat may fail if the tab's thread is saturated.
     });
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
     log12.info("opening..", {}, {
       file: "worker-session.ts",
-      line: 103,
+      line: 104,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2729,7 +2899,7 @@ var WorkerSession = class {
           err: err1
         }, {
           file: "worker-session.ts",
-          line: 115,
+          line: 116,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2738,7 +2908,7 @@ var WorkerSession = class {
         } catch (err) {
           log12.catch(err, {}, {
             file: "worker-session.ts",
-            line: 119,
+            line: 120,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -2749,7 +2919,7 @@ var WorkerSession = class {
   async close() {
     log12.info("closing..", {}, {
       file: "worker-session.ts",
-      line: 126,
+      line: 127,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2758,7 +2928,7 @@ var WorkerSession = class {
     } catch (err) {
       log12.catch(err, {}, {
         file: "worker-session.ts",
-        line: 130,
+        line: 131,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2772,12 +2942,13 @@ var WorkerSession = class {
     ]);
   }
 };
-__decorate2([
+__decorate3([
   logInfo
 ], WorkerSession.prototype, "origin", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
 var WorkerRuntime = class {
+  // prettier-ignore
   constructor(_configProvider) {
     this._configProvider = _configProvider;
     this._transportFactory = new WebRTCTransportProxyFactory();
@@ -2807,6 +2978,9 @@ var WorkerRuntime = class {
   async stop() {
     await this._clientServices.close();
   }
+  /**
+  * Create a new session.
+  */
   async createSession({ appPort, systemPort }) {
     const session = new WorkerSession({
       getServices: async () => {
@@ -2828,6 +3002,9 @@ var WorkerRuntime = class {
     this.sessions.add(session);
     this._reconnectWebrtc();
   }
+  /**
+  * Selects one of the existing session fro WebRTC networking.
+  */
   _reconnectWebrtc() {
     if (this._sessionForNetworking) {
       if (!this.sessions.has(this._sessionForNetworking)) {