@defillama/sdk 5.0.204 → 5.0.207

package/build/util/cache.d.ts

@@ -27,17 +27,18 @@ export declare function getTempLocalCache({ file, defaultData, clearAfter, retur
 export declare function deleteCache(file: string): Promise<void>;
 export declare function readExpiringJsonCache(file: string): Promise<any>;
 export declare function writeExpiringJsonCache(file: string, data: any, { expireAfter, // cache for 1 day by default
-expiryTimestamp, }: {
+expiryTimestamp, }?: {
     expireAfter?: number;
     expiryTimestamp?: number;
 }): Promise<void>;
-export declare function cachedFetch({ key, endpoint, postData, fetcher, fetchOptions, errorOnNoCache, writeCacheOptions, readCacheOptions, }: {
+export declare function cachedFetch({ key, endpoint, postData, fetcher, fetchOptions, errorOnNoCache, cacheMaxAge, writeCacheOptions, readCacheOptions, }: {
     key: string;
     endpoint?: string;
     postData?: any;
     fetcher?: () => Promise<any>;
     fetchOptions?: any;
     errorOnNoCache?: boolean;
+    cacheMaxAge?: number;
     writeCacheOptions?: WriteCacheOptions;
     readCacheOptions?: ReadCacheOptions;
 }): Promise<any>;

package/build/util/cache.js

@@ -222,14 +222,14 @@ async function readExpiringJsonCache(file) {
     return data.data;
 }
 async function writeExpiringJsonCache(file, data, { expireAfter = 60 * 60 * 24, // cache for 1 day by default
-expiryTimestamp, }) {
+expiryTimestamp, } = {}) {
     file = 'expiring/' + file;
     if (!expiryTimestamp)
         expiryTimestamp = Math.floor(Date.now() / 1e3) + expireAfter;
     const options = { skipR2CacheWrite: true, skipCompression: true };
     await writeCache(file, { data, expiryTimestamp }, options);
 }
-async function cachedFetch({ key, endpoint, postData, fetcher, fetchOptions, errorOnNoCache = true, writeCacheOptions = {
+async function cachedFetch({ key, endpoint, postData, fetcher, fetchOptions, errorOnNoCache = true, cacheMaxAge = 0, writeCacheOptions = {
     skipCompression: true,
     skipR2CacheWrite: true,
 }, readCacheOptions = {
@@ -242,6 +242,21 @@ async function cachedFetch({ key, endpoint, postData, fetcher, fetchOptions, err
         key = (0, common_1.getHash)(endpoint);
     }
     const fileKey = 'cached-fetch/' + key;
+    // check local cache first
+    if (cacheMaxAge > 0) {
+        try {
+            const filePath = getFilePath(readCacheOptions.skipCompression ? `${fileKey}-uncompressed` : fileKey);
+            const stats = await fs.stat(filePath);
+            if (Date.now() - stats.mtimeMs < cacheMaxAge) {
+                const cachedData = await readCache(fileKey, readCacheOptions);
+                if (cachedData && Object.keys(cachedData).length > 0)
+                    return cachedData;
+            }
+        }
+        catch (error) {
+            // cache miss or stat error, proceed to fetch
+        }
+    }
     try {
         let data;
         if (fetcher)
@@ -260,7 +275,7 @@ async function cachedFetch({ key, endpoint, postData, fetcher, fetchOptions, err
     catch (error) {
         const errorMessage = (0, common_1.formError)(error).message;
         (0, debugLog_1.debugLog)('Error in cachedFetch:', errorMessage);
-        // if fetch fails, read from cache
+        // if fetch fails, read from cache (regardless of age)
         const cachedData = await readCache(fileKey, readCacheOptions);
         if (!cachedData && errorOnNoCache)
             throw new Error('Fetch failed and no cache available');