@dxos/echo-pipeline 0.3.2-main.de57e73 → 0.3.2-main.e5374ab

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.3.2-main.de57e73",
+  "version": "0.3.2-main.e5374ab",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -20,42 +20,42 @@
   ],
   "dependencies": {
     "crc-32": "^1.2.2",
-    "@dxos/async": "0.3.2-main.de57e73",
-    "@dxos/codec-protobuf": "0.3.2-main.de57e73",
-    "@dxos/context": "0.3.2-main.de57e73",
-    "@dxos/credentials": "0.3.2-main.de57e73",
-    "@dxos/crypto": "0.3.2-main.de57e73",
-    "@dxos/debug": "0.3.2-main.de57e73",
-    "@dxos/document-model": "0.3.2-main.de57e73",
-    "@dxos/echo-db": "0.3.2-main.de57e73",
-    "@dxos/feed-store": "0.3.2-main.de57e73",
-    "@dxos/hypercore": "0.3.2-main.de57e73",
-    "@dxos/invariant": "0.3.2-main.de57e73",
-    "@dxos/keyring": "0.3.2-main.de57e73",
-    "@dxos/keys": "0.3.2-main.de57e73",
-    "@dxos/log": "0.3.2-main.de57e73",
-    "@dxos/messaging": "0.3.2-main.de57e73",
-    "@dxos/model-factory": "0.3.2-main.de57e73",
-    "@dxos/network-manager": "0.3.2-main.de57e73",
-    "@dxos/node-std": "0.3.2-main.de57e73",
-    "@dxos/protocols": "0.3.2-main.de57e73",
-    "@dxos/random-access-storage": "0.3.2-main.de57e73",
-    "@dxos/rpc": "0.3.2-main.de57e73",
-    "@dxos/teleport": "0.3.2-main.de57e73",
-    "@dxos/teleport-extension-gossip": "0.3.2-main.de57e73",
-    "@dxos/teleport-extension-object-sync": "0.3.2-main.de57e73",
-    "@dxos/teleport-extension-replicator": "0.3.2-main.de57e73",
-    "@dxos/timeframe": "0.3.2-main.de57e73",
-    "@dxos/tracing": "0.3.2-main.de57e73",
-    "@dxos/typings": "0.3.2-main.de57e73",
-    "@dxos/util": "0.3.2-main.de57e73"
+    "@dxos/async": "0.3.2-main.e5374ab",
+    "@dxos/codec-protobuf": "0.3.2-main.e5374ab",
+    "@dxos/context": "0.3.2-main.e5374ab",
+    "@dxos/credentials": "0.3.2-main.e5374ab",
+    "@dxos/crypto": "0.3.2-main.e5374ab",
+    "@dxos/debug": "0.3.2-main.e5374ab",
+    "@dxos/document-model": "0.3.2-main.e5374ab",
+    "@dxos/echo-db": "0.3.2-main.e5374ab",
+    "@dxos/feed-store": "0.3.2-main.e5374ab",
+    "@dxos/hypercore": "0.3.2-main.e5374ab",
+    "@dxos/invariant": "0.3.2-main.e5374ab",
+    "@dxos/keyring": "0.3.2-main.e5374ab",
+    "@dxos/keys": "0.3.2-main.e5374ab",
+    "@dxos/log": "0.3.2-main.e5374ab",
+    "@dxos/messaging": "0.3.2-main.e5374ab",
+    "@dxos/model-factory": "0.3.2-main.e5374ab",
+    "@dxos/network-manager": "0.3.2-main.e5374ab",
+    "@dxos/node-std": "0.3.2-main.e5374ab",
+    "@dxos/protocols": "0.3.2-main.e5374ab",
+    "@dxos/random-access-storage": "0.3.2-main.e5374ab",
+    "@dxos/rpc": "0.3.2-main.e5374ab",
+    "@dxos/teleport": "0.3.2-main.e5374ab",
+    "@dxos/teleport-extension-gossip": "0.3.2-main.e5374ab",
+    "@dxos/teleport-extension-object-sync": "0.3.2-main.e5374ab",
+    "@dxos/teleport-extension-replicator": "0.3.2-main.e5374ab",
+    "@dxos/text-model": "0.3.2-main.e5374ab",
+    "@dxos/timeframe": "0.3.2-main.e5374ab",
+    "@dxos/tracing": "0.3.2-main.e5374ab",
+    "@dxos/typings": "0.3.2-main.e5374ab",
+    "@dxos/util": "0.3.2-main.e5374ab"
   },
   "devDependencies": {
     "fast-check": "~3.3.0",
     "hypercore-protocol": "^8.0.7",
     "source-map-support": "^0.5.12",
-    "wait-for-expect": "^3.0.2",
-    "@dxos/text-model": "0.3.2-main.de57e73"
+    "wait-for-expect": "^3.0.2"
   },
   "publishConfig": {
     "access": "public"

package/src/common/codec.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Codec } from '@dxos/codec-protobuf';
+import { type Codec } from '@dxos/codec-protobuf';
 import { createCodecEncoding } from '@dxos/hypercore';
 import { schema } from '@dxos/protocols';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';

package/src/common/feeds.ts

@@ -2,9 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
-import { FeedWriter } from '@dxos/feed-store';
+import { type FeedWriter } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
-import { MaybePromise } from '@dxos/util';
+import { type MaybePromise } from '@dxos/util';
 
 /**
  * Maps the written arguments onto a different message type.

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

@@ -4,14 +4,14 @@
 
 import { Stream } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
-import { tagMutationsInBatch, ItemDemuxer, ItemManager, setMetadataOnObject } from '@dxos/echo-db';
-import { FeedWriter } from '@dxos/feed-store';
+import { tagMutationsInBatch, type ItemDemuxer, type ItemManager, setMetadataOnObject } from '@dxos/echo-db';
+import { type FeedWriter } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { DataMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { EchoObjectBatch } from '@dxos/protocols/proto/dxos/echo/object';
-import { EchoEvent, MutationReceipt, WriteRequest } from '@dxos/protocols/proto/dxos/echo/service';
+import { type DataMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type EchoObjectBatch } from '@dxos/protocols/proto/dxos/echo/object';
+import { EchoEvent, type MutationReceipt, type WriteRequest } from '@dxos/protocols/proto/dxos/echo/service';
 import { ComplexMap } from '@dxos/util';
 
 /**

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

@@ -2,22 +2,22 @@
 // Copyright 2021 DXOS.org
 //
 
-import { Stream } from '@dxos/codec-protobuf';
+import { type Stream } from '@dxos/codec-protobuf';
 import { raise } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import {
-  DataService,
-  MutationReceipt,
-  SubscribeRequest,
-  EchoEvent,
-  WriteRequest,
-  FlushRequest,
+  type DataService,
+  type MutationReceipt,
+  type SubscribeRequest,
+  type EchoEvent,
+  type WriteRequest,
+  type FlushRequest,
 } from '@dxos/protocols/proto/dxos/echo/service';
 import { ComplexMap } from '@dxos/util';
 
-import { DataServiceHost } from './data-service-host';
+import { type DataServiceHost } from './data-service-host';
 
 // TODO(burdon): Clear on close.
 export class DataServiceSubscriptions {

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

@@ -2,11 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import { EchoProcessor, ItemDemuxer, ItemManager } from '@dxos/echo-db';
-import { FeedWriter } from '@dxos/feed-store';
-import { ModelFactory } from '@dxos/model-factory';
-import { DataMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { EchoSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
+import { type EchoProcessor, ItemDemuxer, type ItemManager } from '@dxos/echo-db';
+import { type FeedWriter } from '@dxos/feed-store';
+import { type ModelFactory } from '@dxos/model-factory';
+import { type DataMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type EchoSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
 
 import { DataServiceHost } from './data-service-host';
 

package/src/db-host/snapshot-manager.ts

@@ -2,22 +2,20 @@
 // Copyright 2023 DXOS.org
 //
 
-import { trackLeaks } from '@dxos/async';
-import { Context, cancelWithContext } from '@dxos/context';
+import { type Context, cancelWithContext } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { schema } from '@dxos/protocols';
 import { BlobMeta } from '@dxos/protocols/proto/dxos/echo/blob';
 import { SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
-import { BlobStore, BlobSync } from '@dxos/teleport-extension-object-sync';
+import { type BlobStore, type BlobSync } from '@dxos/teleport-extension-object-sync';
 
-import { SnapshotStore } from './snapshot-store';
+import { type SnapshotStore } from './snapshot-store';
 
 const SpaceSnapshot = schema.getCodecForType('dxos.echo.snapshot.SpaceSnapshot');
 
 /**
  * Snapshot manager for a specific space.
  */
-@trackLeaks('open', 'close')
 export class SnapshotManager {
   constructor(
     private readonly _snapshotStore: SnapshotStore,

package/src/db-host/snapshot-store.test.ts

@@ -5,7 +5,7 @@
 import expect from 'expect';
 
 import { PublicKey } from '@dxos/keys';
-import { SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
+import { type SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
 import { createStorage } from '@dxos/random-access-storage';
 import { describe, test } from '@dxos/test';
 import { Timeframe } from '@dxos/timeframe';

package/src/db-host/snapshot-store.ts

@@ -4,9 +4,9 @@
 
 import { subtleCrypto } from '@dxos/crypto';
 import { schema } from '@dxos/protocols';
-import { StoredSnapshotInfo } from '@dxos/protocols/proto/dxos/devtools/host';
+import { type StoredSnapshotInfo } from '@dxos/protocols/proto/dxos/devtools/host';
 import { SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
-import { Directory } from '@dxos/random-access-storage';
+import { type Directory } from '@dxos/random-access-storage';
 
 const SpaceSnapshot = schema.getCodecForType('dxos.echo.snapshot.SpaceSnapshot');
 /**

package/src/metadata/metadata-store.ts

@@ -5,7 +5,7 @@
 import CRC32 from 'crc-32';
 
 import { synchronized, Event } from '@dxos/async';
-import { Codec } from '@dxos/codec-protobuf';
+import { type Codec } from '@dxos/codec-protobuf';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -13,14 +13,14 @@ import { DataCorruptionError, STORAGE_VERSION, schema } from '@dxos/protocols';
 import { SpaceState } from '@dxos/protocols/proto/dxos/client/services';
 import {
   EchoMetadata,
-  SpaceMetadata,
-  IdentityRecord,
-  SpaceCache,
-  ControlPipelineSnapshot,
+  type SpaceMetadata,
+  type IdentityRecord,
+  type SpaceCache,
+  type ControlPipelineSnapshot,
   LargeSpaceMetadata,
 } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { Directory, File } from '@dxos/random-access-storage';
-import { Timeframe } from '@dxos/timeframe';
+import { type Directory, type File } from '@dxos/random-access-storage';
+import { type Timeframe } from '@dxos/timeframe';
 import { ComplexMap, arrayToBuffer, forEachAsync, isNotNullOrUndefined } from '@dxos/util';
 
 export interface AddSpaceOptions {

package/src/pipeline/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2022 DXOS.org
 //
 
-export { Pipeline, PipelineAccessor } from './pipeline';
+export { Pipeline, type PipelineAccessor } from './pipeline';
 export * from './timeframe-clock';

package/src/pipeline/message-selector.ts

@@ -2,12 +2,12 @@
 // Copyright 2020 DXOS.org
 //
 
-import { FeedBlock, FeedBlockSelector } from '@dxos/feed-store';
+import { type FeedBlock, type FeedBlockSelector } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 
-import { TimeframeClock } from './timeframe-clock';
+import { type TimeframeClock } from './timeframe-clock';
 
 /**
  * The MessageSelector makes sure that we read in a trusted order.

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

@@ -7,11 +7,11 @@ import * as fc from 'fast-check';
 import { inspect } from 'util';
 
 import { asyncTimeout } from '@dxos/async';
-import { FeedStore, FeedWrapper } from '@dxos/feed-store';
+import { type FeedStore, type FeedWrapper } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { FeedMessageBlock } from '@dxos/protocols';
-import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type FeedMessageBlock } from '@dxos/protocols';
+import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { describe, test } from '@dxos/test';
 import { Timeframe } from '@dxos/timeframe';
 import { range } from '@dxos/util';

package/src/pipeline/pipeline.test.ts

@@ -5,7 +5,7 @@
 import expect from 'expect';
 
 import { Event, sleep } from '@dxos/async';
-import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { describe, test, afterTest } from '@dxos/test';
 import { Timeframe } from '@dxos/timeframe';
 import { range } from '@dxos/util';

package/src/pipeline/pipeline.ts

@@ -2,14 +2,14 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Event, sleep, synchronized, Trigger } from '@dxos/async';
+import { Event, sleepWithContext, synchronized, Trigger } from '@dxos/async';
 import { Context, rejectOnDispose } from '@dxos/context';
 import { failUndefined } from '@dxos/debug';
-import { FeedSetIterator, FeedWrapper, FeedWriter } from '@dxos/feed-store';
+import { FeedSetIterator, type FeedWrapper, type FeedWriter } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { FeedMessageBlock } from '@dxos/protocols';
+import { type FeedMessageBlock } from '@dxos/protocols';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { Timeframe } from '@dxos/timeframe';
 import { ComplexMap } from '@dxos/util';
@@ -153,7 +153,7 @@ export class PipelineState {
           done = true;
           this._reachedTarget = true;
         }),
-        sleep(timeout).then(() => {
+        sleepWithContext(this._ctx, timeout).then(() => {
           if (done) {
             return;
           }

package/src/pipeline/timeframe-clock.ts

@@ -4,8 +4,8 @@
 
 import { Event } from '@dxos/async';
 import { timed } from '@dxos/debug';
-import { FeedIndex } from '@dxos/feed-store';
-import { PublicKey } from '@dxos/keys';
+import { type FeedIndex } from '@dxos/feed-store';
+import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { Timeframe } from '@dxos/timeframe';
 

package/src/space/auth.ts

@@ -8,8 +8,8 @@ import { randomBytes } from '@dxos/crypto';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols';
-import { AuthService } from '@dxos/protocols/proto/dxos/mesh/teleport/auth';
-import { ExtensionContext, RpcExtension } from '@dxos/teleport';
+import { type AuthService } from '@dxos/protocols/proto/dxos/mesh/teleport/auth';
+import { type ExtensionContext, RpcExtension } from '@dxos/teleport';
 
 export type AuthProvider = (nonce: Uint8Array) => Promise<Uint8Array | undefined>;
 

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

@@ -7,7 +7,7 @@ import expect from 'expect';
 import { CredentialGenerator, createCredential } from '@dxos/credentials';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
-import { PublicKey } from '@dxos/keys';
+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';

package/src/space/control-pipeline.ts

@@ -2,22 +2,22 @@
 // Copyright 2022 DXOS.org
 //
 
-import { DeferredTask, sleep } from '@dxos/async';
+import { DeferredTask, sleepWithContext, trackLeaks } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { SpaceStateMachine, SpaceState, MemberInfo, FeedInfo } from '@dxos/credentials';
-import { FeedWrapper } from '@dxos/feed-store';
+import { SpaceStateMachine, type SpaceState, type MemberInfo, type FeedInfo } from '@dxos/credentials';
+import { type FeedWrapper } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { FeedMessageBlock } from '@dxos/protocols';
+import { type FeedMessageBlock } from '@dxos/protocols';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { ControlPipelineSnapshot } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { AdmittedFeed, Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type ControlPipelineSnapshot } from '@dxos/protocols/proto/dxos/echo/metadata';
+import { AdmittedFeed, type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { Timeframe } from '@dxos/timeframe';
 import { TimeSeriesCounter, TimeUsageCounter, trace } from '@dxos/tracing';
-import { AsyncCallback, Callback, tracer } from '@dxos/util';
+import { type AsyncCallback, Callback, tracer } from '@dxos/util';
 
-import { MetadataStore } from '../metadata';
-import { Pipeline, PipelineAccessor } from '../pipeline';
+import { type MetadataStore } from '../metadata';
+import { Pipeline, type PipelineAccessor } from '../pipeline';
 
 export type ControlPipelineParams = {
   spaceKey: PublicKey;
@@ -36,6 +36,7 @@ const USE_SNAPSHOTS = true;
  * Processes HALO credentials, which include genesis and invitations.
  */
 @trace.resource()
+@trackLeaks('start', 'stop')
 export class ControlPipeline {
   private readonly _ctx = new Context();
   private readonly _pipeline: Pipeline;
@@ -57,7 +58,7 @@ export class ControlPipeline {
   private _mutations = new TimeSeriesCounter();
 
   private _snapshotTask = new DeferredTask(this._ctx, async () => {
-    await sleep(CONTROL_PIPELINE_SNAPSHOT_DELAY);
+    await sleepWithContext(this._ctx, CONTROL_PIPELINE_SNAPSHOT_DELAY);
     await this._saveSnapshot();
   });
 

package/src/space/data-pipeline.ts

@@ -4,25 +4,30 @@
 
 import { Event, scheduleTask, sleep, synchronized, trackLeaks } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { CredentialProcessor, FeedInfo, SpecificCredential, checkCredentialType } from '@dxos/credentials';
+import {
+  type CredentialProcessor,
+  type FeedInfo,
+  type SpecificCredential,
+  checkCredentialType,
+} from '@dxos/credentials';
 import { getStateMachineFromItem, ItemManager, TYPE_PROPERTIES } from '@dxos/echo-db';
-import { FeedWriter } from '@dxos/feed-store';
+import { type FeedWriter } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 import { log, omit } from '@dxos/log';
-import { ModelFactory } from '@dxos/model-factory';
-import { CancelledError, DataPipelineProcessed } from '@dxos/protocols';
-import { DataMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { ObjectSnapshot } from '@dxos/protocols/proto/dxos/echo/model/document';
-import { SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
-import { Credential, Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type ModelFactory } from '@dxos/model-factory';
+import { CancelledError, type DataPipelineProcessed } from '@dxos/protocols';
+import { type DataMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
+import { type ObjectSnapshot } from '@dxos/protocols/proto/dxos/echo/model/document';
+import { type SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
+import { type Credential, type Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { Timeframe } from '@dxos/timeframe';
 import { TimeSeriesCounter, TimeUsageCounter, trace } from '@dxos/tracing';
 import { tracer } from '@dxos/util';
 
-import { DatabaseHost, SnapshotManager } from '../db-host';
-import { MetadataStore } from '../metadata';
+import { DatabaseHost, type SnapshotManager } from '../db-host';
+import { type MetadataStore } from '../metadata';
 import { Pipeline } from '../pipeline';
 
 export interface PipelineFactory {

package/src/space/space-manager.ts

@@ -4,22 +4,22 @@
 
 import { synchronized, trackLeaks } from '@dxos/async';
 import { failUndefined } from '@dxos/debug';
-import { FeedStore } from '@dxos/feed-store';
+import { type FeedStore } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { ModelFactory } from '@dxos/model-factory';
-import { NetworkManager } from '@dxos/network-manager';
+import { type ModelFactory } from '@dxos/model-factory';
+import { type NetworkManager } from '@dxos/network-manager';
 import { trace } from '@dxos/protocols';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { Teleport } from '@dxos/teleport';
-import { BlobStore } from '@dxos/teleport-extension-object-sync';
+import { type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
+import { type Teleport } from '@dxos/teleport';
+import { type BlobStore } from '@dxos/teleport-extension-object-sync';
 import { ComplexMap } from '@dxos/util';
 
 import { Space } from './space';
-import { SpaceProtocol, SwarmIdentity } from './space-protocol';
-import { SnapshotManager, SnapshotStore } from '../db-host';
-import { MetadataStore } from '../metadata';
+import { SpaceProtocol, type SwarmIdentity } from './space-protocol';
+import { SnapshotManager, type SnapshotStore } from '../db-host';
+import { type MetadataStore } from '../metadata';
 
 export type SpaceManagerParams = {
   feedStore: FeedStore<FeedMessage>;

package/src/space/space-protocol.ts

@@ -2,26 +2,26 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Event } from '@dxos/async';
+import { type Event } from '@dxos/async';
 import { discoveryKey, subtleCrypto } from '@dxos/crypto';
-import { FeedWrapper } from '@dxos/feed-store';
+import { type FeedWrapper } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
 import {
   MMSTTopology,
-  NetworkManager,
-  SwarmConnection,
-  WireProtocol,
-  WireProtocolParams,
-  WireProtocolProvider,
+  type NetworkManager,
+  type SwarmConnection,
+  type WireProtocol,
+  type WireProtocolParams,
+  type WireProtocolProvider,
 } from '@dxos/network-manager';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { MuxerStats, Teleport } from '@dxos/teleport';
-import { BlobStore, BlobSync } from '@dxos/teleport-extension-object-sync';
+import { type MuxerStats, Teleport } from '@dxos/teleport';
+import { type BlobStore, BlobSync } from '@dxos/teleport-extension-object-sync';
 import { ReplicatorExtension } from '@dxos/teleport-extension-replicator';
 import { ComplexMap } from '@dxos/util';
 
-import { AuthExtension, AuthProvider, AuthVerifier } from './auth';
+import { AuthExtension, type AuthProvider, type AuthVerifier } from './auth';
 
 export const MOCK_AUTH_PROVIDER: AuthProvider = async (nonce: Uint8Array) => Buffer.from('mock');
 export const MOCK_AUTH_VERIFIER: AuthVerifier = async (nonce: Uint8Array, credential: Uint8Array) => true;

package/src/space/space.ts

@@ -3,25 +3,25 @@
 //
 
 import { Event, synchronized, trackLeaks, Lock } from '@dxos/async';
-import { Context } from '@dxos/context';
-import { FeedInfo } from '@dxos/credentials';
-import { FeedOptions, FeedWrapper } from '@dxos/feed-store';
+import { type Context } from '@dxos/context';
+import { type FeedInfo } from '@dxos/credentials';
+import { type FeedOptions, type FeedWrapper } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
-import { ModelFactory } from '@dxos/model-factory';
+import { type ModelFactory } from '@dxos/model-factory';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { AdmittedFeed, Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
-import { Timeframe } from '@dxos/timeframe';
+import { AdmittedFeed, type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type Timeframe } from '@dxos/timeframe';
 import { trace } from '@dxos/tracing';
-import { AsyncCallback, Callback } from '@dxos/util';
+import { type AsyncCallback, Callback } from '@dxos/util';
 
 import { ControlPipeline } from './control-pipeline';
 import { DataPipeline } from './data-pipeline';
-import { SpaceProtocol } from './space-protocol';
-import { SnapshotManager } from '../db-host';
-import { MetadataStore } from '../metadata';
-import { PipelineAccessor } from '../pipeline';
+import { type SpaceProtocol } from './space-protocol';
+import { type SnapshotManager } from '../db-host';
+import { type MetadataStore } from '../metadata';
+import { type PipelineAccessor } from '../pipeline';
 
 // TODO(burdon): Factor out?
 type FeedProvider = (feedKey: PublicKey, opts?: FeedOptions) => Promise<FeedWrapper<FeedMessage>>;

package/src/testing/database-test-rig.ts

@@ -5,14 +5,14 @@
 import { Event, Trigger } from '@dxos/async';
 import { DocumentModel } from '@dxos/document-model';
 import { DatabaseProxy, ItemManager, createModelMutation, encodeModelMutation } from '@dxos/echo-db';
-import { WriteOptions, WriteReceipt } from '@dxos/feed-store';
+import { type WriteOptions, type WriteReceipt } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { ModelFactory } from '@dxos/model-factory';
-import { FeedMessageBlock, schema } from '@dxos/protocols';
-import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { EchoSnapshot, SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
-import { Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type FeedMessageBlock, schema } from '@dxos/protocols';
+import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type EchoSnapshot, type SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
+import { type Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { TextModel } from '@dxos/text-model';
 import { Timeframe } from '@dxos/timeframe';
 import { ComplexMap, isNotNullOrUndefined } from '@dxos/util';
@@ -24,8 +24,8 @@ const SPACE_KEY = PublicKey.random();
 export class DatabaseTestBuilder {
   public readonly peers = new ComplexMap<PublicKey, DatabaseTestPeer>(PublicKey.hash);
 
-  async createPeer(): Promise<DatabaseTestPeer> {
-    const peer = new DatabaseTestPeer(this);
+  async createPeer(spaceKey = SPACE_KEY): Promise<DatabaseTestPeer> {
+    const peer = new DatabaseTestPeer(this, spaceKey);
     this.peers.set(peer.key, peer);
     await peer.open();
     return peer;
@@ -74,7 +74,7 @@ export class DatabaseTestPeer {
 
   private readonly _writes = new Set<WriteRequest>();
 
-  constructor(public readonly rig: DatabaseTestBuilder) {}
+  constructor(public readonly rig: DatabaseTestBuilder, public readonly spaceKey: PublicKey) {}
 
   async open() {
     this.hostItems = new ItemManager(this.modelFactory);
@@ -116,7 +116,7 @@ export class DatabaseTestPeer {
     this.proxy = new DatabaseProxy({
       service: this.host.createDataServiceHost(),
       itemManager: this.items,
-      spaceKey: SPACE_KEY,
+      spaceKey: this.spaceKey,
     });
     await this.proxy.open(this.modelFactory);
   }

package/src/testing/index.ts

@@ -5,3 +5,4 @@
 export * from './test-agent-builder';
 export * from './test-feed-builder';
 export * from './util';
+export * from './database-test-rig';