@dxos/network-manager 2.33.9-dev.7d11f506 → 2.33.9-dev.9bbef4e2

package/src/proto/gen/dxos/mesh/signalMessage.ts

@@ -0,0 +1,83 @@
+import type { Stream } from "@dxos/codec-protobuf";
+import substitutions from "../../../substitutions";
+import * as dxos_credentials from "../credentials";
+import * as dxos_halo_keys from "../halo/keys";
+import * as dxos_mesh_signal from "./signal";
+import * as google_protobuf from "../../google/protobuf";
+/**
+ * Defined in:
+ *   {@link file://./../../../defs/dxos/mesh/signalMessage.proto}
+ */
+export interface SignalMessage {
+    /**
+     * Sender's public key.
+     */
+    id: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+    /**
+     * Receiver`s public key.
+     */
+    remoteId: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+    /**
+     * Swarm identefier.
+     */
+    topic: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+    /**
+     * Unique connection identifier.
+     */
+    sessionId: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+    /**
+     * Message payload.
+     */
+    data: MessageData;
+    /**
+     * Unique message identifier. Used for Acknolegment and matching Anwers to Offers.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    messageId?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../defs/dxos/mesh/signalMessage.proto}
+ */
+export interface MessageData {
+    offer?: Offer;
+    answer?: Answer;
+    signal?: Signal;
+    ack?: Acknowledgement;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../defs/dxos/mesh/signalMessage.proto}
+ */
+export interface Offer {
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../defs/dxos/mesh/signalMessage.proto}
+ */
+export interface Answer {
+    accept: boolean;
+    /**
+     * MessageId of the Offer being answered.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    offerMessageId?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../defs/dxos/mesh/signalMessage.proto}
+ */
+export interface Signal {
+    json: string;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../defs/dxos/mesh/signalMessage.proto}
+ */
+export interface Acknowledgement {
+    messageId: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+}

package/src/proto/gen/google/protobuf.ts

@@ -3,7 +3,14 @@ import substitutions from "../../substitutions";
 import * as dxos_credentials from "../dxos/credentials";
 import * as dxos_halo_keys from "../dxos/halo/keys";
 import * as dxos_mesh_signal from "../dxos/mesh/signal";
+import * as dxos_mesh_signalMessage from "../dxos/mesh/signalMessage";
 export interface Any {
-    type_url?: string;
-    value?: Uint8Array;
+    type_url: string;
+    value: Uint8Array;
+}
+export interface Empty {
+}
+export interface Timestamp {
+    seconds: string;
+    nanos: number;
 }

package/src/proto/gen/index.ts

@@ -2,6 +2,7 @@ import { Schema } from "@dxos/codec-protobuf";
 import * as dxos_credentials from "./dxos/credentials";
 import * as dxos_halo_keys from "./dxos/halo/keys";
 import * as dxos_mesh_signal from "./dxos/mesh/signal";
+import * as dxos_mesh_signalMessage from "./dxos/mesh/signalMessage";
 import * as google_protobuf from "./google/protobuf";
 import substitutions from "../substitutions";
 export interface TYPES {
@@ -15,14 +16,26 @@ export interface TYPES {
     "dxos.halo.keys.KeyType": dxos_halo_keys.KeyType;
     "dxos.halo.keys.PrivKey": dxos_halo_keys.PrivKey;
     "dxos.halo.keys.PubKey": dxos_halo_keys.PubKey;
-    "dxos.mesh.signal.Answer": dxos_mesh_signal.Answer;
+    "dxos.mesh.signal.HostEvent": dxos_mesh_signal.HostEvent;
+    "dxos.mesh.signal.JoinRequest": dxos_mesh_signal.JoinRequest;
     "dxos.mesh.signal.Message": dxos_mesh_signal.Message;
-    "dxos.mesh.signal.MessageData": dxos_mesh_signal.MessageData;
-    "dxos.mesh.signal.Offer": dxos_mesh_signal.Offer;
-    "dxos.mesh.signal.Signal": dxos_mesh_signal.Signal;
+    "dxos.mesh.signal.PeerEvent": dxos_mesh_signal.PeerEvent;
+    "dxos.mesh.signal.ReceptionRequest": dxos_mesh_signal.ReceptionRequest;
+    "dxos.mesh.signal.SwarmEvent": dxos_mesh_signal.SwarmEvent;
+    "dxos.mesh.signal.SwarmEvent.PeerAvailable": dxos_mesh_signal.SwarmEvent.PeerAvailable;
+    "dxos.mesh.signal.SwarmEvent.PeerLeft": dxos_mesh_signal.SwarmEvent.PeerLeft;
+    "dxos.mesh.signalMessage.Acknowledgement": dxos_mesh_signalMessage.Acknowledgement;
+    "dxos.mesh.signalMessage.Answer": dxos_mesh_signalMessage.Answer;
+    "dxos.mesh.signalMessage.MessageData": dxos_mesh_signalMessage.MessageData;
+    "dxos.mesh.signalMessage.Offer": dxos_mesh_signalMessage.Offer;
+    "dxos.mesh.signalMessage.Signal": dxos_mesh_signalMessage.Signal;
+    "dxos.mesh.signalMessage.SignalMessage": dxos_mesh_signalMessage.SignalMessage;
     "google.protobuf.Any": google_protobuf.Any;
+    "google.protobuf.Empty": google_protobuf.Empty;
+    "google.protobuf.Timestamp": google_protobuf.Timestamp;
 }
 export interface SERVICES {
+    "dxos.mesh.signal.Signal": dxos_mesh_signal.Signal;
 }
-export const schemaJson = JSON.parse("{\"nested\":{\"dxos\":{\"nested\":{\"credentials\":{\"nested\":{\"Message\":{\"fields\":{\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null}},\"comment\":null},\"SignedMessage\":{\"fields\":{\"signed\":{\"rule\":\"required\",\"type\":\"Signed\",\"id\":1,\"comment\":null},\"signatures\":{\"rule\":\"repeated\",\"type\":\"Signature\",\"id\":2,\"comment\":null}},\"nested\":{\"Signature\":{\"fields\":{\"key\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"signature\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"keyChain\":{\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"Signed\":{\"fields\":{\"created\":{\"rule\":\"required\",\"type\":\"string\",\"id\":1,\"comment\":null},\"nonce\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":10,\"comment\":null}},\"comment\":null}},\"comment\":\"A generic container message used whenever messages are signed (e.g. PartyCredential)\"}}},\"halo\":{\"nested\":{\"keys\":{\"nested\":{\"KeyChain\":{\"fields\":{\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"message\":{\"rule\":\"required\",\"type\":\"SignedMessage\",\"id\":2,\"comment\":null},\"parents\":{\"rule\":\"repeated\",\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"KeyRecord\":{\"fields\":{\"type\":{\"rule\":\"required\",\"type\":\"KeyType\",\"id\":1,\"comment\":\"The `KeyType` type of the key. This is often unknown for keys from other sources.\"},\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":2,\"comment\":\"The public key as a Buffer (required).\"},\"secretKey\":{\"type\":\"PrivKey\",\"id\":3,\"comment\":\"The secret key as a Buffer (this will never be visible outside the Keyring).\"},\"hint\":{\"type\":\"bool\",\"id\":4,\"comment\":\"Is this key from a Greeting \\\"hint\\\"?\"},\"own\":{\"type\":\"bool\",\"id\":5,\"comment\":\"Determines if this is our key?\\nUsually true if `secretKey` is present; may be false for \\\"inception keys\\\" such as the Party key.\"},\"trusted\":{\"type\":\"bool\",\"id\":6,\"comment\":\"Is this key to be trusted?\"},\"added\":{\"type\":\"string\",\"id\":7,\"comment\":\"An RFC-3339 date/time string for when the key was added to the Keyring.\"},\"created\":{\"type\":\"string\",\"id\":8,\"comment\":\"An RFC-3339 date/time string for when the key was created.\"}},\"comment\":null},\"KeyRecordList\":{\"fields\":{\"keys\":{\"rule\":\"repeated\",\"type\":\"KeyRecord\",\"id\":1,\"comment\":null}},\"comment\":null},\"KeyType\":{\"values\":{\"UNKNOWN\":0,\"IDENTITY\":1,\"DEVICE\":2,\"PARTY\":3,\"FEED\":4,\"DXNS_ADDRESS\":5},\"comment\":null,\"comments\":{\"UNKNOWN\":null,\"IDENTITY\":null,\"DEVICE\":null,\"PARTY\":null,\"FEED\":null,\"DXNS_ADDRESS\":null}},\"PrivKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null},\"PubKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null}}}}},\"mesh\":{\"nested\":{\"signal\":{\"nested\":{\"Answer\":{\"fields\":{\"accept\":{\"type\":\"bool\",\"id\":1,\"comment\":null}},\"comment\":null},\"Message\":{\"fields\":{\"id\":{\"type\":\"PubKey\",\"id\":1,\"comment\":\"Sender's public key.\"},\"remoteId\":{\"type\":\"PubKey\",\"id\":2,\"comment\":\"Receiver`s public key.\"},\"topic\":{\"type\":\"PubKey\",\"id\":3,\"comment\":null},\"sessionId\":{\"type\":\"PubKey\",\"id\":4,\"comment\":null},\"data\":{\"type\":\"MessageData\",\"id\":5,\"comment\":null}},\"comment\":null},\"MessageData\":{\"oneofs\":{\"payload\":{\"oneof\":[\"offer\",\"answer\",\"signal\"],\"comment\":null}},\"fields\":{\"offer\":{\"type\":\"Offer\",\"id\":1,\"comment\":null},\"answer\":{\"type\":\"Answer\",\"id\":2,\"comment\":null},\"signal\":{\"type\":\"Signal\",\"id\":3,\"comment\":null}},\"comment\":null},\"Offer\":{\"fields\":{},\"comment\":null},\"Signal\":{\"fields\":{\"json\":{\"type\":\"string\",\"id\":1,\"comment\":null}},\"comment\":null}}}}}}},\"google\":{\"nested\":{\"protobuf\":{\"nested\":{\"Any\":{\"fields\":{\"type_url\":{\"type\":\"string\",\"id\":1},\"value\":{\"type\":\"bytes\",\"id\":2}},\"comment\":null}}}}}}}");
+export const schemaJson = JSON.parse("{\"nested\":{\"dxos\":{\"nested\":{\"credentials\":{\"nested\":{\"Message\":{\"fields\":{\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null}},\"comment\":null},\"SignedMessage\":{\"fields\":{\"signed\":{\"rule\":\"required\",\"type\":\"Signed\",\"id\":1,\"comment\":\"The signed message contents.\"},\"signatures\":{\"rule\":\"repeated\",\"type\":\"Signature\",\"id\":2,\"comment\":\"An array of Signatures, one for each key that signed the message.\"}},\"nested\":{\"Signature\":{\"oneofs\":{\"_keyChain\":{\"oneof\":[\"keyChain\"]}},\"fields\":{\"key\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":\"The publicKey of the keypair that made this signature.\"},\"signature\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":\"The bytes of the signature.\"},\"keyChain\":{\"type\":\"KeyChain\",\"id\":3,\"options\":{\"proto3_optional\":true},\"comment\":\"The certification chain of SignedMessages for this key.\"}},\"comment\":null},\"Signed\":{\"fields\":{\"created\":{\"rule\":\"required\",\"type\":\"string\",\"id\":1,\"comment\":\"RFC-3339 datetime string.\"},\"nonce\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":10,\"comment\":\"The payload to be signed.\"}},\"comment\":null}},\"comment\":\"A generic container message used whenever messages are signed (e.g. PartyCredential)\"}}},\"halo\":{\"nested\":{\"keys\":{\"nested\":{\"KeyChain\":{\"fields\":{\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"message\":{\"rule\":\"required\",\"type\":\"SignedMessage\",\"id\":2,\"comment\":null},\"parents\":{\"rule\":\"repeated\",\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"KeyRecord\":{\"oneofs\":{\"_secretKey\":{\"oneof\":[\"secretKey\"]},\"_hint\":{\"oneof\":[\"hint\"]},\"_own\":{\"oneof\":[\"own\"]},\"_trusted\":{\"oneof\":[\"trusted\"]},\"_added\":{\"oneof\":[\"added\"]},\"_created\":{\"oneof\":[\"created\"]}},\"fields\":{\"type\":{\"rule\":\"required\",\"type\":\"KeyType\",\"id\":1,\"comment\":\"The `KeyType` type of the key. This is often unknown for keys from other sources.\"},\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":2,\"comment\":\"The public key as a Buffer (required).\"},\"secretKey\":{\"type\":\"PrivKey\",\"id\":3,\"options\":{\"proto3_optional\":true},\"comment\":\"The secret key as a Buffer (this will never be visible outside the Keyring).\"},\"hint\":{\"type\":\"bool\",\"id\":4,\"options\":{\"proto3_optional\":true},\"comment\":\"Is this key from a Greeting \\\"hint\\\"?\"},\"own\":{\"type\":\"bool\",\"id\":5,\"options\":{\"proto3_optional\":true},\"comment\":\"Determines if this is our key?\\nUsually true if `secretKey` is present; may be false for \\\"inception keys\\\" such as the Party key.\"},\"trusted\":{\"type\":\"bool\",\"id\":6,\"options\":{\"proto3_optional\":true},\"comment\":\"Is this key to be trusted?\"},\"added\":{\"type\":\"string\",\"id\":7,\"options\":{\"proto3_optional\":true},\"comment\":\"An RFC-3339 date/time string for when the key was added to the Keyring.\"},\"created\":{\"type\":\"string\",\"id\":8,\"options\":{\"proto3_optional\":true},\"comment\":\"An RFC-3339 date/time string for when the key was created.\"}},\"comment\":null},\"KeyRecordList\":{\"fields\":{\"keys\":{\"rule\":\"repeated\",\"type\":\"KeyRecord\",\"id\":1,\"comment\":null}},\"comment\":null},\"KeyType\":{\"values\":{\"UNKNOWN\":0,\"IDENTITY\":1,\"DEVICE\":2,\"PARTY\":3,\"FEED\":4,\"DXNS_ADDRESS\":5},\"comment\":null,\"comments\":{\"UNKNOWN\":null,\"IDENTITY\":null,\"DEVICE\":null,\"PARTY\":null,\"FEED\":null,\"DXNS_ADDRESS\":null}},\"PrivKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null},\"PubKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null}}}}},\"mesh\":{\"nested\":{\"signal\":{\"options\":{\"go_package\":\"github.com/dxos/kube/go/signal/pb\"},\"nested\":{\"HostEvent\":{\"oneofs\":{\"event\":{\"oneof\":[\"peerAvailable\"],\"comment\":null}},\"fields\":{\"peerAvailable\":{\"type\":\"SwarmEvent.PeerAvailable\",\"id\":1,\"comment\":null}},\"comment\":null},\"JoinRequest\":{\"fields\":{\"swarm\":{\"type\":\"bytes\",\"id\":1,\"comment\":null},\"peer\":{\"type\":\"bytes\",\"id\":2,\"comment\":null}},\"comment\":null},\"Message\":{\"fields\":{\"author\":{\"type\":\"bytes\",\"id\":1,\"comment\":null},\"recipient\":{\"type\":\"bytes\",\"id\":2,\"comment\":null},\"payload\":{\"type\":\"google.protobuf.Any\",\"id\":3,\"comment\":null}},\"comment\":null},\"PeerEvent\":{\"oneofs\":{\"event\":{\"oneof\":[\"message\"],\"comment\":null}},\"fields\":{\"message\":{\"type\":\"Message\",\"id\":1,\"comment\":null}},\"comment\":null},\"ReceptionRequest\":{\"fields\":{\"peer\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null},\"Signal\":{\"methods\":{\"Join\":{\"requestType\":\"JoinRequest\",\"responseType\":\"SwarmEvent\",\"responseStream\":true,\"comment\":null},\"ReceiveMessages\":{\"requestType\":\"ReceptionRequest\",\"responseType\":\"Message\",\"responseStream\":true,\"comment\":null},\"SendMessage\":{\"requestType\":\"Message\",\"responseType\":\"google.protobuf.Empty\",\"comment\":null}},\"comment\":null},\"SwarmEvent\":{\"oneofs\":{\"event\":{\"oneof\":[\"peerAvailable\",\"peerLeft\"],\"comment\":null}},\"fields\":{\"peerAvailable\":{\"type\":\"PeerAvailable\",\"id\":1,\"comment\":null},\"peerLeft\":{\"type\":\"PeerLeft\",\"id\":2,\"comment\":null}},\"nested\":{\"PeerAvailable\":{\"oneofs\":{\"_until\":{\"oneof\":[\"until\"]},\"_announceBackToHost\":{\"oneof\":[\"announceBackToHost\"]}},\"fields\":{\"peer\":{\"type\":\"bytes\",\"id\":1,\"comment\":null},\"since\":{\"type\":\"google.protobuf.Timestamp\",\"id\":2,\"comment\":null},\"until\":{\"type\":\"google.protobuf.Timestamp\",\"id\":3,\"options\":{\"proto3_optional\":true},\"comment\":null},\"announceBackToHost\":{\"type\":\"bytes\",\"id\":4,\"options\":{\"proto3_optional\":true},\"comment\":null}},\"comment\":null},\"PeerLeft\":{\"fields\":{\"peer\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null}},\"comment\":null}}},\"signalMessage\":{\"nested\":{\"Acknowledgement\":{\"fields\":{\"messageId\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null}},\"comment\":null},\"Answer\":{\"oneofs\":{\"_offerMessageId\":{\"oneof\":[\"offerMessageId\"]}},\"fields\":{\"accept\":{\"type\":\"bool\",\"id\":1,\"comment\":null},\"offerMessageId\":{\"type\":\"PubKey\",\"id\":2,\"options\":{\"proto3_optional\":true},\"comment\":\"MessageId of the Offer being answered.\"}},\"comment\":null},\"MessageData\":{\"oneofs\":{\"payload\":{\"oneof\":[\"offer\",\"answer\",\"signal\",\"ack\"],\"comment\":null}},\"fields\":{\"offer\":{\"type\":\"Offer\",\"id\":1,\"comment\":null},\"answer\":{\"type\":\"Answer\",\"id\":2,\"comment\":null},\"signal\":{\"type\":\"Signal\",\"id\":3,\"comment\":null},\"ack\":{\"type\":\"Acknowledgement\",\"id\":4,\"comment\":null}},\"comment\":null},\"Offer\":{\"fields\":{},\"comment\":null},\"Signal\":{\"fields\":{\"json\":{\"type\":\"string\",\"id\":1,\"comment\":null}},\"comment\":null},\"SignalMessage\":{\"oneofs\":{\"_messageId\":{\"oneof\":[\"messageId\"]}},\"fields\":{\"id\":{\"type\":\"PubKey\",\"id\":1,\"comment\":\"Sender's public key.\"},\"remoteId\":{\"type\":\"PubKey\",\"id\":2,\"comment\":\"Receiver`s public key.\"},\"topic\":{\"type\":\"PubKey\",\"id\":3,\"comment\":\"Swarm identefier.\"},\"sessionId\":{\"type\":\"PubKey\",\"id\":4,\"comment\":\"Unique connection identifier.\"},\"data\":{\"type\":\"MessageData\",\"id\":5,\"comment\":\"Message payload.\"},\"messageId\":{\"type\":\"PubKey\",\"id\":6,\"options\":{\"proto3_optional\":true},\"comment\":\"Unique message identifier. Used for Acknolegment and matching Anwers to Offers.\"}},\"comment\":null}}}}}}},\"google\":{\"nested\":{\"protobuf\":{\"nested\":{\"Any\":{\"fields\":{\"type_url\":{\"type\":\"string\",\"id\":1},\"value\":{\"type\":\"bytes\",\"id\":2}},\"comment\":null},\"Empty\":{\"fields\":{},\"comment\":null},\"Timestamp\":{\"fields\":{\"seconds\":{\"type\":\"int64\",\"id\":1},\"nanos\":{\"type\":\"int32\",\"id\":2}},\"comment\":null}}}}}}}");
 export const schema = Schema.fromJson<TYPES, SERVICES>(schemaJson, substitutions);

package/src/proto/substitutions.ts

@@ -2,8 +2,10 @@
 // Copyright 2021 DXOS.org
 //
 
+import { timestampSubstitutions } from '@dxos/codec-protobuf';
 import { publicKeySubstitutions } from '@dxos/protocols';
 
 export default {
-  ...publicKeySubstitutions
+  ...publicKeySubstitutions,
+  ...timestampSubstitutions
 };

package/src/protocol-factory.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { discoveryKey } from '@dxos/crypto';
 import { Extension, Protocol } from '@dxos/mesh-protocol';

package/src/signal/in-memory-signal-manager.ts

@@ -2,25 +2,28 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 import { PublicKey } from '@dxos/protocols';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
-import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
+import { SwarmEvent } from '../proto/gen/dxos/mesh/signal';
+import { Answer, SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 import { SignalApi } from './signal-api';
 import { SignalManager } from './signal-manager';
 
 export class InMemorySignalManager implements SignalManager {
   readonly statusChanged = new Event<SignalApi.Status[]>();
   readonly commandTrace = new Event<SignalApi.CommandTrace>();
-  readonly peerCandidatesChanged = new Event<[topic: PublicKey, candidates: PublicKey[]]>()
-  readonly onSignal = new Event<Message>();
+  readonly swarmEvent = new Event<[topic: PublicKey, swarmEvent: SwarmEvent]>();
+  readonly onMessage = new Event<SignalMessage>();
 
   constructor (
-    private readonly _onOffer: (message: Message) => Promise<Answer>
-  ) {}
+    private readonly _onOffer: (message: SignalMessage) => Promise<Answer>
+  ) {
+    state.swarmEvent.on(data => this.swarmEvent.emit(data));
+  }
 
   getStatus (): SignalApi.Status[] {
     return [];
@@ -34,7 +37,24 @@ export class InMemorySignalManager implements SignalManager {
     state.swarms.get(topic)!.add(peerId);
     state.connections.set(peerId, this);
 
-    setTimeout(() => this.peerCandidatesChanged.emit([topic, Array.from(state.swarms.get(topic)!.values())]), 0);
+    state.swarmEvent.emit([topic, {
+      peerAvailable: {
+        peer: peerId.asUint8Array(),
+        since: new Date()
+      }
+    }]);
+
+    // Emitting swarm events for each peer.
+    for (const [topic, peerIds] of state.swarms) {
+      Array.from(peerIds).forEach(peerId => {
+        this.swarmEvent.emit([topic, {
+          peerAvailable: {
+            peer: peerId.asUint8Array(),
+            since: new Date()
+          }
+        }]);
+      });
+    }
   }
 
   leave (topic: PublicKey, peerId: PublicKey) {
@@ -43,22 +63,26 @@ export class InMemorySignalManager implements SignalManager {
     }
 
     state.swarms.get(topic)!.delete(peerId);
-  }
 
-  lookup (topic: PublicKey) {
-    setTimeout(() => this.peerCandidatesChanged.emit([topic, Array.from(state.swarms.get(topic)!.values())]), 0);
+    const swarmEvent: SwarmEvent = {
+      peerLeft: {
+        peer: peerId.asUint8Array()
+      }
+    };
+
+    state.swarmEvent.emit([topic, swarmEvent]);
   }
 
-  offer (msg: Message) {
+  offer (msg: SignalMessage) {
     assert(msg.remoteId);
     assert(state.connections.has(msg.remoteId), 'Peer not connected');
     return state.connections.get(msg.remoteId)!._onOffer(msg);
   }
 
-  async signal (msg: Message) {
+  async message (msg: SignalMessage) {
     assert(msg.remoteId);
     assert(state.connections.get(msg.remoteId), 'Peer not connected');
-    state.connections.get(msg.remoteId)!.onSignal.emit(msg);
+    state.connections.get(msg.remoteId)!.onMessage.emit(msg);
   }
 
   async destroy () {}
@@ -67,6 +91,7 @@ export class InMemorySignalManager implements SignalManager {
 // TODO(burdon): Remove global singleton.
 // This is global state for the in-memory signal manager.
 const state = {
+  swarmEvent: new Event<[topic: PublicKey, swarmEvent: SwarmEvent]>(),
   // Mapping from topic to set of peers.
   swarms: new ComplexMap<PublicKey, ComplexSet<PublicKey>>(x => x.toHex()),
 

package/src/signal/index.ts

@@ -6,5 +6,4 @@ export * from './in-memory-signal-manager';
 export * from './signal-api';
 export * from './signal-client';
 export * from './signal-manager';
-export * from './websocket-rpc';
-export * from './websocket-signal-manager';
+export * from './signal-manager-impl';

package/src/signal/integration.test.ts

@@ -0,0 +1,117 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import { expect, mockFn } from 'earljs';
+import waitForExpect from 'wait-for-expect';
+
+import { PublicKey } from '@dxos/protocols';
+import { createTestBroker, TestBroker } from '@dxos/signal';
+import { afterTest } from '@dxos/testutils';
+
+import { SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
+import { MessageRouter } from './message-router';
+import { SignalManagerImpl } from './signal-manager-impl';
+
+describe('Signal Integration Test', () => {
+  let broker: TestBroker;
+
+  before(async () => {
+    broker = await createTestBroker();
+  });
+
+  after(() => {
+    broker.stop();
+  });
+
+  const setup = () => {
+    const signalManager = new SignalManagerImpl([broker.url()]);
+    signalManager.onMessage.on(msg => messageRouter.receiveMessage(msg));
+
+    const signalMock = mockFn<(msg: SignalMessage) => Promise<void>>().resolvesTo();
+    const messageRouter = new MessageRouter({
+      sendMessage: msg => signalManager.message(msg),
+      onSignal: signalMock,
+      onOffer: async () => ({ accept: true })
+    });
+    afterTest(() => messageRouter.destroy());
+
+    return {
+      signalManager,
+      signalMock,
+      messageRouter
+    };
+  };
+
+  it('two peers connecting', async () => {
+    const peerNetworking1 = setup();
+    const peerNetworking2 = setup();
+
+    const peer1 = PublicKey.random();
+    const peer2 = PublicKey.random();
+    const topic = PublicKey.random();
+
+    const promise1 = peerNetworking1.signalManager.swarmEvent.waitFor(([, swarmEvent]) => !!swarmEvent.peerAvailable && peer2.equals(swarmEvent.peerAvailable.peer));
+    const promise2 = peerNetworking1.signalManager.swarmEvent.waitFor(([, swarmEvent]) => !!swarmEvent.peerAvailable && peer1.equals(swarmEvent.peerAvailable.peer));
+
+    peerNetworking1.signalManager.join(topic, peer1);
+    peerNetworking2.signalManager.join(topic, peer2);
+
+    await promise1;
+    await promise2;
+
+    expect(await peerNetworking1.messageRouter.offer({
+      topic,
+      id: peer1,
+      remoteId: peer2,
+      sessionId: PublicKey.random(),
+      data: {
+        offer: {}
+      }
+    })).toBeAnObjectWith({ accept: true });
+
+    expect(await peerNetworking2.messageRouter.offer({
+      topic,
+      id: peer2,
+      remoteId: peer1,
+      sessionId: PublicKey.random(),
+      data: {
+        offer: {}
+      }
+    })).toBeAnObjectWith({ accept: true });
+
+    {
+      const message: SignalMessage = {
+        topic,
+        id: peer1,
+        remoteId: peer2,
+        sessionId: PublicKey.random(),
+        data: {
+          signal: { json: JSON.stringify({ 'foo': 'bar' }) }
+        }
+      };
+      await peerNetworking1.messageRouter.signal(message);
+
+      await waitForExpect(() => {
+        expect(peerNetworking2.signalMock).toHaveBeenCalledWith([message]);
+      });
+    }
+
+    {
+      const message: SignalMessage = {
+        topic,
+        id: peer2,
+        remoteId: peer1,
+        sessionId: PublicKey.random(),
+        data: {
+          signal: { json: JSON.stringify({ 'foo': 'bar' }) }
+        }
+      };
+      await peerNetworking2.messageRouter.signal(message);
+
+      await waitForExpect(() => {
+        expect(peerNetworking1.signalMock).toHaveBeenCalledWith([message]);
+      });
+    }
+  });
+});