@dxos/client-services 0.1.28 → 0.1.29-next.1bc50d4

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":"AAMA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAuB,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlE,oBAAY,mBAAmB,GAAG;IAChC,UAAU,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,KAAK,OAAO,GAAG,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5G,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE;QACR,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAC1D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA+B;IAC/D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAChE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8C;IACvE,OAAO,CAAC,eAAe,CAAC,CAAiB;IAEzC,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAGvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EACV,UAAU,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,OAEC,EACF,EAAE,mBAAmB;IAkDhB,IAAI;IAuBJ,KAAK;YAeG,eAAe;CAO9B"}
+{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAEL,cAAc,EAIf,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,oBAAY,mBAAmB,GAAG;IAChC,UAAU,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,KAAK,OAAO,GAAG,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5G,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE;QACR,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAC1D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA+B;IAC/D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAChE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8C;IACvE,OAAO,CAAC,eAAe,CAAC,CAAiB;IAEzC,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAGvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EACV,UAAU,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,OAEC,EACF,EAAE,mBAAmB;IAkDhB,IAAI;IAuBJ,KAAK;YAeG,eAAe;CAO9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.1.28",
+  "version": "0.1.29-next.1bc50d4",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -20,38 +20,38 @@
     "src"
   ],
   "dependencies": {
-    "base-x": "~3.0.9",
-    "@dxos/async": "0.1.28",
-    "@dxos/codec-protobuf": "0.1.28",
-    "@dxos/config": "0.1.28",
-    "@dxos/context": "0.1.28",
-    "@dxos/credentials": "0.1.28",
-    "@dxos/crypto": "0.1.28",
-    "@dxos/debug": "0.1.28",
-    "@dxos/document-model": "0.1.28",
-    "@dxos/echo-db": "0.1.28",
-    "@dxos/echo-pipeline": "0.1.28",
-    "@dxos/errors": "0.1.28",
-    "@dxos/feed-store": "0.1.28",
-    "@dxos/keyring": "0.1.28",
-    "@dxos/keys": "0.1.28",
-    "@dxos/log": "0.1.28",
-    "@dxos/messaging": "0.1.28",
-    "@dxos/model-factory": "0.1.28",
-    "@dxos/network-manager": "0.1.28",
-    "@dxos/node-std": "0.1.28",
-    "@dxos/protocols": "0.1.28",
-    "@dxos/random-access-storage": "0.1.28",
-    "@dxos/rpc": "0.1.28",
-    "@dxos/teleport": "0.1.28",
-    "@dxos/teleport-extension-presence": "0.1.28",
-    "@dxos/text-model": "0.1.28",
-    "@dxos/timeframe": "0.1.28",
-    "@dxos/util": "0.1.28"
+    "@dxos/async": "0.1.29-next.1bc50d4",
+    "@dxos/client": "0.1.29-next.1bc50d4",
+    "@dxos/codec-protobuf": "0.1.29-next.1bc50d4",
+    "@dxos/config": "0.1.29-next.1bc50d4",
+    "@dxos/context": "0.1.29-next.1bc50d4",
+    "@dxos/credentials": "0.1.29-next.1bc50d4",
+    "@dxos/crypto": "0.1.29-next.1bc50d4",
+    "@dxos/debug": "0.1.29-next.1bc50d4",
+    "@dxos/document-model": "0.1.29-next.1bc50d4",
+    "@dxos/echo-db": "0.1.29-next.1bc50d4",
+    "@dxos/echo-pipeline": "0.1.29-next.1bc50d4",
+    "@dxos/errors": "0.1.29-next.1bc50d4",
+    "@dxos/feed-store": "0.1.29-next.1bc50d4",
+    "@dxos/keyring": "0.1.29-next.1bc50d4",
+    "@dxos/keys": "0.1.29-next.1bc50d4",
+    "@dxos/log": "0.1.29-next.1bc50d4",
+    "@dxos/messaging": "0.1.29-next.1bc50d4",
+    "@dxos/model-factory": "0.1.29-next.1bc50d4",
+    "@dxos/network-manager": "0.1.29-next.1bc50d4",
+    "@dxos/node-std": "0.1.29-next.1bc50d4",
+    "@dxos/protocols": "0.1.29-next.1bc50d4",
+    "@dxos/random-access-storage": "0.1.29-next.1bc50d4",
+    "@dxos/rpc": "0.1.29-next.1bc50d4",
+    "@dxos/teleport": "0.1.29-next.1bc50d4",
+    "@dxos/teleport-extension-presence": "0.1.29-next.1bc50d4",
+    "@dxos/text-model": "0.1.29-next.1bc50d4",
+    "@dxos/timeframe": "0.1.29-next.1bc50d4",
+    "@dxos/util": "0.1.29-next.1bc50d4"
   },
   "devDependencies": {
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.1.28"
+    "@dxos/signal": "0.1.29-next.1bc50d4"
   },
   "publishConfig": {
     "access": "public"

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

@@ -0,0 +1,56 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { expect } from 'chai';
+
+import { Trigger } from '@dxos/async';
+import { DevicesService, Device } from '@dxos/protocols/proto/dxos/client/services';
+import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
+
+import { ServiceContext } from '../services';
+import { createServiceContext } from '../testing';
+import { DevicesServiceImpl } from './devices-service';
+
+describe('DevicesService', () => {
+  let serviceContext: ServiceContext;
+  let devicesService: DevicesService;
+
+  beforeEach(async () => {
+    serviceContext = createServiceContext();
+    await serviceContext.open();
+    devicesService = new DevicesServiceImpl(serviceContext.identityManager);
+  });
+
+  afterEach(async () => {
+    await serviceContext.close();
+  });
+
+  describe.skip('updateDevice', () => {});
+
+  describe('queryDevices', () => {
+    test('returns empty list if no identity is available', async () => {
+      const query = devicesService.queryDevices();
+      const result = new Trigger<Device[] | undefined>();
+      query.subscribe(({ devices }) => {
+        result.wake(devices);
+      });
+      afterTest(() => query.close());
+      expect(await result.wait()).to.be.length(0);
+    });
+
+    test('updates when identity is created', async () => {
+      const query = devicesService.queryDevices();
+      let result = new Trigger<Device[] | undefined>();
+      query.subscribe(({ devices }) => {
+        result.wake(devices);
+      });
+      afterTest(() => query.close());
+      expect(await result.wait()).to.be.length(0);
+
+      result = new Trigger<Device[] | undefined>();
+      await serviceContext.createIdentity();
+      expect(await result.wait()).to.be.length(1);
+    });
+  });
+});

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

@@ -0,0 +1,82 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import chai, { expect } from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+
+import { Trigger } from '@dxos/async';
+import { PublicKey } from '@dxos/keys';
+import { Identity, IdentityService } from '@dxos/protocols/proto/dxos/client/services';
+import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
+
+import { ServiceContext } from '../services';
+import { createServiceContext } from '../testing';
+import { IdentityServiceImpl } from './identity-service';
+
+chai.use(chaiAsPromised);
+
+describe('IdentityService', () => {
+  let serviceContext: ServiceContext;
+  let identityService: IdentityService;
+
+  beforeEach(async () => {
+    serviceContext = createServiceContext();
+    await serviceContext.open();
+    identityService = new IdentityServiceImpl(serviceContext);
+  });
+
+  afterEach(async () => {
+    await serviceContext.close();
+  });
+
+  describe('createIdentity', () => {
+    test('creates a new identity', async () => {
+      const identity = await identityService.createIdentity({});
+
+      expect(identity.identityKey).to.be.instanceof(PublicKey);
+      expect(identity.spaceKey).to.be.instanceof(PublicKey);
+    });
+
+    test('creates a new identity with a display name', async () => {
+      const identity = await identityService.createIdentity({ displayName: 'Example' });
+
+      expect(identity.identityKey).to.be.instanceof(PublicKey);
+      expect(identity.spaceKey).to.be.instanceof(PublicKey);
+      expect(identity.profile?.displayName).to.equal('Example');
+    });
+
+    test('fails to create identity if one already exists', async () => {
+      await identityService.createIdentity({});
+      await expect(identityService.createIdentity({})).to.be.rejectedWith('Identity already exists');
+    });
+  });
+
+  describe.skip('recoverIdentity', () => {});
+
+  describe('queryIdentity', () => {
+    test('returns undefined if no identity is available', async () => {
+      const query = identityService.queryIdentity();
+      const result = new Trigger<Identity | undefined>();
+      query.subscribe(({ identity }) => {
+        result.wake(identity);
+      });
+      afterTest(() => query.close());
+      expect(await result.wait()).to.be.undefined;
+    });
+
+    test('updates when identity is created', async () => {
+      const query = identityService.queryIdentity();
+      let result = new Trigger<Identity | undefined>();
+      query.subscribe(({ identity }) => {
+        result.wake(identity);
+      });
+      afterTest(() => query.close());
+      expect(await result.wait()).to.be.undefined;
+
+      result = new Trigger<Identity | undefined>();
+      const identity = await identityService.createIdentity({});
+      expect(await result.wait()).to.deep.equal(identity);
+    });
+  });
+});

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

@@ -5,6 +5,16 @@
 import assert from 'node:assert';
 
 import { scheduleTask, sleep, Trigger } from '@dxos/async';
+import {
+  AbstractInvitationsHandler,
+  AuthenticatingInvitationProvider,
+  AUTHENTICATION_CODE_LENGTH,
+  CancellableInvitationObservable,
+  InvitationObservableProvider,
+  InvitationsOptions,
+  INVITATION_TIMEOUT,
+  ON_CLOSE_DELAY
+} from '@dxos/client';
 import { Context } from '@dxos/context';
 import { generatePasscode } from '@dxos/credentials';
 import { Keyring } from '@dxos/keyring';
@@ -23,15 +33,6 @@ import {
 import { ExtensionContext, RpcExtension } from '@dxos/teleport';
 
 import { Identity, JoinIdentityParams } from '../identity';
-import {
-  AuthenticatingInvitationProvider,
-  AUTHENTICATION_CODE_LENGTH,
-  CancellableInvitationObservable,
-  InvitationObservableProvider,
-  INVITATION_TIMEOUT,
-  ON_CLOSE_DELAY
-} from './invitations';
-import { AbstractInvitationsHandler, InvitationsOptions } from './invitations-handler';
 
 type DeviceInvitationsHandlerParams = {
   networkManager: NetworkManager;

package/src/packlets/invitations/device-invitations-service.test.ts

@@ -7,13 +7,13 @@ import assert from 'node:assert';
 import waitForExpect from 'wait-for-expect';
 
 import { asyncChain, Trigger } from '@dxos/async';
+import { DeviceInvitationsProxy } from '@dxos/client';
 import { raise } from '@dxos/debug';
 import { Invitation, DeviceInvitationsService } from '@dxos/protocols/proto/dxos/client/services';
 import { describe, test, afterTest } from '@dxos/test';
 
 import { ServiceContext } from '../services';
 import { createPeers } from '../testing';
-import { DeviceInvitationsProxy } from './device-invitations-proxy';
 import { DeviceInvitationsServiceImpl } from './device-invitations-service';
 
 const closeAfterTest = async (peer: ServiceContext) => {

package/src/packlets/invitations/device-invitations-service.ts

@@ -2,10 +2,10 @@
 // Copyright 2022 DXOS.org
 //
 
+import { InvitationsHandler } from '@dxos/client';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 
 import { IdentityManager } from '../identity';
-import { InvitationsHandler } from './invitations-handler';
 import { AbstractInvitationsService } from './invitations-service';
 
 /**

package/src/packlets/invitations/index.ts

@@ -2,14 +2,8 @@
 // Copyright 2022 DXOS.org
 //
 
-export * from './encoder';
 export * from './device-invitations-handler';
-export * from './device-invitations-proxy';
 export * from './device-invitations-service';
-export * from './invitations';
-export * from './invitations-handler';
-export * from './invitations-proxy';
 export * from './invitations-service';
 export * from './space-invitations-handler';
-export * from './space-invitations-proxy';
 export * from './space-invitations-service';

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

@@ -5,14 +5,19 @@
 import assert from 'node:assert';
 
 import { TimeoutError } from '@dxos/async';
+import {
+  AuthenticatingInvitationObservable,
+  CancellableInvitationObservable,
+  InvitationsService,
+  InvitationsHandler,
+  InvitationsOptions
+} from '@dxos/client';
 import { Stream } from '@dxos/codec-protobuf';
 import { log } from '@dxos/log';
 import { AuthenticationRequest, Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { Provider } from '@dxos/util';
 
 import { IdentityManager } from '../identity';
-import { AuthenticatingInvitationObservable, CancellableInvitationObservable, InvitationsService } from './invitations';
-import { InvitationsHandler, InvitationsOptions } from './invitations-handler';
 
 /**
  * Adapts invitation service observable to client/service stream.

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

@@ -14,7 +14,7 @@ import { afterTest, describe, test } from '@dxos/test';
 import { range } from '@dxos/util';
 
 import { ServiceContext } from '../services';
-import { createIdentity, createPeers, syncItems } from '../testing';
+import { createIdentity, createPeers, syncItemsLocal } from '../testing';
 import { performInvitation } from '../testing/invitation-utils';
 
 const closeAfterTest = async (peer: ServiceContext) => {
@@ -53,7 +53,7 @@ describe('services/space-invitations-handler', () => {
       expect(space1).not.to.be.undefined;
       expect(space2).not.to.be.undefined;
 
-      await syncItems(space1.dataPipelineController, space2.dataPipelineController);
+      await syncItemsLocal(space1.dataPipelineController, space2.dataPipelineController);
 
       await space1.close();
       await space2.close();
@@ -116,7 +116,7 @@ describe('services/space-invitations-handler', () => {
       expect(space1).not.to.be.undefined;
       expect(space2).not.to.be.undefined;
 
-      await syncItems(space1.dataPipelineController, space2.dataPipelineController);
+      await syncItemsLocal(space1.dataPipelineController, space2.dataPipelineController);
 
       await space1.close();
       await space2.close();

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

@@ -5,6 +5,16 @@
 import assert from 'node:assert';
 
 import { scheduleTask, sleep, Trigger } from '@dxos/async';
+import {
+  AuthenticatingInvitationProvider,
+  AUTHENTICATION_CODE_LENGTH,
+  CancellableInvitationObservable,
+  InvitationObservableProvider,
+  INVITATION_TIMEOUT,
+  ON_CLOSE_DELAY,
+  AbstractInvitationsHandler,
+  InvitationsOptions
+} from '@dxos/client';
 import { Context } from '@dxos/context';
 import { createAdmissionCredentials, generatePasscode, getCredentialAssertion } from '@dxos/credentials';
 import { SigningContext } from '@dxos/echo-pipeline';
@@ -29,17 +39,7 @@ import {
 } from '@dxos/protocols/proto/dxos/halo/invitations';
 import { ExtensionContext, RpcExtension } from '@dxos/teleport';
 
-import { DataSpace } from '../spaces/data-space';
-import { DataSpaceManager } from '../spaces/data-space-manager';
-import {
-  AuthenticatingInvitationProvider,
-  AUTHENTICATION_CODE_LENGTH,
-  CancellableInvitationObservable,
-  InvitationObservableProvider,
-  INVITATION_TIMEOUT,
-  ON_CLOSE_DELAY
-} from './invitations';
-import { AbstractInvitationsHandler, InvitationsOptions } from './invitations-handler';
+import { DataSpace, DataSpaceManager } from '../spaces';
 
 const MAX_OTP_ATTEMPTS = 3;
 

package/src/packlets/invitations/space-invitations-service.test.ts

@@ -6,13 +6,13 @@ import { expect } from 'chai';
 import assert from 'node:assert';
 
 import { asyncChain, Trigger } from '@dxos/async';
+import { SpaceInvitationsProxy } from '@dxos/client';
 import { raise } from '@dxos/debug';
 import { Invitation, SpaceInvitationsService } from '@dxos/protocols/proto/dxos/client/services';
 import { describe, test, afterTest } from '@dxos/test';
 
 import { ServiceContext } from '../services';
 import { createIdentity, createPeers } from '../testing';
-import { SpaceInvitationsProxy } from './space-invitations-proxy';
 import { SpaceInvitationsServiceImpl } from './space-invitations-service';
 
 const closeAfterTest = async (peer: ServiceContext) => {

package/src/packlets/invitations/space-invitations-service.ts

@@ -4,13 +4,12 @@
 
 import assert from 'node:assert';
 
+import { InvitationsHandler } from '@dxos/client';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { Provider } from '@dxos/util';
 
 import { IdentityManager } from '../identity';
-import { DataSpace } from '../spaces/data-space';
-import { DataSpaceManager } from '../spaces/data-space-manager';
-import { InvitationsHandler } from './invitations-handler';
+import { DataSpace, DataSpaceManager } from '../spaces';
 import { AbstractInvitationsService } from './invitations-service';
 
 /**

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

@@ -0,0 +1,52 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { expect } from 'chai';
+
+import { Trigger } from '@dxos/async';
+import { NetworkService, ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
+import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
+
+import { ServiceContext } from '../services';
+import { createServiceContext } from '../testing';
+import { NetworkServiceImpl } from './network-service';
+
+describe('NetworkService', () => {
+  let serviceContext: ServiceContext;
+  let networkService: NetworkService;
+
+  beforeEach(async () => {
+    serviceContext = createServiceContext();
+    await serviceContext.open();
+    networkService = new NetworkServiceImpl(serviceContext.networkManager);
+  });
+
+  afterEach(async () => {
+    await serviceContext.close();
+  });
+
+  test('setNetworkOptions changes network status', async () => {
+    await networkService.setNetworkOptions({
+      state: ConnectionState.OFFLINE
+    });
+
+    expect(serviceContext.networkManager.connectionState).to.equal(ConnectionState.OFFLINE);
+  });
+
+  test('subscribeToNetworkStatus returns current network status', async () => {
+    const query = networkService.subscribeToNetworkStatus();
+    let result = new Trigger<ConnectionState | undefined>();
+    query.subscribe(({ state }) => {
+      result.wake(state);
+    });
+    afterTest(() => query.close());
+    expect(await result.wait()).to.equal(ConnectionState.ONLINE);
+
+    result = new Trigger<ConnectionState | undefined>();
+    await networkService.setNetworkOptions({
+      state: ConnectionState.OFFLINE
+    });
+    expect(await result.wait()).to.equal(ConnectionState.OFFLINE);
+  });
+});

package/src/packlets/services/index.ts

@@ -2,8 +2,8 @@
 // Copyright 2022 DXOS.org
 //
 
+export * from './local-client-services';
 export * from './service-context';
-export * from './service-definitions';
 export * from './service-host';
-export * from './service-proxy';
 export * from './service-registry';
+export * from './utils';

package/src/packlets/services/local-client-services.ts

@@ -0,0 +1,35 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { ClientServices, ClientServicesProvider } from '@dxos/client';
+import { ServiceBundle } from '@dxos/rpc';
+
+import { ClientServicesHost, ClientServicesHostParams } from './service-host';
+
+/**
+ * Starts a local instance of the service host.
+ */
+export class LocalClientServices implements ClientServicesProvider {
+  private readonly _host: ClientServicesHost;
+
+  constructor(params: ClientServicesHostParams) {
+    this._host = new ClientServicesHost(params);
+  }
+
+  get descriptors(): ServiceBundle<ClientServices> {
+    return this._host.descriptors;
+  }
+
+  get services(): Partial<ClientServices> {
+    return this._host.services;
+  }
+
+  async open(): Promise<void> {
+    await this._host.open();
+  }
+
+  async close(): Promise<void> {
+    await this._host.close();
+  }
+}

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

@@ -5,7 +5,7 @@
 import { MemorySignalManagerContext } from '@dxos/messaging';
 import { describe, test } from '@dxos/test';
 
-import { createServiceContext, syncItems } from '../testing';
+import { createServiceContext, syncItemsLocal } from '../testing';
 import { performInvitation } from '../testing/invitation-utils';
 
 describe('services/ServiceContext', () => {
@@ -19,7 +19,7 @@ describe('services/ServiceContext', () => {
     await performInvitation(device1.deviceInvitations, device2.deviceInvitations, undefined);
 
     const space2 = await device2.dataSpaceManager!.spaces.get(space1.key);
-    await syncItems(space1.dataPipelineController, space2!.dataPipelineController);
+    await syncItemsLocal(space1.dataPipelineController, space2!.dataPipelineController);
   });
 
   test('new space is synchronized on device invitations', async () => {
@@ -33,7 +33,7 @@ describe('services/ServiceContext', () => {
     const space1 = await device1.dataSpaceManager!.createSpace();
     await device2.dataSpaceManager?.updated.waitForCondition(() => !!device2.dataSpaceManager!.spaces.get(space1.key));
     const space2 = await device2.dataSpaceManager!.spaces.get(space1.key);
-    await syncItems(space1.dataPipelineController, space2!.dataPipelineController);
+    await syncItemsLocal(space1.dataPipelineController, space2!.dataPipelineController);
   });
 
   test('joined space is synchronized on device invitations', async () => {
@@ -51,6 +51,6 @@ describe('services/ServiceContext', () => {
 
     await device2.dataSpaceManager?.updated.waitForCondition(() => !!device2.dataSpaceManager!.spaces.get(space1.key));
     const space2 = await device2.dataSpaceManager!.spaces.get(space1.key);
-    await syncItems(space1.dataPipelineController, space2!.dataPipelineController);
+    await syncItemsLocal(space1.dataPipelineController, space2!.dataPipelineController);
   });
 });

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

@@ -24,7 +24,7 @@ import { Storage } from '@dxos/random-access-storage';
 
 import { CreateIdentityOptions, IdentityManager, JoinIdentityParams } from '../identity';
 import { DeviceInvitationsHandler, SpaceInvitationsHandler } from '../invitations';
-import { DataSpaceManager } from '../spaces/data-space-manager';
+import { DataSpaceManager } from '../spaces';
 
 /**
  * Shared backend for all client services.

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

@@ -5,16 +5,15 @@
 import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
+import { clientServiceBundle, ClientServices, createDefaultModelFactory } from '@dxos/client';
 import { Config } from '@dxos/config';
 import { raise } from '@dxos/debug';
-import { DocumentModel } from '@dxos/document-model';
 import { DataServiceImpl } from '@dxos/echo-pipeline';
 import { log } from '@dxos/log';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
 import { SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { Storage } from '@dxos/random-access-storage';
-import { TextModel } from '@dxos/text-model';
 
 import { TracingServiceImpl } from '../deprecated';
 import { DevicesServiceImpl } from '../devices';
@@ -27,16 +26,9 @@ import { createStorageObjects } from '../storage';
 import { SystemServiceImpl } from '../system';
 import { VaultResourceLock } from '../vault';
 import { ServiceContext } from './service-context';
-import { ClientServicesProvider, ClientServices, clientServiceBundle } from './service-definitions';
 import { ServiceRegistry } from './service-registry';
 
-// TODO(burdon): Factor out to spaces.
-// TODO(burdon): Defaults (with TextModel).
-export const createDefaultModelFactory = () => {
-  return new ModelFactory().registerModel(DocumentModel).registerModel(TextModel);
-};
-
-type ClientServicesHostParams = {
+export type ClientServicesHostParams = {
   config: Config;
   modelFactory?: ModelFactory;
   networkManager: NetworkManager;
@@ -47,7 +39,7 @@ type ClientServicesHostParams = {
 /**
  * Remote service implementation.
  */
-export class ClientServicesHost implements ClientServicesProvider {
+export class ClientServicesHost {
   private readonly _resourceLock?: VaultResourceLock;
   private readonly _serviceRegistry: ServiceRegistry<ClientServices>;
   private readonly _systemService: SystemServiceImpl;

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

@@ -5,15 +5,15 @@
 import assert from 'node:assert';
 
 import { Trigger } from '@dxos/async';
+import { ClientServices, SpaceInvitationsProxy } from '@dxos/client';
 import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols';
 import { Invitation, SpaceInvitationsService } from '@dxos/protocols/proto/dxos/client/services';
 import { createLinkedPorts, createProtoRpcPeer, createServiceBundle } from '@dxos/rpc';
 import { describe, test } from '@dxos/test';
 
-import { SpaceInvitationsProxy, SpaceInvitationsServiceImpl } from '../invitations';
+import { SpaceInvitationsServiceImpl } from '../invitations';
 import { createServiceContext } from '../testing';
-import { ClientServices } from './service-definitions';
 import { ServiceRegistry } from './service-registry';
 
 // TODO(burdon): Create TestService (that doesn't require peers).