@dxos/network-manager 0.1.2 → 0.1.4

package/dist/src/transport/webrtc-transport.test.js

@@ -19,7 +19,11 @@ const webrtc_transport_1 = require("./webrtc-transport");
 describe('WebRTCTransport', function () {
     // This doesn't clean up correctly and crashes with SIGSEGV / SIGABRT at the end. Probably an issue with wrtc package.
     it('open and close', async function () {
-        const connection = new webrtc_transport_1.WebRTCTransport(true, new stream_1.Duplex(), keys_1.PublicKey.random(), keys_1.PublicKey.random(), keys_1.PublicKey.random(), keys_1.PublicKey.random(), async (msg) => { });
+        const connection = new webrtc_transport_1.WebRTCTransport({
+            initiator: true,
+            stream: new stream_1.Duplex(),
+            sendSignal: async () => { }
+        });
         let callsCounter = 0;
         const closedCb = () => {
             callsCounter++;
@@ -36,26 +40,33 @@ describe('WebRTCTransport', function () {
         const topic = keys_1.PublicKey.random();
         const peer1Id = keys_1.PublicKey.random();
         const peer2Id = keys_1.PublicKey.random();
-        const sessionId = keys_1.PublicKey.random();
         const plugin1 = new testing_1.TestProtocolPlugin(peer1Id.asBuffer());
         const protocolProvider1 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
-        const connection1 = new webrtc_transport_1.WebRTCTransport(true, protocolProvider1({
-            channel: (0, crypto_1.discoveryKey)(topic),
-            initiator: true
-        }).stream, peer1Id, peer2Id, sessionId, topic, async (msg) => {
-            await (0, async_1.sleep)(10);
-            await connection2.signal(msg.data.signal);
+        const connection1 = new webrtc_transport_1.WebRTCTransport({
+            initiator: true,
+            stream: protocolProvider1({
+                channel: (0, crypto_1.discoveryKey)(topic),
+                initiator: true
+            }).stream,
+            sendSignal: async (signal) => {
+                await (0, async_1.sleep)(10);
+                await connection2.signal(signal);
+            }
         });
         (0, testutils_1.afterTest)(() => connection1.close());
         (0, testutils_1.afterTest)(() => connection1.errors.assertNoUnhandledErrors());
         const plugin2 = new testing_1.TestProtocolPlugin(peer2Id.asBuffer());
         const protocolProvider2 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer2Id.asBuffer(), plugin2);
-        const connection2 = new webrtc_transport_1.WebRTCTransport(false, protocolProvider2({
-            channel: (0, crypto_1.discoveryKey)(topic),
-            initiator: false
-        }).stream, peer2Id, peer1Id, sessionId, topic, async (msg) => {
-            await (0, async_1.sleep)(10);
-            await connection1.signal(msg.data.signal);
+        const connection2 = new webrtc_transport_1.WebRTCTransport({
+            initiator: false,
+            stream: protocolProvider2({
+                channel: (0, crypto_1.discoveryKey)(topic),
+                initiator: false
+            }).stream,
+            sendSignal: async (signal) => {
+                await (0, async_1.sleep)(10);
+                await connection1.signal(signal);
+            }
         });
         (0, testutils_1.afterTest)(() => connection2.close());
         (0, testutils_1.afterTest)(() => connection2.errors.assertNoUnhandledErrors());

package/dist/src/transport/webrtc-transport.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"webrtc-transport.test.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webrtc-transport.test.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -17,19 +17,19 @@
     "README.md"
   ],
   "dependencies": {
-    "@dxos/async": "0.1.2",
-    "@dxos/codec-protobuf": "0.1.2",
-    "@dxos/credentials": "0.1.2",
-    "@dxos/crypto": "0.1.2",
-    "@dxos/debug": "0.1.2",
-    "@dxos/keys": "0.1.2",
-    "@dxos/log": "0.1.2",
-    "@dxos/mesh-protocol": "0.1.2",
-    "@dxos/messaging": "0.1.2",
-    "@dxos/protocol-plugin-presence": "0.1.2",
-    "@dxos/protocols": "0.1.2",
-    "@dxos/rpc": "0.1.2",
-    "@dxos/util": "0.1.2",
+    "@dxos/async": "0.1.4",
+    "@dxos/codec-protobuf": "0.1.4",
+    "@dxos/credentials": "0.1.4",
+    "@dxos/crypto": "0.1.4",
+    "@dxos/debug": "0.1.4",
+    "@dxos/keys": "0.1.4",
+    "@dxos/log": "0.1.4",
+    "@dxos/mesh-protocol": "0.1.4",
+    "@dxos/messaging": "0.1.4",
+    "@dxos/protocol-plugin-presence": "0.1.4",
+    "@dxos/protocols": "0.1.4",
+    "@dxos/rpc": "0.1.4",
+    "@dxos/util": "0.1.4",
     "@koush/wrtc": "^0.5.3",
     "assert": "^2.0.0",
     "isomorphic-ws": "^4.0.1",
@@ -39,8 +39,8 @@
     "xor-distance": "^2.0.0"
   },
   "devDependencies": {
-    "@dxos/signal": "0.1.2",
-    "@dxos/testutils": "0.1.2",
+    "@dxos/signal": "0.1.4",
+    "@dxos/testutils": "0.1.4",
     "@swc-node/register": "^1.5.4",
     "@swc/core": "^1.3.9",
     "@types/simple-peer": "9.11.3",

package/src/connection-log.ts

@@ -5,7 +5,7 @@
 import { Event } from '@dxos/async';
 import { raise } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
-import { SwarmInfo, ConnectionInfo } from '@dxos/protocols/proto/dxos/devtools/swarmLog';
+import { SwarmInfo, ConnectionInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
 import { ComplexMap } from '@dxos/util';
 
 import { ConnectionState, Swarm } from './swarm';

package/src/network-manager.test.ts

@@ -203,7 +203,6 @@ describe('NetworkManager', function () {
 
       const webRTCTransportService: BridgeService = new WebRTCTransportService();
       const service = createProtoRpcPeer({
-        requested: {},
         exposed: {
           BridgeService: schema.getService('dxos.mesh.bridge.BridgeService')
         },
@@ -219,8 +218,6 @@ describe('NetworkManager', function () {
         requested: {
           BridgeService: schema.getService('dxos.mesh.bridge.BridgeService')
         },
-        exposed: {},
-        handlers: {},
         port: rpcPortB,
         noHandshake: true,
         encodingOptions: {

package/src/swarm/connection.ts

@@ -131,13 +131,17 @@ export class Connection {
 
     assert(!this._transport);
     this._transport = this._transportFactory.create({
-      topic: this.topic,
-      ownId: this.ownId,
-      remoteId: this.remoteId,
-      sessionId: this.sessionId,
       initiator: this.initiator,
       stream: this._protocol.stream,
-      sendSignal: this._signalMessaging.signal.bind(this._signalMessaging)
+      sendSignal: async (signal) => {
+        await this._signalMessaging.signal({
+          author: this.ownId,
+          recipient: this.remoteId,
+          sessionId: this.sessionId,
+          topic: this.topic,
+          data: { signal }
+        });
+      }
     });
 
     this._transport.connected.once(() => {

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

@@ -22,30 +22,29 @@ const createPair = () => {
   const topic = PublicKey.random();
   const peer1Id = PublicKey.random();
   const peer2Id = PublicKey.random();
-  const sessionId = PublicKey.random();
 
   const plugin1 = new TestProtocolPlugin(peer1Id.asBuffer());
   const protocolProvider1 = testProtocolProvider(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
-  const connection1 = new MemoryTransport(
-    peer1Id,
-    peer2Id,
-    sessionId,
-    topic,
-    protocolProvider1({ channel: discoveryKey(topic), initiator: true }).stream
-  );
+  const connection1 = new MemoryTransport({
+    stream: protocolProvider1({ channel: discoveryKey(topic), initiator: true }).stream,
+    sendSignal: async (signal) => {
+      await connection2.signal(signal);
+    },
+    initiator: true
+  });
 
   afterTest(() => connection1.close());
   afterTest(() => connection1.errors.assertNoUnhandledErrors());
 
   const plugin2 = new TestProtocolPlugin(peer2Id.asBuffer());
   const protocolProvider2 = testProtocolProvider(topic.asBuffer(), peer2Id.asBuffer(), plugin2);
-  const connection2 = new MemoryTransport(
-    peer2Id,
-    peer1Id,
-    sessionId,
-    topic,
-    protocolProvider2({ channel: discoveryKey(topic), initiator: false }).stream
-  );
+  const connection2 = new MemoryTransport({
+    stream: protocolProvider2({ channel: discoveryKey(topic), initiator: false }).stream,
+    sendSignal: async (signal) => {
+      await connection1.signal(signal);
+    },
+    initiator: false
+  });
 
   afterTest(() => connection2.close());
   afterTest(() => connection2.errors.assertNoUnhandledErrors());

package/src/transport/memory-transport.ts

@@ -5,16 +5,14 @@
 import assert from 'node:assert';
 import { Transform } from 'stream';
 
-import { Event } from '@dxos/async';
+import { Event, Trigger } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { ComplexMap } from '@dxos/util';
 
-import { Transport, TransportFactory } from './transport';
-
-type ConnectionKey = [topic: PublicKey, nodeId: PublicKey, remoteId: PublicKey];
+import { Transport, TransportFactory, TransportOptions } from './transport';
 
 // Delay (in milliseconds) for data being sent through in-memory connections to simulate network latency.
 const MEMORY_TRANSPORT_DELAY = 1;
@@ -36,71 +34,72 @@ const createStreamDelay = (delay: number): NodeJS.ReadWriteStream =>
 // TODO(burdon): Remove static variables.
 export class MemoryTransport implements Transport {
   // TODO(burdon): Remove global properties.
-  private static readonly _connections = new ComplexMap<ConnectionKey, MemoryTransport>(
-    ([topic, nodeId, remoteId]) => topic.toHex() + nodeId.toHex() + remoteId.toHex()
-  );
+  private static readonly _connections = new ComplexMap<PublicKey, MemoryTransport>(PublicKey.hash);
 
   public readonly closed = new Event<void>();
   public readonly connected = new Event<void>();
   public readonly errors = new ErrorStream();
 
-  private readonly _ownKey: ConnectionKey;
-  private readonly _remoteKey: ConnectionKey;
+  private readonly _ownId = PublicKey.random();
+  private _remoteId!: PublicKey;
+  private readonly _remote = new Trigger<PublicKey>();
 
   private readonly _outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
   private readonly _incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
 
   private _remoteConnection?: MemoryTransport;
 
-  constructor(
-    private readonly _ownId: PublicKey,
-    private readonly _remoteId: PublicKey,
-    private readonly _sessionId: PublicKey,
-    private readonly _topic: PublicKey,
-    private readonly _stream: NodeJS.ReadWriteStream
-  ) {
-    log('creating', { topic: this._topic, peerId: this._ownId, remoteId: this._remoteId });
-
-    this._ownKey = [this._topic, this._ownId, this._remoteId];
-    this._remoteKey = [this._topic, this._remoteId, this._ownId];
-
-    assert(!MemoryTransport._connections.has(this._ownKey), 'Duplicate memory connection');
-    MemoryTransport._connections.set(this._ownKey, this);
-
-    this._remoteConnection = MemoryTransport._connections.get(this._remoteKey);
-    if (this._remoteConnection) {
-      this._remoteConnection._remoteConnection = this;
-
-      log('connected', { topic: this._topic, peerId: this._ownId, remoteId: this._remoteId });
-      this._stream
-        .pipe(this._outgoingDelay)
-        .pipe(this._remoteConnection._stream)
-        .pipe(this._incomingDelay)
-        .pipe(this._stream);
+  constructor(private readonly params: TransportOptions) {
+    log('creating', this._ownId);
 
-      this.connected.emit();
-      this._remoteConnection.connected.emit();
+    if (this.params.initiator) {
+      setTimeout(async () => this.params.sendSignal({ json: JSON.stringify({ transportId: this._ownId.toHex() }) }));
     }
-  }
 
-  get remoteId(): PublicKey {
-    return this._remoteId;
-  }
-
-  get sessionId(): PublicKey {
-    return this._sessionId;
+    assert(!MemoryTransport._connections.has(this._ownId), 'Duplicate memory connection');
+    MemoryTransport._connections.set(this._ownId, this);
+
+    this._remote.wait().then(
+      (remoteId) => {
+        this._remoteId = remoteId;
+        this._remoteConnection = MemoryTransport._connections.get(this._remoteId);
+        if (this._remoteConnection) {
+          this._remoteConnection._remoteConnection = this;
+          this._remoteConnection._remoteId = this._ownId;
+
+          log('connected', { ownId: this._ownId, remoteId: this._remoteId });
+          this.params.stream
+            .pipe(this._outgoingDelay)
+            .pipe(this._remoteConnection.params.stream)
+            .pipe(this._incomingDelay)
+            .pipe(this.params.stream);
+
+          this.connected.emit();
+          this._remoteConnection.connected.emit();
+        }
+      },
+      async (err) => {
+        log.catch(err);
+      }
+    );
   }
 
   async signal(signal: Signal) {
-    // No-op.
+    const { json } = signal;
+    if (json) {
+      const { transportId } = JSON.parse(json);
+      if (transportId) {
+        this._remote.wake(PublicKey.from(transportId));
+      }
+    }
   }
 
   async close(): Promise<void> {
-    log('closing', { topic: this._topic, peerId: this._ownId, remoteId: this._remoteId });
+    log('closing', this._ownId);
 
-    MemoryTransport._connections.delete(this._ownKey);
+    MemoryTransport._connections.delete(this._ownId);
     if (this._remoteConnection) {
-      MemoryTransport._connections.delete(this._remoteKey);
+      MemoryTransport._connections.delete(this._remoteId);
 
       // TODO(dmaretskyi): Hypercore streams do not seem to have the unpipe method.
       //  NOTE(burdon): Using readable-stream.wrap() might help (see feed-store).
@@ -119,10 +118,10 @@ export class MemoryTransport implements Transport {
     }
 
     this.closed.emit();
-    log('closed', { topic: this._topic });
+    log('closed');
   }
 }
 
 export const MemoryTransportFactory: TransportFactory = {
-  create: (opts) => new MemoryTransport(opts.ownId, opts.remoteId, opts.sessionId, opts.topic, opts.stream)
+  create: (params) => new MemoryTransport(params)
 };

package/src/transport/transport.ts

@@ -4,11 +4,8 @@
 
 import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
-import { PublicKey } from '@dxos/keys';
 import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
-import { SignalMessage } from '../signal';
-
 /**
  * Abstraction over a P2P connection transport. Currently either WebRTC or in-memory.
  */
@@ -26,11 +23,6 @@ export type TransportOptions = {
    */
   initiator: boolean;
 
-  ownId: PublicKey;
-  remoteId: PublicKey;
-  sessionId: PublicKey;
-  topic: PublicKey;
-
   /**
    * Wire protocol.
    */
@@ -39,7 +31,7 @@ export type TransportOptions = {
   /**
    * Send a signal message to remote peer.
    */
-  sendSignal: (msg: SignalMessage) => Promise<void>; // TODO(burdon): Remove async?
+  sendSignal: (signal: Signal) => Promise<void>; // TODO(burdon): Remove async?
 };
 
 export interface TransportFactory {

package/src/transport/webrtc-transport-proxy.test.ts

@@ -14,10 +14,10 @@ import { PublicKey } from '@dxos/keys';
 import { Protocol } from '@dxos/mesh-protocol';
 import { schema } from '@dxos/protocols';
 import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
+import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { createLinkedPorts, createProtoRpcPeer, ProtoRpcPeer } from '@dxos/rpc';
 import { afterTest } from '@dxos/testutils';
 
-import { SignalMessage } from '../signal';
 import { TestProtocolPlugin, testProtocolProvider } from '../testing';
 import { WebRTCTransportProxy } from './webrtc-transport-proxy';
 import { WebRTCTransportService } from './webrtc-transport-service';
@@ -25,27 +25,20 @@ import { WebRTCTransportService } from './webrtc-transport-service';
 describe('WebRTCTransportProxy', function () {
   const setupProxy = async ({
     initiator = true,
-    ownId = PublicKey.random(),
-    remoteId = PublicKey.random(),
-    sessionId = PublicKey.random(),
-    topic = PublicKey.random(),
     stream = new Duplex({ write: () => {}, read: () => {} }),
-    sendSignal = () => {}
+    sendSignal = async () => {}
   }: {
     initiator?: boolean;
-    ownId?: PublicKey;
-    remoteId?: PublicKey;
-    sessionId?: PublicKey;
-    topic?: PublicKey;
     stream?: NodeJS.ReadWriteStream;
-    sendSignal?: (msg: SignalMessage) => void;
+    sendSignal?: (msg: Signal) => Promise<void>;
   } = {}) => {
     const [port1, port2] = createLinkedPorts();
 
+    // Starting BridgeService
     const webRTCTransportService: BridgeService = new WebRTCTransportService();
 
     // Starting BridgeService
-    const webRTCService = createProtoRpcPeer({
+    const rpcService = createProtoRpcPeer({
       requested: {},
       exposed: {
         BridgeService: schema.getService('dxos.mesh.bridge.BridgeService')
@@ -57,16 +50,14 @@ describe('WebRTCTransportProxy', function () {
         preserveAny: true
       }
     });
-    await webRTCService.open();
-    afterTest(() => webRTCService.close());
+    await rpcService.open();
+    afterTest(() => rpcService.close());
 
     // Starting RPC client
     const rpcClient = createProtoRpcPeer({
       requested: {
         BridgeService: schema.getService('dxos.mesh.bridge.BridgeService')
       },
-      exposed: {},
-      handlers: {},
       port: port2,
       noHandshake: true,
       encodingOptions: {
@@ -79,16 +70,12 @@ describe('WebRTCTransportProxy', function () {
     const webRTCTransportProxy = new WebRTCTransportProxy({
       initiator,
       stream,
-      ownId,
-      remoteId,
-      sessionId,
-      topic,
       sendSignal,
       bridgeService: rpcClient.rpc.BridgeService
     });
     afterTest(async () => await webRTCTransportProxy.close());
 
-    return { webRTCService, webRTCTransportProxy };
+    return { webRTCService: rpcService, webRTCTransportProxy };
   };
 
   // This doesn't clean up correctly and crashes with SIGSEGV / SIGABRT at the end. Probably an issue with wrtc package.
@@ -119,7 +106,6 @@ describe('WebRTCTransportProxy', function () {
     const topic = PublicKey.random();
     const peer1Id = PublicKey.random();
     const peer2Id = PublicKey.random();
-    const sessionId = PublicKey.random();
 
     const plugin1 = new TestProtocolPlugin(peer1Id.asBuffer());
     const protocolProvider1 = testProtocolProvider(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
@@ -129,13 +115,9 @@ describe('WebRTCTransportProxy', function () {
         channel: discoveryKey(topic),
         initiator: true
       }).stream,
-      ownId: peer1Id,
-      remoteId: peer2Id,
-      sessionId,
-      topic,
-      sendSignal: async (msg) => {
+      sendSignal: async (signal) => {
         await sleep(10);
-        await connection2.signal(msg.data.signal);
+        await connection2.signal(signal);
       }
     });
     afterTest(() => connection1.errors.assertNoUnhandledErrors());
@@ -148,13 +130,9 @@ describe('WebRTCTransportProxy', function () {
         channel: discoveryKey(topic),
         initiator: false
       }).stream,
-      ownId: peer2Id,
-      remoteId: peer1Id,
-      sessionId,
-      topic,
-      sendSignal: async (msg) => {
+      sendSignal: async (signal) => {
         await sleep(10);
-        await connection1.signal(msg.data.signal);
+        await connection1.signal(signal);
       }
     });
     afterTest(() => connection2.errors.assertNoUnhandledErrors());
@@ -169,7 +147,6 @@ describe('WebRTCTransportProxy', function () {
     plugin2.on('connect', async (protocol) => {
       await plugin2.send(peer1Id.asBuffer(), '{"message": "Hello"}');
     });
-
     await waitForExpect(() => {
       expect(received.length).toBe(2);
       expect(received[0]).toBeInstanceOf(Protocol);
@@ -188,7 +165,6 @@ describe('WebRTCTransportProxy', function () {
 
       const webRTCTransportService: BridgeService = new WebRTCTransportService();
       service = createProtoRpcPeer({
-        requested: {},
         exposed: {
           BridgeService: schema.getService('dxos.mesh.bridge.BridgeService')
         },
@@ -205,8 +181,6 @@ describe('WebRTCTransportProxy', function () {
         requested: {
           BridgeService: schema.getService('dxos.mesh.bridge.BridgeService')
         },
-        exposed: {},
-        handlers: {},
         port: port2,
         noHandshake: true,
         encodingOptions: {
@@ -225,7 +199,6 @@ describe('WebRTCTransportProxy', function () {
       const topic = PublicKey.random();
       const peer1Id = PublicKey.random();
       const peer2Id = PublicKey.random();
-      const sessionId = PublicKey.random();
 
       const plugin1 = new TestProtocolPlugin(peer1Id.asBuffer());
       const protocolProvider1 = testProtocolProvider(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
@@ -235,13 +208,9 @@ describe('WebRTCTransportProxy', function () {
           channel: discoveryKey(topic),
           initiator: true
         }).stream,
-        ownId: peer1Id,
-        remoteId: peer2Id,
-        sessionId,
-        topic,
-        sendSignal: async (msg) => {
+        sendSignal: async (signal) => {
           await sleep(10);
-          await proxy2.signal(msg.data.signal);
+          await proxy2.signal(signal);
         },
         bridgeService: rpcClient.rpc.BridgeService
       });
@@ -255,13 +224,9 @@ describe('WebRTCTransportProxy', function () {
           channel: discoveryKey(topic),
           initiator: false
         }).stream,
-        ownId: peer2Id,
-        remoteId: peer1Id,
-        sessionId,
-        topic,
-        sendSignal: async (msg) => {
+        sendSignal: async (signal) => {
           await sleep(10);
-          await proxy1.signal(msg.data.signal);
+          await proxy1.signal(signal);
         },
         bridgeService: rpcClient.rpc.BridgeService
       });

package/src/transport/webrtc-transport-proxy.ts

@@ -12,24 +12,20 @@ import { log } from '@dxos/log';
 import { ConnectionState, BridgeEvent, BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
-import { SignalMessage } from '../signal';
 import { Transport, TransportFactory, TransportOptions } from './transport';
 
-export interface WebRTCTransportProxyParams {
+export type WebRTCTransportProxyParams = {
   initiator: boolean;
   stream: NodeJS.ReadWriteStream;
-  ownId: PublicKey;
-  remoteId: PublicKey;
-  sessionId: PublicKey;
-  topic: PublicKey;
-  sendSignal: (msg: SignalMessage) => void;
   bridgeService: BridgeService;
-}
+  sendSignal: (signal: Signal) => Promise<void>;
+};
 
 export class WebRTCTransportProxy implements Transport {
   readonly closed = new Event();
   private _closed = false;
   readonly connected = new Event();
+
   readonly errors = new ErrorStream();
 
   private _serviceStream!: Stream<BridgeEvent>;
@@ -43,16 +39,16 @@ export class WebRTCTransportProxy implements Transport {
       proxyId: this._proxyId,
       initiator: this._params.initiator
     });
-
     this._serviceStream.waitUntilReady().then(
       () => {
-        this._serviceStream.subscribe(async (msg: BridgeEvent) => {
-          if (msg.connection) {
-            await this._handleConnection(msg.connection);
-          } else if (msg.data) {
-            this._handleData(msg.data);
-          } else if (msg.signal) {
-            await this._handleSignal(msg.signal);
+        this._serviceStream.subscribe(async (event: BridgeEvent) => {
+          log('WebRTCTransportProxy: event', event);
+          if (event.connection) {
+            await this._handleConnection(event.connection);
+          } else if (event.data) {
+            this._handleData(event.data);
+          } else if (event.signal) {
+            await this._handleSignal(event.signal);
           }
         });
 
@@ -94,13 +90,7 @@ export class WebRTCTransportProxy implements Transport {
   }
 
   private async _handleSignal(signalEvent: BridgeEvent.SignalEvent) {
-    await this._params.sendSignal({
-      author: this._params.ownId,
-      recipient: this._params.remoteId,
-      topic: this._params.topic,
-      sessionId: this._params.sessionId,
-      data: { signal: signalEvent.payload }
-    });
+    await this._params.sendSignal(signalEvent.payload);
   }
 
   async signal(signal: Signal): Promise<void> {