Merge pull request #152 from casper-network/fix/fixes-for-middleware

Disabled peers details, performance fixes
casper-network · Jan 30, 2023 · 671614b · 671614b
2 parents f7e2e85 + 766d674
commit 671614b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 53 deletions.
diff --git a/frontend/src/api/middleware.ts b/frontend/src/api/middleware.ts
@@ -165,9 +165,9 @@ export interface GetPeers {
 export interface Peer {
   nodeId: string;
   address: string;
-  uptime: string;
-  isAlive: boolean;
-  lastAddedBlockHash: string;
+  uptime?: string;
+  isAlive?: boolean;
+  lastAddedBlockHash?: string;
 }
 export interface GetBlocks {
   blocks: Block[];

diff --git a/frontend/src/components/tables/PeerTable/PeerTable.tsx b/frontend/src/components/tables/PeerTable/PeerTable.tsx
@@ -1,12 +1,10 @@
 import React, { useMemo } from 'react';
-import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import styled from '@emotion/styled';
 import { ColumnDef } from '@tanstack/react-table';
 import { colors, fontWeight } from 'src/styled-theme';
 import { Peer } from '../../../api';
 import { Table } from '../../base';
-import { truncateHash } from '../../../utils';
 
 interface PeerTableProps {
   readonly peers: Peer[];
@@ -26,36 +24,6 @@ export const PeerTable: React.FC<PeerTableProps> = ({ peers }) => {
         accessorKey: 'address',
         enableSorting: false,
       },
-      {
-        header: `${t('uptime')}`,
-        accessorKey: 'uptime',
-        enableSorting: false,
-      },
-      {
-        header: `${t('last-block-hash')}`,
-        accessorKey: 'lastAddedBlockHash',
-        enableSorting: false,
-        cell: ({ getValue }) => (
-          <div className="flex flex-row items-center">
-            <Link
-              to={{
-                pathname: `/block/${getValue<string>()}`,
-              }}>
-              {truncateHash(getValue<string>())}
-            </Link>
-          </div>
-        ),
-      },
-      {
-        header: `${t('is-alive')}`,
-        accessorKey: 'isAlive',
-        enableSorting: false,
-        cell: ({ getValue }) => (
-          <div className="flex flex-row items-center">
-            {getValue<boolean>() ? t('up') : t('down')}
-          </div>
-        ),
-      },
     ],
     [t],
   );

diff --git a/middleware/CHANGELOG.md b/middleware/CHANGELOG.md
@@ -10,8 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Support for SSE Sidecar (`SIDECAR_REST_URL` & `SIDECAR_EVENTSTREAM_URL` required to enable it)
-- New `/peers` endpoint providing peers statuses (hash of last added block, uptime, ip)
-- New endpoints: `/latest-block`, `/block/:hashOrHeight`, `/status`, `/blocks`, `/deploy/:hash`, `/account/:accountHashOrPublicKey`
+- New endpoints: `/peers`, `/latest-block`, `/block/:hashOrHeight`, `/status`, `/blocks`, `/deploy/:hash`, `/account/:accountHashOrPublicKey`
 - When it's possible, all of the endpoint support both Sidecar as well as RPC
 - Added cache so number of RPC request is minimized
 

diff --git a/middleware/src/routes/index.ts b/middleware/src/routes/index.ts
@@ -40,8 +40,9 @@ router.use("/rpc", (req, res) => {
     axios
       .post(node.url, req.body)
       .then((nodeRes) => res.json(nodeRes.data))
-      .catch(() => {
-        nodeManager.setDeadNode(node.id);
+      .catch((err) => {
+        console.log('>>>>>setDeadNode', err);
+        // nodeManager.setDeadNode(node.id);
         rpcCall();
       });
   };

diff --git a/middleware/src/services/peers.ts b/middleware/src/services/peers.ts
@@ -3,7 +3,7 @@ import { StatusCodes } from "http-status-codes";
 
 import { Peer } from "../types";
 import { ApiError } from "../utils";
-import { getPeers, setPeers } from "./cache";
+import { setPeers } from "./cache";
 import { nodeManager } from "./node-manager";
 
 export const fetchPeerInfo = async (ip: string) => {
@@ -31,11 +31,6 @@ export const fetchPeerInfo = async (ip: string) => {
 };
 
 export const fetchPeers = async (update = false): Promise<Peer[]> => {
-  const existPeers = getPeers();
-  if (existPeers && !update) {
-    return existPeers;
-  }
-
   const rpcCall = async () => {
     const activeNode = nodeManager.getActiveNode();
     try {
@@ -58,14 +53,16 @@ export const fetchPeers = async (update = false): Promise<Peer[]> => {
   const peers: Peer[] = await Promise.all(
     peersToCheck.map(async (peer) => {
       const { node_id: nodeId, address } = peer;
-      const info = await fetchPeerInfo(peer.address.split(":")[0]);
-      return { nodeId, address, ...info };
+      return { nodeId, address };
     })
   );
 
+
   if (update) {
     console.log("Force update peer list");
   }
+
   setPeers(peers);
+
   return peers;
 };
diff --git a/middleware/src/services/rpc-client.ts b/middleware/src/services/rpc-client.ts
@@ -77,21 +77,24 @@ export class RpcClient {
     const targetBlock =
       orderByHeight === "DESC" ? fromBlock - count : fromBlock + count;
 
-    const blocks: Block[] = [];
+    const blockPromises: Promise<Block>[] = [];
 
     for (
       let i = fromBlock;
       orderByHeight === "DESC" ? i > targetBlock : i < targetBlock;
       orderByHeight === "DESC" ? i-- : i++
     ) {
       try {
-        const block = await this.getBlockByHeight(i);
-        blocks.push(block);
+        const block = this.getBlockByHeight(i);
+        blockPromises.push(block);
       } catch (error) {
+        console.log("ERROR", error);
         break;
       }
     }
 
+    const blocks = await Promise.all(blockPromises);
+
     latestBlockHeight = (await this.getLatestBlock()).header.height;
 
     const total = latestBlockHeight + 1;

diff --git a/middleware/src/types/node-status-response.ts b/middleware/src/types/node-status-response.ts
@@ -7,7 +7,7 @@ export interface StatusResponse {
 export interface Peer {
   nodeId: string;
   address: string;
-  isAlive: boolean | null;
-  uptime: string | null;
-  lastAddedBlockHash: string | null;
+  isAlive?: boolean | null;
+  uptime?: string | null;
+  lastAddedBlockHash?: string | null;
 }