From 1023b72fe7af749d9d33c9ae8ed275a5443829a8 Mon Sep 17 00:00:00 2001 From: Maciej Hirsz <1096222+maciejhirsz@users.noreply.github.com> Date: Wed, 6 Mar 2019 16:08:55 +0100 Subject: [PATCH] Remove debug logging (#119) --- packages/backend/src/Node.ts | 19 +++++++++++-------- packages/backend/src/index.ts | 4 ++-- packages/backend/src/message.ts | 1 + packages/common/src/index.ts | 2 +- packages/common/src/types.ts | 3 ++- packages/frontend/src/App.tsx | 1 + packages/frontend/src/components/List/Row.tsx | 8 ++++++++ packages/frontend/src/icons/fingerprint.svg | 1 + packages/frontend/src/state.ts | 5 ++++- 9 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 packages/frontend/src/icons/fingerprint.svg diff --git a/packages/backend/src/Node.ts b/packages/backend/src/Node.ts index 5f957d4..587b02f 100644 --- a/packages/backend/src/Node.ts +++ b/packages/backend/src/Node.ts @@ -26,6 +26,7 @@ export default class Node { public readonly implementation: Types.NodeImplementation; public readonly version: Types.NodeVersion; public readonly address: Maybe; + public readonly networkId: Maybe; public readonly authority: boolean; public readonly events = new EventEmitter() as EventEmitter & NodeEvents; @@ -64,6 +65,7 @@ export default class Node { implentation: Types.NodeImplementation, version: Types.NodeVersion, address: Maybe, + networkId: Maybe, authority: boolean, messages: Array, ) { @@ -76,6 +78,7 @@ export default class Node { this.version = version; this.address = address; this.authority = authority; + this.networkId = networkId; this.lastMessage = timestamp(); this.socket = socket; @@ -143,9 +146,9 @@ export default class Node { if (message.msg === "system.connected") { cleanup(); - const { name, chain, config, implementation, version, pubkey, authority } = message; + const { name, chain, config, implementation, version, pubkey, authority, network_id: networkId } = message; - resolve(new Node(ip, socket, name, chain, config, implementation, version, pubkey, authority === true, messages)); + resolve(new Node(ip, socket, name, chain, config, implementation, version, pubkey, networkId, authority === true, messages)); } else { if (messages.length === 10) { messages.shift(); @@ -179,7 +182,7 @@ export default class Node { public nodeDetails(): Types.NodeDetails { const authority = this.authority ? this.address : null; - return [this.name, this.implementation, this.version, authority]; + return [this.name, this.implementation, this.version, authority, this.networkId]; } public nodeStats(): Types.NodeStats { @@ -235,11 +238,11 @@ export default class Node { } private onSystemInterval(message: SystemInterval) { - const { - peers, - txcount, - cpu, - memory, + const { + peers, + txcount, + cpu, + memory, bandwidth_download: download, bandwidth_upload: upload, finalized_height: finalized, diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index 65e19ca..7f2826e 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -3,8 +3,8 @@ import Node from './Node'; import Feed from './Feed'; import Aggregator from './Aggregator'; -const WS_PORT_TELEMETRY_SERVER = process.env.TELEMETRY_SERVER || 1024; -const WS_PORT_FEED_SERVER = process.env.FEED_SERVER || 8080; +const WS_PORT_TELEMETRY_SERVER = Number(process.env.TELEMETRY_SERVER || 1024); +const WS_PORT_FEED_SERVER = Number(process.env.FEED_SERVER || 8080); const aggregator = new Aggregator(); diff --git a/packages/backend/src/message.ts b/packages/backend/src/message.ts index 6621728..1a1d41d 100644 --- a/packages/backend/src/message.ts +++ b/packages/backend/src/message.ts @@ -48,6 +48,7 @@ export interface SystemConnected { version: Types.NodeVersion; pubkey: Maybe; authority: Maybe; + network_id: Maybe; } export interface SystemInterval extends BestBlock { diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 11bfd15..9556cda 100644 --- a/packages/common/src/index.ts +++ b/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 = 21 as Types.FeedVersion; +export const VERSION: Types.FeedVersion = 22 as Types.FeedVersion; diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts index e28a2cf..4e9025a 100644 --- a/packages/common/src/types.ts +++ b/packages/common/src/types.ts @@ -23,9 +23,10 @@ export type City = Opaque; export type MemoryUse = Opaque; export type CPUUse = Opaque; export type BytesPerSecond = Opaque; +export type NetworkId = Opaque; export type BlockDetails = [BlockNumber, BlockHash, Milliseconds, Timestamp, Maybe]; -export type NodeDetails = [NodeName, NodeImplementation, NodeVersion, Maybe
]; +export type NodeDetails = [NodeName, NodeImplementation, NodeVersion, Maybe
, Maybe]; export type NodeStats = [PeerCount, TransactionCount]; export type NodeHardware = [Array, Array, Array, Array, Array]; export type NodeLocation = [Latitude, Longitude, City]; diff --git a/packages/frontend/src/App.tsx b/packages/frontend/src/App.tsx index d2ca238..2160e01 100644 --- a/packages/frontend/src/App.tsx +++ b/packages/frontend/src/App.tsx @@ -22,6 +22,7 @@ export default class App extends React.Component<{}, State> { validator: true, location: true, implementation: true, + networkId: false, peers: true, txs: true, cpu: true, diff --git a/packages/frontend/src/components/List/Row.tsx b/packages/frontend/src/components/List/Row.tsx index 6cb7030..eacacaf 100644 --- a/packages/frontend/src/components/List/Row.tsx +++ b/packages/frontend/src/components/List/Row.tsx @@ -11,6 +11,7 @@ import nodeIcon from '../../icons/server.svg'; import nodeLocationIcon from '../../icons/location.svg'; import nodeValidatorIcon from '../../icons/shield.svg'; import nodeTypeIcon from '../../icons/terminal.svg'; +import networkIdIcon from '../../icons/fingerprint.svg'; import peersIcon from '../../icons/broadcast.svg'; import transactionsIcon from '../../icons/inbox.svg'; import blockIcon from '../../icons/package.svg'; @@ -150,6 +151,13 @@ export class Row extends React.Component { ); } }, + { + label: 'Network ID', + icon: networkIdIcon, + width: 90, + setting: 'networkId', + render: ({ networkId }) => networkId ? : '-' + }, { label: 'Peer Count', icon: peersIcon, diff --git a/packages/frontend/src/icons/fingerprint.svg b/packages/frontend/src/icons/fingerprint.svg new file mode 100644 index 0000000..b289079 --- /dev/null +++ b/packages/frontend/src/icons/fingerprint.svg @@ -0,0 +1 @@ + diff --git a/packages/frontend/src/state.ts b/packages/frontend/src/state.ts index 28c42ce..f51f9f4 100644 --- a/packages/frontend/src/state.ts +++ b/packages/frontend/src/state.ts @@ -23,6 +23,7 @@ export class Node { public readonly implementation: Types.NodeImplementation; public readonly version: Types.NodeVersion; public readonly validator: Maybe; + public readonly networkId: Maybe; public pinned: boolean; public peers: Types.PeerCount; @@ -57,7 +58,7 @@ export class Node { blockDetails: Types.BlockDetails, location: Maybe ) { - const [name, implementation, version, validator] = nodeDetails; + const [name, implementation, version, validator, networkId] = nodeDetails; this.pinned = pinned; @@ -66,6 +67,7 @@ export class Node { this.implementation = implementation; this.version = version; this.validator = validator; + this.networkId = networkId; this.updateStats(nodeStats); this.updateHardware(nodeHardware); @@ -158,6 +160,7 @@ export namespace State { location: boolean; validator: boolean; implementation: boolean; + networkId: boolean; peers: boolean; txs: boolean; cpu: boolean;