@dxos/client-services 0.6.10-main.e92b5eb → 0.6.10-staging.00555f6

package/dist/lib/browser/{chunk-7VNVUPKU.mjs → chunk-6KDSUJDJ.mjs}

@@ -56,7 +56,7 @@ var findFeedOwner = (spaceManager, feedKey) => {
   ].flatMap((space) => [
     ...space.spaceState.feeds.values()
   ]).find((feed) => feed.key.equals(feedKey));
-  log.info("feeds", {
+  log("feeds", {
     feedInfo,
     key: feedKey.truncate(),
     allSpaces: spaceManager.spaces.size
@@ -404,7 +404,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.6.10-main.e92b5eb";
+var DXOS_VERSION = "0.6.10-staging.00555f6";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -695,7 +695,7 @@ import { Trigger as Trigger2 } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
 import { verifyCredential } from "@dxos/credentials";
 import { log as log3 } from "@dxos/log";
-import { schema } from "@dxos/protocols";
+import { schema } from "@dxos/protocols/proto";
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
 var Credential = schema.getCodecForType("dxos.halo.credentials.Credential");
 var createAuthProvider = (signer) => async (nonce) => {
@@ -1829,7 +1829,8 @@ import { Trigger as Trigger4 } from "@dxos/async";
 import { cancelWithContext as cancelWithContext2, Context as Context4 } from "@dxos/context";
 import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log8 } from "@dxos/log";
-import { InvalidInvitationExtensionRoleError, schema as schema2 } from "@dxos/protocols";
+import { InvalidInvitationExtensionRoleError } from "@dxos/protocols";
+import { schema as schema2 } from "@dxos/protocols/proto";
 import { InvitationOptions } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension } from "@dxos/teleport";
 
@@ -1869,7 +1870,7 @@ var InvitationGuestExtension = class extends RpcExtension {
     this._callbacks = _callbacks;
     this._ctx = new Context4(void 0, {
       F: __dxlog_file11,
-      L: 33
+      L: 34
     });
     this._remoteOptionsTrigger = new Trigger4();
     this._invitationFlowLock = null;
@@ -1883,7 +1884,7 @@ var InvitationGuestExtension = class extends RpcExtension {
         options: async (options) => {
           invariant6(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file11,
-            L: 63,
+            L: 64,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1910,14 +1911,14 @@ var InvitationGuestExtension = class extends RpcExtension {
     try {
       log8("guest acquire lock", void 0, {
         F: __dxlog_file11,
-        L: 84,
+        L: 85,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
       log8("guest lock acquired", void 0, {
         F: __dxlog_file11,
-        L: 86,
+        L: 87,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1926,7 +1927,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       }));
       log8("options sent", void 0, {
         F: __dxlog_file11,
-        L: 91,
+        L: 92,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1935,7 +1936,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       }));
       log8("options received", void 0, {
         F: __dxlog_file11,
-        L: 93,
+        L: 94,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1969,7 +1970,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       this._invitationFlowLock = null;
       log8("invitation flow lock released", void 0, {
         F: __dxlog_file11,
-        L: 126,
+        L: 127,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1984,7 +1985,8 @@ import { randomBytes, verify } from "@dxos/crypto";
 import { invariant as invariant7, InvariantViolation } from "@dxos/invariant";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
-import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, schema as schema3, trace as trace3 } from "@dxos/protocols";
+import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, trace as trace3 } from "@dxos/protocols";
+import { schema as schema3 } from "@dxos/protocols/proto";
 import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse, InvitationOptions as InvitationOptions2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
@@ -2005,7 +2007,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
     this._callbacks = _callbacks;
     this._ctx = new Context5(void 0, {
       F: __dxlog_file12,
-      L: 52
+      L: 53
     });
     this._remoteOptionsTrigger = new Trigger5();
     this._challenge = void 0;
@@ -2026,7 +2028,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
         options: async (options) => {
           invariant7(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file12,
-            L: 101,
+            L: 102,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -2043,7 +2045,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             id: traceId
           }), {
             F: __dxlog_file12,
-            L: 110,
+            L: 111,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2055,7 +2057,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               actual: invitationId
             }, {
               F: __dxlog_file12,
-              L: 116,
+              L: 117,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2069,7 +2071,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             guestProfile: profile
           }, {
             F: __dxlog_file12,
-            L: 125,
+            L: 126,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2080,7 +2082,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             id: traceId
           }), {
             F: __dxlog_file12,
-            L: 132,
+            L: 133,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2095,7 +2097,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             id: traceId
           }), {
             F: __dxlog_file12,
-            L: 141,
+            L: 142,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2104,7 +2106,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             authCode: code
           }, {
             F: __dxlog_file12,
-            L: 144,
+            L: 145,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2118,7 +2120,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             case Invitation3.AuthMethod.NONE: {
               log9("authentication not required", void 0, {
                 F: __dxlog_file12,
-                L: 152,
+                L: 153,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2156,7 +2158,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
                 authMethod: invitation.authMethod
               }, {
                 F: __dxlog_file12,
-                L: 190,
+                L: 191,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2181,7 +2183,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             }
           }), {
             F: __dxlog_file12,
-            L: 202,
+            L: 203,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2195,7 +2197,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             id: traceId
           }), {
             F: __dxlog_file12,
-            L: 208,
+            L: 209,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2212,7 +2214,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               id: traceId
             }), {
               F: __dxlog_file12,
-              L: 222,
+              L: 223,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2230,14 +2232,14 @@ var InvitationHostExtension = class extends RpcExtension2 {
     try {
       log9("host acquire lock", void 0, {
         F: __dxlog_file12,
-        L: 237,
+        L: 238,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
       log9("host lock acquired", void 0, {
         F: __dxlog_file12,
-        L: 239,
+        L: 240,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2248,7 +2250,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
       });
       log9("options sent", void 0, {
         F: __dxlog_file12,
-        L: 243,
+        L: 244,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2257,7 +2259,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
       }));
       log9("options received", void 0, {
         F: __dxlog_file12,
-        L: 245,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2311,7 +2313,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
       this._invitationFlowLock = null;
       log9("invitation flow lock released", void 0, {
         F: __dxlog_file12,
-        L: 300,
+        L: 301,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4146,8 +4148,8 @@ var EdgeFeedReplicator = class extends Resource2 {
     const payloadValue = bufferToArray(encodeCbor(message));
     await this._messenger.send(buf.create(RouterMessageSchema, {
       source: {
-        identityKey: this._messenger.identityKey.toHex(),
-        peerKey: this._messenger.deviceKey.toHex()
+        identityKey: this._messenger.identityKey,
+        peerKey: this._messenger.peerKey
       },
       serviceId: `${EdgeService.FEED_REPLICATOR}:${this._spaceId}`,
       payload: {
@@ -4563,7 +4565,7 @@ import { Context as Context7, rejectOnDispose } from "@dxos/context";
 import { invariant as invariant14 } from "@dxos/invariant";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log17 } from "@dxos/log";
-import { schema as schema4 } from "@dxos/protocols";
+import { schema as schema4 } from "@dxos/protocols/proto";
 import { RpcExtension as RpcExtension3 } from "@dxos/teleport";
 import { ComplexMap as ComplexMap3, ComplexSet as ComplexSet4, entry } from "@dxos/util";
 var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
@@ -6527,7 +6529,7 @@ var ServiceContext = class extends Resource5 {
         if (this._edgeConnection) {
           log21.info("Setting identity on edge connection", {
             identity: identity.identityKey.toHex(),
-            oldIdentity: this._edgeConnection.identityKey.toHex(),
+            oldIdentity: this._edgeConnection.identityKey,
             swarms: this.networkManager.topics
           }, {
             F: __dxlog_file24,
@@ -6536,8 +6538,8 @@ var ServiceContext = class extends Resource5 {
             C: (f, a) => f(...a)
           });
           this._edgeConnection.setIdentity({
-            deviceKey: identity.deviceKey,
-            identityKey: identity.identityKey
+            peerKey: identity.deviceKey.toHex(),
+            identityKey: identity.identityKey.toHex()
           });
           this.networkManager.setPeerInfo({
             identityKey: identity.identityKey.toHex(),
@@ -7602,7 +7604,8 @@ var ClientServicesHost = class {
     }
     const edgeEndpoint = config?.get("runtime.services.edge.url");
     if (edgeEndpoint) {
-      this._edgeConnection = new EdgeClient(PublicKey17.random(), PublicKey17.random(), {
+      const randomKey = PublicKey17.random().toHex();
+      this._edgeConnection = new EdgeClient(randomKey, randomKey, {
         socketEndpoint: edgeEndpoint
       });
     }
@@ -7614,7 +7617,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     invariant20(!this._networkManager, "network manager already set", {
       F: __dxlog_file27,
-      L: 233,
+      L: 232,
       S: this,
       A: [
         "!this._networkManager",
@@ -7626,13 +7629,13 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager,
       peerInfo: this._edgeConnection ? {
-        identityKey: this._edgeConnection.identityKey.toHex(),
-        peerKey: this._edgeConnection.deviceKey.toHex()
+        identityKey: this._edgeConnection.identityKey,
+        peerKey: this._edgeConnection.peerKey
       } : void 0
     });
     log24("initialized", void 0, {
       F: __dxlog_file27,
-      L: 246,
+      L: 245,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7646,13 +7649,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file27,
-      L: 257,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant20(this._config, "config not set", {
       F: __dxlog_file27,
-      L: 259,
+      L: 258,
       S: this,
       A: [
         "this._config",
@@ -7661,7 +7664,7 @@ var ClientServicesHost = class {
     });
     invariant20(this._storage, "storage not set", {
       F: __dxlog_file27,
-      L: 260,
+      L: 259,
       S: this,
       A: [
         "this._storage",
@@ -7670,7 +7673,7 @@ var ClientServicesHost = class {
     });
     invariant20(this._signalManager, "signal manager not set", {
       F: __dxlog_file27,
-      L: 261,
+      L: 260,
       S: this,
       A: [
         "this._signalManager",
@@ -7679,7 +7682,7 @@ var ClientServicesHost = class {
     });
     invariant20(this._networkManager, "network manager not set", {
       F: __dxlog_file27,
-      L: 262,
+      L: 261,
       S: this,
       A: [
         "this._networkManager",
@@ -7691,7 +7694,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file27,
-      L: 265,
+      L: 264,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7747,7 +7750,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file27,
-      L: 353,
+      L: 352,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7755,7 +7758,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file27,
-      L: 354,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7769,7 +7772,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file27,
-      L: 365,
+      L: 364,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7787,7 +7790,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file27,
-      L: 374,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7798,13 +7801,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file27,
-      L: 379,
+      L: 378,
       S: this,
       C: (f, a) => f(...a)
     });
     log24.info("resetting...", void 0, {
       F: __dxlog_file27,
-      L: 381,
+      L: 380,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7812,7 +7815,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log24.info("reset", void 0, {
       F: __dxlog_file27,
-      L: 384,
+      L: 383,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7820,7 +7823,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file27,
-      L: 385,
+      L: 384,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7894,4 +7897,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-7VNVUPKU.mjs.map
+//# sourceMappingURL=chunk-6KDSUJDJ.mjs.map