From 4a48a6eecfd0d22afd233c75d097fdfea6e218ef Mon Sep 17 00:00:00 2001
From: Maciej Hirsz <1096222+maciejhirsz@users.noreply.github.com>
Date: Tue, 14 May 2019 15:19:00 +0200
Subject: [PATCH] fix: Stringify network state on demand (#146)

---
 packages/backend/src/index.ts | 6 ++++--
 packages/common/src/types.ts  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 4d14245..04434d3 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -62,9 +62,11 @@ http.createServer((request, response) => {
       const nodeList = Array.from(chain.nodeList());
       const nodeId = Number(strNodeId);
       const node = nodeList.filter((node) => node.id == nodeId)[0];
-      if (node && typeof node.networkState === 'string') {
+      if (node && node.networkState) {
+        const { networkState } = node;
+
         response.writeHead(200, {"Content-Type": "application/json"});
-        response.write(node.networkState);
+        response.write(typeof networkState === 'string' ? networkState : JSON.stringify(networkState));
       } else {
         response.writeHead(404, {"Content-Type": "text/plain"});
         response.write("Node has disconnected or has not submitted its network state yet");
diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
index 7c2e34b..d071130 100644
--- a/packages/common/src/types.ts
+++ b/packages/common/src/types.ts
@@ -24,7 +24,7 @@ export type MemoryUse = Opaque<number, 'MemoryUse'>;
 export type CPUUse = Opaque<number, 'CPUUse'>;
 export type BytesPerSecond = Opaque<number, 'BytesPerSecond'>;
 export type NetworkId = Opaque<string, 'NetworkId'>;
-export type NetworkState = Opaque<string, 'NetworkState'>;
+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>];