chore: unstable_cache

Author: alexcambose

apps/insights/src/app/price-feeds/[slug]/layout.ts

@@ -2,7 +2,7 @@ import type { Metadata } from "next";
 import { notFound } from "next/navigation";
 import type { ReactNode } from "react";
 
-import { getFeedsCached } from "../../../server/pyth/get-feeds";
+import { getFeedsCached } from "../../../server/pyth";
 import { Cluster } from "../../../services/pyth";
 
 export { PriceFeedLayout as default } from "../../../components/PriceFeed/layout";

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

@@ -11,7 +11,7 @@ import {
 } from "../../config/server";
 import { LivePriceDataProvider } from "../../hooks/use-live-price-data";
 import { getPublishersCached } from '../../server/clickhouse';
-import { getFeedsCached } from '../../server/pyth/get-feeds';
+import { getFeedsCached } from '../../server/pyth';
 import { Cluster } from "../../services/pyth";
 import { PriceFeedIcon } from "../PriceFeedIcon";
 import { PublisherIcon } from "../PublisherIcon";

apps/insights/src/config/server.ts

@@ -1,6 +1,6 @@
 // Disable the following rule because this file is the intended place to declare
 // and load all env variables.
-/* eslint-disable n/no-process-env, @typescript-eslint/no-non-null-assertion, turbo/no-undeclared-env-vars */
+/* eslint-disable n/no-process-env */
 
 import { Redis } from 'ioredis';
 import "server-only";
@@ -63,10 +63,7 @@ export const ENABLE_ACCESSIBILITY_REPORTING =
 let redisClient: Redis | undefined;
 
 export function getRedis(): Redis {
-  const url = process.env.REDIS_URL;
-  if (!url) {
-    throw new Error('REDIS_URL must be set');
-  }
+  const url = demand("REDIS_URL");
   if(redisClient) {
     return redisClient;
   }
@@ -76,13 +73,14 @@ export function getRedis(): Redis {
 
 export const PUBLIC_URL = (() => {
   if (IS_PRODUCTION_SERVER) {
-
-    return `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL!}`;
+    const productionUrl = demand("VERCEL_PROJECT_PRODUCTION_URL");
+    return `https://${productionUrl}`;
   } else if (IS_PREVIEW_SERVER) {
-    return `https://${process.env.VERCEL_URL!}`;
+    const previewUrl = demand("VERCEL_URL");
+    return `https://${previewUrl}`;
   } else {
     return `http://localhost:3003`;
   }
 })();
 
-export const VERCEL_AUTOMATION_BYPASS_SECRET = process.env.VERCEL_AUTOMATION_BYPASS_SECRET!;
+export const VERCEL_AUTOMATION_BYPASS_SECRET = demand("VERCEL_AUTOMATION_BYPASS_SECRET");

apps/insights/src/server/pyth.ts

@@ -1,11 +1,12 @@
-import { parse, } from "superjson";
+import { unstable_cache } from "next/cache";
+import { parse,stringify } from "superjson";
 import { z } from "zod";
 
 import { PUBLIC_URL, VERCEL_AUTOMATION_BYPASS_SECRET } from '../config/server';
 import { Cluster, priceFeedsSchema } from "../services/pyth";
 import { DEFAULT_CACHE_TTL } from "../utils/cache";
+import { getFeedsCached as _getFeedsCached } from "./pyth/get-feeds";
 
-// Convenience helpers matching your previous functions
 export async function getPublishersForFeedCached(
   cluster: Cluster,
   symbol: string
@@ -37,7 +38,17 @@ export async function getFeedsForPublisherCached(
   return parse<z.infer<typeof priceFeedsSchema>>(rawData);
 }
 
-export const getFeedsCached = async (cluster: Cluster) => {
+const _privateGetFeeds  =async (cluster: Cluster) => {
+  // const start = Date.now();
+  // await new Promise((resolve) => setTimeout(resolve, 10_000));
+  // const feeds = await _getFeedsCached(cluster) as Omit<z.infer<typeof priceFeedsSchema>[number], 'price'>[];
+  // const end = Date.now();
+  // // eslint-disable-next-line no-console
+  // console.log("internal getFeedsCached", cluster, end - start);
+  // return feeds.map((feed) => ({
+  //   ...feed,
+  //   price: undefined,
+  // }));
   const data = await fetch(`${PUBLIC_URL}/api/pyth/get-feeds?cluster=${cluster.toString()}&excludePriceComponents=true`, {
     next: {
       revalidate: DEFAULT_CACHE_TTL,
@@ -49,23 +60,38 @@ export const getFeedsCached = async (cluster: Cluster) => {
   const dataJson = await data.text();
   const feeds: Omit<z.infer<typeof priceFeedsSchema>[0], "price">[] = parse(dataJson);
   return feeds;
+};
+export const getFeedsCached = async (cluster: Cluster) => {
+  const start = Date.now();
+  const data = await _privateGetFeeds(cluster);
+  const end = Date.now();
+  // eslint-disable-next-line no-console
+  console.log("getFeedsCached", end - start);
+  return data;
+};
+
+const _getFeedsForSymbol = async (symbol: string, cluster: Cluster) => {
+  const feeds = await _getFeedsCached(cluster);
+  const feed = feeds.find((feed) => feed.symbol === symbol);
+  return feed;
 }
 
-export const getFeedForSymbolCached = async ({symbol, cluster = Cluster.Pythnet}: {symbol: string, cluster?: Cluster}): Promise<z.infer<typeof priceFeedsSchema>[0] | undefined> => {
-  const data = await fetch(`${PUBLIC_URL}/api/pyth/get-feeds/${encodeURIComponent(symbol)}?cluster=${cluster.toString()}`, {
-    next: {
-      revalidate: DEFAULT_CACHE_TTL,
-    },
-    headers: {
-      'x-vercel-protection-bypass': VERCEL_AUTOMATION_BYPASS_SECRET,
-    },
-  });
-  
-  if(!data.ok) {
-    return undefined;
-  }
 
-  const dataJson = await data.text();
-  const feed: z.infer<typeof priceFeedsSchema>[0] = parse(dataJson);
-  return feed;
-}
+
+export const getFeedForSymbol = unstable_cache(async ({symbol, cluster = Cluster.Pythnet}: {symbol: string, cluster?: Cluster}) => {
+  const data = await _getFeedsForSymbol(symbol, cluster);
+  await new Promise((resolve) => setTimeout(resolve, 10_000));
+
+  return stringify(data);
+}, ['getFeedForSymbolCached__'], {
+  revalidate: DEFAULT_CACHE_TTL,
+});
+
+export const getFeedForSymbolCached = async ({symbol, cluster = Cluster.Pythnet}: {symbol: string, cluster?: Cluster}) => {
+  const start = Date.now();
+  const data = await getFeedForSymbol({symbol, cluster});
+  const end = Date.now();
+  // eslint-disable-next-line no-console
+  console.log("getFeedForSymbolCached", symbol, cluster, end - start);
+  return parse<ReturnType<typeof _getFeedsForSymbol>>(data);
+};

apps/insights/turbo.json

@@ -16,7 +16,8 @@
         "DISABLE_ACCESSIBILITY_REPORTING",
         "NEXT_PUBLIC_PYTHNET_RPC",
         "NEXT_PUBLIC_PYTHTEST_CONFORMANCE_RPC",
-        "REDIS_URL"
+        "REDIS_URL",
+        "VERCEL_PROJECT_PRODUCTION_URL"
       ]
     },
     "fix:lint": {