@dxos/client-services 0.1.32-next.77d513e → 0.1.33

package/dist/lib/node/index.cjs

@@ -630,7 +630,9 @@ var Identity = class {
 var import_node_assert2 = __toESM(require("node:assert"));
 var import_async5 = require("@dxos/async");
 var import_credentials4 = require("@dxos/credentials");
+var import_keys4 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
+var import_protocols2 = require("@dxos/protocols");
 var import_credentials5 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_util2 = require("@dxos/util");
 var IdentityManager = class {
@@ -642,18 +644,28 @@ var IdentityManager = class {
     this._feedStore = _feedStore;
     this._spaceManager = _spaceManager;
     this.stateUpdate = new import_async5.Event();
+    this._instanceId = import_keys4.PublicKey.random().toHex();
   }
   get identity() {
     return this._identity;
   }
   async open() {
+    var _a;
+    import_log3.log.trace("dxos.halo.identity-manager", import_protocols2.trace.begin({
+      id: this._instanceId
+    }), {
+      file: "identity-manager.ts",
+      line: 71,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     await this._metadataStore.load();
     const identityRecord = this._metadataStore.getIdentityRecord();
     (0, import_log3.log)("identity record", {
       identityRecord
     }, {
       file: "identity-manager.ts",
-      line: 71,
+      line: 75,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -661,18 +673,36 @@ var IdentityManager = class {
       this._identity = await this._constructIdentity(identityRecord);
       await this._identity.open();
       await this._identity.ready();
+      import_log3.log.trace("dxos.halo.identity", {
+        identityKey: identityRecord.identityKey,
+        displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
+      }, {
+        file: "identity-manager.ts",
+        line: 80,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
       this.stateUpdate.emit();
     }
   }
   async close() {
     var _a;
     await ((_a = this._identity) == null ? void 0 : _a.close());
+    import_log3.log.trace("dxos.halo.identity-manager", import_protocols2.trace.end({
+      id: this._instanceId
+    }), {
+      file: "identity-manager.ts",
+      line: 90,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
   }
   async createIdentity({ displayName } = {}) {
+    var _a;
     (0, import_node_assert2.default)(!this._identity, "Identity already exists.");
     (0, import_log3.log)("creating identity...", {}, {
       file: "identity-manager.ts",
-      line: 86,
+      line: 95,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -716,13 +746,22 @@ var IdentityManager = class {
     await this._metadataStore.setIdentityRecord(identityRecord);
     this._identity = identity;
     await this._identity.ready();
+    import_log3.log.trace("dxos.halo.identity", {
+      identityKey: identityRecord.identityKey,
+      displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
+    }, {
+      file: "identity-manager.ts",
+      line: 150,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     this.stateUpdate.emit();
     (0, import_log3.log)("created identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
       file: "identity-manager.ts",
-      line: 143,
+      line: 156,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -732,11 +771,12 @@ var IdentityManager = class {
   * Accept an existing identity. Expects it's device key to be authorized (now or later).
   */
   async acceptIdentity(params) {
+    var _a;
     (0, import_log3.log)("accepting identity", {
       params
     }, {
       file: "identity-manager.ts",
-      line: 151,
+      line: 164,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -757,13 +797,22 @@ var IdentityManager = class {
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
     await this._identity.ready();
+    import_log3.log.trace("dxos.halo.identity", {
+      identityKey: identityRecord.identityKey,
+      displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
+    }, {
+      file: "identity-manager.ts",
+      line: 184,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     this.stateUpdate.emit();
     (0, import_log3.log)("accepted identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
       file: "identity-manager.ts",
-      line: 172,
+      line: 190,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -775,7 +824,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       file: "identity-manager.ts",
-      line: 178,
+      line: 196,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -808,7 +857,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       file: "identity-manager.ts",
-      line: 206,
+      line: 224,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -884,10 +933,10 @@ var import_async6 = require("@dxos/async");
 var import_client = require("@dxos/client");
 var import_context3 = require("@dxos/context");
 var import_credentials7 = require("@dxos/credentials");
-var import_keys4 = require("@dxos/keys");
+var import_keys5 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
 var import_network_manager = require("@dxos/network-manager");
-var import_protocols2 = require("@dxos/protocols");
+var import_protocols3 = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport = require("@dxos/teleport");
@@ -906,8 +955,8 @@ var DeviceInvitationsHandler = class extends import_client.AbstractInvitationsHa
     const identity = this._params.getIdentity();
     const invitation = {
       type,
-      invitationId: import_keys4.PublicKey.random().toHex(),
-      swarmKey: swarmKey != null ? swarmKey : import_keys4.PublicKey.random(),
+      invitationId: import_keys5.PublicKey.random().toHex(),
+      swarmKey: swarmKey != null ? swarmKey : import_keys5.PublicKey.random(),
       authenticationCode: (0, import_credentials7.generatePasscode)(import_client.AUTHENTICATION_CODE_LENGTH)
     };
     const ctx = new import_context3.Context({
@@ -1168,7 +1217,7 @@ var DeviceInvitationsHandler = class extends import_client.AbstractInvitationsHa
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
         topic,
-        peerId: import_keys4.PublicKey.random(),
+        peerId: import_keys5.PublicKey.random(),
         protocolProvider: (0, import_network_manager.createTeleportProtocolFactory)(async (teleport) => {
           teleport.addExtension("dxos.halo.invitations", createExtension());
         }),
@@ -1187,7 +1236,7 @@ var HostHaloInvitationExtension = class extends import_teleport.RpcExtension {
   constructor(_callbacks) {
     super({
       exposed: {
-        HaloHostService: import_protocols2.schema.getService("dxos.halo.invitations.HaloHostService")
+        HaloHostService: import_protocols3.schema.getService("dxos.halo.invitations.HaloHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -1219,7 +1268,7 @@ var GuestHaloInvitationExtension = class extends import_teleport.RpcExtension {
   constructor(_callbacks) {
     super({
       requested: {
-        HaloHostService: import_protocols2.schema.getService("dxos.halo.invitations.HaloHostService")
+        HaloHostService: import_protocols3.schema.getService("dxos.halo.invitations.HaloHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -1473,10 +1522,10 @@ var import_client2 = require("@dxos/client");
 var import_context4 = require("@dxos/context");
 var import_credentials8 = require("@dxos/credentials");
 var import_feed_store3 = require("@dxos/feed-store");
-var import_keys5 = require("@dxos/keys");
+var import_keys6 = require("@dxos/keys");
 var import_log6 = require("@dxos/log");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols3 = require("@dxos/protocols");
+var import_protocols4 = require("@dxos/protocols");
 var import_services3 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport2 = require("@dxos/teleport");
@@ -1499,8 +1548,8 @@ var SpaceInvitationsHandler = class extends import_client2.AbstractInvitationsHa
     (0, import_node_assert6.default)(space);
     const invitation = {
       type,
-      invitationId: import_keys5.PublicKey.random().toHex(),
-      swarmKey: swarmKey != null ? swarmKey : import_keys5.PublicKey.random(),
+      invitationId: import_keys6.PublicKey.random().toHex(),
+      swarmKey: swarmKey != null ? swarmKey : import_keys6.PublicKey.random(),
       spaceKey: space.key,
       authMethod: (_a = options == null ? void 0 : options.authMethod) != null ? _a : import_invitations2.AuthMethod.SHARED_SECRET,
       authenticationCode: (0, import_credentials8.generatePasscode)(import_client2.AUTHENTICATION_CODE_LENGTH)
@@ -1853,7 +1902,7 @@ var SpaceInvitationsHandler = class extends import_client2.AbstractInvitationsHa
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
         topic,
-        peerId: import_keys5.PublicKey.random(),
+        peerId: import_keys6.PublicKey.random(),
         protocolProvider: (0, import_network_manager2.createTeleportProtocolFactory)(async (teleport) => {
           teleport.addExtension("dxos.halo.invitations", createExtension());
         }),
@@ -1873,7 +1922,7 @@ var HostSpaceInvitationExtension = class extends import_teleport2.RpcExtension {
   constructor(_callbacks) {
     super({
       exposed: {
-        SpaceHostService: import_protocols3.schema.getService("dxos.halo.invitations.SpaceHostService")
+        SpaceHostService: import_protocols4.schema.getService("dxos.halo.invitations.SpaceHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -1904,7 +1953,7 @@ var GuestSpaceInvitationExtension = class extends import_teleport2.RpcExtension
   constructor(_callbacks) {
     super({
       requested: {
-        SpaceHostService: import_protocols3.schema.getService("dxos.halo.invitations.SpaceHostService")
+        SpaceHostService: import_protocols4.schema.getService("dxos.halo.invitations.SpaceHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -1943,6 +1992,7 @@ var import_client8 = require("@dxos/client");
 var import_debug7 = require("@dxos/debug");
 var import_echo_pipeline5 = require("@dxos/echo-pipeline");
 var import_log16 = require("@dxos/log");
+var import_protocols7 = require("@dxos/protocols");
 var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
 
 // packages/sdk/client-services/src/packlets/deprecated/tracing.ts
@@ -2034,7 +2084,7 @@ var import_client4 = require("@dxos/client");
 var import_context7 = require("@dxos/context");
 var import_credentials10 = require("@dxos/credentials");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
-var import_keys8 = require("@dxos/keys");
+var import_keys9 = require("@dxos/keys");
 var import_log9 = require("@dxos/log");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_util5 = require("@dxos/util");
@@ -2046,7 +2096,7 @@ var import_context6 = require("@dxos/context");
 var import_debug3 = require("@dxos/debug");
 var import_echo_pipeline = require("@dxos/echo-pipeline");
 var import_errors = require("@dxos/errors");
-var import_keys7 = require("@dxos/keys");
+var import_keys8 = require("@dxos/keys");
 var import_log8 = require("@dxos/log");
 var import_credentials9 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_util4 = require("@dxos/util");
@@ -2055,9 +2105,9 @@ var import_util4 = require("@dxos/util");
 var import_node_assert8 = __toESM(require("node:assert"));
 var import_async9 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
-var import_keys6 = require("@dxos/keys");
+var import_keys7 = require("@dxos/keys");
 var import_log7 = require("@dxos/log");
-var import_protocols4 = require("@dxos/protocols");
+var import_protocols5 = require("@dxos/protocols");
 var import_teleport3 = require("@dxos/teleport");
 var import_util3 = require("@dxos/util");
 var DEFAULT_RETRY_TIMEOUT = 1e3;
@@ -2068,8 +2118,8 @@ var NotarizationPlugin = class {
     this._ctx = new import_context5.Context();
     this._extensionOpened = new import_async9.Event();
     this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new import_util3.ComplexSet(import_keys6.PublicKey.hash);
-    this._processCredentialsTriggers = new import_util3.ComplexMap(import_keys6.PublicKey.hash);
+    this._processedCredentials = new import_util3.ComplexSet(import_keys7.PublicKey.hash);
+    this._processCredentialsTriggers = new import_util3.ComplexMap(import_keys7.PublicKey.hash);
   }
   async open() {
   }
@@ -2263,10 +2313,10 @@ var NotarizationTeleportExtension = class extends import_teleport3.RpcExtension
   constructor(_params) {
     super({
       requested: {
-        NotarizationService: import_protocols4.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols5.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       },
       exposed: {
-        NotarizationService: import_protocols4.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols5.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       }
     });
     this._params = _params;
@@ -2327,7 +2377,7 @@ var DataSpace = class DataSpace2 {
       snapshotId: params.snapshotId
     });
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new import_util4.ComplexSet(import_keys7.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
+      trustedKeysProvider: () => new import_util4.ComplexSet(import_keys8.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
       update: this._inner.stateUpdate,
       authTimeout: AUTH_TIMEOUT2
     });
@@ -2530,7 +2580,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     this._snapshotStore = _snapshotStore;
     this._ctx = new import_context7.Context();
     this.updated = new import_async11.Event();
-    this._spaces = new import_util5.ComplexMap(import_keys8.PublicKey.hash);
+    this._spaces = new import_util5.ComplexMap(import_keys9.PublicKey.hash);
     this._isOpen = false;
   }
   // TODO(burdon): Remove.
@@ -3698,7 +3748,9 @@ var import_debug6 = require("@dxos/debug");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_keyring = require("@dxos/keyring");
+var import_keys10 = require("@dxos/keys");
 var import_log15 = require("@dxos/log");
+var import_protocols6 = require("@dxos/protocols");
 var ServiceContext = class {
   // prettier-ignore
   constructor(storage, networkManager, modelFactory) {
@@ -3707,6 +3759,7 @@ var ServiceContext = class {
     this.modelFactory = modelFactory;
     this.initialized = new import_async18.Trigger();
     this.dataServiceSubscriptions = new import_echo_pipeline4.DataServiceSubscriptions();
+    this._instanceId = import_keys10.PublicKey.random().toHex();
     this.metadataStore = new import_echo_pipeline4.MetadataStore(storage.createDirectory("metadata"));
     this.snapshotStore = new import_echo_pipeline4.SnapshotStore(storage.createDirectory("snapshots"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
@@ -3735,9 +3788,17 @@ var ServiceContext = class {
     });
   }
   async open() {
+    import_log15.log.trace("dxos.sdk.client-services", import_protocols6.trace.begin({
+      id: this._instanceId
+    }), {
+      file: "service-context.ts",
+      line: 98,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     (0, import_log15.log)("opening...", {}, {
       file: "service-context.ts",
-      line: 94,
+      line: 100,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3749,7 +3810,7 @@ var ServiceContext = class {
     }
     (0, import_log15.log)("opened", {}, {
       file: "service-context.ts",
-      line: 101,
+      line: 107,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3758,7 +3819,7 @@ var ServiceContext = class {
     var _a, _b;
     (0, import_log15.log)("closing...", {}, {
       file: "service-context.ts",
-      line: 105,
+      line: 111,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3771,7 +3832,15 @@ var ServiceContext = class {
     this.dataServiceSubscriptions.clear();
     (0, import_log15.log)("closed", {}, {
       file: "service-context.ts",
-      line: 113,
+      line: 119,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    import_log15.log.trace("dxos.sdk.client-services", import_protocols6.trace.end({
+      id: this._instanceId
+    }), {
+      file: "service-context.ts",
+      line: 121,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3779,7 +3848,7 @@ var ServiceContext = class {
   async reset() {
     (0, import_log15.log)("resetting...", {}, {
       file: "service-context.ts",
-      line: 117,
+      line: 125,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3787,7 +3856,7 @@ var ServiceContext = class {
     await this.storage.reset();
     (0, import_log15.log)("reset", {}, {
       file: "service-context.ts",
-      line: 120,
+      line: 128,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3807,7 +3876,7 @@ var ServiceContext = class {
     var _a;
     (0, import_log15.log)("initializing spaces...", {}, {
       file: "service-context.ts",
-      line: 139,
+      line: 147,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3843,7 +3912,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 182,
+            line: 190,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3854,7 +3923,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 186,
+            line: 194,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3865,7 +3934,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 191,
+            line: 199,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3876,7 +3945,7 @@ var ServiceContext = class {
         } catch (err) {
           import_log15.log.catch(err, {}, {
             file: "service-context.ts",
-            line: 197,
+            line: 205,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3925,6 +3994,7 @@ var ClientServicesHost = class {
     this._statusUpdate = new import_async19.Event();
     this._opening = false;
     this._open = false;
+    this._instanceId = import_client8.PublicKey.random().toHex();
     this._storage = storage;
     this._modelFactory = modelFactory;
     if (config) {
@@ -3997,6 +4067,14 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
+    import_log16.log.trace("dxos.sdk.client-services-host", import_protocols7.trace.begin({
+      id: this._instanceId
+    }), {
+      file: "service-host.ts",
+      line: 168,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     (0, import_node_assert12.default)(this._config, "config not set");
     (0, import_node_assert12.default)(this._storage, "storage not set");
     (0, import_node_assert12.default)(this._networkManager, "network manager not set");
@@ -4005,7 +4083,7 @@ var ClientServicesHost = class {
       lockKey: (_a = this._resourceLock) == null ? void 0 : _a.lockKey
     }, {
       file: "service-host.ts",
-      line: 170,
+      line: 175,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4046,7 +4124,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 224,
+      line: 229,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4061,7 +4139,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 233,
+      line: 238,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4075,7 +4153,15 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 238,
+      line: 243,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    import_log16.log.trace("dxos.sdk.client-services-host", import_protocols7.trace.end({
+      id: this._instanceId
+    }), {
+      file: "service-host.ts",
+      line: 245,
       scope: this,
       callSite: (f, a) => f(...a)
     });