@dxos/client-services 0.5.6-main.1a02a59 → 0.5.6-main.1d8ea4a

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

@@ -15,7 +15,7 @@ import { PublicKey } from '@dxos/keys';
 import { type LevelDB } from '@dxos/kv-store';
 import { log } from '@dxos/log';
 import { type SignalManager } from '@dxos/messaging';
-import { type NetworkManager } from '@dxos/network-manager';
+import { type SwarmNetworkManager } from '@dxos/network-manager';
 import { InvalidStorageVersionError, STORAGE_VERSION, trace } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
@@ -35,10 +35,10 @@ import {
 import {
   DeviceInvitationProtocol,
   InvitationsHandler,
+  InvitationsManager,
   SpaceInvitationProtocol,
   type InvitationProtocol,
 } from '../invitations';
-import { InvitationsManager } from '../invitations/invitations-manager';
 import { DataSpaceManager, type DataSpaceManagerRuntimeParams, type SigningContext } from '../spaces';
 
 export type ServiceContextRuntimeParams = IdentityManagerRuntimeParams &
@@ -81,7 +81,7 @@ export class ServiceContext extends Resource {
   constructor(
     public readonly storage: Storage,
     public readonly level: LevelDB,
-    public readonly networkManager: NetworkManager,
+    public readonly networkManager: SwarmNetworkManager,
     public readonly signalManager: SignalManager,
     public readonly _runtimeParams?: ServiceContextRuntimeParams,
   ) {

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

@@ -13,7 +13,7 @@ import { PublicKey } from '@dxos/keys';
 import { type LevelDB } from '@dxos/kv-store';
 import { log } from '@dxos/log';
 import { WebsocketSignalManager, type SignalManager } from '@dxos/messaging';
-import { NetworkManager, createSimplePeerTransportFactory, type TransportFactory } from '@dxos/network-manager';
+import { SwarmNetworkManager, createSimplePeerTransportFactory, type TransportFactory } from '@dxos/network-manager';
 import { trace } from '@dxos/protocols';
 import { SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { type Storage } from '@dxos/random-access-storage';
@@ -79,7 +79,7 @@ export class ClientServicesHost {
   private _config?: Config;
   private readonly _statusUpdate = new Event<void>();
   private _signalManager?: SignalManager;
-  private _networkManager?: NetworkManager;
+  private _networkManager?: SwarmNetworkManager;
   private _storage?: Storage;
   private _level?: LevelDB;
   private _callbacks?: ClientServicesHostCallbacks;
@@ -210,7 +210,7 @@ export class ClientServicesHost {
     this._signalManager = signalManager;
 
     invariant(!this._networkManager, 'network manager already set');
-    this._networkManager = new NetworkManager({
+    this._networkManager = new SwarmNetworkManager({
       log: connectionLog,
       transportFactory,
       signalManager,

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

@@ -13,7 +13,7 @@ import { Keyring } from '@dxos/keyring';
 import { type LevelDB } from '@dxos/kv-store';
 import { createTestLevel } from '@dxos/kv-store/testing';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
-import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
+import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manager';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { createStorage, StorageType, type Storage } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
@@ -42,7 +42,7 @@ export const createServiceContext = async ({
   storage?: Storage;
 } = {}) => {
   const signalManager = new MemorySignalManager(signalContext);
-  const networkManager = new NetworkManager({
+  const networkManager = new SwarmNetworkManager({
     signalManager,
     transportFactory: MemoryTransportFactory,
   });
@@ -96,7 +96,7 @@ export type TestPeerProps = {
   feedStore?: FeedStore<any>;
   metadataStore?: MetadataStore;
   keyring?: Keyring;
-  networkManager?: NetworkManager;
+  networkManager?: SwarmNetworkManager;
   spaceManager?: SpaceManager;
   dataSpaceManager?: DataSpaceManager;
   snapshotStore?: SnapshotStore;
@@ -155,7 +155,7 @@ export class TestPeer {
   }
 
   get networkManager() {
-    return (this._props.networkManager ??= new NetworkManager({
+    return (this._props.networkManager ??= new SwarmNetworkManager({
       signalManager: new MemorySignalManager(this.signalContext),
       transportFactory: MemoryTransportFactory,
     }));

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.5.6-main.1a02a59";
+export const DXOS_VERSION = "0.5.6-main.1d8ea4a";