@dxos/client-services 0.6.9 → 0.6.10-main.3cfcc89

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

@@ -212,9 +212,8 @@ export class ClientServicesHost {
 
     const edgeEndpoint = config?.get('runtime.services.edge.url');
     if (edgeEndpoint) {
-      this._edgeConnection = new EdgeClient(PublicKey.random(), PublicKey.random(), {
-        socketEndpoint: edgeEndpoint,
-      });
+      const randomKey = PublicKey.random().toHex();
+      this._edgeConnection = new EdgeClient(randomKey, randomKey, { socketEndpoint: edgeEndpoint });
     }
 
     const {
@@ -237,8 +236,8 @@ export class ClientServicesHost {
       signalManager,
       peerInfo: this._edgeConnection
         ? {
-            identityKey: this._edgeConnection.identityKey.toHex(),
-            peerKey: this._edgeConnection.deviceKey.toHex(),
+            identityKey: this._edgeConnection.identityKey,
+            peerKey: this._edgeConnection.peerKey,
           }
         : undefined,
     });

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

@@ -9,7 +9,7 @@ import { type ClientServices } from '@dxos/client-protocol';
 import { Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { log } from '@dxos/log';
-import { schema } from '@dxos/protocols';
+import { schema } from '@dxos/protocols/proto';
 import { type SystemService, SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { createLinkedPorts, createProtoRpcPeer, createServiceBundle } from '@dxos/rpc';
 import { describe, test } from '@dxos/test';

package/src/packlets/spaces/edge-feed-replicator.ts

@@ -120,8 +120,8 @@ export class EdgeFeedReplicator extends Resource {
     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: { value: payloadValue },

package/src/packlets/spaces/notarization-plugin.ts

@@ -9,7 +9,7 @@ import { type FeedWriter } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { schema } from '@dxos/protocols';
+import { schema } from '@dxos/protocols/proto';
 import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type NotarizationService, type NotarizeRequest } from '@dxos/protocols/proto/dxos/mesh/teleport/notarization';
 import { type ExtensionContext, RpcExtension } from '@dxos/teleport';

package/src/packlets/testing/test-builder.ts

@@ -8,7 +8,6 @@ import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/cred
 import { failUndefined } from '@dxos/debug';
 import { EchoHost } from '@dxos/echo-db';
 import { MetadataStore, SpaceManager, valueEncoding, MeshEchoReplicator } from '@dxos/echo-pipeline';
-import { type EdgeConnection } from '@dxos/edge-client';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { type LevelDB } from '@dxos/kv-store';
@@ -42,12 +41,10 @@ export const createServiceContext = async ({
   },
   storage = createStorage({ type: StorageType.RAM }),
   runtimeParams,
-  edgeConnection,
 }: {
   signalManagerFactory?: () => Promise<SignalManager>;
   storage?: Storage;
   runtimeParams?: ServiceContextRuntimeParams;
-  edgeConnection?: EdgeConnection;
 } = {}) => {
   const signalManager = await signalManagerFactory();
   const networkManager = new SwarmNetworkManager({
@@ -57,24 +54,20 @@ export const createServiceContext = async ({
   const level = createTestLevel();
   await level.open();
 
-  return new ServiceContext(storage, level, networkManager, signalManager, edgeConnection, {
+  return new ServiceContext(storage, level, networkManager, signalManager, undefined, {
     invitationConnectionDefaultParams: { controlHeartbeatInterval: 200 },
     ...runtimeParams,
   });
 };
 
-export const createPeers = async (
-  numPeers: number,
-  signalManagerFactory?: () => Promise<SignalManager>,
-  edgeConnection?: EdgeConnection,
-) => {
+export const createPeers = async (numPeers: number, signalManagerFactory?: () => Promise<SignalManager>) => {
   if (!signalManagerFactory) {
     const signalContext = new MemorySignalManagerContext();
     signalManagerFactory = async () => new MemorySignalManager(signalContext);
   }
   return await Promise.all(
     Array.from(Array(numPeers)).map(async () => {
-      const peer = await createServiceContext({ signalManagerFactory, edgeConnection });
+      const peer = await createServiceContext({ signalManagerFactory });
       await peer.open(new Context());
       return peer;
     }),

package/src/version.ts

@@ -1,5 +1 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export const DXOS_VERSION = '0.6.9'; // {x-release-please-version}
+export const DXOS_VERSION = "0.6.10-main.3cfcc89";