@dxos/client-services 0.4.5-main.f8d6c4e → 0.4.5-next.ea4f804

package/dist/lib/node/packlets/testing/index.cjs

@@ -31,7 +31,7 @@ __export(testing_exports, {
   syncItemsLocal: () => syncItemsLocal
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_FVRRSRLI = require("../../chunk-FVRRSRLI.cjs");
+var import_chunk_YHMPI5TG = require("../../chunk-YHMPI5TG.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -209,7 +209,7 @@ var createInvitation = (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_FVRRSRLI.ServiceContext) {
+  if (host instanceof import_chunk_YHMPI5TG.ServiceContext) {
     const hostHandler = host.getInvitationHandler({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -220,7 +220,7 @@ var createInvitation = (host, options) => {
 };
 var acceptInvitation = (guest, invitation) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_FVRRSRLI.ServiceContext) {
+  if (guest instanceof import_chunk_YHMPI5TG.ServiceContext) {
     const guestHandler = guest.getInvitationHandler({
       kind: invitation.kind
     });
@@ -229,7 +229,7 @@ var acceptInvitation = (guest, invitation) => {
   return guest.join(invitation);
 };
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_FVRRSRLI.ClientServicesHost({
+  return new import_chunk_YHMPI5TG.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -243,8 +243,8 @@ var createServiceContext = ({ signalContext = new import_messaging.MemorySignalM
     signalManager,
     transportFactory: import_network_manager.MemoryTransportFactory
   });
-  const modelFactory = (0, import_chunk_FVRRSRLI.createDefaultModelFactory)();
-  return new import_chunk_FVRRSRLI.ServiceContext(storage, networkManager, signalManager, modelFactory);
+  const modelFactory = (0, import_chunk_YHMPI5TG.createDefaultModelFactory)();
+  return new import_chunk_YHMPI5TG.ServiceContext(storage, networkManager, signalManager, modelFactory);
 };
 var createPeers = async (numPeers) => {
   const signalContext = new import_messaging.MemorySignalManagerContext();
@@ -328,7 +328,7 @@ var TestPeer = class {
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       metadataStore: this.metadataStore,
-      modelFactory: (0, import_chunk_FVRRSRLI.createDefaultModelFactory)(),
+      modelFactory: (0, import_chunk_YHMPI5TG.createDefaultModelFactory)(),
       snapshotStore: this.snapshotStore,
       blobStore: this.blobStore
     });
@@ -340,7 +340,7 @@ var TestPeer = class {
     return this._props.automergeHost ??= new import_echo_pipeline.AutomergeHost(this.storage.createDirectory("automerge"));
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_FVRRSRLI.DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore, this.automergeHost);
+    return this._props.dataSpaceManager ??= new import_chunk_YHMPI5TG.DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore, this.automergeHost);
   }
   async createIdentity() {
     this._props.signingContext ??= await createSigningContext(this.keyring);

package/dist/types/src/packlets/identity/identity-manager.d.ts

@@ -4,8 +4,9 @@ import { type MetadataStore, type SpaceManager } from '@dxos/echo-pipeline';
 import { type FeedStore } from '@dxos/feed-store';
 import { type Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
+import { type Device } 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';
+import { type DeviceProfileDocument, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { Timeframe } from '@dxos/timeframe';
 import { Identity } from './identity';
 export type JoinIdentityParams = {
@@ -44,6 +45,7 @@ export declare class IdentityManager {
      * Update the profile document of an existing identity.
      */
     updateProfile(profile: ProfileDocument): Promise<ProfileDocument>;
+    updateDeviceProfile(profile: DeviceProfileDocument): Promise<Device>;
     private _constructIdentity;
     private _constructSpace;
 }

package/dist/types/src/packlets/identity/identity-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAsB,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAAgB,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACjG,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQtC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,SAAS,CAAC;IACxB,kBAAkB,EAAE,SAAS,CAAC;IAC9B,cAAc,EAAE,SAAS,CAAC;IAC1B,WAAW,EAAE,SAAS,CAAC;IAEvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAGF,qBACa,eAAe;IAQxB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAVhC,QAAQ,CAAC,WAAW,cAAe;IAEnC,OAAO,CAAC,SAAS,CAAC,CAAW;gBAKV,cAAc,EAAE,aAAa,EAC7B,QAAQ,EAAE,OAAO,EACjB,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,EAClC,aAAa,EAAE,YAAY;IAG9C,IAAI,QAAQ,yBAEX;IAGK,IAAI,CAAC,GAAG,EAAE,OAAO;IAmBjB,KAAK;IAIL,cAAc,CAAC,EAAE,WAAW,EAAE,GAAE,qBAA0B;IA6EhE;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,kBAAkB;IA+B/C;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,eAAe;YAiB9B,kBAAkB;YA2ClB,eAAe;CAc9B"}
+{"version":3,"file":"identity-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAsB,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,MAAM,EAAc,MAAM,4CAA4C,CAAC;AACrF,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACrB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQtC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,SAAS,CAAC;IACxB,kBAAkB,EAAE,SAAS,CAAC;IAC9B,cAAc,EAAE,SAAS,CAAC;IAC1B,WAAW,EAAE,SAAS,CAAC;IAEvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAGF,qBACa,eAAe;IAQxB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAVhC,QAAQ,CAAC,WAAW,cAAe;IAEnC,OAAO,CAAC,SAAS,CAAC,CAAW;gBAKV,cAAc,EAAE,aAAa,EAC7B,QAAQ,EAAE,OAAO,EACjB,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,EAClC,aAAa,EAAE,YAAY;IAG9C,IAAI,QAAQ,yBAEX;IAGK,IAAI,CAAC,GAAG,EAAE,OAAO;IAmBjB,KAAK;IAIL,cAAc,CAAC,EAAE,WAAW,EAAE,GAAE,qBAA0B;IA6EhE;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,kBAAkB;IA+B/C;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,eAAe;IAiBtC,mBAAmB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;YAqB5D,kBAAkB;YA2ClB,eAAe;CAc9B"}

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

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.4.5-main.f8d6c4e";
+export declare const DXOS_VERSION = "0.4.5-next.ea4f804";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.4.5-main.f8d6c4e",
+  "version": "0.4.5-next.ea4f804",
   "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.4.5-main.f8d6c4e",
-    "@dxos/codec-protobuf": "0.4.5-main.f8d6c4e",
-    "@dxos/client-protocol": "0.4.5-main.f8d6c4e",
-    "@dxos/config": "0.4.5-main.f8d6c4e",
-    "@dxos/credentials": "0.4.5-main.f8d6c4e",
-    "@dxos/context": "0.4.5-main.f8d6c4e",
-    "@dxos/crypto": "0.4.5-main.f8d6c4e",
-    "@dxos/debug": "0.4.5-main.f8d6c4e",
-    "@dxos/document-model": "0.4.5-main.f8d6c4e",
-    "@dxos/echo-db": "0.4.5-main.f8d6c4e",
-    "@dxos/echo-pipeline": "0.4.5-main.f8d6c4e",
-    "@dxos/echo-schema": "0.4.5-main.f8d6c4e",
-    "@dxos/feed-store": "0.4.5-main.f8d6c4e",
-    "@dxos/invariant": "0.4.5-main.f8d6c4e",
-    "@dxos/keyring": "0.4.5-main.f8d6c4e",
-    "@dxos/keys": "0.4.5-main.f8d6c4e",
-    "@dxos/log": "0.4.5-main.f8d6c4e",
-    "@dxos/messaging": "0.4.5-main.f8d6c4e",
-    "@dxos/lock-file": "0.4.5-main.f8d6c4e",
-    "@dxos/model-factory": "0.4.5-main.f8d6c4e",
-    "@dxos/network-manager": "0.4.5-main.f8d6c4e",
-    "@dxos/node-std": "0.4.5-main.f8d6c4e",
-    "@dxos/protocols": "0.4.5-main.f8d6c4e",
-    "@dxos/random-access-storage": "0.4.5-main.f8d6c4e",
-    "@dxos/rpc": "0.4.5-main.f8d6c4e",
-    "@dxos/teleport-extension-gossip": "0.4.5-main.f8d6c4e",
-    "@dxos/text-model": "0.4.5-main.f8d6c4e",
-    "@dxos/teleport": "0.4.5-main.f8d6c4e",
-    "@dxos/teleport-extension-object-sync": "0.4.5-main.f8d6c4e",
-    "@dxos/timeframe": "0.4.5-main.f8d6c4e",
-    "@dxos/tracing": "0.4.5-main.f8d6c4e",
-    "@dxos/util": "0.4.5-main.f8d6c4e",
-    "@dxos/websocket-rpc": "0.4.5-main.f8d6c4e"
+    "@dxos/async": "0.4.5-next.ea4f804",
+    "@dxos/codec-protobuf": "0.4.5-next.ea4f804",
+    "@dxos/config": "0.4.5-next.ea4f804",
+    "@dxos/context": "0.4.5-next.ea4f804",
+    "@dxos/client-protocol": "0.4.5-next.ea4f804",
+    "@dxos/credentials": "0.4.5-next.ea4f804",
+    "@dxos/crypto": "0.4.5-next.ea4f804",
+    "@dxos/debug": "0.4.5-next.ea4f804",
+    "@dxos/document-model": "0.4.5-next.ea4f804",
+    "@dxos/echo-db": "0.4.5-next.ea4f804",
+    "@dxos/echo-schema": "0.4.5-next.ea4f804",
+    "@dxos/feed-store": "0.4.5-next.ea4f804",
+    "@dxos/echo-pipeline": "0.4.5-next.ea4f804",
+    "@dxos/keyring": "0.4.5-next.ea4f804",
+    "@dxos/invariant": "0.4.5-next.ea4f804",
+    "@dxos/keys": "0.4.5-next.ea4f804",
+    "@dxos/lock-file": "0.4.5-next.ea4f804",
+    "@dxos/log": "0.4.5-next.ea4f804",
+    "@dxos/model-factory": "0.4.5-next.ea4f804",
+    "@dxos/messaging": "0.4.5-next.ea4f804",
+    "@dxos/network-manager": "0.4.5-next.ea4f804",
+    "@dxos/protocols": "0.4.5-next.ea4f804",
+    "@dxos/random-access-storage": "0.4.5-next.ea4f804",
+    "@dxos/node-std": "0.4.5-next.ea4f804",
+    "@dxos/teleport": "0.4.5-next.ea4f804",
+    "@dxos/teleport-extension-gossip": "0.4.5-next.ea4f804",
+    "@dxos/rpc": "0.4.5-next.ea4f804",
+    "@dxos/text-model": "0.4.5-next.ea4f804",
+    "@dxos/timeframe": "0.4.5-next.ea4f804",
+    "@dxos/teleport-extension-object-sync": "0.4.5-next.ea4f804",
+    "@dxos/tracing": "0.4.5-next.ea4f804",
+    "@dxos/util": "0.4.5-next.ea4f804",
+    "@dxos/websocket-rpc": "0.4.5-next.ea4f804"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.4.5-main.f8d6c4e"
+    "@dxos/signal": "0.4.5-next.ea4f804"
   },
   "publishConfig": {
     "access": "public"

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

@@ -27,7 +27,18 @@ describe('DevicesService', () => {
     await serviceContext.close();
   });
 
-  describe.skip('updateDevice', () => {});
+  describe('updateDevice', () => {
+    test.skip('updates device profile', async () => {
+      const query = devicesService.queryDevices();
+      const device = await devicesService.updateDevice({ label: 'test-device' });
+      const result = new Trigger<Device[] | undefined>();
+      query.subscribe(({ devices }) => {
+        result.wake(devices);
+      });
+      afterTest(() => query.close());
+      expect(device.profile?.label).to.equal('test-device');
+    });
+  });
 
   describe('queryDevices', () => {
     test('returns empty list if no identity is available', async () => {

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

@@ -18,7 +18,7 @@ export class DevicesServiceImpl implements DevicesService {
   constructor(private readonly _identityManager: IdentityManager) {}
 
   async updateDevice(profile: DeviceProfileDocument): Promise<Device> {
-    throw new Error('Method not implemented.');
+    return this._identityManager.updateDeviceProfile(profile);
   }
 
   queryDevices(): Stream<QueryDevicesResponse> {

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

@@ -163,4 +163,23 @@ describe('identity/identity-manager', () => {
 
     expect(!!identity.authorizedDeviceKeys.get(identity.deviceKey)?.platform).is.true;
   });
+
+  test('updates device profile', async () => {
+    const signalContext = new MemorySignalManagerContext();
+
+    const peer = await setupPeer({ signalContext });
+
+    const identity = await peer.identityManager.createIdentity();
+
+    // Note: Waiting for device profile credential to be processed.
+    await identity.stateUpdate.waitForCount(1);
+
+    const deviceProfile = identity.authorizedDeviceKeys.get(identity.deviceKey);
+    expect(deviceProfile).to.exist;
+
+    deviceProfile!.label = 'updated profile';
+    await peer.identityManager.updateDeviceProfile(deviceProfile!);
+
+    expect(identity.authorizedDeviceKeys.get(identity.deviceKey)?.label).to.equal('updated profile');
+  });
 });

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

@@ -14,9 +14,14 @@ import { type Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { trace } from '@dxos/protocols';
+import { type Device, DeviceKind } from '@dxos/protocols/proto/dxos/client/services';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type IdentityRecord, type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { AdmittedFeed, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import {
+  AdmittedFeed,
+  type DeviceProfileDocument,
+  type ProfileDocument,
+} from '@dxos/protocols/proto/dxos/halo/credentials';
 import { Timeframe } from '@dxos/timeframe';
 import { trace as Trace } from '@dxos/tracing';
 import { deferFunction } from '@dxos/util';
@@ -224,6 +229,27 @@ export class IdentityManager {
     return profile;
   }
 
+  async updateDeviceProfile(profile: DeviceProfileDocument): Promise<Device> {
+    invariant(this._identity, 'Identity not initialized.');
+
+    // TODO(nf): CredentialGenerator doesn't work when not updating own device.
+    // const generator = new CredentialGenerator(this._keyring, this._identity.identityKey, this._identity.deviceKey);
+    // const credential = await generator.createDeviceProfile(profile);
+
+    const credential = await this._identity.getIdentityCredentialSigner().createCredential({
+      subject: this._identity.deviceKey,
+      assertion: {
+        '@type': 'dxos.halo.credentials.DeviceProfile',
+        profile,
+      },
+    });
+
+    const receipt = await this._identity.controlPipeline.writer.write({ credential: { credential } });
+    await this._identity.controlPipeline.state.waitUntilTimeframe(new Timeframe([[receipt.feedKey, receipt.seq]]));
+    this.stateUpdate.emit();
+    return { deviceKey: this._identity.deviceKey, kind: DeviceKind.CURRENT, profile };
+  }
+
   private async _constructIdentity(identityRecord: IdentityRecord) {
     invariant(!this._identity);
     log('constructing identity', { identityRecord });

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

@@ -8,7 +8,7 @@ import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { DocumentModel } from '@dxos/document-model';
 import { DataServiceImpl } from '@dxos/echo-pipeline';
-import { type TypedObject, base, getRawDoc, type SpaceDoc } from '@dxos/echo-schema';
+import { type TypedObject, base, getRawDoc, type DocStructure } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -348,10 +348,10 @@ export class ClientServicesHost {
 
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant(automergeIndex);
-    const document = await this._serviceContext.automergeHost.repo.find<SpaceDoc>(automergeIndex as any);
+    const document = await this._serviceContext.automergeHost.repo.find<DocStructure>(automergeIndex as any);
     await document.whenReady();
 
-    document.change((doc: SpaceDoc) => {
+    document.change((doc: DocStructure) => {
       assignDeep(doc, ['objects', obj[base]._id], getRawDoc(obj).handle.docSync());
     });
 

package/src/packlets/spaces/data-space-manager.ts

@@ -143,7 +143,7 @@ export class DataSpaceManager {
 
     const automergeRoot = this._automergeHost.repo.create();
     automergeRoot.change((doc: any) => {
-      doc.access = { spaceKey: spaceKey.toHex() };
+      doc.experimental_spaceKey = spaceKey.toHex();
     });
 
     const space = await this._constructSpace(metadata);

package/src/packlets/spaces/data-space.ts

@@ -391,9 +391,9 @@ export class DataSpace {
         }
 
         const doc = handle.docSync() ?? failedInvariant();
-        if (!doc.access?.spaceKey) {
+        if (!doc.experimental_spaceKey) {
           handle.change((doc: any) => {
-            doc.access = { spaceKey: this.key.toHex() };
+            doc.experimental_spaceKey = this.key.toHex();
           });
         }
       } catch (err) {

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.5-main.f8d6c4e";
+export const DXOS_VERSION = "0.4.5-next.ea4f804";