Bläddra i källkod

fix: publishers metadata

Alexandru Cambose 3 månader sedan
förälder
incheckning
b684cbebe9

+ 4 - 8
apps/insights/src/components/Publisher/layout.tsx

@@ -45,6 +45,7 @@ import { SemicircleMeter } from "../SemicircleMeter";
 import { TabPanel, TabRoot, Tabs } from "../Tabs";
 import { TokenIcon } from "../TokenIcon";
 import { OisApyHistory } from "./ois-apy-history";
+import { getPublisherAverageScoreHistory, getPublisherRankingHistory } from '../../services/clickhouse';
 
 type Props = {
   children: ReactNode;
@@ -150,10 +151,7 @@ const RankingCard = async ({
   cluster: Cluster;
   publisherKey: string;
 }) => {
-  const rankingHistory = await getPublisherRankingHistoryCached(
-    cluster,
-    publisherKey,
-  );
+  const rankingHistory = await getPublisherRankingHistoryCached({ cluster, key: publisherKey });
   return <RankingCardImpl rankingHistory={rankingHistory} />;
 };
 
@@ -234,10 +232,8 @@ const ScoreCard = async ({
   cluster: Cluster;
   publisherKey: string;
 }) => {
-  const averageScoreHistory = await getPublisherAverageScoreHistoryCached(
-    cluster,
-    publisherKey,
-  );
+  const averageScoreHistory = await getPublisherAverageScoreHistoryCached({ cluster, key: publisherKey });
+  
   return <ScoreCardImpl averageScoreHistory={averageScoreHistory} />;
 };
 

+ 5 - 12
apps/insights/src/config/server.ts

@@ -63,27 +63,20 @@ export const ENABLE_ACCESSIBILITY_REPORTING =
 let redisClient: Redis | undefined;
 
 export function getRedis(): Redis {
-  const host = process.env.REDIS_HOST;
-  const port = process.env.REDIS_PORT;
-  const password = process.env.REDIS_PASSWORD;
-  if (!host || !port) {
-    throw new Error('REDIS_HOST, and REDIS_PORT must be set');
+  const url = process.env.REDIS_URL;
+  if (!url) {
+    throw new Error('REDIS_URL must be set');
   }
   if(redisClient) {
     return redisClient;
   }
-  redisClient = new Redis({ 
-    username: 'default',
-    password: password ?? '',
-    host,
-    port: Number.parseInt(port),
-    });
+  redisClient = new Redis(url);
   return redisClient;
 }
 
 export const PUBLIC_URL = (() => {
   if (IS_PRODUCTION_SERVER) {
-    
+
     return `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL!}`;
   } else if (IS_PREVIEW_SERVER) {
     return `https://${process.env.VERCEL_URL!}`;

+ 4 - 8
apps/insights/src/server/clickhouse.ts

@@ -19,14 +19,10 @@ export const getPublishersCached = redisCache.define(
 
 export const getPublisherAverageScoreHistoryCached = redisCache.define(
   "getPublisherAverageScoreHistory",
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error - The ACD cache lib does not have `define` correctly typed 
-  getPublisherAverageScoreHistory,
-).getPublisherAverageScoreHistory as typeof getPublisherAverageScoreHistory;
+  getPublisherAverageScoreHistory
+).getPublisherAverageScoreHistory
 
 export const getPublisherRankingHistoryCached = redisCache.define(
   "getPublisherRankingHistory",
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error - The ACD cache lib does not have `define` correctly typed 
-  getPublisherRankingHistory,
-).getPublisherRankingHistory as typeof getPublisherRankingHistory;
+  getPublisherRankingHistory
+).getPublisherRankingHistory

+ 2 - 4
apps/insights/src/services/clickhouse.ts

@@ -183,8 +183,7 @@ export const getYesterdaysPrices = async (symbols: string[]) =>
   );
 
 export const getPublisherRankingHistory = async (
-  cluster: Cluster,
-  key: string,
+  { cluster, key }: { cluster: Cluster; key: string }
 ) =>
   safeQuery(
     z.array(
@@ -288,8 +287,7 @@ export const getFeedPriceHistory = async (
   );
 
 export const getPublisherAverageScoreHistory = async (
-  cluster: Cluster,
-  key: string,
+  { cluster, key }: { cluster: Cluster; key: string }
 ) =>
   safeQuery(
     z.array(

+ 1 - 3
apps/insights/turbo.json

@@ -16,9 +16,7 @@
         "DISABLE_ACCESSIBILITY_REPORTING",
         "NEXT_PUBLIC_PYTHNET_RPC",
         "NEXT_PUBLIC_PYTHTEST_CONFORMANCE_RPC",
-        "REDIS_HOST",
-        "REDIS_PORT",
-        "REDIS_PASSWORD"
+        "REDIS_URL"
       ]
     },
     "fix:lint": {