@dxos/echo-pipeline 0.8.3 → 0.8.4-main.28f8d3d

package/src/db-host/documents-synchronizer.ts

@@ -3,17 +3,15 @@
 //
 
 import { next as A, type Heads } from '@automerge/automerge';
-import { type Repo, type DocHandle, type DocumentId } from '@automerge/automerge-repo';
+import { type DocHandle, type DocumentId, type Repo } from '@automerge/automerge-repo';
 
-import { UpdateScheduler } from '@dxos/async';
-import { Resource } from '@dxos/context';
+import { UpdateScheduler, sleep } from '@dxos/async';
+import { LifecycleState, Resource, cancelWithContext } from '@dxos/context';
 import { type DatabaseDirectory } from '@dxos/echo-protocol';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { type BatchedDocumentUpdates, type DocumentUpdate } from '@dxos/protocols/proto/dxos/echo/service';
 
-import { FIND_PARAMS } from '../automerge';
-
 const MAX_UPDATE_FREQ = 10; // [updates/sec]
 
 export type DocumentsSynchronizerParams = {
@@ -27,6 +25,9 @@ interface DocSyncState {
   clearSubscriptions?: () => void;
 }
 
+const WRAP_AROUND_RETRY_LIMIT = 3;
+const WRAP_AROUND_RETRY_INITIAL_DELAY = 100; // [ms]
+
 /**
  * Manages a connection and replication between worker's Automerge Repo and the client's Repo.
  */
@@ -47,8 +48,12 @@ export class DocumentsSynchronizer extends Resource {
     super();
   }
 
-  addDocuments(documentIds: DocumentId[], retryCounter = 0): void {
-    if (retryCounter > 3) {
+  addDocuments(
+    documentIds: DocumentId[],
+    retryCounter = 0,
+    wrapAroundRetryDelay = WRAP_AROUND_RETRY_INITIAL_DELAY,
+  ): void {
+    if (retryCounter > WRAP_AROUND_RETRY_LIMIT) {
       log.warn('Failed to load document, retry limit reached', { documentIds });
       return;
     }
@@ -64,7 +69,9 @@ export class DocumentsSynchronizer extends Resource {
         })
         .catch((error) => {
           log.warn('Failed to load document, wraparound', { documentId, error });
-          this.addDocuments([documentId], retryCounter + 1);
+          void cancelWithContext(this._ctx, sleep(wrapAroundRetryDelay)).then(() =>
+            this.addDocuments([documentId], retryCounter + 1, wrapAroundRetryDelay * 2),
+          );
         });
     }
   }
@@ -90,17 +97,13 @@ export class DocumentsSynchronizer extends Resource {
 
   async update(updates: DocumentUpdate[]): Promise<void> {
     for (const { documentId, mutation, isNew } of updates) {
-      if (isNew) {
-        const doc = await this._params.repo.find<DatabaseDirectory>(documentId as DocumentId, FIND_PARAMS);
-        doc.update((doc) => A.loadIncremental(doc, mutation));
-        this._startSync(doc);
-      } else {
-        this._writeMutation(documentId as DocumentId, mutation);
-      }
+      this._writeMutation(documentId as DocumentId, mutation, isNew);
     }
+    // TODO(mykola): This should not be required.
+    await this._params.repo.flush(updates.map(({ documentId }) => documentId as DocumentId));
   }
 
-  private _startSync(doc: DocHandle<DatabaseDirectory>): void {
+  private _startSync(doc: DocHandle<DatabaseDirectory>) {
     if (this._syncStates.has(doc.documentId)) {
       log('Document already being synced', { documentId: doc.documentId });
       return;
@@ -109,6 +112,7 @@ export class DocumentsSynchronizer extends Resource {
     const syncState: DocSyncState = { handle: doc };
     this._subscribeForChanges(syncState);
     this._syncStates.set(doc.documentId, syncState);
+    return syncState;
   }
 
   _subscribeForChanges(syncState: DocSyncState): void {
@@ -157,16 +161,25 @@ export class DocumentsSynchronizer extends Resource {
     return mutation;
   }
 
-  private _writeMutation(documentId: DocumentId, mutation: Uint8Array): void {
-    const syncState = this._syncStates.get(documentId);
-    invariant(syncState, 'Sync state for document not found');
-    syncState.handle.update((doc) => {
-      const headsBefore = A.getHeads(doc);
-      const newDoc = A.loadIncremental(doc, mutation);
-      if (A.equals(headsBefore, syncState.lastSentHead)) {
-        syncState.lastSentHead = A.getHeads(newDoc);
+  private _writeMutation(documentId: DocumentId, mutation: Uint8Array, isNew?: boolean): void {
+    if (this._lifecycleState === LifecycleState.CLOSED) {
+      return;
+    }
+    if (isNew) {
+      const newHandle = this._params.repo.import<DatabaseDirectory>(mutation, { docId: documentId });
+      const syncState = this._startSync(newHandle);
+      syncState!.lastSentHead = A.getHeads(newHandle.doc());
+    } else {
+      const syncState = this._syncStates.get(documentId);
+      invariant(syncState, 'Sync state for document not found');
+      const headsBefore = A.getHeads(syncState.handle.doc());
+      // This will update corresponding handle in the repo.
+      this._params.repo.import(mutation, { docId: documentId });
+
+      if (A.equals(headsBefore, syncState!.lastSentHead)) {
+        // No new mutations were discovered on network, so we do not need to send updates from worker to client.
+        syncState!.lastSentHead = A.getHeads(syncState.handle.doc());
       }
-      return newDoc;
-    });
+    }
   }
 }

package/src/db-host/echo-host.ts

@@ -10,9 +10,9 @@ import {
   type Repo,
 } from '@automerge/automerge-repo';
 
-import { LifecycleState, Resource, type Context } from '@dxos/context';
+import { type Context, LifecycleState, Resource } from '@dxos/context';
 import { todo } from '@dxos/debug';
-import { createIdFromSpaceKey, SpaceDocVersion, type DatabaseDirectory } from '@dxos/echo-protocol';
+import { type DatabaseDirectory, SpaceDocVersion, createIdFromSpaceKey } from '@dxos/echo-protocol';
 import { IndexMetadataStore, IndexStore, Indexer } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey, type SpaceId } from '@dxos/keys';
@@ -20,24 +20,25 @@ import { type LevelDB } from '@dxos/kv-store';
 import { IndexKind } from '@dxos/protocols/proto/dxos/echo/indexing';
 import { trace } from '@dxos/tracing';
 
-import { DataServiceImpl } from './data-service';
-import { type DatabaseRoot } from './database-root';
-import { createSelectedDocumentsIterator } from './documents-iterator';
-import { QueryServiceImpl } from './query-service';
-import { SpaceStateManager } from './space-state-manager';
 import {
   AutomergeHost,
-  FIND_PARAMS,
-  EchoDataMonitor,
-  deriveCollectionIdFromSpaceId,
-  type LoadDocOptions,
   type CreateDocOptions,
-  type EchoReplicator,
+  EchoDataMonitor,
   type EchoDataStats,
+  type EchoReplicator,
+  FIND_PARAMS,
+  type LoadDocOptions,
   type PeerIdProvider,
   type RootDocumentSpaceKeyProvider,
+  deriveCollectionIdFromSpaceId,
 } from '../automerge';
 
+import { DataServiceImpl } from './data-service';
+import { type DatabaseRoot } from './database-root';
+import { createSelectedDocumentsIterator } from './documents-iterator';
+import { QueryServiceImpl } from './query-service';
+import { SpaceStateManager } from './space-state-manager';
+
 export interface EchoHostIndexingConfig {
   /**
    * @default true

package/src/db-host/query-service.ts

@@ -23,10 +23,11 @@ import {
 } from '@dxos/protocols/proto/dxos/echo/query';
 import { trace } from '@dxos/tracing';
 
-import type { SpaceStateManager } from './space-state-manager';
 import { type AutomergeHost } from '../automerge';
 import { QueryExecutor } from '../query';
 
+import type { SpaceStateManager } from './space-state-manager';
+
 export type QueryServiceParams = {
   indexer: Indexer;
   automergeHost: AutomergeHost;
@@ -96,6 +97,12 @@ export class QueryServiceImpl extends Resource implements QueryService {
 
   execQuery(request: QueryRequest): Stream<QueryResponse> {
     return new Stream<QueryResponse>(({ next, close, ctx }) => {
+      if (this._params.indexer.config?.enabled !== true) {
+        log.error('indexer is disabled', { config: this._params.indexer.config });
+        close();
+        return;
+      }
+
       const queryEntry = this._createQuery(ctx, request, next, close, close);
       scheduleMicroTask(ctx, async () => {
         await queryEntry.executor.open();

package/src/db-host/space-state-manager.ts

@@ -2,11 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { interpretAsDocumentId, type DocHandle, type DocumentId } from '@automerge/automerge-repo';
+import { type DocHandle, type DocumentId, interpretAsDocumentId } from '@automerge/automerge-repo';
 import isEqual from 'lodash.isequal';
 
 import { Event, UpdateScheduler } from '@dxos/async';
-import { Resource, Context, LifecycleState } from '@dxos/context';
+import { Context, LifecycleState, Resource } from '@dxos/context';
 import { type DatabaseDirectory } from '@dxos/echo-protocol';
 import { invariant } from '@dxos/invariant';
 import { type SpaceId } from '@dxos/keys';

package/src/edge/echo-edge-replicator.test.ts

@@ -7,7 +7,7 @@ import { getRandomPort } from 'get-port-please';
 import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Event } from '@dxos/async';
-import { createEphemeralEdgeIdentity, EdgeClient, MessageSchema } from '@dxos/edge-client';
+import { EdgeClient, MessageSchema, createEphemeralEdgeIdentity } from '@dxos/edge-client';
 import { createTestEdgeWsServer } from '@dxos/edge-client/testing';
 import { PublicKey, SpaceId } from '@dxos/keys';
 import { EdgeService } from '@dxos/protocols';
@@ -16,9 +16,10 @@ import { createBuf } from '@dxos/protocols/buf';
 import type { Peer } from '@dxos/protocols/proto/dxos/edge/messenger';
 import { openAndClose } from '@dxos/test-utils';
 
-import { EchoEdgeReplicator } from './echo-edge-replicator';
 import type { EchoReplicatorContext, ReplicatorConnection } from '../automerge';
 
+import { EchoEdgeReplicator } from './echo-edge-replicator';
+
 describe('EchoEdgeReplicator', () => {
   test('reconnects', async () => {
     const { client, server } = await createClientServer();

package/src/edge/echo-edge-replicator.ts

@@ -4,7 +4,7 @@
 
 import { cbor } from '@automerge/automerge-repo';
 
-import { Mutex, scheduleTask, scheduleMicroTask } from '@dxos/async';
+import { Mutex, scheduleMicroTask, scheduleTask } from '@dxos/async';
 import { Context, Resource } from '@dxos/context';
 import { randomUUID } from '@dxos/crypto';
 import type { CollectionId } from '@dxos/echo-protocol';
@@ -12,7 +12,7 @@ import { type EdgeConnection } from '@dxos/edge-client';
 import { invariant } from '@dxos/invariant';
 import type { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { EdgeService, type AutomergeProtocolMessage, type PeerId } from '@dxos/protocols';
+import { type AutomergeProtocolMessage, EdgeService, type PeerId } from '@dxos/protocols';
 import { buf } from '@dxos/protocols/buf';
 import {
   type Message as RouterMessage,
@@ -20,16 +20,17 @@ import {
 } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 import { bufferToArray } from '@dxos/util';
 
-import { InflightRequestLimiter } from './inflight-request-limiter';
 import {
-  getSpaceIdFromCollectionId,
   type EchoReplicator,
   type EchoReplicatorContext,
   type ReplicatorConnection,
   type ShouldAdvertiseParams,
   type ShouldSyncCollectionParams,
+  getSpaceIdFromCollectionId,
 } from '../automerge';
 
+import { InflightRequestLimiter } from './inflight-request-limiter';
+
 /**
  * Delay before restarting the connection after receiving a forbidden error.
  */
@@ -132,9 +133,11 @@ export class EchoEdgeReplicator implements EchoReplicator {
       context: this._context,
       sharedPolicyEnabled: this._sharePolicyEnabled,
       onRemoteConnected: async () => {
+        log.trace('dxos.echo.edge.replicator.onRemoteConnected', { spaceId });
         this._context?.onConnectionOpen(connection);
       },
       onRemoteDisconnected: async () => {
+        log.trace('dxos.echo.edge.replicator.onRemoteDisconnected', { spaceId });
         this._context?.onConnectionClosed(connection);
       },
       onRestartRequested: async () => {
@@ -162,6 +165,7 @@ export class EchoEdgeReplicator implements EchoReplicator {
             if (ctx?.disposed) {
               return;
             }
+            log.trace('dxos.echo.edge.replicator.restart', { spaceId, reconnects, restartDelay });
             await this._openConnection(spaceId, reconnects + 1);
           },
           restartDelay,
@@ -252,13 +256,26 @@ class EdgeReplicatorConnection extends Resource implements ReplicatorConnection
 
     await this._requestLimiter.open();
 
-    // TODO: handle reconnects
     this._ctx.onDispose(
       this._edgeConnection.onMessage((msg: RouterMessage) => {
         this._onMessage(msg);
       }),
     );
 
+    let firstReconnect = true;
+    this._ctx.onDispose(
+      // NOTE: This will fire immediately if the connection is already open.
+      this._edgeConnection.onReconnected(async () => {
+        if (firstReconnect) {
+          log.verbose('first reconnect skipped');
+          firstReconnect = false;
+          return;
+        }
+
+        this._onRestartRequested();
+      }),
+    );
+
     await this._onRemoteConnected();
   }
 
@@ -353,16 +370,20 @@ class EdgeReplicatorConnection extends Resource implements ReplicatorConnection
 
     const encoded = cbor.encode(message);
 
-    await this._edgeConnection.send(
-      buf.create(RouterMessageSchema, {
-        serviceId: this._targetServiceId,
-        source: {
-          identityKey: this._edgeConnection.identityKey,
-          peerKey: this._edgeConnection.peerKey,
-        },
-        payload: { value: bufferToArray(encoded) },
-      }),
-    );
+    try {
+      await this._edgeConnection.send(
+        buf.create(RouterMessageSchema, {
+          serviceId: this._targetServiceId,
+          source: {
+            identityKey: this._edgeConnection.identityKey,
+            peerKey: this._edgeConnection.peerKey,
+          },
+          payload: { value: bufferToArray(encoded) },
+        }),
+      );
+    } catch (err) {
+      log.error('failed to send message', { err });
+    }
   }
 }
 

package/src/filter/filter-match.test.ts

@@ -6,10 +6,10 @@ import { describe, expect, test } from 'vitest';
 
 import { Filter } from '@dxos/echo';
 import { ObjectStructure } from '@dxos/echo-protocol';
-import { Expando, EXPANDO_TYPENAME, Ref } from '@dxos/echo-schema';
+import { EXPANDO_TYPENAME, Expando, Ref } from '@dxos/echo-schema';
 import { DXN, ObjectId, SpaceId } from '@dxos/keys';
 
-import { filterMatchObject, type MatchedObject } from './filter-match';
+import { type MatchedObject, filterMatchObject } from './filter-match';
 
 describe('filterMatch', () => {
   test('properties', () => {

package/src/filter/filter-match.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { decodeReference, isEncodedReference, type QueryAST, type ObjectStructure } from '@dxos/echo-protocol';
+import { type ObjectStructure, type QueryAST, decodeReference, isEncodedReference } from '@dxos/echo-protocol';
 import { EXPANDO_TYPENAME } from '@dxos/echo-schema';
 import { DXN, type ObjectId, type SpaceId } from '@dxos/keys';
 

package/src/metadata/metadata-store.ts

@@ -16,11 +16,11 @@ import { Invitation, SpaceState } from '@dxos/protocols/proto/dxos/client/servic
 import {
   type ControlPipelineSnapshot,
   type EchoMetadata,
-  type SpaceMetadata,
+  type EdgeReplicationSetting,
   type IdentityRecord,
-  type SpaceCache,
   type LargeSpaceMetadata,
-  type EdgeReplicationSetting,
+  type SpaceCache,
+  type SpaceMetadata,
 } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { type Directory, type File } from '@dxos/random-access-storage';
 import { type Timeframe } from '@dxos/timeframe';

package/src/pipeline/pipeline-stress.test.ts

@@ -2,8 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
-import * as fc from 'fast-check';
 import { inspect } from 'node:util';
+
+import * as fc from 'fast-check';
 import { describe, expect, test } from 'vitest';
 
 import { asyncTimeout } from '@dxos/async';
@@ -15,9 +16,10 @@ import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { Timeframe } from '@dxos/timeframe';
 import { range } from '@dxos/util';
 
-import { Pipeline } from './pipeline';
 import { TestFeedBuilder } from '../testing';
 
+import { Pipeline } from './pipeline';
+
 const NUM_AGENTS = 2;
 const NUM_MESSAGES = 10;
 

package/src/pipeline/pipeline.test.ts

@@ -2,16 +2,17 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Event, sleep } from '@dxos/async';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { Timeframe } from '@dxos/timeframe';
 import { range } from '@dxos/util';
 
-import { Pipeline } from './pipeline';
 import { TestFeedBuilder } from '../testing';
 
+import { Pipeline } from './pipeline';
+
 const TEST_MESSAGE: FeedMessage = {
   timeframe: new Timeframe(),
   payload: {},

package/src/pipeline/pipeline.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Event, sleepWithContext, synchronized, Trigger } from '@dxos/async';
+import { Event, Trigger, sleepWithContext, synchronized } from '@dxos/async';
 import { Context, rejectOnDispose } from '@dxos/context';
 import { failUndefined } from '@dxos/debug';
 import { FeedSetIterator, type FeedWrapper, type FeedWriter } from '@dxos/feed-store';
@@ -14,10 +14,11 @@ import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { Timeframe } from '@dxos/timeframe';
 import { ComplexMap } from '@dxos/util';
 
-import { createMessageSelector } from './message-selector';
-import { mapFeedIndexesToTimeframe, startAfter, TimeframeClock } from './timeframe-clock';
 import { createMappedFeedWriter } from '../common';
 
+import { createMessageSelector } from './message-selector';
+import { TimeframeClock, mapFeedIndexesToTimeframe, startAfter } from './timeframe-clock';
+
 export type WaitUntilReachedTargetParams = {
   /**
    * For cancellation.
@@ -40,8 +41,10 @@ export class PipelineState {
    */
   _ctx = new Context();
 
-  // TODO(dmaretskyi): Remove?.
-  public readonly timeframeUpdate = this._timeframeClock.update;
+  // TODO(dmaretskyi): Remove?. Avoid accessing `_timeframeClock` before constructor initialization.
+  public get timeframeUpdate() {
+    return this._timeframeClock.update;
+  }
 
   public readonly stalled = new Event();
 

package/src/query/query-executor.ts

@@ -6,7 +6,7 @@ import type { AutomergeUrl, DocumentId } from '@automerge/automerge-repo';
 import { Match } from 'effect';
 
 import { Context, ContextDisposedError, LifecycleState, Resource } from '@dxos/context';
-import { DatabaseDirectory, isEncodedReference, ObjectStructure, type QueryAST } from '@dxos/echo-protocol';
+import { DatabaseDirectory, ObjectStructure, type QueryAST, isEncodedReference } from '@dxos/echo-protocol';
 import { EscapedPropPath, type FindResult, type Indexer } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { DXN, type ObjectId, PublicKey, type SpaceId } from '@dxos/keys';
@@ -15,13 +15,14 @@ import { objectPointerCodec } from '@dxos/protocols';
 import { type QueryReactivity, type QueryResult } from '@dxos/protocols/proto/dxos/echo/query';
 import { getDeep, isNonNullable } from '@dxos/util';
 
-import type { QueryPlan } from './plan';
-import { QueryPlanner } from './query-planner';
 import type { AutomergeHost } from '../automerge';
 import { createIdFromSpaceKey } from '../common';
 import type { SpaceStateManager } from '../db-host';
 import { filterMatchObject } from '../filter';
 
+import type { QueryPlan } from './plan';
+import { QueryPlanner } from './query-planner';
+
 type QueryExecutorOptions = {
   indexer: Indexer;
   automergeHost: AutomergeHost;
@@ -189,7 +190,6 @@ export class QueryExecutor extends Resource {
       );
 
     if (TRACE_QUERY_EXECUTION) {
-      // eslint-disable-next-line no-console
       console.log(ExecutionTrace.format(trace));
     }
 
@@ -383,7 +383,7 @@ export class QueryExecutor extends Resource {
     workingSet: QueryItem[],
   ): Promise<StepExecutionResult> {
     if (workingSet.length === 6) {
-      log.info('FilterDeletedStep', { step, workingSet });
+      log('filter deleted step', { step, workingSet });
     }
 
     const expected = step.mode === 'only-deleted';
@@ -428,7 +428,7 @@ export class QueryExecutor extends Resource {
                         }
                       : null;
                   } catch {
-                    log.warn('Invalid reference', { ref: ref['/'] });
+                    log.warn('invalid reference', { ref: ref['/'] });
                     return null;
                   }
                 });
@@ -491,7 +491,7 @@ export class QueryExecutor extends Resource {
                     spaceId: item.spaceId,
                   };
                 } catch {
-                  log.warn('Invalid reference', { ref: ref['/'] });
+                  log.warn('invalid reference', { ref: ref['/'] });
                   return null;
                 }
               })

package/src/query/query-planner.test.ts

@@ -8,9 +8,10 @@ import { Filter, Query } from '@dxos/echo';
 import { type QueryAST } from '@dxos/echo-protocol';
 import { SpaceId } from '@dxos/keys';
 
-import { QueryPlanner } from './query-planner';
 import { TestSchema } from '../testing';
 
+import { QueryPlanner } from './query-planner';
+
 describe('QueryPlanner', () => {
   const planner = new QueryPlanner();
 

package/src/space/admission-discovery-extension.ts

@@ -2,15 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import { scheduleTask, type Trigger } from '@dxos/async';
+import { type Trigger, scheduleTask } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { ProtocolError } from '@dxos/protocols';
 import { schema } from '@dxos/protocols/proto';
 import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import {
   type AdmissionDiscoveryService,
-  type GetAdmissionCredentialResponse,
   type GetAdmissionCredentialRequest,
+  type GetAdmissionCredentialResponse,
 } from '@dxos/protocols/proto/dxos/mesh/teleport';
 import { type ExtensionContext, RpcExtension } from '@dxos/teleport';
 

package/src/space/control-pipeline.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { CredentialGenerator, createCredential } from '@dxos/credentials';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
@@ -11,13 +11,14 @@ import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 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';
+import { StorageType, createStorage } from '@dxos/random-access-storage';
 import { Timeframe } from '@dxos/timeframe';
 
-import { ControlPipeline } from './control-pipeline';
 import { valueEncoding } from '../common';
 import { MetadataStore } from '../metadata';
 
+import { ControlPipeline } from './control-pipeline';
+
 describe('space/control-pipeline', () => {
   test('admits feeds', async () => {
     const keyring = new Keyring();

package/src/space/control-pipeline.ts

@@ -5,11 +5,11 @@
 import { DeferredTask, sleepWithContext, trackLeaks } from '@dxos/async';
 import { Context } from '@dxos/context';
 import {
-  SpaceStateMachine,
-  type SpaceState,
-  type MemberInfo,
-  type FeedInfo,
   type DelegateInvitationCredential,
+  type FeedInfo,
+  type MemberInfo,
+  type SpaceState,
+  SpaceStateMachine,
 } from '@dxos/credentials';
 import { type FeedWrapper } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';

package/src/space/space-manager.browser.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, test, onTestFinished } from 'vitest';
+import { describe, onTestFinished, test } from 'vitest';
 
 import { createStorage } from '@dxos/random-access-storage';
 

package/src/space/space-manager.ts

@@ -4,8 +4,8 @@
 
 import { type AutomergeUrl, parseAutomergeUrl } from '@automerge/automerge-repo';
 
-import { synchronized, trackLeaks, Trigger } from '@dxos/async';
-import { getCredentialAssertion, type DelegateInvitationCredential, type MemberInfo } from '@dxos/credentials';
+import { Trigger, synchronized, trackLeaks } from '@dxos/async';
+import { type DelegateInvitationCredential, type MemberInfo, getCredentialAssertion } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
 import { type FeedStore } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
@@ -19,11 +19,12 @@ import { type Teleport } from '@dxos/teleport';
 import { type BlobStore } from '@dxos/teleport-extension-object-sync';
 import { ComplexMap } from '@dxos/util';
 
+import { createIdFromSpaceKey } from '../common/space-id';
+import { type MetadataStore } from '../metadata';
+
 import { CredentialRetrieverExtension } from './admission-discovery-extension';
 import { Space } from './space';
 import { SpaceProtocol, type SwarmIdentity } from './space-protocol';
-import { createIdFromSpaceKey } from '../common/space-id';
-import { type MetadataStore } from '../metadata';
 
 export type SpaceManagerParams = {
   feedStore: FeedStore<FeedMessage>;

package/src/space/space-protocol.browser.test.ts

@@ -2,14 +2,14 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { createStorage } from '@dxos/random-access-storage';
 import { Timeframe } from '@dxos/timeframe';
 
-import { TestFeedBuilder, TestAgentBuilder, WebsocketNetworkManagerProvider } from '../testing';
+import { TestAgentBuilder, TestFeedBuilder, WebsocketNetworkManagerProvider } from '../testing';
 
 // TODO(burdon): Config.
 // Signal server will be started by the setup script.