Skip to content

Commit 98ecf5f

Browse files
alexcambosealexcambose
committed
chore: test with unstable_cache
1 parent 1872162 commit 98ecf5f

File tree

5 files changed

+67
-42
lines changed

5 files changed

+67
-42
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Metadata } from "next";
22
import { notFound } from "next/navigation";
33
import type { ReactNode } from "react";
44

5-
import { getFeedsCached } from "../../../server/pyth/get-feeds";
5+
import { getFeedsCached } from "../../../server/pyth";
66
import { Cluster } from "../../../services/pyth";
77

88
export { PriceFeedLayout as default } from "../../../components/PriceFeed/layout";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from "../../config/server";
1212
import { LivePriceDataProvider } from "../../hooks/use-live-price-data";
1313
import { getPublishersCached } from '../../server/clickhouse';
14-
import { getFeedsCached } from '../../server/pyth/get-feeds';
14+
import { getFeedsCached } from '../../server/pyth';
1515
import { Cluster } from "../../services/pyth";
1616
import { PriceFeedIcon } from "../PriceFeedIcon";
1717
import { PublisherIcon } from "../PublisherIcon";

‎apps/insights/src/config/server.ts‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Disable the following rule because this file is the intended place to declare
22
// and load all env variables.
3-
/* eslint-disable n/no-process-env, @typescript-eslint/no-non-null-assertion, turbo/no-undeclared-env-vars */
3+
/* eslint-disable n/no-process-env */
44

55
import { Redis } from 'ioredis';
66
import "server-only";
@@ -63,10 +63,7 @@ export const ENABLE_ACCESSIBILITY_REPORTING =
6363
let redisClient: Redis | undefined;
6464

6565
export function getRedis(): Redis {
66-
const url = process.env.REDIS_URL;
67-
if (!url) {
68-
throw new Error('REDIS_URL must be set');
69-
}
66+
const url = demand("REDIS_URL");
7067
if(redisClient) {
7168
return redisClient;
7269
}
@@ -76,13 +73,14 @@ export function getRedis(): Redis {
7673

7774
export const PUBLIC_URL = (() => {
7875
if (IS_PRODUCTION_SERVER) {
79-
80-
return `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL!}`;
76+
const productionUrl = demand("VERCEL_PROJECT_PRODUCTION_URL");
77+
return `https://${productionUrl}`;
8178
} else if (IS_PREVIEW_SERVER) {
82-
return `https://${process.env.VERCEL_URL!}`;
79+
const previewUrl = demand("VERCEL_URL");
80+
return `https://${previewUrl}`;
8381
} else {
8482
return `http://localhost:3003`;
8583
}
8684
})();
8785

88-
export const VERCEL_AUTOMATION_BYPASS_SECRET = process.env.VERCEL_AUTOMATION_BYPASS_SECRET!;
86+
export const VERCEL_AUTOMATION_BYPASS_SECRET = demand("VERCEL_AUTOMATION_BYPASS_SECRET");

‎apps/insights/src/server/pyth.ts‎

Lines changed: 56 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { parse, } from "superjson";
1+
import { unstable_cache } from "next/cache";
2+
import { parse,stringify } from "superjson";
23
import { z } from "zod";
34

45
import { PUBLIC_URL, VERCEL_AUTOMATION_BYPASS_SECRET } from '../config/server';
56
import { Cluster, priceFeedsSchema } from "../services/pyth";
67
import { DEFAULT_CACHE_TTL } from "../utils/cache";
8+
import { getFeedsCached as _getFeedsCached } from "./pyth/get-feeds";
79

8-
// Convenience helpers matching your previous functions
910
export async function getPublishersForFeedCached(
1011
cluster: Cluster,
1112
symbol: string
@@ -37,35 +38,60 @@ export async function getFeedsForPublisherCached(
3738
return parse<z.infer<typeof priceFeedsSchema>>(rawData);
3839
}
3940

41+
const _privateGetFeeds =unstable_cache(async (cluster: Cluster) => {
42+
const start = Date.now();
43+
const feeds = await _getFeedsCached(cluster) as Omit<z.infer<typeof priceFeedsSchema>[number], 'price'>[];
44+
const end = Date.now();
45+
// eslint-disable-next-line no-console
46+
console.log("internal getFeedsCached", cluster, end - start);
47+
return feeds.map((feed) => ({
48+
...feed,
49+
price: undefined,
50+
}));
51+
// const data = await fetch(`${PUBLIC_URL}/api/pyth/get-feeds?cluster=${cluster.toString()}&excludePriceComponents=true`, {
52+
// next: {
53+
// revalidate: DEFAULT_CACHE_TTL,
54+
// },
55+
// headers: {
56+
// 'x-vercel-protection-bypass': VERCEL_AUTOMATION_BYPASS_SECRET,
57+
// },
58+
// });
59+
// const dataJson = await data.text();
60+
// const feeds: Omit<z.infer<typeof priceFeedsSchema>[0], "price">[] = parse(dataJson);
61+
// return feeds;
62+
}, ['getFeedsCached__'], {
63+
revalidate: DEFAULT_CACHE_TTL,
64+
});
65+
4066
export const getFeedsCached = async (cluster: Cluster) => {
41-
const data = await fetch(`${PUBLIC_URL}/api/pyth/get-feeds?cluster=${cluster.toString()}&excludePriceComponents=true`, {
42-
next: {
43-
revalidate: DEFAULT_CACHE_TTL,
44-
},
45-
headers: {
46-
'x-vercel-protection-bypass': VERCEL_AUTOMATION_BYPASS_SECRET,
47-
},
48-
});
49-
const dataJson = await data.text();
50-
const feeds: Omit<z.infer<typeof priceFeedsSchema>[0], "price">[] = parse(dataJson);
51-
return feeds;
67+
const start = Date.now();
68+
const data = await _privateGetFeeds(cluster);
69+
const end = Date.now();
70+
// eslint-disable-next-line no-console
71+
console.log("getFeedsCached", end - start);
72+
return data;
73+
};
74+
75+
const _getFeedsForSymbol = async (symbol: string, cluster: Cluster) => {
76+
const feeds = await _getFeedsCached(cluster);
77+
const feed = feeds.find((feed) => feed.symbol === symbol);
78+
return feed;
5279
}
5380

54-
export const getFeedForSymbolCached = async ({symbol, cluster = Cluster.Pythnet}: {symbol: string, cluster?: Cluster}): Promise<z.infer<typeof priceFeedsSchema>[0] | undefined> => {
55-
const data = await fetch(`${PUBLIC_URL}/api/pyth/get-feeds/${encodeURIComponent(symbol)}?cluster=${cluster.toString()}`, {
56-
next: {
57-
revalidate: DEFAULT_CACHE_TTL,
58-
},
59-
headers: {
60-
'x-vercel-protection-bypass': VERCEL_AUTOMATION_BYPASS_SECRET,
61-
},
62-
});
63-
64-
if(!data.ok) {
65-
return undefined;
66-
}
6781

68-
const dataJson = await data.text();
69-
const feed: z.infer<typeof priceFeedsSchema>[0] = parse(dataJson);
70-
return feed;
71-
}
82+
83+
export const getFeedForSymbol = unstable_cache(async ({symbol, cluster = Cluster.Pythnet}: {symbol: string, cluster?: Cluster}) => {
84+
const data = await _getFeedsForSymbol(symbol, cluster);
85+
return stringify(data);
86+
}, ['getFeedForSymbolCached__'], {
87+
revalidate: DEFAULT_CACHE_TTL,
88+
});
89+
90+
export const getFeedForSymbolCached = async ({symbol, cluster = Cluster.Pythnet}: {symbol: string, cluster?: Cluster}) => {
91+
const start = Date.now();
92+
const data = await getFeedForSymbol({symbol, cluster});
93+
const end = Date.now();
94+
// eslint-disable-next-line no-console
95+
console.log("getFeedForSymbolCached", symbol, cluster, end - start);
96+
return parse<ReturnType<typeof _getFeedsForSymbol>>(data);
97+
};

‎apps/insights/turbo.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"DISABLE_ACCESSIBILITY_REPORTING",
1717
"NEXT_PUBLIC_PYTHNET_RPC",
1818
"NEXT_PUBLIC_PYTHTEST_CONFORMANCE_RPC",
19-
"REDIS_URL"
19+
"REDIS_URL",
20+
"VERCEL_PROJECT_PRODUCTION_URL"
2021
]
2122
},
2223
"fix:lint": {

0 commit comments

Comments
 (0)