From 856153178226e25b1fd9f77624ea4b645ffc3085 Mon Sep 17 00:00:00 2001
From: maciejhirsz <maciej.hirsz@gmail.com>
Date: Wed, 20 Jun 2018 17:14:16 +0200
Subject: [PATCH] Proper aggregator

---
 src/index.ts | 11 ++++-------
 src/node.ts  | 32 +++++++++++++++++++-------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 1dc0aa6..9fc1ade 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,20 +1,17 @@
 import * as WebSocket from 'ws';
 import Node from './node';
+import Aggregator from './aggregator';
 
 const wss = new WebSocket.Server({ port: 1024 });
-const nodes = new WeakSet();
+
+const aggregator = new Aggregator;
 
 wss.on('connection', async (socket: WebSocket) => {
-    let node: Node;
-
     try {
-        node = await Node.fromSocket(socket);
+        aggregator.add(await Node.fromSocket(socket));
     } catch (err) {
         console.error(err);
 
         return;
     }
-
-    nodes.add(node);
-    node.once('disconnect', () => nodes.delete(node));
 });
diff --git a/src/node.ts b/src/node.ts
index 5038483..157e06e 100644
--- a/src/node.ts
+++ b/src/node.ts
@@ -5,21 +5,26 @@ import { parseMessage, getBestBlock, Message, BestBlock } from './message';
 
 const BLOCK_TIME_HISTORY = 10;
 
+let idDispenser = 0;
+
 export default class Node extends EventEmitter {
-    private id: number;
+    public id: number;
+    public name: string;
+    public implementation: string;
+    public version: string;
+    public height: number = 0;
+    public config: string;
+    public latency: number = 0;
+    public blockTime: number = 0;
+
     private socket: WebSocket;
-    private name: string;
-    private config: string;
-    private implementation: string;
-    private version: string;
-    private height: number = 0;
     private blockTimes: Array<number> = new Array(BLOCK_TIME_HISTORY);
-    private lastBlockTime: Maybe<Date> = null;
-    private latency: number = 0;
+    private lastBlockAt: Maybe<Date> = null;
 
     constructor(socket: WebSocket, name: string, config: string, implentation: string, version: string) {
         super();
 
+        this.id = idDispenser++;
         this.socket = socket;
         this.name = name;
         this.config = config;
@@ -86,6 +91,7 @@ export default class Node extends EventEmitter {
     private disconnect() {
         console.log(`${this.name} has disconnected`);
 
+        this.socket.removeAllListeners('message');
         this.emit('disconnect');
     }
 
@@ -100,19 +106,20 @@ export default class Node extends EventEmitter {
             const blockTime = this.getBlockTime(time);
 
             this.height = height;
-            this.lastBlockTime = time;
+            this.lastBlockAt = time;
             this.blockTimes[height % BLOCK_TIME_HISTORY] = blockTime;
+            this.blockTime = blockTime;
 
-            console.log(`Best block for ${this.name} is ${this.height}, block time: ${blockTime / 1000}s, average: ${this.average / 1000}s | latency ${this.latency}`);
+            this.emit('block');
         }
     }
 
     private getBlockTime(time: Date): number {
-        if (!this.lastBlockTime) {
+        if (!this.lastBlockAt) {
             return 0;
         }
 
-        return +time - +this.lastBlockTime;
+        return +time - +this.lastBlockAt;
     }
 
     get average(): number {
@@ -132,5 +139,4 @@ export default class Node extends EventEmitter {
 
         return sum / accounted;
     }
-
 }