Node Uptime (#196)

* fix: node stats updating live
* fix: Propagation time for first node to hit a block
* chore: Leaner feed serialization
* fix: Handle old nodes with stringified network_state
* feat: Add Node Uptime to the list
* chore: Remove old backend from test pipeline

backend/src/aggregator.rs

@@ -177,7 +177,7 @@ impl Handler<Connect> for Aggregator {
 
         connector.do_send(Connected(fid));
 
-        self.serializer.push(feed::Version(27));
+        self.serializer.push(feed::Version(28));
 
         // TODO: keep track on number of nodes connected to each chain
         for (_, entry) in self.chains.iter() {

backend/src/chain.rs

@@ -182,14 +182,7 @@ impl Handler<AddNode> for Chain {
         if let Err(_) = msg.rec.do_send(Initialize(nid, ctx.address())) {
             self.nodes.remove(nid);
         } else if let Some(node) = self.nodes.get(nid) {
-            self.serializer.push(feed::AddedNode(
+            self.serializer.push(feed::AddedNode(nid, node));
-                nid,
-                node.details(),
-                node.stats(),
-                node.hardware(),
-                node.block_details(),
-                node.location(),
-            ));
             self.broadcast();
         }
 
@@ -222,6 +215,7 @@ impl Handler<UpdateNode> for Chain {
                 self.update_average_block_time(now);
                 self.timestamp = Some(now);
                 self.serializer.push(feed::BestBlock(self.best.height, now, self.average_block_time));
+                propagation_time = Some(0);
             } else if block.height == self.best.height {
                 if let Some(timestamp) = self.timestamp {
                     propagation_time = Some(now - timestamp);
@@ -333,14 +327,7 @@ impl Handler<Subscribe> for Chain {
         self.serializer.push(feed::BestFinalized(self.finalized.height, self.finalized.hash));
 
         for (nid, node) in self.nodes.iter() {
-            self.serializer.push(feed::AddedNode(
+            self.serializer.push(feed::AddedNode(nid, node));
-                nid,
-                node.details(),
-                node.stats(),
-                node.hardware(),
-                node.block_details(),
-                node.location(),
-            ));
             self.serializer.push(feed::FinalizedBlock(nid, node.finalized().height, node.finalized().hash));
             if node.stale() {
                 self.serializer.push(feed::StaleNode(nid));

backend/src/feed.rs

@@ -1,8 +1,10 @@
 use serde::Serialize;
+use serde::ser::{Serializer, SerializeTuple};
+
 use serde_json::to_writer;
+use crate::node::Node;
 use crate::types::{
-    NodeId, NodeDetails, NodeStats, NodeHardware, NodeLocation,
+    NodeId, NodeStats, NodeHardware, BlockNumber, BlockHash, BlockDetails, Timestamp,
-    BlockNumber, BlockHash, BlockDetails, Timestamp,
 };
 
 pub mod connector;
@@ -96,9 +98,7 @@ pub struct BestBlock(pub BlockNumber, pub Timestamp, pub Option<u64>);
 #[derive(Serialize)]
 pub struct BestFinalized(pub BlockNumber, pub BlockHash);
 
-#[derive(Serialize)]
+pub struct AddedNode<'a>(pub NodeId, pub &'a Node);
-pub struct AddedNode<'a>(pub NodeId, pub &'a NodeDetails, pub &'a NodeStats, pub NodeHardware<'a>,
-                         pub &'a BlockDetails, pub Option<&'a NodeLocation>);
 
 #[derive(Serialize)]
 pub struct RemovedNode(pub NodeId);
@@ -116,7 +116,7 @@ pub struct FinalizedBlock(pub NodeId, pub BlockNumber, pub BlockHash);
 pub struct NodeStatsUpdate<'a>(pub NodeId, pub &'a NodeStats);
 
 #[derive(Serialize)]
-pub struct Hardware<'a>(pub NodeId, pub NodeHardware<'a>);
+pub struct Hardware<'a>(pub NodeId, pub &'a NodeHardware);
 
 #[derive(Serialize)]
 pub struct TimeSync(pub u64);
@@ -138,3 +138,21 @@ pub struct Pong<'a>(pub &'a str);
 
 #[derive(Serialize)]
 pub struct StaleNode(pub NodeId);
+
+impl Serialize for AddedNode<'_> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let AddedNode(nid, node) = self;
+        let mut tup = serializer.serialize_tuple(7)?;
+        tup.serialize_element(nid)?;
+        tup.serialize_element(node.details())?;
+        tup.serialize_element(node.stats())?;
+        tup.serialize_element(node.hardware())?;
+        tup.serialize_element(node.block_details())?;
+        tup.serialize_element(&node.location())?;
+        tup.serialize_element(&node.connected_at())?;
+        tup.end()
+    }
+}

backend/src/node.rs

@@ -1,8 +1,8 @@
 use bytes::Bytes;
 use std::sync::Arc;
 
-use crate::types::{NodeId, NodeDetails, NodeStats, NodeHardware, NodeLocation, BlockDetails, Block};
+use crate::types::{NodeId, NodeDetails, NodeStats, NodeHardware, NodeLocation, BlockDetails, Block, Timestamp};
-use crate::util::{MeanList, now};
+use crate::util::now;
 
 pub mod message;
 pub mod connector;
@@ -25,27 +25,22 @@ pub struct Node {
     finalized: Block,
     /// Timer for throttling block updates
     throttle: u64,
-    /// CPU use means
+    /// Hardware stats over time
-    cpu: MeanList<f32>,
+    hardware: NodeHardware,
-    /// Memory use means
-    memory: MeanList<f32>,
-    /// Upload uses means
-    upload: MeanList<f64>,
-    /// Download uses means
-    download: MeanList<f64>,
-    /// Stampchange uses means
-    chart_stamps: MeanList<f64>,
     /// Physical location details
     location: Option<Arc<NodeLocation>>,
     /// Flag marking if the node is stale (not syncing or producing blocks)
     stale: bool,
+    /// Connected at timestamp
+    connected_at: Timestamp,
     /// Network state
-    pub network_state: Option<Bytes>,
+    network_state: Option<Bytes>,
 }
 
 impl Node {
     pub fn new(details: NodeDetails) -> Self {
         Node {
+
             details,
             stats: NodeStats {
                 txcount: 0,
@@ -59,13 +54,10 @@ impl Node {
             },
             finalized: Block::zero(),
             throttle: 0,
-            cpu: MeanList::new(),
+            hardware: NodeHardware::default(),
-            memory: MeanList::new(),
-            upload: MeanList::new(),
-            download: MeanList::new(),
-            chart_stamps: MeanList::new(),
             location: None,
             stale: false,
+            connected_at: now(),
             network_state: None,
         }
     }
@@ -86,14 +78,8 @@ impl Node {
         &self.finalized
     }
 
-    pub fn hardware(&self) -> NodeHardware {
+    pub fn hardware(&self) -> &NodeHardware {
-        (
+        &self.hardware
-            self.memory.slice(),
-            self.cpu.slice(),
-            self.upload.slice(),
-            self.download.slice(),
-            self.chart_stamps.slice(),
-        )
     }
 
     pub fn location(&self) -> Option<&NodeLocation> {
@@ -135,18 +121,18 @@ impl Node {
         let mut changed = false;
 
         if let Some(cpu) = interval.cpu {
-            changed |= self.cpu.push(cpu);
+            changed |= self.hardware.cpu.push(cpu);
         }
         if let Some(memory) = interval.memory {
-            changed |= self.memory.push(memory);
+            changed |= self.hardware.memory.push(memory);
         }
         if let Some(upload) = interval.bandwidth_upload {
-            changed |= self.upload.push(upload);
+            changed |= self.hardware.upload.push(upload);
         }
         if let Some(download) = interval.bandwidth_download {
-            changed |= self.download.push(download);
+            changed |= self.hardware.download.push(download);
         }
-        self.chart_stamps.push(now() as f64);
+        self.hardware.chart_stamps.push(now() as f64);
 
         changed
     }
@@ -196,15 +182,23 @@ impl Node {
         #[derive(Deserialize)]
         struct Wrapper<'a> {
             #[serde(borrow)]
-            state: Option<&'a RawValue>,
+            #[serde(alias = "network_state")]
-            #[serde(borrow)]
+            state: &'a RawValue,
-            network_state: Option<&'a RawValue>,
         }
 
         let raw = self.network_state.as_ref()?;
         let wrap: Wrapper = serde_json::from_slice(raw).ok()?;
-        let state = wrap.state.or(wrap.network_state)?;
+        let json = wrap.state.get();
 
-        Some(state.get().into())
+        // Handle old nodes that exposed network_state as stringified JSON
+        if let Ok(stringified) = serde_json::from_str::<String>(json) {
+            Some(stringified.into())
+        } else {
+            Some(json.into())
+        }
+    }
+
+    pub fn connected_at(&self) -> Timestamp {
+        self.connected_at
     }
 }

backend/src/types.rs

@@ -1,6 +1,8 @@
 use serde::ser::{Serialize, Serializer, SerializeTuple};
 use serde::Deserialize;
 
+use crate::util::MeanList;
+
 pub type NodeId = usize;
 pub type BlockNumber = u64;
 pub type Timestamp = u64;
@@ -36,7 +38,19 @@ pub struct BlockDetails {
     pub propagation_time: Option<u64>,
 }
 
-pub type NodeHardware<'a> = (&'a [f32], &'a [f32], &'a [f64], &'a [f64], &'a [f64]);
+#[derive(Default)]
+pub struct NodeHardware {
+    /// CPU use means
+    pub cpu: MeanList<f32>,
+    /// Memory use means
+    pub memory: MeanList<f32>,
+    /// Upload uses means
+    pub upload: MeanList<f64>,
+    /// Download uses means
+    pub download: MeanList<f64>,
+    /// Stampchange uses means
+    pub chart_stamps: MeanList<f64>,
+}
 
 #[derive(Deserialize, Debug, Clone)]
 pub struct NodeLocation {
@@ -54,9 +68,8 @@ impl Serialize for NodeDetails {
         tup.serialize_element(&self.name)?;
         tup.serialize_element(&self.implementation)?;
         tup.serialize_element(&self.version)?;
-        tup.serialize_element(&self.validator)?; // TODO Maybe<Address>
+        tup.serialize_element(&self.validator)?;
-        tup.serialize_element(&self.network_id)?; // TODO Maybe<NetworkId>
+        tup.serialize_element(&self.network_id)?;
-        tup.serialize_element("")?; // TODO Address
         tup.end()
     }
 }
@@ -100,3 +113,18 @@ impl Serialize for NodeLocation {
         tup.end()
     }
 }
+
+impl Serialize for NodeHardware {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut tup = serializer.serialize_tuple(5)?;
+        tup.serialize_element(self.memory.slice())?;
+        tup.serialize_element(self.cpu.slice())?;
+        tup.serialize_element(self.upload.slice())?;
+        tup.serialize_element(self.download.slice())?;
+        tup.serialize_element(self.chart_stamps.slice())?;
+        tup.end()
+    }
+}

backend/src/util/mean_list.rs

@@ -9,8 +9,11 @@ pub struct MeanList<T> where T: Float + AddAssign + Zero + From<u8> {
     ticks_per_mean: u8,
 }
 
-impl<T> MeanList<T> where T: Float + AddAssign + Zero + From<u8> {
+impl<T> Default for MeanList<T>
-    pub fn new() -> MeanList<T> {
+where
+    T: Float + AddAssign + Zero + From<u8>,
+{
+    fn default() -> MeanList<T> {
         MeanList {
             period_sum: T::zero(),
             period_count: 0,
@@ -19,7 +22,9 @@ impl<T> MeanList<T> where T: Float + AddAssign + Zero + From<u8> {
             ticks_per_mean: 1,
         }
     }
+}
 
+impl<T> MeanList<T> where T: Float + AddAssign + Zero + From<u8> {
     pub fn slice(&self) -> &[T] {
         &self.means[..usize::from(self.mean_index)]
     }

package.json

@@ -13,9 +13,6 @@
     "build:all": "scripts/build-all.sh",
     "start:frontend": "scripts/start-frontend.sh",
     "build:frontend": "scripts/build-frontend.sh",
-    "start:backend": "scripts/start-backend.sh",
-    "build:backend": "scripts/build-backend.sh",
-    "check:backend": "tsc -p packages/backend --noEmit",
     "build:common": "tsc -p packages/common",
     "check:common": "tsc -p packages/common --noEmit",
     "test": "scripts/test.sh"

packages/common/src/feed.ts

@@ -70,7 +70,7 @@ export namespace Variants {
 
   export interface AddedNodeMessage extends MessageBase {
     action: typeof Actions.AddedNode;
-    payload: [NodeId, NodeDetails, NodeStats, NodeHardware, BlockDetails, Maybe<NodeLocation>];
+    payload: [NodeId, NodeDetails, NodeStats, NodeHardware, BlockDetails, Maybe<NodeLocation>, Timestamp];
   }
 
   export interface RemovedNodeMessage extends MessageBase {

packages/common/src/index.ts

@@ -9,4 +9,4 @@ import * as FeedMessage from './feed';
 export { Types, FeedMessage };
 
 // Increment this if breaking changes were made to types in `feed.ts`
-export const VERSION: Types.FeedVersion = 27 as Types.FeedVersion;
+export const VERSION: Types.FeedVersion = 28 as Types.FeedVersion;

packages/common/src/types.ts

@@ -27,7 +27,7 @@ export type NetworkId = Opaque<string, 'NetworkId'>;
 export type NetworkState = Opaque<string | object, 'NetworkState'>;
 
 export type BlockDetails = [BlockNumber, BlockHash, Milliseconds, Timestamp, Maybe<PropagationTime>];
-export type NodeDetails = [NodeName, NodeImplementation, NodeVersion, Maybe<Address>, Maybe<NetworkId>, Address];
+export type NodeDetails = [NodeName, NodeImplementation, NodeVersion, Maybe<Address>, Maybe<NetworkId>];
 export type NodeStats = [PeerCount, TransactionCount];
 export type NodeHardware = [Array<MemoryUse>, Array<CPUUse>, Array<BytesPerSecond>, Array<BytesPerSecond>, Array<Timestamp>];
 export type NodeLocation = [Latitude, Longitude, City];

packages/frontend/src/App.tsx

@@ -39,6 +39,7 @@ export default class App extends React.Component<{}, State> {
         finalizedhash: false,
         blockpropagation: true,
         blocklasttime: false,
+        uptime: false,
         networkstate: false,
       },
       (settings) => this.setState({ settings })

packages/frontend/src/Connection.ts

@@ -159,9 +159,9 @@ export class Connection {
         }
 
         case Actions.AddedNode: {
-          const [id, nodeDetails, nodeStats, nodeHardware, blockDetails, location] = message.payload;
+          const [id, nodeDetails, nodeStats, nodeHardware, blockDetails, location, connectedAt] = message.payload;
           const pinned = this.pins.has(nodeDetails[0]);
-          const node = new Node(pinned, id, nodeDetails, nodeStats, nodeHardware, blockDetails, location);
+          const node = new Node(pinned, id, nodeDetails, nodeStats, nodeHardware, blockDetails, location, connectedAt);
 
           nodes.add(node);
 

packages/frontend/src/components/Ago.tsx

@@ -5,6 +5,7 @@ import { timestamp, Types } from '@dotstats/common';
 export namespace Ago {
   export interface Props {
     when: Types.Timestamp,
+    justTime?: boolean,
   }
 
   export interface State {
@@ -78,6 +79,10 @@ export class Ago extends React.Component<Ago.Props, Ago.State> {
       agoStr = `${ ago / (3600 * 24) | 0}d`;
     }
 
-    return <span title={new Date(this.props.when).toUTCString()}>{agoStr} ago</span>
+    if (this.props.justTime !== true) {
+      agoStr += ' ago';
+    }
+
+    return <span title={new Date(this.props.when).toUTCString()}>{agoStr}</span>
   }
 }

packages/frontend/src/components/Consensus/Consensus.tsx

@@ -233,7 +233,7 @@ export class Consensus extends React.Component<Consensus.Props, {}> {
     }
 
     return this.props.appState.authorities.map(address => {
-      const node2 = this.props.appState.nodes.sorted().filter(node => node.address === address)[0];
+      const node2 = this.props.appState.nodes.sorted().filter(node => node.validator === address)[0];
       if (!node2) {
         return {Address: address, NodeId: null, Name: null} as Types.Authority;
       }

packages/frontend/src/components/List/Row.tsx

@@ -24,6 +24,7 @@ import memoryIcon from '../../icons/memory-solid.svg';
 import uploadIcon from '../../icons/cloud-upload.svg';
 import downloadIcon from '../../icons/cloud-download.svg';
 import networkIcon from '../../icons/network.svg';
+import uptimeIcon from '../../icons/pulse.svg';
 import externalLinkIcon from '../../icons/link-external.svg';
 
 import parityPolkadotIcon from '../../icons/dot.svg';
@@ -305,6 +306,13 @@ export class Row extends React.Component<Row.Props, Row.State> {
       setting: 'blocklasttime',
       render: ({ blockTimestamp }) => <Ago when={blockTimestamp} />
     },
+    {
+      label: 'Node Uptime',
+      icon: uptimeIcon,
+      width: 58,
+      setting: 'uptime',
+      render: ({ connectedAt }) => <Ago when={connectedAt} justTime={true} />
+    },
     {
       label: 'NetworkState',
       icon: networkIcon,

packages/frontend/src/state.ts

@@ -24,12 +24,12 @@ export class Node {
   }
 
   public readonly id: Types.NodeId;
-  public readonly address: Types.Address;
   public readonly name: Types.NodeName;
   public readonly implementation: Types.NodeImplementation;
   public readonly version: Types.NodeVersion;
   public readonly validator: Maybe<Types.Address>;
   public readonly networkId: Maybe<Types.NetworkId>;
+  public readonly connectedAt: Types.Timestamp;
 
   public stale: boolean;
   public pinned: boolean;
@@ -64,19 +64,20 @@ export class Node {
     nodeStats: Types.NodeStats,
     nodeHardware: Types.NodeHardware,
     blockDetails: Types.BlockDetails,
-    location: Maybe<Types.NodeLocation>
+    location: Maybe<Types.NodeLocation>,
+    connectedAt: Types.Timestamp,
   ) {
-    const [name, implementation, version, validator, networkId, address] = nodeDetails;
+    const [name, implementation, version, validator, networkId] = nodeDetails;
 
     this.pinned = pinned;
 
     this.id = id;
     this.name = name;
-    this.address = address;
     this.implementation = implementation;
     this.version = version;
     this.validator = validator;
     this.networkId = networkId;
+    this.connectedAt = connectedAt;
 
     this.updateStats(nodeStats);
     this.updateHardware(nodeHardware);
@@ -199,6 +200,7 @@ export namespace State {
     blocktime: boolean;
     blockpropagation: boolean;
     blocklasttime: boolean;
+    uptime: boolean;
     networkstate: boolean;
   }
 }

scripts/build-all.sh

@@ -1 +1 @@
-yarn build:common && yarn build:backend && yarn build:frontend
+yarn build:common && yarn build:frontend

scripts/build-backend.sh

@@ -1 +0,0 @@
-tsc -p packages/backend

scripts/start-backend.sh

@@ -1,3 +0,0 @@
-scripts/build-common.sh
-scripts/build-backend.sh
-node packages/backend/build/index.js

scripts/test.sh

@@ -1 +1 @@
-yarn && tsc -p packages/common && tsc -p packages/backend && node packages/common/test | tap-spec && cd packages/backend && yarn test && cd ../frontend && yarn test && cd ../../
+yarn && tsc -p packages/common && node packages/common/test | tap-spec && cd packages/frontend && yarn test && cd ../../