From 88668ae9f5578aad06e3502577f81150178d0755 Mon Sep 17 00:00:00 2001
From: "ildar.timerbaev" <dkildar@gmail.com>
Date: Tue, 21 Nov 2023 20:53:05 +0600
Subject: [PATCH 1/6] Added an example of server selection by latency

---
 src/common/app.tsx                          | 184 +++++++++++---------
 src/common/core/core-provider.tsx           |  42 +++++
 src/common/core/hive/get-request-latency.ts |  16 ++
 src/common/core/hive/hive-client-query.ts   |  42 +++++
 src/common/core/hive/index.ts               |   2 +
 src/common/core/index.ts                    |   1 +
 6 files changed, 201 insertions(+), 86 deletions(-)
 create mode 100644 src/common/core/core-provider.tsx
 create mode 100644 src/common/core/hive/get-request-latency.ts
 create mode 100644 src/common/core/hive/hive-client-query.ts
 create mode 100644 src/common/core/hive/index.ts

diff --git a/src/common/app.tsx b/src/common/app.tsx
index 308da7ba8e7..7173772f88f 100644
--- a/src/common/app.tsx
+++ b/src/common/app.tsx
@@ -25,7 +25,7 @@ import loadable from "@loadable/component";
 import Announcement from "./components/announcement";
 import FloatingFAQ from "./components/floating-faq";
 import { useMappedStore } from "./store/use-mapped-store";
-import { EntriesCacheManager } from "./core";
+import { CoreProvider, EntriesCacheManager } from "./core";
 
 import { UserActivityRecorder } from "./components/user-activity-recorder";
 
@@ -92,91 +92,103 @@ const App = (props: any) => {
   }, []);
 
   return (
-    <EntriesCacheManager>
-      {/*Excluded from production*/}
-      {/*<ReactQueryDevtools initialIsOpen={false} />*/}
-      <Tracker />
-      <UserActivityRecorder />
-      <Switch>
-        <Route exact={true} path={routes.HOME} component={EntryIndexContainer} />
-        <Route exact={true} strict={true} path={routes.FILTER} component={EntryIndexContainer} />
-        <Route exact={true} strict={true} path={routes.USER_FEED} component={EntryIndexContainer} />
-        <Route exact={true} strict={true} path={routes.PURCHASE} component={PurchasePage} />
-        <Route exact={true} strict={true} path={routes.USER} component={ProfilePage} />
-        <Route exact={true} strict={true} path={routes.USER_SECTION} component={ProfilePage} />
-        <Route exact={true} strict={true} path={routes.ENTRY} component={EntryPage} />
-        <Route exact={true} strict={true} path={routes.COMMUNITIES} component={CommunitiesPage} />
-        <Route
-          exact={true}
-          strict={true}
-          path={routes.COMMUNITIES_CREATE}
-          component={CommunityCreatePage}
-        />
-        <Route
-          exact={true}
-          strict={true}
-          path={routes.COMMUNITIES_CREATE_HS}
-          component={CommunityCreateHSPage}
-        />
-        <Route exact={true} strict={true} path={routes.COMMUNITY} component={CommunityPage} />
-        <Route
-          exact={true}
-          strict={true}
-          path={routes.FILTER_TAG}
-          component={EntryIndexContainer}
-        />
-        <Route exact={true} strict={true} path={routes.DISCOVER} component={DiscoverPage} />
-        <Route exact={true} path={routes.SEARCH} component={SearchPageContainer} />
-        <Route exact={true} path={routes.SEARCH_MORE} component={SearchMorePageContainer} />
-        <Route exact={true} strict={true} path={routes.AUTH} component={AuthPage} />
-        <Route exact={true} strict={true} path={routes.SUBMIT} component={SubmitPage} />
-        <Route exact={true} strict={true} path={routes.MARKET} component={MarketPage} />
-        <Route exact={true} strict={true} path={routes.EDIT} component={SubmitPage} />
-        <Route exact={true} strict={true} path={routes.SIGN_UP} component={SignUpPage} />
-        <Route exact={true} strict={true} path={routes.ONBOARD} component={OnboardPage} />
-        <Route exact={true} strict={true} path={routes.EDIT_DRAFT} component={SubmitPage} />
-        <Route exact={true} strict={true} path={routes.WITNESSES} component={WitnessesPage} />
-        <Route
-          exact={true}
-          strict={true}
-          path={routes.PROPOSALS}
-          component={ProposalsIndexContainer}
-        />
-        <Route
-          exact={true}
-          strict={true}
-          path={routes.PROPOSAL_DETAIL}
-          component={ProposalDetailContainer}
-        />
-        <Route
-          exact={true}
-          strict={true}
-          path={`/me${routes.PROPOSAL_DETAIL}`}
-          component={ProposalDetailContainer}
-        />
-        <Route exact={true} strict={true} path={routes.ABOUT} component={AboutPage} />
-        <Route exact={true} strict={true} path={routes.GUESTS} component={GuestPostPage} />
-        <Route exact={true} strict={true} path={routes.CONTRIBUTE} component={ContributePage} />
-        <Route exact={true} strict={true} path={routes.PRIVACY} component={PrivacyPage} />
-        <Route exact={true} strict={true} path={routes.WHITE_PAPER} component={WhitePaperPage} />
-        <Route exact={true} strict={true} path={routes.TOS} component={TosPage} />
-        <Route exact={true} strict={true} path={routes.FAQ} component={FaqPage} />
-        <Route exact={true} strict={true} path={routes.CONTRIBUTORS} component={ContributorsPage} />
-        <Route
-          exact={true}
-          strict={true}
-          path={routes.DECKS}
-          component={global.usePrivate ? DecksPage : NotFound}
-        />
-        <Route component={NotFound} />
-      </Switch>
-
-      <Announcement activeUser={props.activeUser} />
-      <FloatingFAQ />
-      <div id="popper-container" />
-      <div id="modal-overlay-container" />
-      <div id="modal-dialog-container" />
-    </EntriesCacheManager>
+    <CoreProvider>
+      <EntriesCacheManager>
+        {/*Excluded from production*/}
+        {/*<ReactQueryDevtools initialIsOpen={false} />*/}
+        <Tracker />
+        <UserActivityRecorder />
+        <Switch>
+          <Route exact={true} path={routes.HOME} component={EntryIndexContainer} />
+          <Route exact={true} strict={true} path={routes.FILTER} component={EntryIndexContainer} />
+          <Route
+            exact={true}
+            strict={true}
+            path={routes.USER_FEED}
+            component={EntryIndexContainer}
+          />
+          <Route exact={true} strict={true} path={routes.PURCHASE} component={PurchasePage} />
+          <Route exact={true} strict={true} path={routes.USER} component={ProfilePage} />
+          <Route exact={true} strict={true} path={routes.USER_SECTION} component={ProfilePage} />
+          <Route exact={true} strict={true} path={routes.ENTRY} component={EntryPage} />
+          <Route exact={true} strict={true} path={routes.COMMUNITIES} component={CommunitiesPage} />
+          <Route
+            exact={true}
+            strict={true}
+            path={routes.COMMUNITIES_CREATE}
+            component={CommunityCreatePage}
+          />
+          <Route
+            exact={true}
+            strict={true}
+            path={routes.COMMUNITIES_CREATE_HS}
+            component={CommunityCreateHSPage}
+          />
+          <Route exact={true} strict={true} path={routes.COMMUNITY} component={CommunityPage} />
+          <Route
+            exact={true}
+            strict={true}
+            path={routes.FILTER_TAG}
+            component={EntryIndexContainer}
+          />
+          <Route exact={true} strict={true} path={routes.DISCOVER} component={DiscoverPage} />
+          <Route exact={true} path={routes.SEARCH} component={SearchPageContainer} />
+          <Route exact={true} path={routes.SEARCH_MORE} component={SearchMorePageContainer} />
+          <Route exact={true} strict={true} path={routes.AUTH} component={AuthPage} />
+          <Route exact={true} strict={true} path={routes.SUBMIT} component={SubmitPage} />
+          <Route exact={true} strict={true} path={routes.MARKET} component={MarketPage} />
+          <Route exact={true} strict={true} path={routes.EDIT} component={SubmitPage} />
+          <Route exact={true} strict={true} path={routes.SIGN_UP} component={SignUpPage} />
+          <Route exact={true} strict={true} path={routes.ONBOARD} component={OnboardPage} />
+          <Route exact={true} strict={true} path={routes.EDIT_DRAFT} component={SubmitPage} />
+          <Route exact={true} strict={true} path={routes.WITNESSES} component={WitnessesPage} />
+          <Route
+            exact={true}
+            strict={true}
+            path={routes.PROPOSALS}
+            component={ProposalsIndexContainer}
+          />
+          <Route
+            exact={true}
+            strict={true}
+            path={routes.PROPOSAL_DETAIL}
+            component={ProposalDetailContainer}
+          />
+          <Route
+            exact={true}
+            strict={true}
+            path={`/me${routes.PROPOSAL_DETAIL}`}
+            component={ProposalDetailContainer}
+          />
+          <Route exact={true} strict={true} path={routes.ABOUT} component={AboutPage} />
+          <Route exact={true} strict={true} path={routes.GUESTS} component={GuestPostPage} />
+          <Route exact={true} strict={true} path={routes.CONTRIBUTE} component={ContributePage} />
+          <Route exact={true} strict={true} path={routes.PRIVACY} component={PrivacyPage} />
+          <Route exact={true} strict={true} path={routes.WHITE_PAPER} component={WhitePaperPage} />
+          <Route exact={true} strict={true} path={routes.TOS} component={TosPage} />
+          <Route exact={true} strict={true} path={routes.FAQ} component={FaqPage} />
+          <Route
+            exact={true}
+            strict={true}
+            path={routes.CONTRIBUTORS}
+            component={ContributorsPage}
+          />
+          <Route
+            exact={true}
+            strict={true}
+            path={routes.DECKS}
+            component={global.usePrivate ? DecksPage : NotFound}
+          />
+          <Route component={NotFound} />
+        </Switch>
+
+        <Announcement activeUser={props.activeUser} />
+        <FloatingFAQ />
+        <div id="popper-container" />
+        <div id="modal-overlay-container" />
+        <div id="modal-dialog-container" />
+      </EntriesCacheManager>
+    </CoreProvider>
   );
 };
 
diff --git a/src/common/core/core-provider.tsx b/src/common/core/core-provider.tsx
new file mode 100644
index 00000000000..abb5947a8ab
--- /dev/null
+++ b/src/common/core/core-provider.tsx
@@ -0,0 +1,42 @@
+import React, { createContext, PropsWithChildren, useMemo, useRef, useState } from "react";
+import { Client } from "@hiveio/dhive";
+import useMount from "react-use/lib/useMount";
+import { useGetRequestLatency } from "./hive";
+import SERVERS from "../constants/servers.json";
+
+export const CoreContext = createContext<{
+  hiveClient: Client | undefined;
+}>({
+  hiveClient: undefined
+});
+
+export function CoreProvider(props: PropsWithChildren<unknown>) {
+  const hiveClientRef = useRef<Client>();
+  const [lastLatency, setLastLatency] = useState(0);
+
+  const { mutateAsync: getRequestLatency } = useGetRequestLatency();
+
+  const hiveClient = useMemo(() => hiveClientRef.current, [hiveClientRef]);
+
+  useMount(async () => {
+    let minLatencyServer: [string | undefined, number] = [undefined, Infinity];
+    for (const server of SERVERS) {
+      try {
+        const { latency } = await getRequestLatency(server);
+        console.log(server, latency);
+        if (latency < minLatencyServer[1]) {
+          minLatencyServer = [server, latency];
+        }
+      } catch (e) {}
+    }
+
+    setLastLatency(minLatencyServer[1]);
+    hiveClientRef.current = new Client(minLatencyServer[0] ? [minLatencyServer[0]] : SERVERS, {
+      timeout: 3000,
+      failoverThreshold: 3,
+      consoleOnFailover: true
+    });
+  });
+
+  return <CoreContext.Provider value={{ hiveClient }}>{props.children}</CoreContext.Provider>;
+}
diff --git a/src/common/core/hive/get-request-latency.ts b/src/common/core/hive/get-request-latency.ts
new file mode 100644
index 00000000000..d90bf958710
--- /dev/null
+++ b/src/common/core/hive/get-request-latency.ts
@@ -0,0 +1,16 @@
+import { useMutation } from "@tanstack/react-query";
+import axios from "axios";
+
+export function useGetRequestLatency() {
+  return useMutation(["hive", "ping-nearest-server"], async (url: string) => {
+    const startDate = new Date();
+    await axios.get(url);
+
+    const endDate = new Date();
+    return {
+      startDate,
+      endDate,
+      latency: endDate.getTime() - startDate.getTime() // in ms
+    };
+  });
+}
diff --git a/src/common/core/hive/hive-client-query.ts b/src/common/core/hive/hive-client-query.ts
new file mode 100644
index 00000000000..33fbc731c95
--- /dev/null
+++ b/src/common/core/hive/hive-client-query.ts
@@ -0,0 +1,42 @@
+import { useContext } from "react";
+import { CoreContext } from "../core-provider";
+import { MutationOptions, QueryOptions, useMutation, useQuery } from "@tanstack/react-query";
+import { useMappedStore } from "../../store/use-mapped-store";
+
+export function useHiveClientMutation<DATA>(
+  api: string,
+  method: string,
+  options: MutationOptions<DATA>
+) {
+  const { activeUser } = useMappedStore();
+  const { hiveClient } = useContext(CoreContext);
+
+  return useMutation<DATA>(
+    ["hive", activeUser?.username, api, method],
+    async (params?: any) => {
+      if (!hiveClient) {
+        return undefined;
+      }
+
+      return hiveClient.call(api, method, params);
+    },
+    options
+  );
+}
+
+export function useHiveClientQuery<DATA>(api: string, method: string, options: QueryOptions<DATA>) {
+  const { activeUser } = useMappedStore();
+  const { hiveClient } = useContext(CoreContext);
+
+  return useQuery<DATA>(
+    ["hive", activeUser?.username, api, method],
+    async (params?: any) => {
+      if (!hiveClient) {
+        return undefined;
+      }
+
+      return hiveClient.call(api, method, params);
+    },
+    { ...options, enabled: !!hiveClient }
+  );
+}
diff --git a/src/common/core/hive/index.ts b/src/common/core/hive/index.ts
new file mode 100644
index 00000000000..98b01177128
--- /dev/null
+++ b/src/common/core/hive/index.ts
@@ -0,0 +1,2 @@
+export * from "./hive-client-query";
+export * from "./get-request-latency";
diff --git a/src/common/core/index.ts b/src/common/core/index.ts
index 89e45276b5c..dd3815683da 100644
--- a/src/common/core/index.ts
+++ b/src/common/core/index.ts
@@ -1,2 +1,3 @@
 export * from "./react-query";
 export * from "./caches";
+export * from "./core-provider";

From b1918a05d83a9c3ee6922b42e6de2a69525f80ac Mon Sep 17 00:00:00 2001
From: "ildar.timerbaev" <dkildar@gmail.com>
Date: Sat, 25 Nov 2023 22:08:15 +0600
Subject: [PATCH 2/6] Added latency checker for each hive client request

---
 src/common/core/core-provider.tsx             | 11 +++-
 src/common/core/hive/errors/index.ts          |  1 +
 .../core/hive/errors/no-hive-client-error.ts  |  1 +
 src/common/core/hive/hive-client-mutation.ts  | 47 +++++++++++++++
 src/common/core/hive/hive-client-query.ts     | 57 +++++++++++--------
 src/common/core/hive/index.ts                 |  1 +
 .../hive/types/hive-response-with-latency.ts  |  4 ++
 src/common/core/hive/types/index.ts           |  1 +
 8 files changed, 96 insertions(+), 27 deletions(-)
 create mode 100644 src/common/core/hive/errors/index.ts
 create mode 100644 src/common/core/hive/errors/no-hive-client-error.ts
 create mode 100644 src/common/core/hive/hive-client-mutation.ts
 create mode 100644 src/common/core/hive/types/hive-response-with-latency.ts
 create mode 100644 src/common/core/hive/types/index.ts

diff --git a/src/common/core/core-provider.tsx b/src/common/core/core-provider.tsx
index abb5947a8ab..975aa5a5a04 100644
--- a/src/common/core/core-provider.tsx
+++ b/src/common/core/core-provider.tsx
@@ -6,8 +6,10 @@ import SERVERS from "../constants/servers.json";
 
 export const CoreContext = createContext<{
   hiveClient: Client | undefined;
+  setLastLatency: (v: number) => void;
 }>({
-  hiveClient: undefined
+  hiveClient: undefined,
+  setLastLatency: () => {}
 });
 
 export function CoreProvider(props: PropsWithChildren<unknown>) {
@@ -23,7 +25,6 @@ export function CoreProvider(props: PropsWithChildren<unknown>) {
     for (const server of SERVERS) {
       try {
         const { latency } = await getRequestLatency(server);
-        console.log(server, latency);
         if (latency < minLatencyServer[1]) {
           minLatencyServer = [server, latency];
         }
@@ -38,5 +39,9 @@ export function CoreProvider(props: PropsWithChildren<unknown>) {
     });
   });
 
-  return <CoreContext.Provider value={{ hiveClient }}>{props.children}</CoreContext.Provider>;
+  return (
+    <CoreContext.Provider value={{ hiveClient, setLastLatency }}>
+      {props.children}
+    </CoreContext.Provider>
+  );
 }
diff --git a/src/common/core/hive/errors/index.ts b/src/common/core/hive/errors/index.ts
new file mode 100644
index 00000000000..f8a7114ec45
--- /dev/null
+++ b/src/common/core/hive/errors/index.ts
@@ -0,0 +1 @@
+export * from "./no-hive-client-error";
diff --git a/src/common/core/hive/errors/no-hive-client-error.ts b/src/common/core/hive/errors/no-hive-client-error.ts
new file mode 100644
index 00000000000..a41308795f9
--- /dev/null
+++ b/src/common/core/hive/errors/no-hive-client-error.ts
@@ -0,0 +1 @@
+export class NoHiveClientError extends Error {}
diff --git a/src/common/core/hive/hive-client-mutation.ts b/src/common/core/hive/hive-client-mutation.ts
new file mode 100644
index 00000000000..14a8d54388c
--- /dev/null
+++ b/src/common/core/hive/hive-client-mutation.ts
@@ -0,0 +1,47 @@
+import { MutationOptions, useMutation } from "@tanstack/react-query";
+import { useMappedStore } from "../../store/use-mapped-store";
+import { useContext } from "react";
+import { CoreContext } from "../core-provider";
+import { NoHiveClientError } from "./errors";
+import { HiveResponseWithLatency } from "./types";
+import axios from "axios";
+
+export function useHiveClientMutation<DATA>(
+  api: string,
+  method: string,
+  options: MutationOptions<HiveResponseWithLatency<DATA>>
+) {
+  const { activeUser } = useMappedStore();
+  const { hiveClient, setLastLatency } = useContext(CoreContext);
+
+  return useMutation<HiveResponseWithLatency<DATA>>(
+    ["hive", activeUser?.username, api, method],
+    async (params?: any) => {
+      if (!hiveClient) {
+        throw new NoHiveClientError();
+      }
+
+      const startDate = new Date();
+      const response = await hiveClient.call(api, method, params);
+      const endDate = new Date();
+
+      return {
+        response,
+        latency: endDate.getTime() - startDate.getTime() // in ms
+      };
+    },
+    {
+      ...options,
+      onSuccess: (data, variables, context) => {
+        setLastLatency(data.latency);
+        options?.onSuccess?.(data, variables, context);
+      },
+      onError: (error, variables, context) => {
+        if (axios.isAxiosError(error) && error.code === "ECONNABORTED") {
+          setLastLatency(Infinity);
+        }
+        options?.onError?.(error, variables, context);
+      }
+    }
+  );
+}
diff --git a/src/common/core/hive/hive-client-query.ts b/src/common/core/hive/hive-client-query.ts
index 33fbc731c95..d43d70c505b 100644
--- a/src/common/core/hive/hive-client-query.ts
+++ b/src/common/core/hive/hive-client-query.ts
@@ -1,42 +1,51 @@
-import { useContext } from "react";
+import { useContext, useEffect } from "react";
 import { CoreContext } from "../core-provider";
-import { MutationOptions, QueryOptions, useMutation, useQuery } from "@tanstack/react-query";
+import { QueryOptions, useQuery } from "@tanstack/react-query";
 import { useMappedStore } from "../../store/use-mapped-store";
+import { Client } from "@hiveio/dhive";
+import { NoHiveClientError } from "./errors";
+import { HiveResponseWithLatency } from "./types";
+import axios from "axios";
 
-export function useHiveClientMutation<DATA>(
+export function useHiveClientQuery<DATA>(
   api: string,
   method: string,
-  options: MutationOptions<DATA>
+  options: QueryOptions<HiveResponseWithLatency<DATA>>
 ) {
   const { activeUser } = useMappedStore();
-  const { hiveClient } = useContext(CoreContext);
+  const { hiveClient, setLastLatency } = useContext(CoreContext);
 
-  return useMutation<DATA>(
+  const query = useQuery<HiveResponseWithLatency<DATA>>(
     ["hive", activeUser?.username, api, method],
-    async (params?: any) => {
+    async (params?: Parameters<typeof Client.call>[2]) => {
       if (!hiveClient) {
-        return undefined;
+        throw new NoHiveClientError();
       }
 
-      return hiveClient.call(api, method, params);
+      const startDate = new Date();
+      const response = await hiveClient.call(api, method, params);
+      const endDate = new Date();
+
+      return {
+        response,
+        latency: endDate.getTime() - startDate.getTime() // in ms
+      };
     },
-    options
+    {
+      ...options,
+      enabled: !!hiveClient
+    }
   );
-}
-
-export function useHiveClientQuery<DATA>(api: string, method: string, options: QueryOptions<DATA>) {
-  const { activeUser } = useMappedStore();
-  const { hiveClient } = useContext(CoreContext);
 
-  return useQuery<DATA>(
-    ["hive", activeUser?.username, api, method],
-    async (params?: any) => {
-      if (!hiveClient) {
-        return undefined;
+  useEffect(() => {
+    if (query.status === "success") {
+      setLastLatency(query.data.latency);
+    } else if (query.status === "error" && axios.isAxiosError(query.error)) {
+      if (query.error.code === "ECONNABORTED") {
+        setLastLatency(Infinity);
       }
+    }
+  }, [query.status, query.data, query.error]);
 
-      return hiveClient.call(api, method, params);
-    },
-    { ...options, enabled: !!hiveClient }
-  );
+  return query;
 }
diff --git a/src/common/core/hive/index.ts b/src/common/core/hive/index.ts
index 98b01177128..f56f472f34e 100644
--- a/src/common/core/hive/index.ts
+++ b/src/common/core/hive/index.ts
@@ -1,2 +1,3 @@
 export * from "./hive-client-query";
 export * from "./get-request-latency";
+export * from "./hive-client-mutation";
diff --git a/src/common/core/hive/types/hive-response-with-latency.ts b/src/common/core/hive/types/hive-response-with-latency.ts
new file mode 100644
index 00000000000..51059510404
--- /dev/null
+++ b/src/common/core/hive/types/hive-response-with-latency.ts
@@ -0,0 +1,4 @@
+export interface HiveResponseWithLatency<T> {
+  response: T;
+  latency: number;
+}
diff --git a/src/common/core/hive/types/index.ts b/src/common/core/hive/types/index.ts
new file mode 100644
index 00000000000..43f6b92d813
--- /dev/null
+++ b/src/common/core/hive/types/index.ts
@@ -0,0 +1 @@
+export * from "./hive-response-with-latency";

From 90872dcb3d85bcd77e0dd5a3d0996df269fc0ec2 Mon Sep 17 00:00:00 2001
From: "ildar.timerbaev" <dkildar@gmail.com>
Date: Sun, 26 Nov 2023 20:44:29 +0600
Subject: [PATCH 3/6] Added network status bottom bar

---
 src/common/app.tsx                            |  2 +
 .../components/bottom-status-bar/index.tsx    | 10 +++++
 .../bottom-status-bar/latency-status-bar.tsx  | 43 +++++++++++++++++++
 src/common/core/core-provider.tsx             | 11 ++++-
 tailwind.config.js                            |  1 +
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/common/components/bottom-status-bar/index.tsx
 create mode 100644 src/common/components/bottom-status-bar/latency-status-bar.tsx

diff --git a/src/common/app.tsx b/src/common/app.tsx
index 7173772f88f..2d4ed2a62bb 100644
--- a/src/common/app.tsx
+++ b/src/common/app.tsx
@@ -28,6 +28,7 @@ import { useMappedStore } from "./store/use-mapped-store";
 import { CoreProvider, EntriesCacheManager } from "./core";
 
 import { UserActivityRecorder } from "./components/user-activity-recorder";
+import { BottomStatusBar } from "./components/bottom-status-bar";
 
 // Define lazy pages
 const ProfileContainer = loadable(() => import("./pages/profile-functional"));
@@ -184,6 +185,7 @@ const App = (props: any) => {
 
         <Announcement activeUser={props.activeUser} />
         <FloatingFAQ />
+        <BottomStatusBar />
         <div id="popper-container" />
         <div id="modal-overlay-container" />
         <div id="modal-dialog-container" />
diff --git a/src/common/components/bottom-status-bar/index.tsx b/src/common/components/bottom-status-bar/index.tsx
new file mode 100644
index 00000000000..e939cf51c69
--- /dev/null
+++ b/src/common/components/bottom-status-bar/index.tsx
@@ -0,0 +1,10 @@
+import React from "react";
+import { LatencyStatusBar } from "./latency-status-bar";
+
+export function BottomStatusBar() {
+  return (
+    <div className="fixed flex justify-start bottom-0 left-0 right-0 duration-300 overflow-hidden w-[2rem] border-r border-[--border-color] hover:w-full whitespace-nowrap">
+      <LatencyStatusBar />
+    </div>
+  );
+}
diff --git a/src/common/components/bottom-status-bar/latency-status-bar.tsx b/src/common/components/bottom-status-bar/latency-status-bar.tsx
new file mode 100644
index 00000000000..42817bea6fd
--- /dev/null
+++ b/src/common/components/bottom-status-bar/latency-status-bar.tsx
@@ -0,0 +1,43 @@
+import React, { useContext, useMemo } from "react";
+import { CoreContext } from "../../core";
+import { classNameObject } from "../../helper/class-name-object";
+
+export function LatencyStatusBar() {
+  const { lastLatency, server } = useContext(CoreContext);
+
+  const status = useMemo(() => {
+    if (lastLatency < 150) {
+      return "Stable connection";
+    } else if (lastLatency !== Infinity) {
+      return "Poor connection";
+    } else {
+      return "No connection";
+    }
+  }, [lastLatency]);
+
+  return (
+    <div
+      className={classNameObject({
+        "bg-white flex leading-0 items-center gap-2 border-t text-xs font-[500] py-0.5 px-2 border-[--border-color]":
+          true,
+        "text-green-dark": status === "Stable connection",
+        "text-orange": status === "Poor connection",
+        "text-red": status === "No connection"
+      })}
+    >
+      <svg width={16} height={12} viewBox="0 0 24 16" fill="currentColor">
+        <rect width={2} height={4} x={0} y={12} />
+        <rect width={2} height={8} x={6} y={10} />
+        {lastLatency < 150 && <rect width={2} height={12} x={12} y={4} />}
+        {lastLatency < 150 && <rect width={2} height={16} x={18} />}
+      </svg>
+
+      <div className="flex items-center">
+        <span>
+          {lastLatency}ms – {status}
+        </span>
+        <div className="text-gray-600 dark:text-gray-400 pl-1">– {server}</div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/common/core/core-provider.tsx b/src/common/core/core-provider.tsx
index 975aa5a5a04..43dc4fbbf41 100644
--- a/src/common/core/core-provider.tsx
+++ b/src/common/core/core-provider.tsx
@@ -6,15 +6,21 @@ import SERVERS from "../constants/servers.json";
 
 export const CoreContext = createContext<{
   hiveClient: Client | undefined;
+  lastLatency: number;
+  server: string;
   setLastLatency: (v: number) => void;
 }>({
+  lastLatency: 0,
+  server: "",
   hiveClient: undefined,
   setLastLatency: () => {}
 });
 
 export function CoreProvider(props: PropsWithChildren<unknown>) {
   const hiveClientRef = useRef<Client>();
+
   const [lastLatency, setLastLatency] = useState(0);
+  const [server, setServer] = useState("");
 
   const { mutateAsync: getRequestLatency } = useGetRequestLatency();
 
@@ -31,6 +37,9 @@ export function CoreProvider(props: PropsWithChildren<unknown>) {
       } catch (e) {}
     }
 
+    if (minLatencyServer[0]) {
+      setServer(minLatencyServer[0]);
+    }
     setLastLatency(minLatencyServer[1]);
     hiveClientRef.current = new Client(minLatencyServer[0] ? [minLatencyServer[0]] : SERVERS, {
       timeout: 3000,
@@ -40,7 +49,7 @@ export function CoreProvider(props: PropsWithChildren<unknown>) {
   });
 
   return (
-    <CoreContext.Provider value={{ hiveClient, setLastLatency }}>
+    <CoreContext.Provider value={{ hiveClient, lastLatency, setLastLatency, server }}>
       {props.children}
     </CoreContext.Provider>
   );
diff --git a/tailwind.config.js b/tailwind.config.js
index 92cd0a49e1a..953b64dd6dd 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -247,6 +247,7 @@ module.exports = {
         dark: "#081c36"
       },
       green: "#69bb85",
+      "green-dark": "#2f7948",
       "green-030": "#bcf3cf",
       "green-040": "#e3fceb",
       warning: {

From 26e0edba9a09b3704ea7b23afceddb777697111a Mon Sep 17 00:00:00 2001
From: "ildar.timerbaev" <dkildar@gmail.com>
Date: Sun, 26 Nov 2023 22:16:01 +0600
Subject: [PATCH 4/6] Added finding near hive server and test proposals queries

---
 src/common/api/hive.ts                        |  20 +-
 src/common/app.tsx                            |   3 +-
 .../components/bottom-status-bar/index.tsx    |   2 +-
 src/common/core/core-provider.tsx             |  27 +--
 src/common/core/hive/find-near-hive-server.ts |  23 +++
 src/common/core/hive/hive-client-query.ts     |  11 +-
 src/common/core/hive/index.ts                 |   1 +
 src/common/pages/proposals.tsx                | 173 +++++++-----------
 8 files changed, 129 insertions(+), 131 deletions(-)
 create mode 100644 src/common/core/hive/find-near-hive-server.ts

diff --git a/src/common/api/hive.ts b/src/common/api/hive.ts
index 0f3e617e91d..71eea8e755e 100644
--- a/src/common/api/hive.ts
+++ b/src/common/api/hive.ts
@@ -1,10 +1,10 @@
-import { Client, RCAPI, utils } from "@hiveio/dhive";
+import { Client, RCAPI } from "@hiveio/dhive";
 
 import { RCAccount } from "@hiveio/dhive/lib/chain/rc";
 
 import { TrendingTag } from "../store/trending-tags/types";
 import { DynamicProps } from "../store/dynamic-props/types";
-import { FullAccount, AccountProfile, AccountFollowStats } from "../store/accounts/types";
+import { AccountFollowStats, AccountProfile, FullAccount } from "../store/accounts/types";
 import { Entry } from "../store/entries/types";
 
 import parseAsset from "../helper/parse-asset";
@@ -14,6 +14,7 @@ import isCommunity from "../helper/is-community";
 import SERVERS from "../constants/servers.json";
 import { dataLimit } from "./bridge";
 import moment, { Moment } from "moment";
+import { useHiveClientQuery } from "../core/hive";
 
 export const client = new Client(SERVERS, {
   timeout: 3000,
@@ -147,6 +148,7 @@ export interface Reputations {
   account: string;
   reputation: number;
 }
+
 interface ApiError {
   error: string;
   data: any;
@@ -663,3 +665,17 @@ export const getRcOperationStats = (): Promise<any> => client.call("rc_api", "ge
 
 export const getContentReplies = (author: string, permlink: string): Promise<Entry[] | null> =>
   client.call("condenser_api", "get_content_replies", { author, permlink });
+
+export const getPostQuery = (username?: string, permlink?: string) =>
+  useHiveClientQuery<Entry>("condenser_api", "get_content", [username, permlink], {
+    enabled: !!username && !!permlink
+  });
+
+export const getProposalsQuery = () =>
+  useHiveClientQuery<{ proposals: Proposal[] }>("database_api", "list_proposals", {
+    start: [-1],
+    limit: 500,
+    order: "by_total_votes",
+    order_direction: "descending",
+    status: "all"
+  });
diff --git a/src/common/app.tsx b/src/common/app.tsx
index 2d4ed2a62bb..450cc4586d6 100644
--- a/src/common/app.tsx
+++ b/src/common/app.tsx
@@ -29,6 +29,7 @@ import { CoreProvider, EntriesCacheManager } from "./core";
 
 import { UserActivityRecorder } from "./components/user-activity-recorder";
 import { BottomStatusBar } from "./components/bottom-status-bar";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 
 // Define lazy pages
 const ProfileContainer = loadable(() => import("./pages/profile-functional"));
@@ -96,7 +97,7 @@ const App = (props: any) => {
     <CoreProvider>
       <EntriesCacheManager>
         {/*Excluded from production*/}
-        {/*<ReactQueryDevtools initialIsOpen={false} />*/}
+        <ReactQueryDevtools initialIsOpen={false} />
         <Tracker />
         <UserActivityRecorder />
         <Switch>
diff --git a/src/common/components/bottom-status-bar/index.tsx b/src/common/components/bottom-status-bar/index.tsx
index e939cf51c69..450890b2c47 100644
--- a/src/common/components/bottom-status-bar/index.tsx
+++ b/src/common/components/bottom-status-bar/index.tsx
@@ -3,7 +3,7 @@ import { LatencyStatusBar } from "./latency-status-bar";
 
 export function BottomStatusBar() {
   return (
-    <div className="fixed flex justify-start bottom-0 left-0 right-0 duration-300 overflow-hidden w-[2rem] border-r border-[--border-color] hover:w-full whitespace-nowrap">
+    <div className="fixed flex justify-start bottom-0 left-0 right-0 duration-300 overflow-hidden border-r border-[--border-color] hover:w-full whitespace-nowrap">
       <LatencyStatusBar />
     </div>
   );
diff --git a/src/common/core/core-provider.tsx b/src/common/core/core-provider.tsx
index 43dc4fbbf41..4f04d1ee85e 100644
--- a/src/common/core/core-provider.tsx
+++ b/src/common/core/core-provider.tsx
@@ -1,7 +1,6 @@
 import React, { createContext, PropsWithChildren, useMemo, useRef, useState } from "react";
 import { Client } from "@hiveio/dhive";
-import useMount from "react-use/lib/useMount";
-import { useGetRequestLatency } from "./hive";
+import { useFindNearHiveServer } from "./hive";
 import SERVERS from "../constants/servers.json";
 
 export const CoreContext = createContext<{
@@ -22,26 +21,14 @@ export function CoreProvider(props: PropsWithChildren<unknown>) {
   const [lastLatency, setLastLatency] = useState(0);
   const [server, setServer] = useState("");
 
-  const { mutateAsync: getRequestLatency } = useGetRequestLatency();
+  const hiveClient = useMemo(() => hiveClientRef.current, [hiveClientRef.current]);
 
-  const hiveClient = useMemo(() => hiveClientRef.current, [hiveClientRef]);
-
-  useMount(async () => {
-    let minLatencyServer: [string | undefined, number] = [undefined, Infinity];
-    for (const server of SERVERS) {
-      try {
-        const { latency } = await getRequestLatency(server);
-        if (latency < minLatencyServer[1]) {
-          minLatencyServer = [server, latency];
-        }
-      } catch (e) {}
-    }
-
-    if (minLatencyServer[0]) {
-      setServer(minLatencyServer[0]);
+  useFindNearHiveServer((server, latency) => {
+    if (server) {
+      setServer(server);
     }
-    setLastLatency(minLatencyServer[1]);
-    hiveClientRef.current = new Client(minLatencyServer[0] ? [minLatencyServer[0]] : SERVERS, {
+    setLastLatency(latency);
+    hiveClientRef.current = new Client(server ?? SERVERS, {
       timeout: 3000,
       failoverThreshold: 3,
       consoleOnFailover: true
diff --git a/src/common/core/hive/find-near-hive-server.ts b/src/common/core/hive/find-near-hive-server.ts
new file mode 100644
index 00000000000..6a02f54e622
--- /dev/null
+++ b/src/common/core/hive/find-near-hive-server.ts
@@ -0,0 +1,23 @@
+import useMount from "react-use/lib/useMount";
+import SERVERS from "../../constants/servers.json";
+import { useGetRequestLatency } from "./get-request-latency";
+
+export function useFindNearHiveServer(
+  onFind?: (server: string | undefined, latency: number) => void
+) {
+  const { mutateAsync: getRequestLatency } = useGetRequestLatency();
+
+  useMount(async () => {
+    let minLatencyServer: [string | undefined, number] = [undefined, Infinity];
+    for (const server of SERVERS) {
+      try {
+        const { latency } = await getRequestLatency(server);
+        if (latency < minLatencyServer[1]) {
+          minLatencyServer = [server, latency];
+        }
+      } catch (e) {}
+    }
+
+    onFind?.(minLatencyServer[0], minLatencyServer[1]);
+  });
+}
diff --git a/src/common/core/hive/hive-client-query.ts b/src/common/core/hive/hive-client-query.ts
index d43d70c505b..a43daa4b6e2 100644
--- a/src/common/core/hive/hive-client-query.ts
+++ b/src/common/core/hive/hive-client-query.ts
@@ -1,6 +1,6 @@
 import { useContext, useEffect } from "react";
 import { CoreContext } from "../core-provider";
-import { QueryOptions, useQuery } from "@tanstack/react-query";
+import { useQuery, UseQueryOptions } from "@tanstack/react-query";
 import { useMappedStore } from "../../store/use-mapped-store";
 import { Client } from "@hiveio/dhive";
 import { NoHiveClientError } from "./errors";
@@ -10,20 +10,21 @@ import axios from "axios";
 export function useHiveClientQuery<DATA>(
   api: string,
   method: string,
-  options: QueryOptions<HiveResponseWithLatency<DATA>>
+  initialParams: Parameters<typeof Client.call>[2],
+  options?: UseQueryOptions<HiveResponseWithLatency<DATA>>
 ) {
   const { activeUser } = useMappedStore();
   const { hiveClient, setLastLatency } = useContext(CoreContext);
 
   const query = useQuery<HiveResponseWithLatency<DATA>>(
-    ["hive", activeUser?.username, api, method],
-    async (params?: Parameters<typeof Client.call>[2]) => {
+    ["hive", activeUser?.username, api, method, initialParams],
+    async () => {
       if (!hiveClient) {
         throw new NoHiveClientError();
       }
 
       const startDate = new Date();
-      const response = await hiveClient.call(api, method, params);
+      const response = await hiveClient.call(api, method, initialParams);
       const endDate = new Date();
 
       return {
diff --git a/src/common/core/hive/index.ts b/src/common/core/hive/index.ts
index f56f472f34e..64acd38855c 100644
--- a/src/common/core/hive/index.ts
+++ b/src/common/core/hive/index.ts
@@ -1,3 +1,4 @@
 export * from "./hive-client-query";
 export * from "./get-request-latency";
 export * from "./hive-client-mutation";
+export * from "./find-near-hive-server";
diff --git a/src/common/pages/proposals.tsx b/src/common/pages/proposals.tsx
index 81b31569401..70ad5c31b02 100644
--- a/src/common/pages/proposals.tsx
+++ b/src/common/pages/proposals.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from "react";
+import React, { Fragment, useMemo } from "react";
 import { Link } from "react-router-dom";
 import { connect } from "react-redux";
 import { match } from "react-router";
@@ -8,7 +8,6 @@ import _ from "lodash";
 import defaults from "../constants/defaults.json";
 
 import { catchPostImage, renderPostBody, setProxyBase } from "@ecency/render-helper";
-import { Entry } from "../store/entries/types";
 
 import BaseComponent from "../components/base";
 import Meta from "../components/meta";
@@ -24,7 +23,7 @@ import SearchBox from "../components/search-box";
 import { _t } from "../i18n";
 import { Tsx } from "../i18n/helper";
 
-import { getAccount, getPost, getProposals, Proposal } from "../api/hive";
+import { getAccount, getPostQuery, getProposals, getProposalsQuery, Proposal } from "../api/hive";
 
 import { pageMapDispatchToProps, pageMapStateToProps, PageProps } from "./common";
 
@@ -332,111 +331,81 @@ interface DetailProps extends PageProps {
   match: match<MatchParams>;
 }
 
-interface DetailState {
-  loading: boolean;
-  proposal: Proposal | null;
-  entry: Entry | null;
-}
-
-class ProposalDetailPage extends BaseComponent<DetailProps, DetailState> {
-  state: DetailState = {
-    loading: true,
-    proposal: null,
-    entry: null
-  };
-
-  componentDidMount() {
-    this.load();
+export function ProposalDetailPage(props: DetailProps) {
+  const { data: proposalsResponse, isLoading: isProposalsLoading } = getProposalsQuery();
+
+  const proposal = useMemo(
+    () => proposalsResponse?.response.proposals.find((x) => x.id === +props.match.params.id),
+    [proposalsResponse, props.match.params]
+  );
+  const { data: getPostResponse, isLoading: isGetPostLoading } = getPostQuery(
+    proposal?.creator,
+    proposal?.permlink
+  );
+  const entry = useMemo(() => getPostResponse?.response, [getPostResponse]);
+  const isLoading = useMemo(
+    () => isProposalsLoading && isGetPostLoading,
+    [isProposalsLoading, isGetPostLoading]
+  );
+
+  if (isLoading) {
+    return (
+      <>
+        <NavBar history={props.history} />
+        <LinearProgress />
+      </>
+    );
   }
 
-  load = () => {
-    const { match } = this.props;
-    const proposalId = Number(match.params.id);
-
-    this.stateSet({ loading: true });
-    getProposals()
-      .then((proposals) => {
-        const proposal = proposals.find((x) => x.id === proposalId);
-        if (proposal) {
-          this.stateSet({ proposal });
-          return getPost(proposal.creator, proposal.permlink);
-        }
+  if (!proposal || !entry) {
+    return NotFound({ ...props });
+  }
 
-        return null;
-      })
-      .then((entry) => {
-        if (entry) {
-          this.stateSet({ entry });
-        }
-      })
-      .finally(() => {
-        this.stateSet({ loading: false });
-      });
+  const renderedBody = { __html: renderPostBody(entry.body, false, props.global.canUseWebp) };
+
+  //  Meta config
+  const metaProps = {
+    title: `${_t("proposals.page-title")} | ${proposal.subject}`,
+    description: `${proposal.subject} by @${proposal.creator}`,
+    url: `/proposals/${proposal.id}`,
+    canonical: `/proposals/${proposal.id}`,
+    published: parseDate(entry.created).toISOString(),
+    modified: parseDate(entry.updated).toISOString(),
+    image: catchPostImage(entry.body, 600, 500, props.global.canUseWebp ? "webp" : "match")
   };
 
-  render() {
-    const { global } = this.props;
-    const { loading, proposal, entry } = this.state;
-
-    if (loading) {
-      return (
-        <>
-          <NavBar history={this.props.history} />
-          <LinearProgress />
-        </>
-      );
-    }
-
-    if (!proposal || !entry) {
-      return NotFound({ ...this.props });
-    }
-
-    const renderedBody = { __html: renderPostBody(entry.body, false, global.canUseWebp) };
-
-    //  Meta config
-    const metaProps = {
-      title: `${_t("proposals.page-title")} | ${proposal.subject}`,
-      description: `${proposal.subject} by @${proposal.creator}`,
-      url: `/proposals/${proposal.id}`,
-      canonical: `/proposals/${proposal.id}`,
-      published: parseDate(entry.created).toISOString(),
-      modified: parseDate(entry.updated).toISOString(),
-      image: catchPostImage(entry.body, 600, 500, global.canUseWebp ? "webp" : "match")
-    };
-
-    return (
-      <>
-        <Meta {...metaProps} />
-        <ScrollToTop />
-        <Theme global={this.props.global} />
-        <Feedback activeUser={this.props.activeUser} />
-        <NavBar history={this.props.history} />
-        <div className="app-content proposals-page proposals-detail-page">
-          <div className="page-header mt-5">
-            <h1 className="header-title">{_t("proposals.page-title")}</h1>
-            <p className="see-all">
-              <Link to="/proposals">{_t("proposals.see-all")}</Link>
-            </p>
-          </div>
-          <div className="proposal-list">
-            <Link to="/proposals" className="btn-dismiss">
-              {closeSvg}
-            </Link>
-            {ProposalListItem({
-              ...this.props,
-              proposal
-            })}
-          </div>
-          <div className="the-entry">
-            <div
-              className="entry-body markdown-view user-selectable"
-              dangerouslySetInnerHTML={renderedBody}
-            />
-          </div>
+  return (
+    <>
+      <Meta {...metaProps} />
+      <ScrollToTop />
+      <Theme global={props.global} />
+      <Feedback activeUser={props.activeUser} />
+      <NavBar history={props.history} />
+      <div className="app-content proposals-page proposals-detail-page">
+        <div className="page-header mt-5">
+          <h1 className="header-title">{_t("proposals.page-title")}</h1>
+          <p className="see-all">
+            <Link to="/proposals">{_t("proposals.see-all")}</Link>
+          </p>
         </div>
-      </>
-    );
-  }
+        <div className="proposal-list">
+          <Link to="/proposals" className="btn-dismiss">
+            {closeSvg}
+          </Link>
+          {ProposalListItem({
+            ...props,
+            proposal
+          })}
+        </div>
+        <div className="the-entry">
+          <div
+            className="entry-body markdown-view user-selectable"
+            dangerouslySetInnerHTML={renderedBody}
+          />
+        </div>
+      </div>
+    </>
+  );
 }
 
 export const ProposalDetailContainer = connect(

From d6939b1da2a45daf4efb2bb3f435a7508348396e Mon Sep 17 00:00:00 2001
From: "ildar.timerbaev" <dkildar@gmail.com>
Date: Sun, 26 Nov 2023 22:38:39 +0600
Subject: [PATCH 5/6] Updated get post query enabling status

---
 .../components/bottom-status-bar/index.tsx    |  2 +-
 src/common/core/core-provider.tsx             | 19 +++++++++----------
 src/common/core/hive/hive-client-query.ts     |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/common/components/bottom-status-bar/index.tsx b/src/common/components/bottom-status-bar/index.tsx
index 450890b2c47..533dcd7fa69 100644
--- a/src/common/components/bottom-status-bar/index.tsx
+++ b/src/common/components/bottom-status-bar/index.tsx
@@ -3,7 +3,7 @@ import { LatencyStatusBar } from "./latency-status-bar";
 
 export function BottomStatusBar() {
   return (
-    <div className="fixed flex justify-start bottom-0 left-0 right-0 duration-300 overflow-hidden border-r border-[--border-color] hover:w-full whitespace-nowrap">
+    <div className="fixed flex justify-start bottom-0 left-0 right-0 duration-300 overflow-hidden border-r w-[2rem] border-[--border-color] hover:w-full whitespace-nowrap">
       <LatencyStatusBar />
     </div>
   );
diff --git a/src/common/core/core-provider.tsx b/src/common/core/core-provider.tsx
index 4f04d1ee85e..29073df9f6a 100644
--- a/src/common/core/core-provider.tsx
+++ b/src/common/core/core-provider.tsx
@@ -1,4 +1,4 @@
-import React, { createContext, PropsWithChildren, useMemo, useRef, useState } from "react";
+import React, { createContext, PropsWithChildren, useState } from "react";
 import { Client } from "@hiveio/dhive";
 import { useFindNearHiveServer } from "./hive";
 import SERVERS from "../constants/servers.json";
@@ -16,23 +16,22 @@ export const CoreContext = createContext<{
 });
 
 export function CoreProvider(props: PropsWithChildren<unknown>) {
-  const hiveClientRef = useRef<Client>();
-
+  const [hiveClient, setHiveClient] = useState<Client | undefined>(undefined);
   const [lastLatency, setLastLatency] = useState(0);
   const [server, setServer] = useState("");
 
-  const hiveClient = useMemo(() => hiveClientRef.current, [hiveClientRef.current]);
-
   useFindNearHiveServer((server, latency) => {
     if (server) {
       setServer(server);
     }
     setLastLatency(latency);
-    hiveClientRef.current = new Client(server ?? SERVERS, {
-      timeout: 3000,
-      failoverThreshold: 3,
-      consoleOnFailover: true
-    });
+    setHiveClient(
+      new Client(server ?? SERVERS, {
+        timeout: 3000,
+        failoverThreshold: 3,
+        consoleOnFailover: true
+      })
+    );
   });
 
   return (
diff --git a/src/common/core/hive/hive-client-query.ts b/src/common/core/hive/hive-client-query.ts
index a43daa4b6e2..eca44260510 100644
--- a/src/common/core/hive/hive-client-query.ts
+++ b/src/common/core/hive/hive-client-query.ts
@@ -34,7 +34,7 @@ export function useHiveClientQuery<DATA>(
     },
     {
       ...options,
-      enabled: !!hiveClient
+      enabled: !!hiveClient && (options?.enabled ?? true)
     }
   );
 

From 19e2b58d85dd44be5f09d3080a4a0b9cf5fcd13c Mon Sep 17 00:00:00 2001
From: "ildar.timerbaev" <dkildar@gmail.com>
Date: Sun, 26 Nov 2023 22:56:00 +0600
Subject: [PATCH 6/6] Added server re-selection if current one isn't responding

---
 src/common/core/core-provider.tsx             | 12 +++++--
 src/common/core/hive/find-near-hive-server.ts | 35 ++++++++++++-------
 src/common/core/hive/hive-client-query.ts     | 14 +++++++-
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/common/core/core-provider.tsx b/src/common/core/core-provider.tsx
index 29073df9f6a..b077f78db0d 100644
--- a/src/common/core/core-provider.tsx
+++ b/src/common/core/core-provider.tsx
@@ -8,19 +8,22 @@ export const CoreContext = createContext<{
   lastLatency: number;
   server: string;
   setLastLatency: (v: number) => void;
+  setFindNearHiveServer: (v: boolean) => void;
 }>({
   lastLatency: 0,
   server: "",
   hiveClient: undefined,
-  setLastLatency: () => {}
+  setLastLatency: () => {},
+  setFindNearHiveServer: () => {}
 });
 
 export function CoreProvider(props: PropsWithChildren<unknown>) {
   const [hiveClient, setHiveClient] = useState<Client | undefined>(undefined);
   const [lastLatency, setLastLatency] = useState(0);
   const [server, setServer] = useState("");
+  const [findNearHiveServer, setFindNearHiveServer] = useState(true);
 
-  useFindNearHiveServer((server, latency) => {
+  useFindNearHiveServer(findNearHiveServer, (server, latency) => {
     if (server) {
       setServer(server);
     }
@@ -32,10 +35,13 @@ export function CoreProvider(props: PropsWithChildren<unknown>) {
         consoleOnFailover: true
       })
     );
+    setFindNearHiveServer(false);
   });
 
   return (
-    <CoreContext.Provider value={{ hiveClient, lastLatency, setLastLatency, server }}>
+    <CoreContext.Provider
+      value={{ hiveClient, lastLatency, setFindNearHiveServer, setLastLatency, server }}
+    >
       {props.children}
     </CoreContext.Provider>
   );
diff --git a/src/common/core/hive/find-near-hive-server.ts b/src/common/core/hive/find-near-hive-server.ts
index 6a02f54e622..6d8fe66e4f0 100644
--- a/src/common/core/hive/find-near-hive-server.ts
+++ b/src/common/core/hive/find-near-hive-server.ts
@@ -1,23 +1,32 @@
-import useMount from "react-use/lib/useMount";
 import SERVERS from "../../constants/servers.json";
 import { useGetRequestLatency } from "./get-request-latency";
+import useDebounce from "react-use/lib/useDebounce";
 
 export function useFindNearHiveServer(
+  isFind: boolean,
   onFind?: (server: string | undefined, latency: number) => void
 ) {
   const { mutateAsync: getRequestLatency } = useGetRequestLatency();
 
-  useMount(async () => {
-    let minLatencyServer: [string | undefined, number] = [undefined, Infinity];
-    for (const server of SERVERS) {
-      try {
-        const { latency } = await getRequestLatency(server);
-        if (latency < minLatencyServer[1]) {
-          minLatencyServer = [server, latency];
-        }
-      } catch (e) {}
-    }
+  useDebounce(
+    async () => {
+      if (!isFind) {
+        return;
+      }
 
-    onFind?.(minLatencyServer[0], minLatencyServer[1]);
-  });
+      let minLatencyServer: [string | undefined, number] = [undefined, Infinity];
+      for (const server of SERVERS) {
+        try {
+          const { latency } = await getRequestLatency(server);
+          if (latency < minLatencyServer[1]) {
+            minLatencyServer = [server, latency];
+          }
+        } catch (e) {}
+      }
+
+      onFind?.(minLatencyServer[0], minLatencyServer[1]);
+    },
+    100,
+    [isFind]
+  );
 }
diff --git a/src/common/core/hive/hive-client-query.ts b/src/common/core/hive/hive-client-query.ts
index eca44260510..92f39fffccc 100644
--- a/src/common/core/hive/hive-client-query.ts
+++ b/src/common/core/hive/hive-client-query.ts
@@ -14,7 +14,7 @@ export function useHiveClientQuery<DATA>(
   options?: UseQueryOptions<HiveResponseWithLatency<DATA>>
 ) {
   const { activeUser } = useMappedStore();
-  const { hiveClient, setLastLatency } = useContext(CoreContext);
+  const { hiveClient, setLastLatency, setFindNearHiveServer } = useContext(CoreContext);
 
   const query = useQuery<HiveResponseWithLatency<DATA>>(
     ["hive", activeUser?.username, api, method, initialParams],
@@ -34,6 +34,18 @@ export function useHiveClientQuery<DATA>(
     },
     {
       ...options,
+      retry: (failureCount, error) => {
+        if (failureCount <= 3) {
+          return true;
+        }
+
+        // Find new nearest server if request failed a lot of time
+        if (axios.isAxiosError(error) && error.code === "ECONNABORTED") {
+          setFindNearHiveServer(true);
+        }
+
+        return false;
+      },
       enabled: !!hiveClient && (options?.enabled ?? true)
     }
   );