feat: replaced more cached functions

Author: alexcambose

apps/insights/src/components/Publishers/index.tsx

@@ -29,7 +29,7 @@ export const Publishers = async () => {
     await Promise.all([
       getPublishersCached(Cluster.Pythnet),
       getPublishersCached(Cluster.PythtestConformance),
-      getOisStatsCached(),
+      getOisStats(),
     ]);
 
   const rankingTime = pythnetPublishers[0]?.timestamp;
@@ -165,8 +165,7 @@ const toTableRow = ({
   };
 };
 
-const getOisStatsCached = async () => {
-  "use cache";
+const getOisStats = async () => {
   const [delState, claimableRewards, distributedRewards, publisherCaps] =
     await Promise.all([
       getDelState(),

apps/insights/src/components/Root/index.tsx

@@ -5,17 +5,17 @@ import type { ReactNode } from "react";
 import { Suspense } from "react";
 
 import {
+  AMPLITUDE_API_KEY,
   ENABLE_ACCESSIBILITY_REPORTING,
   GOOGLE_ANALYTICS_ID,
-  AMPLITUDE_API_KEY,
 } from "../../config/server";
 import { LivePriceDataProvider } from "../../hooks/use-live-price-data";
-import { getPublishers } from "../../services/clickhouse";
+import { getPublishersCached } from '../../server/clickhouse';
+import { getFeedsCached } from '../../server/pyth';
 import { Cluster } from "../../services/pyth";
 import { PriceFeedIcon } from "../PriceFeedIcon";
 import { PublisherIcon } from "../PublisherIcon";
 import { SearchButton as SearchButtonImpl } from "./search-button";
-import { getFeedsCached } from '../../server/pyth';
 
 export const TABS = [
   { segment: "", children: "Overview" },
@@ -58,8 +58,7 @@ const SearchButton = async () => {
 };
 
 const getPublishersForSearchDialog = async (cluster: Cluster) => {
-  "use cache";
-  const publishers = await getPublishers(cluster);
+  const publishers = await getPublishersCached(cluster);
   return publishers.map((publisher) => {
     const knownPublisher = lookupPublisher(publisher.key);
 
@@ -76,7 +75,6 @@ const getPublishersForSearchDialog = async (cluster: Cluster) => {
 };
 
 const getFeedsForSearchDialog = async (cluster: Cluster) => {
-  "use cache";
   const feeds = await getFeedsCached(cluster);
 
   return feeds.map((feed) => ({

apps/insights/src/server/clickhouse.ts

@@ -1,28 +1,45 @@
 
 import { getPublisherAverageScoreHistory, getPublisherRankingHistory, getPublishers, getRankingsByPublisher, getRankingsBySymbol } from "../services/clickhouse";
 import { Cluster } from "../services/pyth";
+import { createChunkedCacheFetcher, fetchAllChunks } from '../utils/cache';
 
-export const getRankingsBySymbolCached = async (symbol: string) => {
-  "use cache";
+
+const _getRankingsBySymbol = createChunkedCacheFetcher(async (symbol: string) => {
   return getRankingsBySymbol(symbol);
+}, 'getRankingsBySymbol');
+
+export const getRankingsBySymbolCached = async (symbol: string) => {
+  return fetchAllChunks<ReturnType<typeof getRankingsBySymbol>, [string]>(_getRankingsBySymbol, symbol);
 };
 
-export const getRankingsByPublisherCached = async (publisherKey: string) => {
-  "use cache";
+const _getRankingsByPublisher = createChunkedCacheFetcher(async (publisherKey: string) => {
   return getRankingsByPublisher(publisherKey);
+}, 'getRankingsByPublisher');
+
+export const getRankingsByPublisherCached = async (publisherKey: string) => {
+  return fetchAllChunks<ReturnType<typeof getRankingsByPublisher>, [string]>(_getRankingsByPublisher, publisherKey);
 };
 
-export const getPublisherAverageScoreHistoryCached = async (cluster: Cluster, key: string) => {
-  "use cache";
+const _getPublisherAverageScoreHistory = createChunkedCacheFetcher(async (cluster: Cluster, key: string) => {
   return getPublisherAverageScoreHistory(cluster, key);
+}, 'getPublisherAverageScoreHistory');
+
+export const getPublisherAverageScoreHistoryCached = async (cluster: Cluster, key: string) => {
+  return fetchAllChunks<ReturnType<typeof getPublisherAverageScoreHistory>, [Cluster, string]>(_getPublisherAverageScoreHistory, cluster, key);
 };
 
-export const getPublisherRankingHistoryCached = async (cluster: Cluster, key: string) => {
-  "use cache";
+const _getPublisherRankingHistory = createChunkedCacheFetcher(async (cluster: Cluster, key: string) => {
   return getPublisherRankingHistory(cluster, key);
+}, 'getPublisherRankingHistory');
+
+export const getPublisherRankingHistoryCached = async (cluster: Cluster, key: string) => {
+  return fetchAllChunks<ReturnType<typeof getPublisherRankingHistory>, [Cluster, string]>(_getPublisherRankingHistory, cluster, key);
 };
 
-export const getPublishersCached = async (cluster: Cluster) => {
-  "use cache";
+const _getPublishers = createChunkedCacheFetcher(async (cluster: Cluster) => {
   return getPublishers(cluster);
+}, 'getPublishers');
+
+export const getPublishersCached = async (cluster: Cluster) => {
+  return fetchAllChunks<ReturnType<typeof getPublishers>, [Cluster]>(_getPublishers, cluster);
 };

apps/insights/src/server/pyth.ts

@@ -32,7 +32,6 @@ const fetchFeeds = createChunkedCacheFetcher(async (cluster: Cluster) => {
   return parsedData;
 }, 'getfeeds');
 
-
 const fetchPublishers = createChunkedCacheFetcher(async (cluster: Cluster) => {
   const data = await getDataCached(cluster);
   const result: Record<string, string[]> = {};