From 38060cd3c68cbde5c2ad992beed4b1b634f4f1cd Mon Sep 17 00:00:00 2001 From: Tom Bertrand Date: Thu, 21 Mar 2024 09:10:17 -0400 Subject: [PATCH] rwmove nanoTicker --- server/constants.js | 2 - server/cron/nanobrowserquestStats.js | 5 +- server/cron/nanotickerStats.js | 27 ---------- server/server.js | 10 ---- src/api/hooks/use-nanoticker.tsx | 50 ------------------- .../ConfirmationsPerSecond/index.tsx | 17 ------- 6 files changed, 2 insertions(+), 109 deletions(-) delete mode 100644 server/cron/nanotickerStats.js delete mode 100644 src/api/hooks/use-nanoticker.tsx diff --git a/server/constants.js b/server/constants.js index ba0abb36..4910e5dc 100644 --- a/server/constants.js +++ b/server/constants.js @@ -53,7 +53,6 @@ const TELEMETRY = "TELEMETRY"; const REPRESENTATIVE = "REPRESENTATIVE"; const REDIS_RICH_LIST = "RICH_LIST"; const PARTICIPANTS = "PARTICIPANTS"; -const NANOTICKER_STATS = "NANOTICKER_STATS"; const NANOTPS_STATS = "NANOTPS_STATS"; const NANOSPEED_STATS = "NANOSPEED_STATS"; const NANOBROWSERQUEST_ONLINE_PLAYERS = "NANOBROWSERQUEST_ONLINE_PLAYERS"; @@ -125,7 +124,6 @@ module.exports = { DELEGATED_ENTITY, REDIS_RICH_LIST, PARTICIPANTS, - NANOTICKER_STATS, NANOTPS_STATS, NANOSPEED_STATS, NANOBROWSERQUEST_ONLINE_PLAYERS, diff --git a/server/cron/nanobrowserquestStats.js b/server/cron/nanobrowserquestStats.js index 1f962a37..0db4a329 100644 --- a/server/cron/nanobrowserquestStats.js +++ b/server/cron/nanobrowserquestStats.js @@ -34,7 +34,7 @@ const getNanoBrowserQuestLeaderboard = async () => { ); // rawCursor = reply.cursor; - console.log('~~~reply.cursor',reply.cursor) + console.log("~~~reply.cursor", reply.cursor); keys.push(...reply.keys); } while (reply.cursor); return keys; @@ -99,6 +99,5 @@ cron.schedule("*/15 * * * *", async () => { }); if (!nodeCache.get(NANOBROWSERQUEST_LEADERBOARD)) { - -getNanoBrowserQuestLeaderboard(); + getNanoBrowserQuestLeaderboard(); } diff --git a/server/cron/nanotickerStats.js b/server/cron/nanotickerStats.js deleted file mode 100644 index 8d4497c0..00000000 --- a/server/cron/nanotickerStats.js +++ /dev/null @@ -1,27 +0,0 @@ -const cron = require("node-cron"); -const fetch = require("node-fetch"); -const { Sentry } = require("../sentry"); -const { nodeCache } = require("../client/cache"); -const { NANOTICKER_STATS } = require("../constants"); - -const doNanotickerStats = async () => { - try { - const res = await fetch("https://nanoticker.info/json/stats.json"); - - const { CPSMedian: cps } = await res.json(); - - nodeCache.set(NANOTICKER_STATS, { cps }); - } catch (err) { - //@NOTE throws too much.... - // Sentry.captureException(err); - } -}; - -// Every 10 seconds -cron.schedule("*/10 * * * * *", async () => { - doNanotickerStats(); -}); - -if (!nodeCache.get(NANOTICKER_STATS)) { - doNanotickerStats(); -} diff --git a/server/server.js b/server/server.js index dedb370c..094faff3 100644 --- a/server/server.js +++ b/server/server.js @@ -13,7 +13,6 @@ require("./cron/telemetry"); require("./cron/ws"); require("./cron/coingeckoStats"); require("./cron/btcTransactionFees"); -require("./cron/nanotickerStats"); require("./cron/nanotpsStats"); require("./cron/nanospeed"); require("./cron/nanobrowserquestStats"); @@ -38,7 +37,6 @@ const { TOTAL_VOLUME_7D, TOTAL_VOLUME_14D, CONFIRMATIONS_PER_SECOND, - NANOTICKER_STATS, NANOBROWSERQUEST_ONLINE_PLAYERS, NANOBROWSERQUEST_LEADERBOARD, NANOTPS_STATS, @@ -323,14 +321,6 @@ app.get("/api/nanobrowserquest/leaderboard", async (req, res, next) => { } }); -app.get("/api/nanoticker", async (req, res, next) => { - try { - res.send(nodeCache.get(NANOTICKER_STATS) || {}); - } catch (err) { - next(err); - } -}); - app.get("/api/youtube-playlist", async (req, res) => { const playlist = await getYoutubePlaylist(); diff --git a/src/api/hooks/use-nanoticker.tsx b/src/api/hooks/use-nanoticker.tsx deleted file mode 100644 index bae77717..00000000 --- a/src/api/hooks/use-nanoticker.tsx +++ /dev/null @@ -1,50 +0,0 @@ -import * as React from "react"; - -export interface UseUptimeReturn { - confirmationsPerSecond: number | undefined; -} - -let confirmationsPerSecondTimeout: number | undefined; - -const useNanoTicker = (): UseUptimeReturn => { - const [confirmationsPerSecond, setConfirmationsPerSecond] = React.useState(); - - const getConfirmationsPerSecond = async () => { - clearTimeout(confirmationsPerSecondTimeout); - // try { - const res = await fetch("/api/nanoticker"); - const { cps } = await res.json(); - - setConfirmationsPerSecond(cps); - // } catch (err) { - // setConfirmationsPerSecond(undefined); - // } - - confirmationsPerSecondTimeout = window.setTimeout(() => { - getConfirmationsPerSecond(); - }, 3000); - }; - - React.useEffect(() => { - function visibilityChange() { - if (document.visibilityState === "visible") { - getConfirmationsPerSecond(); - } else { - clearTimeout(confirmationsPerSecondTimeout); - } - } - - getConfirmationsPerSecond(); - window.addEventListener("visibilitychange", visibilityChange); - - return () => { - clearTimeout(confirmationsPerSecondTimeout); - window.removeEventListener("visibilitychange", visibilityChange); - }; - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - - return { confirmationsPerSecond }; -}; - -export default useNanoTicker; diff --git a/src/components/ConfirmationsPerSecond/index.tsx b/src/components/ConfirmationsPerSecond/index.tsx index 8a230ad5..aa00a6eb 100644 --- a/src/components/ConfirmationsPerSecond/index.tsx +++ b/src/components/ConfirmationsPerSecond/index.tsx @@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next"; import { Skeleton, Statistic, Tooltip, Typography } from "antd"; import useConfirmationsPerSecond from "api/hooks/use-confirmations-per-second"; -import useNanoTicker from "api/hooks/use-nanoticker"; import QuestionCircle from "components/QuestionCircle"; const { Text } = Typography; @@ -12,25 +11,9 @@ const { Text } = Typography; const ConfirmationsPerSecond = () => { const { t } = useTranslation(); const { confirmationsPerSecond: nodeCps } = useConfirmationsPerSecond(); - const { confirmationsPerSecond: networkCps } = useNanoTicker(); return nodeCps ? ( <> - {networkCps ? ( - <> - - {t("pages.home.cpsNetwork")} - -
- -
- - ) : null} - {nodeCps ? ( {t("pages.home.cpsLocal")}