@dxos/client-services 0.3.2-main.de57e73 → 0.3.2-main.ec06501

package/dist/lib/browser/{chunk-XEZCTVLQ.mjs → chunk-KLSDV4XQ.mjs}

@@ -460,9 +460,11 @@ import { DeviceStateMachine, createCredentialSignerWithKey, createCredentialSign
 import { failUndefined } from "@dxos/debug";
 import { writeMessages } from "@dxos/feed-store";
 import { invariant } from "@dxos/invariant";
+import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log2 } from "@dxos/log";
 import { AdmittedFeed } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { trace } from "@dxos/tracing";
+import { ComplexSet } from "@dxos/util";
 function _ts_decorate(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")
@@ -481,6 +483,14 @@ var Identity = class Identity2 {
     this._signer = signer;
     this.identityKey = identityKey;
     this.deviceKey = deviceKey;
+    log2.trace("dxos.halo.device", {
+      deviceKey
+    }, {
+      F: __dxlog_file2,
+      L: 60,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._deviceStateMachine = new DeviceStateMachine({
       identityKey: this.identityKey,
       deviceKey: this.deviceKey,
@@ -491,7 +501,7 @@ var Identity = class Identity2 {
       onUpdate: () => this.stateUpdate.emit()
     });
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => this.authorizedDeviceKeys,
+      trustedKeysProvider: () => new ComplexSet(PublicKey3.hash, this.authorizedDeviceKeys.keys()),
       update: this.stateUpdate,
       authTimeout: AUTH_TIMEOUT
     });
@@ -549,7 +559,7 @@ var Identity = class Identity2 {
   getIdentityCredentialSigner() {
     invariant(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file2,
-      L: 139,
+      L: 141,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -573,7 +583,7 @@ var Identity = class Identity2 {
       dataFeedKey
     }, {
       F: __dxlog_file2,
-      L: 155,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -625,11 +635,12 @@ Identity = _ts_decorate([
 ], Identity);
 
 // packages/sdk/client-services/src/packlets/identity/identity-manager.ts
+import platform from "platform";
 import { Event as Event2 } from "@dxos/async";
 import { Context as Context3 } from "@dxos/context";
 import { createCredentialSignerWithKey as createCredentialSignerWithKey2, CredentialGenerator } from "@dxos/credentials";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { PublicKey as PublicKey3 } from "@dxos/keys";
+import { PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { trace as trace2 } from "@dxos/protocols";
 import { AdmittedFeed as AdmittedFeed2 } from "@dxos/protocols/proto/dxos/halo/credentials";
@@ -661,12 +672,12 @@ var IdentityManager = class IdentityManager2 {
     return this._identity;
   }
   async open(ctx) {
-    const traceId = PublicKey3.random().toHex();
+    const traceId = PublicKey4.random().toHex();
     log3.trace("dxos.halo.identity-manager.open", trace2.begin({
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 73,
+      L: 75,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -675,7 +686,7 @@ var IdentityManager = class IdentityManager2 {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 76,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -688,7 +699,7 @@ var IdentityManager = class IdentityManager2 {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file3,
-        L: 81,
+        L: 83,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -698,7 +709,7 @@ var IdentityManager = class IdentityManager2 {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 87,
+      L: 89,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -709,7 +720,7 @@ var IdentityManager = class IdentityManager2 {
   async createIdentity({ displayName } = {}) {
     invariant2(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 95,
+      L: 97,
       S: this,
       A: [
         "!this._identity",
@@ -718,7 +729,7 @@ var IdentityManager = class IdentityManager2 {
     });
     log3("creating identity...", void 0, {
       F: __dxlog_file3,
-      L: 96,
+      L: 98,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -739,7 +750,7 @@ var IdentityManager = class IdentityManager2 {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       invariant2(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file3,
-        L: 115,
+        L: 117,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -748,7 +759,7 @@ var IdentityManager = class IdentityManager2 {
       });
       invariant2(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file3,
-        L: 116,
+        L: 118,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -767,6 +778,13 @@ var IdentityManager = class IdentityManager2 {
         }));
       }
       credentials.push(await generator.createDeviceAuthorization(identityRecord.deviceKey));
+      credentials.push(await generator.createDeviceProfile({
+        platform: platform.name,
+        platformVersion: platform.version,
+        architecture: typeof platform.os?.architecture === "number" ? String(platform.os.architecture) : void 0,
+        os: platform.os?.family,
+        osVersion: platform.os?.version
+      }));
       for (const credential of credentials) {
         await identity.controlPipeline.writer.write({
           credential: {
@@ -783,7 +801,7 @@ var IdentityManager = class IdentityManager2 {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
-      L: 151,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -793,7 +811,7 @@ var IdentityManager = class IdentityManager2 {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file3,
-      L: 157,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -807,13 +825,13 @@ var IdentityManager = class IdentityManager2 {
       params
     }, {
       F: __dxlog_file3,
-      L: 165,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 166,
+      L: 178,
       S: this,
       A: [
         "!this._identity",
@@ -841,7 +859,7 @@ var IdentityManager = class IdentityManager2 {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
-      L: 185,
+      L: 197,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -851,7 +869,7 @@ var IdentityManager = class IdentityManager2 {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file3,
-      L: 191,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -863,7 +881,7 @@ var IdentityManager = class IdentityManager2 {
   async updateProfile(profile) {
     invariant2(this._identity, "Identity not initialized.", {
       F: __dxlog_file3,
-      L: 199,
+      L: 211,
       S: this,
       A: [
         "this._identity",
@@ -894,7 +912,7 @@ var IdentityManager = class IdentityManager2 {
   async _constructIdentity(identityRecord) {
     invariant2(!this._identity, void 0, {
       F: __dxlog_file3,
-      L: 216,
+      L: 228,
       S: this,
       A: [
         "!this._identity",
@@ -905,13 +923,13 @@ var IdentityManager = class IdentityManager2 {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 217,
+      L: 229,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 220,
+      L: 232,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -923,7 +941,7 @@ var IdentityManager = class IdentityManager2 {
     });
     invariant2(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 224,
+      L: 236,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -955,7 +973,7 @@ var IdentityManager = class IdentityManager2 {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file3,
-      L: 248,
+      L: 260,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -976,7 +994,7 @@ var IdentityManager = class IdentityManager2 {
       onAuthFailure: () => {
         log3.warn("auth failure", void 0, {
           F: __dxlog_file3,
-          L: 267,
+          L: 279,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1161,7 +1179,7 @@ import { AuthenticatingInvitation, AUTHENTICATION_CODE_LENGTH, CancellableInvita
 import { Context as Context5 } from "@dxos/context";
 import { generatePasscode } from "@dxos/credentials";
 import { invariant as invariant6 } from "@dxos/invariant";
-import { PublicKey as PublicKey5 } from "@dxos/keys";
+import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
 import { createTeleportProtocolFactory, StarTopology } from "@dxos/network-manager";
 import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, trace as trace4 } from "@dxos/protocols";
@@ -1172,7 +1190,7 @@ import { AuthenticationResponse as AuthenticationResponse2 } from "@dxos/protoco
 import { Trigger as Trigger2 } from "@dxos/async";
 import { cancelWithContext, Context as Context4 } from "@dxos/context";
 import { invariant as invariant5 } from "@dxos/invariant";
-import { PublicKey as PublicKey4 } from "@dxos/keys";
+import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError, schema as schema2, trace as trace3 } from "@dxos/protocols";
 import { Invitation as Invitation2 } from "@dxos/protocols/proto/dxos/client/services";
@@ -1220,7 +1238,7 @@ var InvitationHostExtension = class extends RpcExtension {
         },
         introduce: async (request) => {
           const { profile, invitationId } = request;
-          const traceId = PublicKey4.random().toHex();
+          const traceId = PublicKey5.random().toHex();
           log4.trace("dxos.sdk.invitation-handler.host.introduce", trace3.begin({
             id: traceId
           }), {
@@ -1272,7 +1290,7 @@ var InvitationHostExtension = class extends RpcExtension {
           };
         },
         authenticate: async ({ authCode: code }) => {
-          const traceId = PublicKey4.random().toHex();
+          const traceId = PublicKey5.random().toHex();
           log4.trace("dxos.sdk.invitation-handler.host.authenticate", trace3.begin({
             id: traceId
           }), {
@@ -1352,7 +1370,7 @@ var InvitationHostExtension = class extends RpcExtension {
           };
         },
         admit: async (request) => {
-          const traceId = PublicKey4.random().toHex();
+          const traceId = PublicKey5.random().toHex();
           log4.trace("dxos.sdk.invitation-handler.host.admit", trace3.begin({
             id: traceId
           }), {
@@ -1518,7 +1536,7 @@ var InvitationsHandler = class {
     this._networkManager = _networkManager;
   }
   createInvitation(protocol, options) {
-    const { invitationId = PublicKey5.random().toHex(), type = Invitation3.Type.INTERACTIVE, authMethod = Invitation3.AuthMethod.SHARED_SECRET, state = Invitation3.State.INIT, timeout = INVITATION_TIMEOUT, swarmKey = PublicKey5.random() } = options ?? {};
+    const { invitationId = PublicKey6.random().toHex(), type = Invitation3.Type.INTERACTIVE, authMethod = Invitation3.AuthMethod.SHARED_SECRET, state = Invitation3.State.INIT, timeout = INVITATION_TIMEOUT, swarmKey = PublicKey6.random() } = options ?? {};
     const authCode = options?.authCode ?? (authMethod === Invitation3.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
     invariant6(protocol, void 0, {
       F: __dxlog_file7,
@@ -1593,7 +1611,7 @@ var InvitationsHandler = class {
         },
         onOpen: () => {
           scheduleTask2(ctx, async () => {
-            const traceId = PublicKey5.random().toHex();
+            const traceId = PublicKey6.random().toHex();
             try {
               log5.trace("dxos.sdk.invitations-handler.host.onOpen", trace4.begin({
                 id: traceId
@@ -1826,7 +1844,7 @@ var InvitationsHandler = class {
             }
           });
           scheduleTask2(ctx, async () => {
-            const traceId = PublicKey5.random().toHex();
+            const traceId = PublicKey6.random().toHex();
             try {
               log5.trace("dxos.sdk.invitations-handler.guest.onOpen", trace4.begin({
                 id: traceId
@@ -2033,7 +2051,7 @@ var InvitationsHandler = class {
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
         topic,
-        peerId: PublicKey5.random(),
+        peerId: PublicKey6.random(),
         protocolProvider: createTeleportProtocolFactory(async (teleport) => {
           teleport.addExtension("dxos.halo.invitations", createExtension());
         }),
@@ -2190,15 +2208,6 @@ var InvitationsServiceImpl = class {
       await accepted.cancel();
       this._acceptInvitations.delete(invitationId);
       this._removedAccepted.emit(accepted.get());
-    } else {
-      log6.warn("invalid invitation", {
-        invitationId
-      }, {
-        F: __dxlog_file8,
-        L: 132,
-        S: this,
-        C: (f, a) => f(...a)
-      });
     }
   }
   queryInvitations() {
@@ -2486,10 +2495,10 @@ var getPlatform = () => {
       };
     }
   } else {
-    const { platform, version, arch } = process;
+    const { platform: platform2, version, arch } = process;
     return {
       type: "node",
-      platform: `${platform} ${version} ${arch}`,
+      platform: `${platform2} ${version} ${arch}`,
       runtime: process.version,
       uptime: Math.floor(process.uptime()),
       memory: process.memoryUsage()
@@ -2498,7 +2507,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.3.2-main.de57e73";
+var DXOS_VERSION = "0.3.2-main.ec06501";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -2624,24 +2633,24 @@ import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
 import { cancelWithContext as cancelWithContext2, Context as Context7 } from "@dxos/context";
 import { timed } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
-import { PublicKey as PublicKey7 } from "@dxos/keys";
+import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { CancelledError, SystemError } from "@dxos/protocols";
 import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
 import { trace as trace5 } from "@dxos/tracing";
-import { ComplexSet as ComplexSet2 } from "@dxos/util";
+import { ComplexSet as ComplexSet3 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
 import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, sleep, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
 import { Context as Context6, rejectOnDispose } from "@dxos/context";
 import { invariant as invariant10 } from "@dxos/invariant";
-import { PublicKey as PublicKey6 } from "@dxos/keys";
+import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
-import { ComplexMap as ComplexMap2, ComplexSet, entry } from "@dxos/util";
+import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet2, entry } from "@dxos/util";
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
@@ -2652,8 +2661,8 @@ var NotarizationPlugin = class {
     this._ctx = new Context6();
     this._extensionOpened = new Event4();
     this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new ComplexSet(PublicKey6.hash);
-    this._processCredentialsTriggers = new ComplexMap2(PublicKey6.hash);
+    this._processedCredentials = new ComplexSet2(PublicKey7.hash);
+    this._processCredentialsTriggers = new ComplexMap2(PublicKey7.hash);
   }
   get hasWriter() {
     return !!this._writer;
@@ -2935,7 +2944,7 @@ var DataSpace = class DataSpace2 {
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new ComplexSet2(PublicKey7.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
+      trustedKeysProvider: () => new ComplexSet3(PublicKey8.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
       update: this._inner.stateUpdate,
       authTimeout: AUTH_TIMEOUT2
     });
@@ -3268,7 +3277,7 @@ import { Event as Event6, synchronized as synchronized2, trackLeaks as trackLeak
 import { cancelWithContext as cancelWithContext3, Context as Context8 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
 import { invariant as invariant11 } from "@dxos/invariant";
-import { PublicKey as PublicKey8 } from "@dxos/keys";
+import { PublicKey as PublicKey9 } from "@dxos/keys";
 import { log as log11 } from "@dxos/log";
 import { trace as trace6 } from "@dxos/protocols";
 import { SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
@@ -3366,9 +3375,9 @@ var DataSpaceManager = class DataSpaceManager2 {
     this._feedStore = _feedStore;
     this._ctx = new Context8();
     this.updated = new Event6();
-    this._spaces = new ComplexMap3(PublicKey8.hash);
+    this._spaces = new ComplexMap3(PublicKey9.hash);
     this._isOpen = false;
-    this._instanceId = PublicKey8.random().toHex();
+    this._instanceId = PublicKey9.random().toHex();
   }
   // TODO(burdon): Remove.
   get spaces() {
@@ -3907,7 +3916,7 @@ import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, S
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
-import { PublicKey as PublicKey9 } from "@dxos/keys";
+import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log13 } from "@dxos/log";
 import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace7 } from "@dxos/protocols";
 import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
@@ -3934,7 +3943,7 @@ var ServiceContext = class ServiceContext2 {
     this.initialized = new Trigger5();
     this.dataServiceSubscriptions = new DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
-    this._instanceId = PublicKey9.random().toHex();
+    this._instanceId = PublicKey10.random().toHex();
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
     this.snapshotStore = new SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new BlobStore(storage.createDirectory("blobs"));
@@ -4364,7 +4373,7 @@ import { DocumentModel as DocumentModel2 } from "@dxos/document-model";
 import { DataServiceImpl } from "@dxos/echo-pipeline";
 import { base } from "@dxos/echo-schema";
 import { invariant as invariant14 } from "@dxos/invariant";
-import { PublicKey as PublicKey10 } from "@dxos/keys";
+import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { log as log16 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
 import { ModelFactory } from "@dxos/model-factory";
@@ -4383,7 +4392,7 @@ var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
   }
-  updateDevice(request) {
+  async updateDevice(profile) {
     throw new Error("Method not implemented.");
   }
   queryDevices() {
@@ -4396,9 +4405,10 @@ var DevicesServiceImpl = class {
           });
         } else {
           next({
-            devices: Array.from(deviceKeys.values()).map((key) => ({
+            devices: Array.from(deviceKeys.entries()).map(([key, profile]) => ({
               deviceKey: key,
-              kind: this._identityManager.identity?.deviceKey.equals(key) ? DeviceKind.CURRENT : DeviceKind.TRUSTED
+              kind: this._identityManager.identity?.deviceKey.equals(key) ? DeviceKind.CURRENT : DeviceKind.TRUSTED,
+              profile
             }))
           });
         }
@@ -4791,7 +4801,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     if (this._open) {
       return;
     }
-    const traceId = PublicKey10.random().toHex();
+    const traceId = PublicKey11.random().toHex();
     log16.trace("dxos.client-services.host.open", trace8.begin({
       id: traceId
     }), {
@@ -4931,7 +4941,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
   }
   async reset() {
-    const traceId = PublicKey10.random().toHex();
+    const traceId = PublicKey11.random().toHex();
     log16.trace("dxos.sdk.client-services-host.reset", trace8.begin({
       id: traceId
     }), {
@@ -5035,4 +5045,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-XEZCTVLQ.mjs.map
+//# sourceMappingURL=chunk-KLSDV4XQ.mjs.map