@dxos/network-manager 2.33.9-dev.d70ac9ee → 2.33.9-dev.d9963f00

package/src/signal/signal-client.ts

@@ -5,8 +5,10 @@
 import debug from 'debug';
 
 import { Event } from '@dxos/async';
+import { failUndefined } from '@dxos/debug';
 import { PublicKey } from '@dxos/protocols';
 
+import { schema } from '../proto/gen';
 import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
 import { SignalApi } from './signal-api';
 import { WebsocketRpc } from './websocket-rpc';
@@ -90,13 +92,17 @@ export class SignalClient {
       data: message.data
     }));
 
-    this._client.subscribe('signal', (msg: Message) => this._onSignal({
-      id: PublicKey.from(msg.id!),
-      remoteId: PublicKey.from(msg.remoteId!),
-      topic: PublicKey.from(msg.topic!),
-      sessionId: PublicKey.from(msg.sessionId!),
-      data: msg.data
-    }));
+    this._client.subscribe('signal', (msg: SignalMessage) => {
+      return this._onSignal({
+        id: PublicKey.from(msg.id!),
+        remoteId: PublicKey.from(msg.remoteId!),
+        topic: PublicKey.from(msg.topic!),
+        sessionId: PublicKey.from(msg.sessionId!),
+        data: schema.getCodecForType('dxos.mesh.signal.MessageData').decode(msg.data ?? failUndefined()),
+        // Field that MessageRouter adds, so on lower level it not always defined.
+        messageId: msg.messageId ? PublicKey.from(msg.messageId) : undefined
+      });
+    });
 
     this._clientCleanup.push(this._client.connected.on(() => {
       log('Socket connected');
@@ -210,6 +216,7 @@ export class SignalClient {
   /**
    * Routes an offer to the other peer's _onOffer callback.
    * @returns Other peer's _onOffer callback return value.
+   * @deprecated
    */
   async offer (msg: Message): Promise<Answer> {
     return this._client.call('offer', {
@@ -224,13 +231,33 @@ export class SignalClient {
   /**
    * Routes an offer to the other peer's _onSignal callback.
    */
-  async signal (payload: Message): Promise<void> {
-    return this._client.emit('signal', {
-      id: payload.id?.asBuffer(),
-      remoteId: payload.remoteId?.asBuffer(),
-      topic: payload.topic?.asBuffer(),
-      sessionId: payload.sessionId?.asBuffer(),
-      data: payload.data
-    });
+  async signal (message: Message): Promise<void> {
+    const signalMessage: SignalMessage = {
+      messageId: message.messageId?.asBuffer(),
+      id: message.id?.asBuffer(),
+      remoteId: message.remoteId?.asBuffer(),
+      topic: message.topic?.asBuffer(),
+      sessionId: message.sessionId?.asBuffer(),
+      data: Buffer.from(schema.getCodecForType('dxos.mesh.signal.MessageData').encode(message.data ?? failUndefined()))
+    };
+    return this._client.emit('signal', signalMessage);
   }
 }
+
+/**
+ * Messages as processed by the signal server.
+ */
+interface SignalMessage{
+  /**
+   * Sender's public key.
+   */
+  id?: Buffer;
+  /**
+   * Receiver`s public key.
+   */
+  remoteId?: Buffer;
+  topic?: Buffer;
+  sessionId?: Buffer;
+  data?: Buffer;
+  messageId?: Buffer;
+}

package/src/signal/websocket-rpc.ts

@@ -2,10 +2,10 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
 import WebSocket from 'isomorphic-ws';
 import nanomessagerpc from 'nanomessage-rpc';
+import assert from 'node:assert';
 import { promisify } from 'util';
 
 import { Event, Trigger, sleep } from '@dxos/async';

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

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event, synchronized } from '@dxos/async';
 import { PublicKey } from '@dxos/protocols';

package/src/swarm/connection.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event, synchronized } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';

package/src/swarm/swarm.test.ts

@@ -52,12 +52,14 @@ const setup = ({ router = false } = {}) => {
     onSignal: msg => swarm1.onSignal(msg),
     onOffer: msg => swarm1.onOffer(msg)
   });
+  afterTest(() => mr1.destroy());
 
   const mr2: MessageRouter = new MessageRouter({
     sendMessage: msg => mr1.receiveMessage(msg),
     onSignal: msg => swarm2.onSignal(msg),
     onOffer: msg => swarm2.onOffer(msg)
   });
+  afterTest(() => mr2.destroy());
 
   const sm1: SignalMessaging = router ? mr1 : new MockSignalConnection(() => swarm2);
 

package/src/swarm/swarm.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 import { discoveryKey } from '@dxos/crypto';
@@ -101,7 +101,7 @@ export class Swarm {
   }
 
   async onOffer (message: Message): Promise<Answer> {
-    log(`Offer from ${message.id} topic=${this._topic}`);
+    log(`Offer from ${JSON.stringify(message)}`);
     // Id of the peer offering us the connection.
     assert(message.id);
     const remoteId = message.id;

package/src/testing/test-protocol.ts

@@ -4,9 +4,9 @@
 
 // Test/mock Protocol implementation used in network-manager tests.
 
-import assert from 'assert';
 import debug from 'debug';
 import { EventEmitter } from 'events';
+import assert from 'node:assert';
 
 import { Extension, Protocol } from '@dxos/mesh-protocol';
 import { PublicKey } from '@dxos/protocols';

package/src/topology/fully-connected-topology.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { PublicKey } from '@dxos/protocols';
 

package/src/topology/mmst-topology.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 import distance from 'xor-distance';
 
 import { PublicKey } from '@dxos/protocols';

package/src/topology/star-topology.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { PublicKey } from '@dxos/protocols';
 

package/src/transport/in-memory-transport.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 import { Transform } from 'stream';
 
 import { Event } from '@dxos/async';

package/src/transport/webrtc-transport.ts

@@ -3,8 +3,8 @@
 //
 
 import wrtc from '@koush/wrtc';
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 import SimplePeerConstructor, { Instance as SimplePeer } from 'simple-peer';
 
 import { Event } from '@dxos/async';