@dxos/messaging 0.8.4-main.fd6878d → 0.8.4-main.fffef41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/messaging",
-  "version": "0.8.4-main.fd6878d",
+  "version": "0.8.4-main.fffef41",
   "description": "Messaging",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -38,23 +38,23 @@
   "dependencies": {
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.8.4-main.fd6878d",
-    "@dxos/codec-protobuf": "0.8.4-main.fd6878d",
-    "@dxos/context": "0.8.4-main.fd6878d",
-    "@dxos/invariant": "0.8.4-main.fd6878d",
-    "@dxos/edge-client": "0.8.4-main.fd6878d",
-    "@dxos/keys": "0.8.4-main.fd6878d",
-    "@dxos/log": "0.8.4-main.fd6878d",
-    "@dxos/node-std": "0.8.4-main.fd6878d",
-    "@dxos/protocols": "0.8.4-main.fd6878d",
-    "@dxos/rpc": "0.8.4-main.fd6878d",
-    "@dxos/tracing": "0.8.4-main.fd6878d",
-    "@dxos/util": "0.8.4-main.fd6878d"
+    "@dxos/async": "0.8.4-main.fffef41",
+    "@dxos/codec-protobuf": "0.8.4-main.fffef41",
+    "@dxos/context": "0.8.4-main.fffef41",
+    "@dxos/edge-client": "0.8.4-main.fffef41",
+    "@dxos/invariant": "0.8.4-main.fffef41",
+    "@dxos/keys": "0.8.4-main.fffef41",
+    "@dxos/log": "0.8.4-main.fffef41",
+    "@dxos/node-std": "0.8.4-main.fffef41",
+    "@dxos/protocols": "0.8.4-main.fffef41",
+    "@dxos/rpc": "0.8.4-main.fffef41",
+    "@dxos/tracing": "0.8.4-main.fffef41",
+    "@dxos/util": "0.8.4-main.fffef41"
   },
   "devDependencies": {
-    "@dxos/signal": "0.8.4-main.fd6878d",
-    "@dxos/test-utils": "0.8.4-main.fd6878d",
-    "@dxos/keyring": "0.8.4-main.fd6878d"
+    "@dxos/keyring": "0.8.4-main.fffef41",
+    "@dxos/signal": "0.8.4-main.fffef41",
+    "@dxos/test-utils": "0.8.4-main.fffef41"
   },
   "publishConfig": {
     "access": "public"

package/src/messenger.node.test.ts

@@ -2,48 +2,17 @@
 // Copyright 2022 DXOS.org
 //
 
-import { afterAll, beforeAll, describe, onTestFinished, test } from 'vitest';
-
-import { asyncTimeout } from '@dxos/async';
-import { type SignalServerRunner, runTestSignalServer } from '@dxos/signal';
+import { beforeEach, describe } from 'vitest';
 
 import { messengerTests } from './messenger.blueprint-test';
-import { WebsocketSignalManager } from './signal-manager';
-import { type Message } from './signal-methods';
-import { PAYLOAD_1, TestBuilder } from './testing';
+import { MemorySignalManager, MemorySignalManagerContext } from './signal-manager';
 
+// TODO(mykola): Use EDGE signal server.
 describe('Messenger with WebsocketSignalManager', () => {
-  let broker: SignalServerRunner;
-
-  beforeAll(async () => {
-    broker = await runTestSignalServer();
-  });
-
-  afterAll(() => {
-    void broker.stop();
+  let context: MemorySignalManagerContext;
+  beforeEach(async () => {
+    context = new MemorySignalManagerContext();
   });
 
-  messengerTests(async () => new WebsocketSignalManager([{ server: broker.url() }]));
-
-  test('Message with broken signal server', { timeout: 1000 }, async () => {
-    const builder = new TestBuilder({
-      signalManagerFactory: async () =>
-        new WebsocketSignalManager([{ server: 'ws://broken.kube.' }, { server: broker.url() }]),
-    });
-    onTestFinished(() => builder.close());
-    const peer1 = await builder.createPeer();
-    const peer2 = await builder.createPeer();
-
-    const message: Message = {
-      author: peer1.peerInfo,
-      recipient: peer2.peerInfo,
-      payload: PAYLOAD_1,
-    };
-
-    {
-      const receivePromise = peer2.waitTillReceive(message);
-      await peer1.messenger.sendMessage(message);
-      await asyncTimeout(receivePromise, 1_000);
-    }
-  });
+  messengerTests(async () => new MemorySignalManager(context));
 });

package/src/signal-manager/edge-signal-manager.ts

@@ -4,7 +4,7 @@
 
 import { Event, scheduleMicroTask } from '@dxos/async';
 import { Resource, cancelWithContext } from '@dxos/context';
-import { type EdgeConnection, protocol } from '@dxos/edge-client';
+import { type EdgeConnection, EdgeIdentityChangedError, protocol } from '@dxos/edge-client';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -87,13 +87,22 @@ export class EdgeSignalManager extends Resource implements SignalManager {
 
   async leave({ topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
     this._swarmPeers.delete(topic);
-    await this._edgeConnection.send(
-      protocol.createMessage(SwarmRequestSchema, {
-        serviceId: EdgeService.SWARM,
-        source: createMessageSource(topic, peer),
-        payload: { action: SwarmRequestAction.LEAVE, swarmKeys: [topic.toHex()] },
-      }),
-    );
+    try {
+      await this._edgeConnection.send(
+        protocol.createMessage(SwarmRequestSchema, {
+          serviceId: EdgeService.SWARM,
+          source: createMessageSource(topic, peer),
+          payload: { action: SwarmRequestAction.LEAVE, swarmKeys: [topic.toHex()] },
+        }),
+      );
+    } catch (err) {
+      if (err instanceof EdgeIdentityChangedError) {
+        // Note: On edge identity change, the connection is closed and EDGE will remove us from the swarm.
+        //       So we should just delete the swarm from _swarmPeers.
+        return;
+      }
+      throw err;
+    }
   }
 
   async query({ topic }: { topic: PublicKey }): Promise<SwarmResponse> {