@dxos/client-services 0.8.2-main.fbd8ed0 → 0.8.2-staging.7ac8446

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

@@ -3,7 +3,6 @@
 //
 
 import { Stream } from '@dxos/codec-protobuf/stream';
-import { type EdgeConnection } from '@dxos/edge-client';
 import { type SignalManager } from '@dxos/messaging';
 import { type SwarmNetworkManager } from '@dxos/network-manager';
 import {
@@ -24,11 +23,10 @@ export class NetworkServiceImpl implements NetworkService {
   constructor(
     private readonly networkManager: SwarmNetworkManager,
     private readonly signalManager: SignalManager,
-    private readonly edgeConnection?: EdgeConnection,
   ) {}
 
   queryStatus() {
-    return new Stream<NetworkStatus>(({ ctx, next }) => {
+    return new Stream<NetworkStatus>(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -37,9 +35,14 @@ export class NetworkServiceImpl implements NetworkService {
         });
       };
 
-      this.networkManager.connectionStateChanged.on(ctx, () => update());
-      this.signalManager.statusChanged?.on(ctx, () => update());
+      const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
+      const unsubscribeSignal = this.signalManager.statusChanged?.on(() => update());
       update();
+
+      return () => {
+        unsubscribeSwarm();
+        unsubscribeSignal?.();
+      };
     });
   }
 
@@ -60,12 +63,13 @@ export class NetworkServiceImpl implements NetworkService {
   }
 
   subscribeSwarmState(request: SubscribeSwarmStateRequest): Stream<SwarmResponse> {
-    return new Stream<SwarmResponse>(({ ctx, next }) => {
-      this.signalManager.swarmState?.on(ctx, (state) => {
+    return new Stream<SwarmResponse>(({ next }) => {
+      const unsubscribe = this.signalManager.swarmState?.on((state) => {
         if (request.topic.equals(state.swarmKey)) {
           next(state);
         }
       });
+      return unsubscribe;
     });
   }
 
@@ -74,12 +78,14 @@ export class NetworkServiceImpl implements NetworkService {
   }
 
   subscribeMessages(peer: Peer): Stream<Message> {
-    return new Stream<Message>(({ ctx, next }) => {
-      this.signalManager.onMessage.on(ctx, (message) => {
+    return new Stream<Message>(({ next }) => {
+      const unsubscribe = this.signalManager.onMessage.on((message) => {
         if (message.recipient.peerKey === peer.peerKey) {
           next(message);
         }
       });
+
+      return unsubscribe;
     });
   }
 }

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

@@ -329,11 +329,7 @@ export class ClientServicesHost {
       DataService: this._serviceContext.echoHost.dataService,
       QueryService: this._serviceContext.echoHost.queryService,
 
-      NetworkService: new NetworkServiceImpl(
-        this._serviceContext.networkManager,
-        this._serviceContext.signalManager,
-        this._edgeConnection,
-      ),
+      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
 
       LoggingService: this._loggingService,
       TracingService: this._tracingService,

package/src/packlets/space-export/space-archive-reader.ts

@@ -2,8 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import type { DocumentId } from '@automerge/automerge-repo';
-
+import type { DocumentId } from '@dxos/automerge/automerge-repo';
 import { assertArgument, failedInvariant, invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { SpaceArchiveFileStructure, type SpaceArchiveMetadata } from '@dxos/protocols';

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

@@ -2,10 +2,14 @@
 // Copyright 2022 DXOS.org
 //
 
-import { type Doc } from '@automerge/automerge';
-import { interpretAsDocumentId, type AutomergeUrl, type DocHandle, type DocumentId } from '@automerge/automerge-repo';
-
 import { Event, synchronized, trackLeaks } from '@dxos/async';
+import { type Doc } from '@dxos/automerge/automerge';
+import {
+  interpretAsDocumentId,
+  type AutomergeUrl,
+  type DocHandle,
+  type DocumentId,
+} from '@dxos/automerge/automerge-repo';
 import { PropertiesType, TYPE_PROPERTIES } from '@dxos/client-protocol';
 import { Context, LifecycleState, Resource, cancelWithContext } from '@dxos/context';
 import {
@@ -28,7 +32,6 @@ import {
   type SpaceManager,
   type SpaceProtocol,
   type SpaceProtocolSession,
-  FIND_PARAMS,
 } from '@dxos/echo-pipeline';
 import {
   SpaceDocVersion,
@@ -37,7 +40,7 @@ import {
   type ObjectStructure,
   type SpaceDoc,
 } from '@dxos/echo-protocol';
-import { ObjectId, getTypeReference } from '@dxos/echo-schema';
+import { createObjectId, getTypeReference } from '@dxos/echo-schema';
 import type { EdgeConnection, EdgeHttpClient } from '@dxos/edge-client';
 import { writeMessages, type FeedStore } from '@dxos/feed-store';
 import { assertArgument, assertState, failedInvariant, invariant } from '@dxos/invariant';
@@ -174,29 +177,24 @@ export class DataSpaceManager extends Resource {
       id: 'spaces',
       name: 'Spaces',
       fetch: async () => {
-        return Promise.all(
-          Array.from(this._spaces.values()).map(async (space) => {
-            const rootUrl = space.automergeSpaceState.rootUrl;
-            const rootHandle = rootUrl
-              ? await this._echoHost.automergeRepo.find<Doc<SpaceDoc>>(rootUrl as AutomergeUrl, FIND_PARAMS)
-              : undefined;
-            await rootHandle?.whenReady();
-            const rootDoc = rootHandle?.doc();
-
-            const properties = rootDoc && findInlineObjectOfType(rootDoc, TYPE_PROPERTIES);
-
-            return {
-              key: space.key.toHex(),
-              state: SpaceState[space.state],
-              name: properties?.[1].data.name ?? null,
-              inlineObjects: rootDoc ? Object.keys(rootDoc.objects ?? {}).length : null,
-              linkedObjects: rootDoc ? Object.keys(rootDoc.links ?? {}).length : null,
-              credentials: space.inner.spaceState.credentials.length,
-              members: space.inner.spaceState.members.size,
-              rootUrl,
-            };
-          }),
-        );
+        return Array.from(this._spaces.values()).map((space) => {
+          const rootUrl = space.automergeSpaceState.rootUrl;
+          const rootHandle = rootUrl ? this._echoHost.automergeRepo.find(rootUrl as AutomergeUrl) : undefined;
+          const rootDoc = rootHandle?.docSync() as Doc<SpaceDoc> | undefined;
+
+          const properties = rootDoc && findInlineObjectOfType(rootDoc, TYPE_PROPERTIES);
+
+          return {
+            key: space.key.toHex(),
+            state: SpaceState[space.state],
+            name: properties?.[1].data.name ?? null,
+            inlineObjects: rootDoc ? Object.keys(rootDoc.objects ?? {}).length : null,
+            linkedObjects: rootDoc ? Object.keys(rootDoc.links ?? {}).length : null,
+            credentials: space.inner.spaceState.credentials.length,
+            members: space.inner.spaceState.members.size,
+            rootUrl,
+          };
+        });
       },
     });
   }
@@ -321,11 +319,7 @@ export class DataSpaceManager extends Resource {
     }
     switch (space.databaseRoot.getVersion()) {
       case SpaceDocVersion.CURRENT: {
-        if (!space.databaseRoot.handle.isReady()) {
-          log.warn('waiting for space root to be ready', { spaceId: space.id });
-          await space.databaseRoot.handle.whenReady();
-        }
-        const [_, properties] = findInlineObjectOfType(space.databaseRoot.doc()!, TYPE_PROPERTIES) ?? [];
+        const [_, properties] = findInlineObjectOfType(space.databaseRoot.docSync()!, TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       case SpaceDocVersion.LEGACY: {
@@ -355,7 +349,7 @@ export class DataSpaceManager extends Resource {
       },
     };
 
-    const propertiesId = ObjectId.random();
+    const propertiesId = createObjectId();
     document.change((doc: SpaceDoc) => {
       setDeep(doc, ['objects', propertiesId], properties);
     });
@@ -367,7 +361,7 @@ export class DataSpaceManager extends Resource {
   private async _getSpaceRootDocument(space: DataSpace): Promise<DocHandle<SpaceDoc>> {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant(automergeIndex);
-    const document = await this._echoHost.automergeRepo.find<SpaceDoc>(automergeIndex as any, FIND_PARAMS);
+    const document = this._echoHost.automergeRepo.find<SpaceDoc>(automergeIndex as any);
     await document.whenReady();
     return document;
   }

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

@@ -2,10 +2,8 @@
 // Copyright 2022 DXOS.org
 //
 
-import { save } from '@automerge/automerge';
-import { type DocHandle } from '@automerge/automerge-repo';
-
 import { Event, Mutex, scheduleTask, sleep, synchronized, trackLeaks } from '@dxos/async';
+import { save } from '@dxos/automerge/automerge';
 import { AUTH_TIMEOUT } from '@dxos/client-protocol';
 import { Context, ContextDisposedError, cancelWithContext } from '@dxos/context';
 import type { SpecificCredential } from '@dxos/credentials';
@@ -16,7 +14,6 @@ import {
   createMappedFeedWriter,
   type MetadataStore,
   type Space,
-  FIND_PARAMS,
 } from '@dxos/echo-pipeline';
 import { SpaceDocVersion, type SpaceDoc } from '@dxos/echo-protocol';
 import type { EdgeConnection, EdgeHttpClient } from '@dxos/edge-client';
@@ -355,7 +352,7 @@ export class DataSpace {
 
   async *getAllDocuments(): AsyncIterable<[string, Uint8Array]> {
     invariant(this._databaseRoot, 'Space is not ready');
-    const doc = this._databaseRoot.doc() ?? failedInvariant();
+    const doc = this._databaseRoot.docSync() ?? failedInvariant();
     const root = save(doc);
     yield [this._databaseRoot.documentId, root];
 
@@ -462,16 +459,12 @@ export class DataSpace {
   private _onNewAutomergeRoot(rootUrl: string) {
     log('loading automerge root doc for space', { space: this.key, rootUrl });
 
-    let handle: DocHandle<SpaceDoc>;
+    const handle = this._echoHost.automergeRepo.find<SpaceDoc>(rootUrl as any);
 
     // TODO(dmaretskyi): Make this single-threaded (but doc loading should still be parallel to not block epoch processing).
     queueMicrotask(async () => {
       try {
         await warnAfterTimeout(5_000, 'Automerge root doc load timeout (DataSpace)', async () => {
-          handle = await cancelWithContext(
-            this._ctx,
-            this._echoHost.automergeRepo.find<SpaceDoc>(rootUrl as any, FIND_PARAMS),
-          );
           await cancelWithContext(this._ctx, handle.whenReady());
         });
         if (this._ctx.disposed) {
@@ -482,7 +475,7 @@ export class DataSpace {
         using _guard = await this._epochProcessingMutex.acquire();
 
         // Attaching space keys to legacy documents.
-        const doc = handle.doc() ?? failedInvariant();
+        const doc = handle.docSync() ?? failedInvariant();
         if (!doc.access?.spaceKey) {
           handle.change((doc: any) => {
             doc.access = { spaceKey: this.key.toHex() };

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

@@ -14,7 +14,6 @@ import { createTestEdgeWsServer } from '@dxos/edge-client/testing';
 import { FeedFactory, FeedStore, type FeedWrapper } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { SpaceId } from '@dxos/keys';
-import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { createStorage } from '@dxos/random-access-storage';
 import { openAndClose } from '@dxos/test-utils';
@@ -45,7 +44,7 @@ describe('EdgeFeedReplicator', () => {
     const { endpoint, admitConnection, messageSink } = await createEdge();
     const { messenger } = await createClient(endpoint);
     admitConnection.wake();
-    await expect.poll(() => messenger.status).toBe(EdgeStatus.CONNECTED);
+    await expect.poll(() => messenger.isConnected).toBeTruthy();
 
     await attachReplicator(messenger);
     await expect.poll(() => messageSink.length).toEqual(1);

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

@@ -19,7 +19,6 @@ import {
   type Message as RouterMessage,
 } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 import type { FeedBlock, ProtocolMessage } from '@dxos/protocols/feed-replication';
-import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { ComplexMap, arrayToBuffer, bufferToArray, defaultMap, rangeFromTo } from '@dxos/util';
 
 export type EdgeFeedReplicatorParams = {
@@ -87,7 +86,7 @@ export class EdgeFeedReplicator extends Resource {
 
   private async _handleReconnect() {
     await this._resetConnection();
-    if (this._messenger.status === EdgeStatus.CONNECTED) {
+    if (this._messenger.isConnected) {
       this._startReplication();
     }
   }

package/src/packlets/spaces/epoch-migrations.ts

@@ -2,8 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import type { AutomergeUrl } from '@automerge/automerge-repo';
-
+import type { AutomergeUrl } from '@dxos/automerge/automerge-repo';
 import { type Context } from '@dxos/context';
 import { type EchoHost } from '@dxos/echo-pipeline';
 import { invariant } from '@dxos/invariant';
@@ -48,7 +47,7 @@ export const runEpochMigration = async (ctx: Context, context: MigrationContext)
         timeout: LOAD_DOC_TIMEOUT,
       });
 
-      const newRoot = context.echoHost.createDoc(rootHandle.doc());
+      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
       await context.echoHost.flush();
       return { newRoot: newRoot.url };
     }

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

@@ -2,9 +2,8 @@
 // Copyright 2022 DXOS.org
 //
 
-import type { AutomergeUrl } from '@automerge/automerge-repo';
-
 import { SubscriptionList, UpdateScheduler, scheduleTask } from '@dxos/async';
+import type { AutomergeUrl } from '@dxos/automerge/automerge-repo';
 import { Stream } from '@dxos/codec-protobuf/stream';
 import {
   type CredentialProcessor,

package/src/packlets/storage/profile-archive.ts

@@ -2,8 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { cbor } from '@automerge/automerge-repo';
-
+import { cbor } from '@dxos/automerge/automerge-repo';
 import { invariant } from '@dxos/invariant';
 import type { LevelDB } from '@dxos/kv-store';
 import { log } from '@dxos/log';

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.8.2-main.fbd8ed0";
+export const DXOS_VERSION = "0.8.2-staging.7ac8446";