@dxos/client-services 0.5.8 → 0.5.9-main.07b4bad

package/src/packlets/devtools/network.ts

@@ -6,7 +6,7 @@ import { Stream } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { type SignalManager } from '@dxos/messaging';
-import { type NetworkManager } from '@dxos/network-manager';
+import { type SwarmNetworkManager } from '@dxos/network-manager';
 import {
   type GetNetworkPeersRequest,
   type GetNetworkPeersResponse,
@@ -56,7 +56,7 @@ export const subscribeToSignal = ({ signalManager }: { signalManager: SignalMana
     };
   });
 
-export const subscribeToNetworkTopics = ({ networkManager }: { networkManager: NetworkManager }) =>
+export const subscribeToNetworkTopics = ({ networkManager }: { networkManager: SwarmNetworkManager }) =>
   new Stream<SubscribeToNetworkTopicsResponse>(({ next, close }) => {
     const update = () => {
       try {
@@ -75,7 +75,7 @@ export const subscribeToNetworkTopics = ({ networkManager }: { networkManager: N
     update();
   });
 
-export const subscribeToSwarmInfo = ({ networkManager }: { networkManager: NetworkManager }) =>
+export const subscribeToSwarmInfo = ({ networkManager }: { networkManager: SwarmNetworkManager }) =>
   new Stream<SubscribeToSwarmInfoResponse>(({ next }) => {
     const update = () => {
       const info = networkManager.connectionLog?.swarms;
@@ -88,7 +88,7 @@ export const subscribeToSwarmInfo = ({ networkManager }: { networkManager: Netwo
   });
 
 export const getNetworkPeers = (
-  { networkManager }: { networkManager: NetworkManager },
+  { networkManager }: { networkManager: SwarmNetworkManager },
   request: GetNetworkPeersRequest,
 ): GetNetworkPeersResponse => {
   if (!request.topic) {

package/src/packlets/identity/identity-manager.test.ts

@@ -9,7 +9,7 @@ import { valueEncoding, MetadataStore, SpaceManager, AuthStatus, SnapshotStore }
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
-import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
+import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manager';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { createStorage, type Storage, StorageType } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
@@ -41,7 +41,7 @@ describe('identity/identity-manager', () => {
 
     afterTest(() => feedStore.close());
 
-    const networkManager = new NetworkManager({
+    const networkManager = new SwarmNetworkManager({
       signalManager: new MemorySignalManager(signalContext),
       transportFactory: MemoryTransportFactory,
     });

package/src/packlets/identity/identity.test.ts

@@ -7,6 +7,7 @@ import expect from 'expect';
 import { Context } from '@dxos/context';
 import { CredentialGenerator, verifyCredential } from '@dxos/credentials';
 import {
+  createIdFromSpaceKey,
   MetadataStore,
   MOCK_AUTH_PROVIDER,
   MOCK_AUTH_VERIFIER,
@@ -20,7 +21,7 @@ import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { type PublicKey } from '@dxos/keys';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
-import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
+import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manager';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { AdmittedFeed } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { createStorage, StorageType } from '@dxos/random-access-storage';
@@ -78,7 +79,7 @@ describe('identity/identity', () => {
         credentialAuthenticator: MOCK_AUTH_VERIFIER,
       },
       blobStore,
-      networkManager: new NetworkManager({
+      networkManager: new SwarmNetworkManager({
         signalManager: new MemorySignalManager(new MemorySignalManagerContext()),
         transportFactory: MemoryTransportFactory,
       }),
@@ -86,6 +87,7 @@ describe('identity/identity', () => {
 
     await metadataStore.setIdentityRecord({ haloSpace: { key: spaceKey }, identityKey, deviceKey });
     const space: Space = new Space({
+      id: await createIdFromSpaceKey(spaceKey),
       spaceKey,
       protocol,
       genesisFeed: controlFeed,
@@ -193,7 +195,7 @@ describe('identity/identity', () => {
           credentialAuthenticator: MOCK_AUTH_VERIFIER, // createHaloAuthVerifier(() => identity.authorizedDeviceKeys),
         },
         blobStore,
-        networkManager: new NetworkManager({
+        networkManager: new SwarmNetworkManager({
           signalManager: new MemorySignalManager(signalContext),
           transportFactory: MemoryTransportFactory,
         }),
@@ -201,6 +203,7 @@ describe('identity/identity', () => {
 
       await metadataStore.setIdentityRecord({ haloSpace: { key: spaceKey }, identityKey, deviceKey });
       const space = new Space({
+        id: await createIdFromSpaceKey(spaceKey),
         spaceKey,
         protocol,
         genesisFeed: controlFeed,
@@ -281,7 +284,7 @@ describe('identity/identity', () => {
           credentialAuthenticator: MOCK_AUTH_VERIFIER, // createHaloAuthVerifier(() => identity.authorizedDeviceKeys),
         },
         blobStore,
-        networkManager: new NetworkManager({
+        networkManager: new SwarmNetworkManager({
           signalManager: new MemorySignalManager(signalContext),
           transportFactory: MemoryTransportFactory,
         }),
@@ -293,6 +296,7 @@ describe('identity/identity', () => {
         deviceKey,
       });
       const space = new Space({
+        id: await createIdFromSpaceKey(spaceKey),
         spaceKey,
         protocol,
         genesisFeed: await feedStore.openFeed(genesisFeedKey),

package/src/packlets/invitations/invitations-handler.ts

@@ -9,7 +9,7 @@ import { createKeyPair, sign } from '@dxos/crypto';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { createTeleportProtocolFactory, type NetworkManager, type SwarmConnection } from '@dxos/network-manager';
+import { createTeleportProtocolFactory, type SwarmNetworkManager, type SwarmConnection } from '@dxos/network-manager';
 import { InvalidInvitationExtensionRoleError, trace } from '@dxos/protocols';
 import { type AdmissionKeypair, Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { type DeviceProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -61,7 +61,7 @@ export class InvitationsHandler {
    * @internal
    */
   constructor(
-    private readonly _networkManager: NetworkManager,
+    private readonly _networkManager: SwarmNetworkManager,
     private readonly _defaultTeleportParams?: Partial<TeleportParams>,
   ) {}
 

package/src/packlets/network/network-service.ts

@@ -4,7 +4,7 @@
 
 import { Stream } from '@dxos/codec-protobuf';
 import { type SignalManager } from '@dxos/messaging';
-import { type NetworkManager } from '@dxos/network-manager';
+import { type SwarmNetworkManager } from '@dxos/network-manager';
 import {
   type NetworkService,
   type NetworkStatus,
@@ -13,7 +13,7 @@ import {
 
 export class NetworkServiceImpl implements NetworkService {
   constructor(
-    private readonly networkManager: NetworkManager,
+    private readonly networkManager: SwarmNetworkManager,
     private readonly signalManager: SignalManager,
   ) {}
 

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

@@ -3,7 +3,7 @@
 //
 
 import { Event, synchronized } from '@dxos/async';
-import { clientServiceBundle, defaultKey, type ClientServices, Properties } from '@dxos/client-protocol';
+import { clientServiceBundle, defaultKey, type ClientServices, PropertiesType } from '@dxos/client-protocol';
 import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { type ObjectStructure, encodeReference, type SpaceDoc } from '@dxos/echo-protocol';
@@ -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,
@@ -356,13 +356,13 @@ export class ClientServicesHost {
 
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant(automergeIndex);
-    const document = await this._serviceContext.echoHost.automergeRepo.find<SpaceDoc>(automergeIndex as any);
+    const document = this._serviceContext.echoHost.automergeRepo.find<SpaceDoc>(automergeIndex as any);
     await document.whenReady();
 
     // TODO(dmaretskyi): Better API for low-level data access.
     const properties: ObjectStructure = {
       system: {
-        type: encodeReference(getTypeReference(Properties)!),
+        type: encodeReference(getTypeReference(PropertiesType)!),
       },
       data: {
         [defaultKey]: identity.identityKey.toHex(),
@@ -377,7 +377,6 @@ export class ClientServicesHost {
     });
 
     await this._serviceContext.echoHost.flush();
-
     return identity;
   }
 }

package/src/packlets/spaces/data-space.ts

@@ -9,6 +9,7 @@ import { timed, warnAfterTimeout } from '@dxos/debug';
 import { type EchoHost } from '@dxos/echo-db';
 import {
   AutomergeDocumentLoaderImpl,
+  createIdFromSpaceKey,
   createMappedFeedWriter,
   type MetadataStore,
   type Space,
@@ -75,6 +76,7 @@ export type DataSpaceParams = {
 
 export type CreateEpochOptions = {
   migration?: CreateEpochRequest.Migration;
+  newAutomergeRoot?: string;
 };
 
 @trackLeaks('open', 'close')
@@ -141,6 +143,11 @@ export class DataSpace {
     log('new state', { state: SpaceState[this._state] });
   }
 
+  @trace.info()
+  get id() {
+    return this._inner.id;
+  }
+
   @trace.info()
   get key() {
     return this._inner.key;
@@ -476,7 +483,11 @@ export class DataSpace {
           invariant(typeof newRoot.url === 'string' && newRoot.url.length > 0);
 
           // Create new automerge documents for all objects.
-          const docLoader = new AutomergeDocumentLoaderImpl(this.key, this._echoHost.automergeRepo);
+          const docLoader = new AutomergeDocumentLoaderImpl(
+            await createIdFromSpaceKey(this.key),
+            this._echoHost.automergeRepo,
+            this.key,
+          );
           await docLoader.loadSpaceRootDocHandle(this._ctx, { rootUrl: newRoot.url });
 
           otherObjects.forEach(([key, value]) => {
@@ -497,6 +508,18 @@ export class DataSpace {
           };
         }
         break;
+      case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT:
+        {
+          invariant(options.newAutomergeRoot);
+          // TODO(dmaretskyi): Unify epoch construction.
+          epoch = {
+            previousId: this._automergeSpaceState.lastEpoch?.id,
+            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe(),
+            automergeRoot: options.newAutomergeRoot,
+          };
+        }
+        break;
     }
 
     if (!epoch) {
@@ -516,6 +539,7 @@ export class DataSpace {
     });
 
     await this.inner.controlPipeline.state.waitUntilTimeframe(new Timeframe([[receipt.feedKey, receipt.seq]]));
+    await this._echoHost.updateIndexes();
   }
 
   @synchronized

package/src/packlets/spaces/spaces-service.ts

@@ -208,14 +208,15 @@ export class SpacesServiceImpl implements SpacesService {
     }
   }
 
-  async createEpoch({ spaceKey, migration }: CreateEpochRequest) {
+  async createEpoch({ spaceKey, migration, automergeRootUrl }: CreateEpochRequest) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
-    await space.createEpoch({ migration });
+    await space.createEpoch({ migration, newAutomergeRoot: automergeRootUrl });
   }
 
   private _serializeSpace(space: DataSpace): Space {
     return {
+      id: space.id,
       spaceKey: space.key,
       state: space.state,
       error: space.error ? encodeError(space.error) : undefined,

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/packlets/worker/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+export * from './worker-runtime';
+export * from './worker-session';

package/src/version.ts

@@ -1,5 +1 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export const DXOS_VERSION = '0.5.8'; // {x-release-please-version}
+export const DXOS_VERSION = "0.5.9-main.07b4bad";