refactor: proof api (#10647)

* fix: proof api requets * fix: nextid api cache
DimensionDev · Aug 28, 2023 · 0aa5e13 · 0aa5e13
1 parent 72daa31
commit 0aa5e13
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 24 deletions.
diff --git a/packages/web3-providers/src/DSearch/helpers.ts b/packages/web3-providers/src/DSearch/helpers.ts
@@ -4,6 +4,6 @@ import { fetchCachedJSON } from '../helpers/fetchJSON.js'
 export function fetchFromDSearch<T>(request: RequestInfo | URL, init?: RequestInit) {
     return fetchCachedJSON<T>(request, init, {
         squashExpiration: 0,
-        cacheDuration: Duration.MEDIUM,
+        cacheDuration: Duration.THIRTY_MINUTES,
     })
 }
diff --git a/packages/web3-providers/src/DeBank/apis/FungibleTokenAPI.ts b/packages/web3-providers/src/DeBank/apis/FungibleTokenAPI.ts
@@ -23,7 +23,7 @@ export class DeBankFungibleTokenAPI implements FungibleTokenAPI.Provider<ChainId
             }),
             undefined,
             {
-                cacheDuration: Duration.MINIMAL,
+                cacheDuration: Duration.TEN_SECONDS,
             },
         )
 

diff --git a/packages/web3-providers/src/NextID/proof.ts b/packages/web3-providers/src/NextID/proof.ts
@@ -22,6 +22,7 @@ import { staleNextIDCached } from './helpers.js'
 import PRESET_LENS from './preset-lens.json'
 import { fetchCachedJSON, fetchJSON, fetchSquashedJSON } from '../helpers/fetchJSON.js'
 import type { NextIDBaseAPI } from '../entry-types.js'
+import { Duration, Expiration } from '../entry-helpers.js'
 
 const BASE_URL =
     env.channel === 'stable' && process.env.NODE_ENV === 'production' ? PROOF_BASE_URL_PROD : PROOF_BASE_URL_DEV
@@ -223,7 +224,10 @@ const getExistedBindingQueryURL = (platform: string, identity: string, personaPu
 
 export class NextIDProofAPI implements NextIDBaseAPI.Proof {
     fetchFromProofService<T>(request: Request | RequestInfo, init?: RequestInit) {
-        return fetchCachedJSON<T>(request, init)
+        return fetchCachedJSON<T>(request, init, {
+            squashExpiration: Expiration.THIRTY_MINUTES,
+            cacheDuration: Duration.THIRTY_MINUTES,
+        })
     }
 
     async clearPersonaQueryCache(personaPublicKey: string) {
@@ -276,9 +280,9 @@ export class NextIDProofAPI implements NextIDBaseAPI.Proof {
     }
 
     async queryExistedBindingByPersona(personaPublicKey: string) {
-        const url = getPersonaQueryURL(NextIDPlatform.NextID, personaPublicKey)
-
-        const { ids } = await this.fetchFromProofService<NextIDBindings>(url)
+        const { ids } = await this.fetchFromProofService<NextIDBindings>(
+            getPersonaQueryURL(NextIDPlatform.NextID, personaPublicKey),
+        )
         // Will have only one item when query by personaPublicKey
         return first(ids)
     }
@@ -293,8 +297,6 @@ export class NextIDProofAPI implements NextIDBaseAPI.Proof {
                 page,
                 exact: true,
                 // TODO workaround for the API, and will sort the result manually
-                // sort: 'activated_at',
-                // order: 'desc',
             }),
         )
 

diff --git a/packages/web3-providers/src/R2D2/apis/TokenListAPI.ts b/packages/web3-providers/src/R2D2/apis/TokenListAPI.ts
@@ -16,7 +16,7 @@ const fetchTokenList = memoizePromise(
             url,
             { cache: 'default' },
             {
-                cacheDuration: Duration.LONG,
+                cacheDuration: Duration.TWELVE_HOURS,
             },
         )
     },

diff --git a/packages/web3-providers/src/SmartPay/apis/BundlerAPI.ts b/packages/web3-providers/src/SmartPay/apis/BundlerAPI.ts
@@ -15,7 +15,7 @@ export class SmartPayBundlerAPI implements BundlerAPI.Provider {
                 method: 'GET',
             },
             {
-                cacheDuration: Duration.LONG,
+                cacheDuration: Duration.TWELVE_HOURS,
             },
         )
     }

diff --git a/packages/web3-providers/src/Twitter/apis/getUserViaWebAPI.ts b/packages/web3-providers/src/Twitter/apis/getUserViaWebAPI.ts
@@ -48,8 +48,8 @@ export async function getUserViaWebAPI(screenName: string): Promise<TwitterBaseA
     if (!request) return null
 
     const response = await fetchGlobal(request, undefined, {
-        cacheDuration: Duration.SHORT,
-        squashExpiration: Expiration.SHORT,
+        cacheDuration: Duration.ONE_MINUTE,
+        squashExpiration: Expiration.ONE_SECOND,
     })
     if (response.ok) {
         const json: TwitterBaseAPI.UserByScreenNameResponse = await response.json()

diff --git a/packages/web3-providers/src/helpers/fetchCached.ts b/packages/web3-providers/src/helpers/fetchCached.ts
@@ -3,10 +3,11 @@ import type { Fetcher } from './fetch.js'
 const { fetch: originalFetch } = globalThis
 
 export enum Duration {
-    MINIMAL = 10000, // 10 seconds
-    SHORT = 60000, // 1 min
-    MEDIUM = 1800000, // 30 mins
-    LONG = 43200000, // 12 hours
+    TEN_SECONDS = 10000,
+    ONE_MINUTE = 60000,
+    THIRTY_MINUTES = 1800000,
+    TWELVE_HOURS = 43200000,
+    ONE_DAY = 86400000,
 }
 
 function __open__(url: string) {
@@ -56,7 +57,7 @@ export async function fetchCached(
     input: RequestInfo | URL,
     init?: RequestInit,
     next = originalFetch,
-    duration = Duration.SHORT,
+    duration = Duration.ONE_MINUTE,
 ): Promise<Response> {
     // why: the caches doesn't define in test env
     if (process.env.NODE_ENV === 'test') return next(input, init)
@@ -89,7 +90,7 @@ export async function staleCached(info: RequestInfo | URL, init?: RequestInit):
 
 export function createFetchCached({
     next = originalFetch,
-    duration = Duration.SHORT,
+    duration = Duration.ONE_MINUTE,
 }: {
     next?: Fetcher
     duration?: number

diff --git a/packages/web3-providers/src/helpers/fetchChains.ts b/packages/web3-providers/src/helpers/fetchChains.ts
@@ -31,6 +31,6 @@ export interface ChainConfig {
 export async function fetchChains() {
     return fetchCachedJSON<ChainConfig[]>('https://chainid.network/chains.json', undefined, {
         squashExpiration: 0,
-        cacheDuration: Duration.LONG,
+        cacheDuration: Duration.TWELVE_HOURS,
     })
 }
diff --git a/packages/web3-providers/src/helpers/fetchJSON.ts b/packages/web3-providers/src/helpers/fetchJSON.ts
@@ -19,7 +19,7 @@ export async function fetchSquashedJSON<T = unknown>(
     options?: NextFetchersOptions,
 ): Promise<T> {
     return fetchJSON<T>(input, init, {
-        squashExpiration: Expiration.SHORT,
+        squashExpiration: Expiration.ONE_SECOND,
         ...options,
     })
 }
@@ -30,8 +30,8 @@ export async function fetchCachedJSON<T = unknown>(
     options?: NextFetchersOptions,
 ): Promise<T> {
     return fetchJSON<T>(input, init, {
-        squashExpiration: Expiration.SHORT,
-        cacheDuration: Duration.SHORT,
+        squashExpiration: Expiration.ONE_SECOND,
+        cacheDuration: Duration.ONE_MINUTE,
         ...options,
     })
 }
diff --git a/packages/web3-providers/src/helpers/fetchSquashed.ts b/packages/web3-providers/src/helpers/fetchSquashed.ts
@@ -1,7 +1,10 @@
 const { fetch: originalFetch } = globalThis
 
 export enum Expiration {
-    SHORT = 1000,
+    ONE_SECOND = 1000,
+    ONE_MINUTE = 60000,
+    THIRTY_MINUTES = 1800000,
+    ONE_HOUR = 3600000,
 }
 
 const CACHE = new Map<
@@ -38,7 +41,7 @@ export async function fetchSquashed(
     init?: RequestInit,
     next = originalFetch,
     resolver = defaultResolver,
-    expiration = Expiration.SHORT,
+    expiration = Expiration.ONE_SECOND,
 ): Promise<Response> {
     // why: the caches doesn't define in test env
     if (process.env.NODE_ENV === 'test') return next(input, init)