Wire up peer handing in PeerServer

Going to be a heck fo a stack trace if it crashes though.....

Agent → .... → PeerServer → Peer → Connection → FramedTransport → { 
rekey, StreamHelpers }
This commit is contained in:
Starbeamrainbowlabs 2021-10-19 02:36:22 +01:00
parent 32dec3049f
commit cf7451dcf2
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
3 changed files with 85 additions and 13 deletions

View file

@ -26,7 +26,12 @@ class Peer extends EventEmitter {
*/ */
this.connection = connection; this.connection = connection;
// Fetch the remote's id /**
* A list of other peers known to this peer.
* May or may not actually be up to date.
* @type {{address:string,port:number}[]}
*/
this.known_peers = [];
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -34,7 +39,7 @@ class Peer extends EventEmitter {
/** /**
* Accepts an existing connection as a new Peer. * Accepts an existing connection as a new Peer.
* @param {Connection} connection The Connection to accept. * @param {Connection} connection The Connection to accept.
* @return {Promise} A Promise that resolves once the initial handshake is complete. * @return {Promise<HelloMsg>} A Promise that resolves once the initial handshake is complete.
*/ */
async __accept(connection) { async __accept(connection) {
this.connection = connection; this.connection = connection;
@ -46,18 +51,18 @@ class Peer extends EventEmitter {
/** /**
* Initiates the handshake after opening a new connection. * Initiates the handshake after opening a new connection.
* @return {Promise} A Promise that resolves after the initial peer handshake is complete. * @return {Promise<HelloMsg>} A Promise that resolves after the initial peer handshake is complete.
*/ */
async __initiate() { async __initiate() {
await this.__send_hello(); await this.__send_hello();
const [ msg ] = await once(this.connection, "message-hello"); const [ msg ] = await once(this.connection, "message-hello");
this.__handle_hello(msg); this.__handle_hello(msg);
this.emit("connect"); this.emit("connect");
} }
__handle_hello(msg) { __handle_hello(msg) {
this.id = msg.id; this.id = msg.id;
this.known_peers = msg.peers;
} }
async __send_hello() { async __send_hello() {
@ -80,11 +85,14 @@ Peer.Initiate = function(server, address, port) {
const conn = await Connection.Create(server.secret_join, address, port); const conn = await Connection.Create(server.secret_join, address, port);
const peer = new Peer(server, conn); const peer = new Peer(server, conn);
await peer.__initiate(); await peer.__initiate();
return peer;
} }
Peer.Accept = function(server, connection) { Peer.Accept = function(server, connection) {
const peer = new Peer(server); const peer = new Peer(server);
await peer.__accept(connection); await peer.__accept(connection);
return peer;
} }
export default Peer; export default Peer;

View file

@ -4,16 +4,19 @@ import { EventEmitter, once } from 'events';
import net from 'net'; import net from 'net';
import Connection from '../transport/Connection.mjs'; import Connection from '../transport/Connection.mjs';
import ErrorWrapper from '../core/ErrorWrapper.mjs';
import Peer from './Peer.mjs'; import Peer from './Peer.mjs';
class PeerServer extends EventEmitter { class PeerServer extends EventEmitter {
constructor(our_id) { constructor(our_id, secret_join) {
super(); super();
this.our_id = our_id; this.our_id = our_id;
this.secret_join = secret_join;
this.peers = []; this.connected_peers = [];
this.connecting_peers = [];
} }
/** /**
@ -46,8 +49,8 @@ class PeerServer extends EventEmitter {
} }
async handle_client(client) { async handle_client(client) {
const peer = new Peer(this, await Connection.Wrap(client)); const peer = await Peer.Accept(this, await Connection.Wrap(this.secret_join, client));
this.peers.push(peer); this.connected_peers.push(peer);
peer.on("message", this.handle_message.bind(this, peer)); peer.on("message", this.handle_message.bind(this, peer));
peer.on("destroy", this.handle_destroy.bind(this, peer)); peer.on("destroy", this.handle_destroy.bind(this, peer));
await once(peer, "connect"); await once(peer, "connect");
@ -59,9 +62,9 @@ class PeerServer extends EventEmitter {
} }
async handle_destroy(peer) { async handle_destroy(peer) {
const index = this.peers.indexOf(peer); const index = this.connected_peers.indexOf(peer);
if(index > -1) if(index > -1)
this.peers.splice(index, 1); this.connected_peers.splice(index, 1);
this.emit("disconnect", peer.remote_endpoint); this.emit("disconnect", peer.remote_endpoint);
} }
@ -70,11 +73,58 @@ class PeerServer extends EventEmitter {
* Returns a list of all currently known peer addresses. * Returns a list of all currently known peer addresses.
* @return {{address:string,port:number}[]} * @return {{address:string,port:number}[]}
*/ */
peer() { peers() {
return this.peers.map((peer) => peer.remote_endpoint) return this.connected_peers.map((peer) => peer.remote_endpoint)
.filter(el => typeof el.addr === "string" && typeof el.port === "number"); .filter(el => typeof el.addr === "string" && typeof el.port === "number");
} }
/**
* Processes a list of peers.
* New connections are established to any peers in the list to which
* we don't already have a connection.
* Note that this function does NOT connect to any other peers known to the
* peers in the list you've specified! You need to do this manually.
* @param {...{address: string, port: number}} new_peers The list of new peers to process.
* @returns {Promise<Peer[]>} A list of new peers to which we have successfully established a connection.
*/
async add_peers(...new_peers) {
return (await Promise.all(new_peers.map(async new_peer => this.add_peer(
new_peer.address,
new_peer.port
)))).filter(peer => peer instanceof Peer);
}
/**
* Connects to a new peer and adds them to the pool of currently connected peers.
* Note: This does NOT automatically connect to all the peers known to the
* peer you're connecting to!
* You need to do this manually.
* @throws {ErrorWrapper} Throws if the connection failed. This could be for a large number of different reasons, from an incorrect join secret from the remote to connection issues.
* @param {string} address The address to connect to.
* @param {number} port The port number to connect to.
* @return {Promise<Peer|null>} A Promise that resolves to the resulting Peer connection, or null if the connection wasn't attemped.
*/
async add_peer(address, port) {
if(this.peers().some(el => el.address === address && el.port === port))
return;
const peer_string = `peer:${address}:${port}`;
this.connecting_peers.push(peer_string);
let conn;
try {
conn = await Peer.Initiate(this, address, port);
this.connected_peers.push(conn);
}
catch(error) {
throw new ErrorWrapper(`Error: Failed to connect to peer.`, error);
}
finally {
this.connecting_peers.splice(this.connecting_peers.indexOf(peer_string));
}
this.emit(`peer`, conn);
return conn;
}
/** /**
* Shuts the server down. * Shuts the server down.
@ -93,7 +143,7 @@ class PeerServer extends EventEmitter {
*/ */
async destroy() { async destroy() {
await this.shutdown_server(); await this.shutdown_server();
await Promise.all(...this.peers.map(peer => peer.destroy())); await Promise.all(...this.connected_peers.map(peer => peer.destroy()));
} }
} }

View file

@ -0,0 +1,14 @@
"use strict";
class ErrorWrapper extends Error {
constructor(message, inner_exception) {
super(message);
this.inner_exception = inner_exception;
}
toString() {
return `${super.toString()}\n***Inner Exception ***\n${this.inner_exception}`;
}
}
export ErrorWrapper;