@dxos/network-manager 2.33.9-dev.bba8fc00 → 2.33.9-dev.ceab0857

package/dist/src/proto/gen/index.d.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";
 export interface TYPES {
     "dxos.credentials.Message": dxos_credentials.Message;
@@ -14,15 +15,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.Acknowledgement": dxos_mesh_signal.Acknowledgement;
-    "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 declare const schemaJson: any;
 export declare const schema: Schema<TYPES, SERVICES>;

package/dist/src/proto/gen/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAErD,MAAM,WAAW,KAAK;IAClB,0BAA0B,EAAE,gBAAgB,CAAC,OAAO,CAAC;IACrD,gCAAgC,EAAE,gBAAgB,CAAC,aAAa,CAAC;IACjE,0CAA0C,EAAE,gBAAgB,CAAC,aAAa,CAAC,SAAS,CAAC;IACrF,uCAAuC,EAAE,gBAAgB,CAAC,aAAa,CAAC,MAAM,CAAC;IAC/E,yBAAyB,EAAE,cAAc,CAAC,QAAQ,CAAC;IACnD,0BAA0B,EAAE,cAAc,CAAC,SAAS,CAAC;IACrD,8BAA8B,EAAE,cAAc,CAAC,aAAa,CAAC;IAC7D,wBAAwB,EAAE,cAAc,CAAC,OAAO,CAAC;IACjD,wBAAwB,EAAE,cAAc,CAAC,OAAO,CAAC;IACjD,uBAAuB,EAAE,cAAc,CAAC,MAAM,CAAC;IAC/C,kCAAkC,EAAE,gBAAgB,CAAC,eAAe,CAAC;IACrE,yBAAyB,EAAE,gBAAgB,CAAC,MAAM,CAAC;IACnD,0BAA0B,EAAE,gBAAgB,CAAC,OAAO,CAAC;IACrD,8BAA8B,EAAE,gBAAgB,CAAC,WAAW,CAAC;IAC7D,wBAAwB,EAAE,gBAAgB,CAAC,KAAK,CAAC;IACjD,yBAAyB,EAAE,gBAAgB,CAAC,MAAM,CAAC;IACnD,qBAAqB,EAAE,eAAe,CAAC,GAAG,CAAC;CAC9C;AACD,MAAM,WAAW,QAAQ;CACxB;AACD,eAAO,MAAM,UAAU,KAA6rL,CAAC;AACrtL,eAAO,MAAM,MAAM,yBAA8D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,uBAAuB,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAErD,MAAM,WAAW,KAAK;IAClB,0BAA0B,EAAE,gBAAgB,CAAC,OAAO,CAAC;IACrD,gCAAgC,EAAE,gBAAgB,CAAC,aAAa,CAAC;IACjE,0CAA0C,EAAE,gBAAgB,CAAC,aAAa,CAAC,SAAS,CAAC;IACrF,uCAAuC,EAAE,gBAAgB,CAAC,aAAa,CAAC,MAAM,CAAC;IAC/E,yBAAyB,EAAE,cAAc,CAAC,QAAQ,CAAC;IACnD,0BAA0B,EAAE,cAAc,CAAC,SAAS,CAAC;IACrD,8BAA8B,EAAE,cAAc,CAAC,aAAa,CAAC;IAC7D,wBAAwB,EAAE,cAAc,CAAC,OAAO,CAAC;IACjD,wBAAwB,EAAE,cAAc,CAAC,OAAO,CAAC;IACjD,uBAAuB,EAAE,cAAc,CAAC,MAAM,CAAC;IAC/C,4BAA4B,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACzD,8BAA8B,EAAE,gBAAgB,CAAC,WAAW,CAAC;IAC7D,0BAA0B,EAAE,gBAAgB,CAAC,OAAO,CAAC;IACrD,4BAA4B,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACzD,mCAAmC,EAAE,gBAAgB,CAAC,gBAAgB,CAAC;IACvE,6BAA6B,EAAE,gBAAgB,CAAC,UAAU,CAAC;IAC3D,2CAA2C,EAAE,gBAAgB,CAAC,UAAU,CAAC,aAAa,CAAC;IACvF,sCAAsC,EAAE,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC;IAC7E,yCAAyC,EAAE,uBAAuB,CAAC,eAAe,CAAC;IACnF,gCAAgC,EAAE,uBAAuB,CAAC,MAAM,CAAC;IACjE,qCAAqC,EAAE,uBAAuB,CAAC,WAAW,CAAC;IAC3E,+BAA+B,EAAE,uBAAuB,CAAC,KAAK,CAAC;IAC/D,gCAAgC,EAAE,uBAAuB,CAAC,MAAM,CAAC;IACjE,uCAAuC,EAAE,uBAAuB,CAAC,aAAa,CAAC;IAC/E,qBAAqB,EAAE,eAAe,CAAC,GAAG,CAAC;IAC3C,uBAAuB,EAAE,eAAe,CAAC,KAAK,CAAC;IAC/C,2BAA2B,EAAE,eAAe,CAAC,SAAS,CAAC;CAC1D;AACD,MAAM,WAAW,QAAQ;IACrB,yBAAyB,EAAE,gBAAgB,CAAC,MAAM,CAAC;CACtD;AACD,eAAO,MAAM,UAAU,KAAilQ,CAAC;AACzmQ,eAAO,MAAM,MAAM,yBAA8D,CAAC"}

package/dist/src/proto/gen/index.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = exports.schemaJson = void 0;
 const codec_protobuf_1 = require("@dxos/codec-protobuf");
 const substitutions_1 = __importDefault(require("../substitutions"));
-exports.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\":{\"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},\"Message\":{\"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},\"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}}}}}}},\"google\":{\"nested\":{\"protobuf\":{\"nested\":{\"Any\":{\"fields\":{\"type_url\":{\"type\":\"string\",\"id\":1},\"value\":{\"type\":\"bytes\",\"id\":2}},\"comment\":null}}}}}}}");
+exports.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}}}}}}}");
 exports.schema = codec_protobuf_1.Schema.fromJson(exports.schemaJson, substitutions_1.default);
 //# sourceMappingURL=index.js.map

package/dist/src/proto/gen/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/proto/gen/index.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA8C;AAK9C,qEAA6C;AAsBhC,QAAA,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,8qLAA8qL,CAAC,CAAC;AACxsL,QAAA,MAAM,GAAG,uBAAM,CAAC,QAAQ,CAAkB,kBAAU,EAAE,uBAAa,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/proto/gen/index.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA8C;AAM9C,qEAA6C;AAiChC,QAAA,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,kkQAAkkQ,CAAC,CAAC;AAC5lQ,QAAA,MAAM,GAAG,uBAAM,CAAC,QAAQ,CAAkB,kBAAU,EAAE,uBAAa,CAAC,CAAC"}

package/dist/src/proto/substitutions.d.ts

@@ -1,5 +1,9 @@
 /// <reference types="node" />
 declare const _default: {
+    'google.protobuf.Timestamp': {
+        encode: (value: Date) => any;
+        decode: (value: any) => Date;
+    };
     'dxos.halo.keys.PubKey': {
         encode: (value: import("@dxos/protocols").PublicKey) => {
             data: Uint8Array;

package/dist/src/proto/substitutions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"substitutions.d.ts","sourceRoot":"","sources":["../../../src/proto/substitutions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAMA,wBAEE"}
+{"version":3,"file":"substitutions.d.ts","sourceRoot":"","sources":["../../../src/proto/substitutions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAOA,wBAGE"}

package/dist/src/proto/substitutions.js

@@ -3,8 +3,10 @@
 // Copyright 2021 DXOS.org
 //
 Object.defineProperty(exports, "__esModule", { value: true });
+const codec_protobuf_1 = require("@dxos/codec-protobuf");
 const protocols_1 = require("@dxos/protocols");
 exports.default = {
-    ...protocols_1.publicKeySubstitutions
+    ...protocols_1.publicKeySubstitutions,
+    ...codec_protobuf_1.timestampSubstitutions
 };
 //# sourceMappingURL=substitutions.js.map

package/dist/src/proto/substitutions.js.map

@@ -1 +1 @@
-{"version":3,"file":"substitutions.js","sourceRoot":"","sources":["../../../src/proto/substitutions.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,+CAAyD;AAEzD,kBAAe;IACb,GAAG,kCAAsB;CAC1B,CAAC"}
+{"version":3,"file":"substitutions.js","sourceRoot":"","sources":["../../../src/proto/substitutions.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,yDAA8D;AAC9D,+CAAyD;AAEzD,kBAAe;IACb,GAAG,kCAAsB;IACzB,GAAG,uCAAsB;CAC1B,CAAC"}

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

@@ -1,21 +1,21 @@
 import { Event } from '@dxos/async';
 import { PublicKey } from '@dxos/protocols';
-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 declare class InMemorySignalManager implements SignalManager {
     private readonly _onOffer;
     readonly statusChanged: Event<SignalApi.Status[]>;
     readonly commandTrace: Event<SignalApi.CommandTrace>;
-    readonly peerCandidatesChanged: Event<[topic: PublicKey, candidates: PublicKey[]]>;
-    readonly onSignal: Event<Message>;
-    constructor(_onOffer: (message: Message) => Promise<Answer>);
+    readonly swarmEvent: Event<[topic: PublicKey, swarmEvent: SwarmEvent]>;
+    readonly onMessage: Event<SignalMessage>;
+    constructor(_onOffer: (message: SignalMessage) => Promise<Answer>);
     getStatus(): SignalApi.Status[];
     join(topic: PublicKey, peerId: PublicKey): void;
     leave(topic: PublicKey, peerId: PublicKey): void;
-    lookup(topic: PublicKey): void;
-    offer(msg: Message): Promise<Answer>;
-    signal(msg: Message): Promise<void>;
+    offer(msg: SignalMessage): Promise<Answer>;
+    message(msg: SignalMessage): Promise<void>;
     destroy(): Promise<void>;
 }
 //# sourceMappingURL=in-memory-signal-manager.d.ts.map

package/dist/src/signal/in-memory-signal-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"in-memory-signal-manager.d.ts","sourceRoot":"","sources":["../../../src/signal/in-memory-signal-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,qBAAsB,YAAW,aAAa;IAOvD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAN3B,QAAQ,CAAC,aAAa,4BAAmC;IACzD,QAAQ,CAAC,YAAY,gCAAuC;IAC5D,QAAQ,CAAC,qBAAqB,qDAA2D;IACzF,QAAQ,CAAC,QAAQ,iBAAwB;gBAGtB,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IAGlE,SAAS,IAAK,SAAS,CAAC,MAAM,EAAE;IAIhC,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IAWzC,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IAQ1C,MAAM,CAAE,KAAK,EAAE,SAAS;IAIxB,KAAK,CAAE,GAAG,EAAE,OAAO;IAMb,MAAM,CAAE,GAAG,EAAE,OAAO;IAMpB,OAAO;CACd"}
+{"version":3,"file":"in-memory-signal-manager.d.ts","sourceRoot":"","sources":["../../../src/signal/in-memory-signal-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,qBAAsB,YAAW,aAAa;IAOvD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAN3B,QAAQ,CAAC,aAAa,4BAAmC;IACzD,QAAQ,CAAC,YAAY,gCAAuC;IAC5D,QAAQ,CAAC,UAAU,oDAA2D;IAC9E,QAAQ,CAAC,SAAS,uBAA8B;gBAG7B,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC;IAKxE,SAAS,IAAK,SAAS,CAAC,MAAM,EAAE;IAIhC,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IA4BzC,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IAgB1C,KAAK,CAAE,GAAG,EAAE,aAAa;IAMnB,OAAO,CAAE,GAAG,EAAE,aAAa;IAM3B,OAAO;CACd"}

package/dist/src/signal/in-memory-signal-manager.js

@@ -15,8 +15,9 @@ class InMemorySignalManager {
         this._onOffer = _onOffer;
         this.statusChanged = new async_1.Event();
         this.commandTrace = new async_1.Event();
-        this.peerCandidatesChanged = new async_1.Event();
-        this.onSignal = new async_1.Event();
+        this.swarmEvent = new async_1.Event();
+        this.onMessage = new async_1.Event();
+        state.swarmEvent.on(data => this.swarmEvent.emit(data));
     }
     getStatus() {
         return [];
@@ -27,26 +28,45 @@ class InMemorySignalManager {
         }
         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, peerId) {
         if (!state.swarms.has(topic)) {
             state.swarms.set(topic, new util_1.ComplexSet(x => x.toHex()));
         }
         state.swarms.get(topic).delete(peerId);
-    }
-    lookup(topic) {
-        setTimeout(() => this.peerCandidatesChanged.emit([topic, Array.from(state.swarms.get(topic).values())]), 0);
+        const swarmEvent = {
+            peerLeft: {
+                peer: peerId.asUint8Array()
+            }
+        };
+        state.swarmEvent.emit([topic, swarmEvent]);
     }
     offer(msg) {
         (0, node_assert_1.default)(msg.remoteId);
         (0, node_assert_1.default)(state.connections.has(msg.remoteId), 'Peer not connected');
         return state.connections.get(msg.remoteId)._onOffer(msg);
     }
-    async signal(msg) {
+    async message(msg) {
         (0, node_assert_1.default)(msg.remoteId);
         (0, node_assert_1.default)(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() { }
 }
@@ -54,6 +74,7 @@ exports.InMemorySignalManager = InMemorySignalManager;
 // TODO(burdon): Remove global singleton.
 // This is global state for the in-memory signal manager.
 const state = {
+    swarmEvent: new async_1.Event(),
     // Mapping from topic to set of peers.
     swarms: new util_1.ComplexMap(x => x.toHex()),
     // Map of connections for each peer for signaling.

package/dist/src/signal/in-memory-signal-manager.js.map

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

package/dist/src/signal/index.d.ts

@@ -2,6 +2,5 @@ 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';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/signal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/signal/index.ts"],"names":[],"mappings":"AAIA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/signal/index.ts"],"names":[],"mappings":"AAIA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}

package/dist/src/signal/index.js

@@ -21,6 +21,5 @@ __exportStar(require("./in-memory-signal-manager"), exports);
 __exportStar(require("./signal-api"), exports);
 __exportStar(require("./signal-client"), exports);
 __exportStar(require("./signal-manager"), exports);
-__exportStar(require("./websocket-rpc"), exports);
-__exportStar(require("./websocket-signal-manager"), exports);
+__exportStar(require("./signal-manager-impl"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/signal/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/signal/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,6DAA2C;AAC3C,+CAA6B;AAC7B,kDAAgC;AAChC,mDAAiC;AACjC,kDAAgC;AAChC,6DAA2C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/signal/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,6DAA2C;AAC3C,+CAA6B;AAC7B,kDAAgC;AAChC,mDAAiC;AACjC,wDAAsC"}

package/dist/src/signal/integration.test.d.ts

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

package/dist/src/signal/integration.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"integration.test.d.ts","sourceRoot":"","sources":["../../../src/signal/integration.test.ts"],"names":[],"mappings":""}

package/dist/src/signal/integration.test.js

@@ -0,0 +1,102 @@
+"use strict";
+//
+// Copyright 2022 DXOS.org
+//
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const earljs_1 = require("earljs");
+const wait_for_expect_1 = __importDefault(require("wait-for-expect"));
+const protocols_1 = require("@dxos/protocols");
+const signal_1 = require("@dxos/signal");
+const testutils_1 = require("@dxos/testutils");
+const message_router_1 = require("./message-router");
+const signal_manager_impl_1 = require("./signal-manager-impl");
+describe('Signal Integration Test', () => {
+    let broker;
+    before(async () => {
+        broker = await (0, signal_1.createTestBroker)();
+    });
+    after(() => {
+        broker.stop();
+    });
+    const setup = () => {
+        const signalManager = new signal_manager_impl_1.SignalManagerImpl([broker.url()]);
+        signalManager.onMessage.on(msg => messageRouter.receiveMessage(msg));
+        const signalMock = (0, earljs_1.mockFn)().resolvesTo();
+        const messageRouter = new message_router_1.MessageRouter({
+            sendMessage: msg => signalManager.message(msg),
+            onSignal: signalMock,
+            onOffer: async () => ({ accept: true })
+        });
+        (0, testutils_1.afterTest)(() => messageRouter.destroy());
+        return {
+            signalManager,
+            signalMock,
+            messageRouter
+        };
+    };
+    it('two peers connecting', async () => {
+        const peerNetworking1 = setup();
+        const peerNetworking2 = setup();
+        const peer1 = protocols_1.PublicKey.random();
+        const peer2 = protocols_1.PublicKey.random();
+        const topic = protocols_1.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;
+        (0, earljs_1.expect)(await peerNetworking1.messageRouter.offer({
+            topic,
+            id: peer1,
+            remoteId: peer2,
+            sessionId: protocols_1.PublicKey.random(),
+            data: {
+                offer: {}
+            }
+        })).toBeAnObjectWith({ accept: true });
+        (0, earljs_1.expect)(await peerNetworking2.messageRouter.offer({
+            topic,
+            id: peer2,
+            remoteId: peer1,
+            sessionId: protocols_1.PublicKey.random(),
+            data: {
+                offer: {}
+            }
+        })).toBeAnObjectWith({ accept: true });
+        {
+            const message = {
+                topic,
+                id: peer1,
+                remoteId: peer2,
+                sessionId: protocols_1.PublicKey.random(),
+                data: {
+                    signal: { json: JSON.stringify({ 'foo': 'bar' }) }
+                }
+            };
+            await peerNetworking1.messageRouter.signal(message);
+            await (0, wait_for_expect_1.default)(() => {
+                (0, earljs_1.expect)(peerNetworking2.signalMock).toHaveBeenCalledWith([message]);
+            });
+        }
+        {
+            const message = {
+                topic,
+                id: peer2,
+                remoteId: peer1,
+                sessionId: protocols_1.PublicKey.random(),
+                data: {
+                    signal: { json: JSON.stringify({ 'foo': 'bar' }) }
+                }
+            };
+            await peerNetworking2.messageRouter.signal(message);
+            await (0, wait_for_expect_1.default)(() => {
+                (0, earljs_1.expect)(peerNetworking1.signalMock).toHaveBeenCalledWith([message]);
+            });
+        }
+    });
+});
+//# sourceMappingURL=integration.test.js.map

package/dist/src/signal/integration.test.js.map

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

package/dist/src/signal/message-router.d.ts

@@ -1,9 +1,9 @@
-import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
+import { Answer, SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 import { SignalMessaging } from './signal-manager';
 interface MessageRouterOptions {
-    onSignal?: (message: Message) => Promise<void>;
-    sendMessage?: (message: Message) => Promise<void>;
-    onOffer?: (message: Message) => Promise<Answer>;
+    sendMessage?: (message: SignalMessage) => Promise<void>;
+    onOffer?: (message: SignalMessage) => Promise<Answer>;
+    onSignal?: (message: SignalMessage) => Promise<void>;
     retryDelay?: number;
     timeout?: number;
 }
@@ -21,9 +21,9 @@ export declare class MessageRouter implements SignalMessaging {
     private readonly _timeout;
     private readonly _subscriptions;
     constructor({ sendMessage, onSignal, onOffer, retryDelay, timeout }?: MessageRouterOptions);
-    receiveMessage(message: Message): Promise<void>;
-    signal(message: Message): Promise<void>;
-    offer(message: Message): Promise<Answer>;
+    receiveMessage(message: SignalMessage): Promise<void>;
+    signal(message: SignalMessage): Promise<void>;
+    offer(message: SignalMessage): Promise<Answer>;
     private _sendReliableMessage;
     private _resolveAnswers;
     private _handleOffer;

package/dist/src/signal/message-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-router.d.ts","sourceRoot":"","sources":["../../../src/signal/message-router.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOnD,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAGD;;GAEG;AAEH,qBAAa,aAAc,YAAW,eAAe;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0E;IACxG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;IAChE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsC;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwC;IAEjE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6D;IAC7F,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiD;IACnF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2B;gBAE7C,EACX,WAAW,EACX,QAAQ,EACR,OAAO,EACP,UAAgB,EAChB,OAAc,EACf,GAAE,oBAAyB;IAWtB,cAAc,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBhD,MAAM,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxC,KAAK,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;YASjC,oBAAoB;YA8BpB,eAAe;YAWf,YAAY;YAaZ,aAAa;YAKb,sBAAsB;YAKtB,oBAAoB;IAalC,OAAO,IAAK,IAAI;CAGjB"}
+{"version":3,"file":"message-router.d.ts","sourceRoot":"","sources":["../../../src/signal/message-router.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOnD,UAAU,oBAAoB;IAC5B,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAGD;;GAEG;AAEH,qBAAa,aAAc,YAAW,eAAe;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0E;IACxG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4C;IACzE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8C;IAEvE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6D;IAC7F,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiD;IACnF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2B;gBAE7C,EACX,WAAW,EACX,QAAQ,EACR,OAAO,EACP,UAAgB,EAChB,OAAc,EACf,GAAE,oBAAyB;IAWtB,cAAc,CAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBtD,MAAM,CAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9C,KAAK,CAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;YASvC,oBAAoB;YAkCpB,eAAe;YAWf,YAAY;YAaZ,aAAa;YAKb,sBAAsB;YAKtB,oBAAoB;IAalC,OAAO,IAAK,IAAI;CAGjB"}

package/dist/src/signal/message-router.js

@@ -75,7 +75,12 @@ class MessageRouter {
         // Setting retry interval if signal was not acknowledged.
         const cancelRetry = (0, util_1.exponentialBackoffInterval)(async () => {
             log(`retrying message: ${JSON.stringify(message)}`);
-            await this._sendMessage(message);
+            try {
+                await this._sendMessage(message);
+            }
+            catch (error) {
+                log(`ERROR failed to send message: ${error}`);
+            }
         }, this._retryDelay);
         const timeout = setTimeout(() => {
             log('Signal was not delivered!');

package/dist/src/signal/message-router.js.map

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