@dxos/client-services 0.6.12-main.15a606f → 0.6.12-main.78ddbdf

package/dist/lib/node-esm/testing/index.mjs

@@ -6,7 +6,7 @@ import {
   InvitationsManager,
   ServiceContext,
   SpaceInvitationProtocol
-} from "../chunk-LDBJYNPL.mjs";
+} from "../chunk-3HDLTAT2.mjs";
 
 // packages/sdk/client-services/src/packlets/testing/credential-utils.ts
 import { createCredential } from "@dxos/credentials";

package/dist/types/src/packlets/spaces/edge-feed-replicator.d.ts

@@ -23,6 +23,7 @@ export declare class EdgeFeedReplicator extends Resource {
     constructor({ messenger, spaceId }: EdgeFeedReplicatorParams);
     protected _open(): Promise<void>;
     protected _close(): Promise<void>;
+    private _resetConnection;
     addFeed(feed: FeedWrapper<any>): Promise<void>;
     private _getPushMutex;
     private _replicateFeed;

package/dist/types/src/packlets/spaces/edge-feed-replicator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edge-feed-replicator.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/edge-feed-replicator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAgB,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAa,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAQrD,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+D;IAEtF,OAAO,CAAC,cAAc,CAAC,CAAsB;IAC7C,OAAO,CAAC,UAAU,CAAS;IAC3B;;OAEG;IACH,OAAO,CAAC,aAAa,CAAqD;IAE1E;;OAEG;IACH,OAAO,CAAC,UAAU,CAAoD;gBAE1D,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,wBAAwB;cAMnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cA+BtB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC;IASpC,OAAO,CAAC,aAAa;YAIP,cAAc;YAad,YAAY;IAoB1B,OAAO,CAAC,UAAU;YAmDJ,WAAW;YA0BX,gBAAgB;YAkBhB,mBAAmB;CAalC"}
+{"version":3,"file":"edge-feed-replicator.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/edge-feed-replicator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,QAAQ,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAa,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAWrD,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+D;IAEtF,OAAO,CAAC,cAAc,CAAC,CAAsB;IAC7C,OAAO,CAAC,UAAU,CAAS;IAC3B;;OAEG;IACH,OAAO,CAAC,aAAa,CAAqD;IAE1E;;OAEG;IACH,OAAO,CAAC,UAAU,CAAoD;gBAE1D,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,wBAAwB;cAMnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cAmDtB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAIlC,gBAAgB;IAOxB,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC;IASpC,OAAO,CAAC,aAAa;YAIP,cAAc;YAWd,YAAY;IAyB1B,OAAO,CAAC,UAAU;YAuDJ,WAAW;YA0BX,gBAAgB;YAkBhB,mBAAmB;CAalC"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=edge-feed-replicator.test.d.ts.map

package/dist/types/src/packlets/spaces/edge-feed-replicator.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"edge-feed-replicator.test.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/edge-feed-replicator.test.ts"],"names":[],"mappings":""}

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.6.12-main.15a606f";
+export declare const DXOS_VERSION = "0.6.12-main.78ddbdf";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.6.12-main.15a606f",
+  "version": "0.6.12-main.78ddbdf",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -47,47 +47,48 @@
   "dependencies": {
     "cbor-x": "^1.5.4",
     "platform": "^1.3.6",
-    "@dxos/async": "0.6.12-main.15a606f",
-    "@dxos/automerge": "0.6.12-main.15a606f",
-    "@dxos/client-protocol": "0.6.12-main.15a606f",
-    "@dxos/codec-protobuf": "0.6.12-main.15a606f",
-    "@dxos/context": "0.6.12-main.15a606f",
-    "@dxos/config": "0.6.12-main.15a606f",
-    "@dxos/credentials": "0.6.12-main.15a606f",
-    "@dxos/crypto": "0.6.12-main.15a606f",
-    "@dxos/echo-db": "0.6.12-main.15a606f",
-    "@dxos/echo-pipeline": "0.6.12-main.15a606f",
-    "@dxos/echo-protocol": "0.6.12-main.15a606f",
-    "@dxos/debug": "0.6.12-main.15a606f",
-    "@dxos/echo-schema": "0.6.12-main.15a606f",
-    "@dxos/feed-store": "0.6.12-main.15a606f",
-    "@dxos/invariant": "0.6.12-main.15a606f",
-    "@dxos/edge-client": "0.6.12-main.15a606f",
-    "@dxos/indexing": "0.6.12-main.15a606f",
-    "@dxos/keyring": "0.6.12-main.15a606f",
-    "@dxos/keys": "0.6.12-main.15a606f",
-    "@dxos/lock-file": "0.6.12-main.15a606f",
-    "@dxos/kv-store": "0.6.12-main.15a606f",
-    "@dxos/log": "0.6.12-main.15a606f",
-    "@dxos/network-manager": "0.6.12-main.15a606f",
-    "@dxos/messaging": "0.6.12-main.15a606f",
-    "@dxos/node-std": "0.6.12-main.15a606f",
-    "@dxos/protocols": "0.6.12-main.15a606f",
-    "@dxos/rpc": "0.6.12-main.15a606f",
-    "@dxos/random-access-storage": "0.6.12-main.15a606f",
-    "@dxos/teleport-extension-gossip": "0.6.12-main.15a606f",
-    "@dxos/teleport": "0.6.12-main.15a606f",
-    "@dxos/teleport-extension-object-sync": "0.6.12-main.15a606f",
-    "@dxos/timeframe": "0.6.12-main.15a606f",
-    "@dxos/util": "0.6.12-main.15a606f",
-    "@dxos/websocket-rpc": "0.6.12-main.15a606f",
-    "@dxos/tracing": "0.6.12-main.15a606f"
+    "@dxos/async": "0.6.12-main.78ddbdf",
+    "@dxos/client-protocol": "0.6.12-main.78ddbdf",
+    "@dxos/config": "0.6.12-main.78ddbdf",
+    "@dxos/codec-protobuf": "0.6.12-main.78ddbdf",
+    "@dxos/automerge": "0.6.12-main.78ddbdf",
+    "@dxos/context": "0.6.12-main.78ddbdf",
+    "@dxos/crypto": "0.6.12-main.78ddbdf",
+    "@dxos/credentials": "0.6.12-main.78ddbdf",
+    "@dxos/debug": "0.6.12-main.78ddbdf",
+    "@dxos/echo-db": "0.6.12-main.78ddbdf",
+    "@dxos/echo-pipeline": "0.6.12-main.78ddbdf",
+    "@dxos/echo-protocol": "0.6.12-main.78ddbdf",
+    "@dxos/echo-schema": "0.6.12-main.78ddbdf",
+    "@dxos/feed-store": "0.6.12-main.78ddbdf",
+    "@dxos/indexing": "0.6.12-main.78ddbdf",
+    "@dxos/edge-client": "0.6.12-main.78ddbdf",
+    "@dxos/invariant": "0.6.12-main.78ddbdf",
+    "@dxos/keyring": "0.6.12-main.78ddbdf",
+    "@dxos/keys": "0.6.12-main.78ddbdf",
+    "@dxos/lock-file": "0.6.12-main.78ddbdf",
+    "@dxos/log": "0.6.12-main.78ddbdf",
+    "@dxos/kv-store": "0.6.12-main.78ddbdf",
+    "@dxos/messaging": "0.6.12-main.78ddbdf",
+    "@dxos/network-manager": "0.6.12-main.78ddbdf",
+    "@dxos/node-std": "0.6.12-main.78ddbdf",
+    "@dxos/random-access-storage": "0.6.12-main.78ddbdf",
+    "@dxos/protocols": "0.6.12-main.78ddbdf",
+    "@dxos/teleport": "0.6.12-main.78ddbdf",
+    "@dxos/rpc": "0.6.12-main.78ddbdf",
+    "@dxos/teleport-extension-gossip": "0.6.12-main.78ddbdf",
+    "@dxos/timeframe": "0.6.12-main.78ddbdf",
+    "@dxos/tracing": "0.6.12-main.78ddbdf",
+    "@dxos/teleport-extension-object-sync": "0.6.12-main.78ddbdf",
+    "@dxos/util": "0.6.12-main.78ddbdf",
+    "@dxos/websocket-rpc": "0.6.12-main.78ddbdf"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.6.12-main.15a606f",
-    "@dxos/test-utils": "0.6.12-main.15a606f"
+    "get-port-please": "^3.1.1",
+    "@dxos/signal": "0.6.12-main.78ddbdf",
+    "@dxos/test-utils": "0.6.12-main.78ddbdf"
   },
   "publishConfig": {
     "access": "public"

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

@@ -4,6 +4,7 @@
 
 import { onTestFinished, describe, expect, test } from 'vitest';
 
+import { Event } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { CredentialGenerator, verifyCredential } from '@dxos/credentials';
 import {
@@ -107,8 +108,10 @@ describe('identity/identity', () => {
 
   test('edge feed replicator', async () => {
     let replicationStarted = false;
+    const connectedEvent = new Event();
     const setup = await setupIdentity({
       edgeConnection: {
+        connected: connectedEvent,
         open: async () => {},
         close: async () => {},
         addListener: (_: MessageListener): (() => void) => {
@@ -121,6 +124,7 @@ describe('identity/identity', () => {
     });
 
     await writeGenesisCredential(setup);
+    connectedEvent.emit();
 
     await expect.poll(() => replicationStarted).toBeTruthy();
   });

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

@@ -0,0 +1,244 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import { decode as decodeCbor, encode as encodeCbor } from 'cbor-x';
+import { getRandomPort } from 'get-port-please';
+import { describe, test, onTestFinished, vi, expect } from 'vitest';
+
+import { Trigger, sleep } from '@dxos/async';
+import { Context } from '@dxos/context';
+import { valueEncoding } from '@dxos/echo-pipeline';
+import { EdgeClient, EdgeIdentityChangedError } from '@dxos/edge-client';
+import { createTestEdgeWsServer } from '@dxos/edge-client/testing';
+import { FeedFactory, FeedStore } from '@dxos/feed-store';
+import { type FeedWrapper } from '@dxos/feed-store';
+import { Keyring } from '@dxos/keyring';
+import { PublicKey, SpaceId } from '@dxos/keys';
+import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { createStorage } from '@dxos/random-access-storage';
+import { openAndClose } from '@dxos/test-utils';
+import { Timeframe } from '@dxos/timeframe';
+import { range } from '@dxos/util';
+
+import { EdgeFeedReplicator } from './edge-feed-replicator';
+
+describe('EdgeFeedReplicator', () => {
+  test('requests metadata after connection is open', async () => {
+    const { endpoint, admitConnection, messageSink } = await createEdge();
+    const { messenger, sendSpy } = await createClient(endpoint);
+
+    await attachReplicator(messenger);
+
+    await sleep(50);
+
+    expect(sendSpy).not.toHaveBeenCalled();
+    expect(messageSink.length).toEqual(0);
+
+    admitConnection.wake();
+    await expect.poll(() => sendSpy.mock.calls.length).toEqual(1);
+    expect(messageSink.length).toEqual(1);
+    expect(messageSink[0].type).toEqual('get-metadata');
+  });
+
+  test('sends a block', async () => {
+    const { endpoint, admitConnection, messageSink } = await createEdge();
+    const { messenger } = await createClient(endpoint);
+
+    const { feed } = await attachReplicator(messenger);
+
+    admitConnection.wake();
+    await appendMessage(feed);
+
+    await expect.poll(() => messageSink.length).toEqual(2);
+    expect(messageSink[1].type).toEqual('data');
+  });
+
+  test('re-requests metadata on reconnect', async () => {
+    const { endpoint, admitConnection, messageSink } = await createEdge();
+    const { messenger } = await createClient(endpoint);
+
+    await attachReplicator(messenger);
+
+    admitConnection.wake();
+    await expect.poll(() => messageSink.length).toEqual(1);
+
+    updateIdentity(messenger);
+    await messenger.reconnect.waitForCount(1);
+
+    await expect.poll(() => messageSink.length).toEqual(2);
+    expect(messageSink[1].type).toEqual('get-metadata');
+  });
+
+  test('recovers after query sending failure during identity change', async () => {
+    const { endpoint, admitConnection, messageSink } = await createEdge();
+    const { messenger, sendSpy } = await createClient(endpoint);
+
+    await attachReplicator(messenger);
+
+    sendSpy.mockImplementationOnce(() => {
+      throw new EdgeIdentityChangedError(); // Hard to mock the exact race condition for when this error is thrown
+    });
+    admitConnection.wake();
+
+    await expect.poll(() => sendSpy.mock.calls.length).toEqual(1);
+    expect(messageSink.length).toEqual(0);
+    updateIdentity(messenger);
+
+    await expect.poll(() => messageSink.length).toEqual(1);
+    expect(messageSink[0].type).toEqual('get-metadata');
+  });
+
+  test('recovers after response sending failure during identity change', async () => {
+    const { endpoint, admitConnection, messageSink, sendResponseMessage } = await createEdge();
+    const { messenger, sendSpy } = await createClient(endpoint);
+
+    const { feed } = await attachReplicator(messenger);
+    await appendMessage(feed);
+
+    sendSpy.mockImplementationOnce(async (request: any) => {
+      sendResponseMessage(request, encodeCbor({ type: 'metadata', feedKey: feed.key.toHex(), length: 0 }));
+      return Promise.resolve();
+    });
+    sendSpy.mockImplementationOnce(async () => {
+      throw new EdgeIdentityChangedError();
+    });
+    admitConnection.wake();
+
+    await expect.poll(() => sendSpy.mock.calls.length).toEqual(2);
+    expect(messageSink.length).toEqual(0);
+    updateIdentity(messenger);
+
+    await expect.poll(() => messageSink.length).toEqual(2);
+    expect(messageSink[1].type).toEqual('data');
+  });
+
+  test('propagates errors unrelated to reconnect', async () => {
+    const { endpoint, admitConnection } = await createEdge();
+    const { messenger, sendSpy } = await createClient(endpoint);
+
+    const { replicator } = await attachReplicator(messenger, { skipOpen: true });
+    const raised = new Trigger();
+    await replicator.open(new Context({ onError: () => raised.wake() }));
+    onTestFinished(async () => {
+      await replicator.close();
+    });
+
+    sendSpy.mockImplementationOnce(() => {
+      throw new Error();
+    });
+    admitConnection.wake();
+
+    await raised.wait();
+  });
+
+  test('identity update before connected', async () => {
+    const { endpoint, admitConnection, messageSink } = await createEdge();
+    const { messenger } = await createClient(endpoint);
+
+    await attachReplicator(messenger);
+    updateIdentity(messenger);
+    await sleep(100);
+    admitConnection.wake();
+
+    await expect.poll(() => messageSink.length).toEqual(2);
+    expect(messageSink.map((m) => m.type)).toStrictEqual(range(2, () => 'get-metadata'));
+  });
+
+  test('block appended during reconnect', async () => {
+    const { endpoint, admitConnection, feedLength } = await createEdge();
+    const { messenger } = await createClient(endpoint);
+
+    const { feed } = await attachReplicator(messenger);
+    admitConnection.wake();
+    await sleep(10);
+
+    admitConnection.reset();
+    updateIdentity(messenger);
+    await appendMessage(feed);
+    await sleep(20);
+    admitConnection.wake();
+
+    await expect.poll(() => feedLength()).toEqual(1);
+  });
+
+  test('reconnect during block append', async () => {
+    const { endpoint, admitConnection, feedLength } = await createEdge();
+    const { messenger } = await createClient(endpoint);
+
+    const { feed } = await attachReplicator(messenger);
+    admitConnection.wake();
+    await sleep(10);
+
+    void appendMessage(feed);
+    updateIdentity(messenger);
+
+    await expect.poll(() => feedLength()).toEqual(1);
+  });
+
+  const createEdge = async () => {
+    const port = await getRandomPort('127.0.0.1');
+    let lastBlockIndex = -1;
+    const admitConnection = new Trigger();
+    const { cleanup, endpoint, messageSink, sendResponseMessage } = await createTestEdgeWsServer(port, {
+      admitConnection,
+      payloadDecoder: decodeCbor,
+      messageHandler: async (message: any) => {
+        if (message.type === 'get-metadata') {
+          return encodeCbor({ type: 'metadata', feedKey: message.feedKey, length: lastBlockIndex + 1 });
+        } else {
+          lastBlockIndex = Math.max(lastBlockIndex, message.blocks[message.blocks.length - 1].index);
+        }
+      },
+    });
+    onTestFinished(cleanup);
+
+    return {
+      endpoint,
+      messageSink,
+      admitConnection,
+      sendResponseMessage,
+      feedLength: () => lastBlockIndex + 1,
+    };
+  };
+
+  const createClient = async (endpoint: string) => {
+    const peerKey = PublicKey.random().toHex();
+    const messenger = new EdgeClient(peerKey, peerKey, { socketEndpoint: endpoint });
+    const sendSpy = vi.spyOn(messenger, 'send');
+    await openAndClose(messenger);
+    return { messenger, sendSpy };
+  };
+
+  const attachReplicator = async (messenger: EdgeClient, options?: { skipOpen?: boolean }) => {
+    const spaceId = SpaceId.random();
+    const feed = await createNewFeed();
+    const replicator = new EdgeFeedReplicator({ messenger, spaceId });
+    await replicator.addFeed(feed);
+    if (!options?.skipOpen) {
+      await openAndClose(replicator);
+    }
+    return { feed, replicator };
+  };
+
+  const createNewFeed = async () => {
+    const storage = createStorage();
+    const keyring = new Keyring();
+    const feedStore = new FeedStore<FeedMessage>({
+      factory: new FeedFactory<FeedMessage>({
+        root: storage.createDirectory(),
+        signer: keyring,
+        hypercore: { valueEncoding },
+      }),
+    });
+    onTestFinished(() => feedStore.close());
+    return feedStore.openFeed(await keyring.createKey(), { writable: true });
+  };
+
+  const updateIdentity = (messenger: EdgeClient) => {
+    const identityKey = PublicKey.random().toHex();
+    messenger.setIdentity({ peerKey: messenger.peerKey, identityKey });
+  };
+
+  const appendMessage = (feed: FeedWrapper<FeedMessage>) => feed.append({ timeframe: new Timeframe() });
+});

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

@@ -5,15 +5,19 @@
 import { decode as decodeCbor, encode as encodeCbor } from 'cbor-x';
 
 import { Event, Mutex, scheduleMicroTask } from '@dxos/async';
-import { Resource, type Context } from '@dxos/context';
+import { Context, Resource } from '@dxos/context';
 import { type EdgeConnection } from '@dxos/edge-client';
+import { EdgeConnectionClosedError, EdgeIdentityChangedError } from '@dxos/edge-client';
 import { type FeedWrapper } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { PublicKey, type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { EdgeService } from '@dxos/protocols';
 import { buf } from '@dxos/protocols/buf';
-import { MessageSchema as RouterMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import {
+  MessageSchema as RouterMessageSchema,
+  type Message as RouterMessage,
+} from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 import type { FeedBlock, ProtocolMessage } from '@dxos/protocols/feed-replication';
 import { ComplexMap, arrayToBuffer, bufferToArray, defaultMap, rangeFromTo } from '@dxos/util';
 
@@ -48,7 +52,7 @@ export class EdgeFeedReplicator extends Resource {
   protected override async _open(): Promise<void> {
     // TODO: handle reconnects
     this._ctx.onDispose(
-      this._messenger.addListener(async (message) => {
+      this._messenger.addListener((message: RouterMessage) => {
         if (!message.serviceId) {
           return;
         }
@@ -69,16 +73,38 @@ export class EdgeFeedReplicator extends Resource {
       }),
     );
 
-    this._connected = true;
-    this._connectionCtx = this._ctx.derive();
-    for (const feed of this._feeds.values()) {
-      await this._replicateFeed(feed);
-    }
+    this._messenger.connected.on(this._ctx, async () => {
+      await this._resetConnection();
+
+      this._connected = true;
+      const connectionCtx = new Context({
+        onError: async (err: any) => {
+          if (connectionCtx !== this._connectionCtx) {
+            return;
+          }
+          if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
+            log('resetting on reconnect');
+            await this._resetConnection();
+          } else {
+            this._ctx.raise(err);
+          }
+        },
+      });
+      this._connectionCtx = connectionCtx;
+      log('connection context created');
+      scheduleMicroTask(connectionCtx, async () => {
+        for (const feed of this._feeds.values()) {
+          await this._replicateFeed(connectionCtx, feed);
+        }
+      });
+    });
   }
 
   protected override async _close(): Promise<void> {
-    this._connected = false;
+    await this._resetConnection();
+  }
 
+  private async _resetConnection() {
     this._connected = false;
     await this._connectionCtx?.dispose();
     this._connectionCtx = undefined;
@@ -89,8 +115,8 @@ export class EdgeFeedReplicator extends Resource {
     log.info('addFeed', { key: feed.key });
     this._feeds.set(feed.key, feed);
 
-    if (this._connected) {
-      await this._replicateFeed(feed);
+    if (this._connected && this._connectionCtx) {
+      await this._replicateFeed(this._connectionCtx, feed);
     }
   }
 
@@ -98,20 +124,23 @@ export class EdgeFeedReplicator extends Resource {
     return defaultMap(this._pushMutex, key, () => new Mutex());
   }
 
-  private async _replicateFeed(feed: FeedWrapper<any>) {
-    invariant(this._connectionCtx);
-
+  private async _replicateFeed(ctx: Context, feed: FeedWrapper<any>) {
     await this._sendMessage({
       type: 'get-metadata',
       feedKey: feed.key.toHex(),
     });
 
-    Event.wrap(feed.core as any, 'append').on(this._connectionCtx, async () => {
+    Event.wrap(feed.core as any, 'append').on(ctx, async () => {
       await this._pushBlocksIfNeeded(feed);
     });
   }
 
   private async _sendMessage(message: ProtocolMessage) {
+    if (!this._connectionCtx) {
+      log.info('message dropped because connection was disposed');
+      return;
+    }
+
     const logPayload =
       message.type === 'data' ? { feedKey: message.feedKey, blocks: message.blocks.map((b) => b.index) } : { message };
     log.info('sending message', logPayload);
@@ -132,7 +161,11 @@ export class EdgeFeedReplicator extends Resource {
   }
 
   private _onMessage(message: ProtocolMessage) {
-    scheduleMicroTask(this._ctx, async () => {
+    if (!this._connectionCtx) {
+      log.warn('received message after connection context was disposed');
+      return;
+    }
+    scheduleMicroTask(this._connectionCtx, async () => {
       switch (message.type) {
         case 'metadata': {
           log.info('received metadata', { message });
@@ -227,7 +260,7 @@ export class EdgeFeedReplicator extends Resource {
   }
 
   private async _pushBlocksIfNeeded(feed: FeedWrapper<any>) {
-    using _guard = await this._getPushMutex(feed.key).acquire();
+    using _ = await this._getPushMutex(feed.key).acquire();
 
     if (!this._remoteLength.has(feed.key)) {
       log('blocks not pushed because remote length is unknown');

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.6.12-main.15a606f";
+export const DXOS_VERSION = "0.6.12-main.78ddbdf";