@fileverse-dev/formulajs 4.4.11-mod-71 → 4.4.11-mod-68-patch-8

package/lib/esm/index.mjs

@@ -13142,15 +13142,131 @@ const SERVICES_API_KEY = {
   Defillama: 'Defillama'
 };
 
+// Proxy map configuration
+const PROXY_MAP = {
+    Etherscan: {
+        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        removeParams: ['apikey']
+    },
+    Basescan: {
+        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        removeParams: ['apikey']
+    },
+    Gnosisscan: {
+        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        removeParams: ['apikey']
+    },
+    Coingecko: {
+        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        removeParams: ['apikey']
+    },
+    Firefly: {
+        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        removeParams: ['apikey']
+    },
+    Neynar: {
+        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        removeParams: ['api_key']
+    },
+    Safe: {
+        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        removeParams: ['api_key']
+    },
+    Defillama: {
+        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        removeParams: ['api_key']
+    },
+    GnosisPay: {
+        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        removeParams: ['api_key']
+    },
+    // Add more services as needed. It can be direct url instead of ENV variable
+    // ANOTHER_SERVICE: "https://another-proxy-url.com"
+};
+
+/**
+ * Removes specified parameters from a URL
+ * @param {string} url - The original URL
+ * @param {string[]} paramsToRemove - Array of parameter names to remove
+ * @returns {string} URL with specified parameters removed
+ */
+function removeUrlParams(url, paramsToRemove) {
+    if (!paramsToRemove || paramsToRemove.length === 0) {
+        return url;
+    }
+
+    const urlObj = new URL(url);
+
+    paramsToRemove.forEach(param => {
+        if (urlObj.searchParams.has(param)) {
+            urlObj.searchParams.delete(param);
+        }
+    });
+
+    return urlObj.toString();
+}
+
+/**
+ * Handles URL routing through proxy or direct API calls
+ * @param {string} url - The original API URL
+ * @param {string} serviceName - The name of the service (e.g., 'EOA')
+ * @param {string} headers - The name of the service (e.g., 'EOA')
+ * @returns {Object} Object containing URL and HEADERS for the fetch request
+ */
+function getUrlAndHeaders({ url, serviceName, headers = {} }) {
+    console.log('getUrlAndHeaders new modified function from formulajs', url, serviceName);
+    // Check if proxy is enabled in localStorage
+    const apiKeyLS = window.localStorage.getItem(SERVICES_API_KEY[serviceName]);
+    const isProxyModeEnabledValue = apiKeyLS === 'DEFAULT_PROXY_MODE';
+
+    // Check if proxy URL exists for this service
+    const proxyConfig = PROXY_MAP[serviceName];
+
+    // If proxy mode is enabled AND proxy URL exists for this service
+    if (isProxyModeEnabledValue && proxyConfig && serviceName && SERVICES_API_KEY[serviceName]) {
+        console.log('isProxyModeEnabledValue', isProxyModeEnabledValue);
+        // Remove specified parameters from the target URL
+        const cleanedUrl = removeUrlParams(url, proxyConfig.removeParams);
+
+        return {
+            URL: proxyConfig.url,
+            HEADERS: {
+                'target-url': cleanedUrl,
+                method: 'GET',
+                'Content-Type': 'application/json'
+            }
+        };
+    }
+
+
+    return {
+        URL: url,
+        HEADERS: {
+            ...headers,
+            method: 'GET',
+            'Content-Type': 'application/json'
+        }
+    };
+}
+
 const fromTimeStampToBlock = async (timestamp, chain, apiKey) => {
-if(!timestamp || !chain || !apiKey) return 
-      const chainId = CHAIN_ID_MAP[chain];
-      const url = `https://api.etherscan.io/v2/api?module=block&action=getblocknobytime&timestamp=${timestamp}&closest=before&apikey=${apiKey}&chainId=${chainId}`;
-      const res = await fetch(url);
-      const json = await res.json();
-      return parseInt(json.result);
+  console.log('fromTimeStampToBlock', timestamp, chain, apiKey);
+  if (!timestamp || !chain || !apiKey) return
+  const chainId = CHAIN_ID_MAP[chain];
+  console.log('chainId', chainId);
+  const url = `https://api.etherscan.io/v2/api?module=block&action=getblocknobytime&timestamp=${timestamp}&closest=before&apikey=${apiKey}&chainId=${chainId}`;
+  console.log('url', url, getUrlAndHeaders);
+  const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: {} });
+  console.log('finalUrl', finalUrl, HEADERS);
+  const res = await fetch(finalUrl, {
+    method: 'GET',
+    headers: HEADERS,
+  });
+  console.log('res', res, finalUrl, HEADERS);
+  const json = await res.json();
+  return parseInt(json.result);
 
-  };
+};
 
 var fromTimestampToBlock = {
   fromTimeStampToBlock
@@ -13308,7 +13424,11 @@ async function handleScanRequest({
     }
     url += `&page=${page}&offset=${offset}`;
   }
-    const res = await fetch(url);
+    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({url, serviceName: 'Etherscan', headers: {}});
+    const res = await fetch(finalUrl, {
+        method: 'GET',
+        headers: HEADERS,
+      });
     if (!res.ok) {
       throw new NetworkError(apiInfo.apiKeyName, res.status)
     }
@@ -13327,14 +13447,19 @@ async function handleScanRequest({
 }
 
 const fromUsernameToFid = async (username, apiKey) => {
-  if(!username) return null
+  if (!username) return null
   const url = `https://api.neynar.com/v2/farcaster/user/search/?q=${username}&limit=5`;
-  const res = await fetch(url, {
-    headers: {
+  const { URL: finalUrl, HEADERS } = getUrlAndHeaders({
+    url, serviceName: 'Neynar', headers: {
       'x-api-key': apiKey,
       'x-neynar-experimental': 'false'
     }
   });
+
+  const res = await fetch(finalUrl, {
+    method: 'GET',
+    headers: HEADERS,
+  });
   const json = await res.json();
   const users = json.result ? json.result.users : [];
   const user = users.find(user => user.username === username);
@@ -17574,9 +17699,9 @@ const aaveParamsSchema = objectType({
 
 async function FIREFLY() {
   try {
-  const [platform, contentType, identifier, start = 0, end = 10] = argsToArray(arguments);
+    const [platform, contentType, identifier, start = 0, end = 10] = argsToArray(arguments);
 
-validateParams(fireflyParamsSchema, {
+    validateParams(fireflyParamsSchema, {
       platform,
       contentType,
       identifier,
@@ -17598,12 +17723,14 @@ validateParams(fireflyParamsSchema, {
           .filter(Boolean)
           .join(',')
       );
-      url.searchParams.set('type',  fireFlyPlaformType[platform][contentType]);
-          url.searchParams.set('start', String(start));
-          url.searchParams.set('end',   String(end));
+    url.searchParams.set('type', fireFlyPlaformType[platform][contentType]);
+    url.searchParams.set('start', String(start));
+    url.searchParams.set('end', String(end));
 
-    const response = await fetch(url.toString(), {
-      headers: { 'x-api-key': apiKey }
+    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url: url.toString(), serviceName: 'Firefly', headers: { 'x-api-key': apiKey } });
+    const response = await fetch(finalUrl, {
+      method: 'GET',
+      headers: HEADERS,
     });
     if (!response.ok) {
       throw new NetworkError(SERVICES_API_KEY.Firefly, response.status)
@@ -17661,15 +17788,18 @@ async function LENS() {
         .join(',')
     );
     const typeMap = {
-      posts:   'lensid',
+      posts: 'lensid',
       replies: 'lenspostid',
     };
     url.searchParams.set('type', typeMap[contentType]);
     url.searchParams.set('start', String(start));
-    url.searchParams.set('end',   String(end));
+    url.searchParams.set('end', String(end));
 
-    const response = await fetch(url.toString(), {
-      headers: { 'x-api-key': apiKey },
+    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url: url.toString(), serviceName: 'Firefly', headers: { 'x-api-key': apiKey } });
+
+    const response = await fetch(finalUrl, {
+      method: 'GET',
+      headers: HEADERS,
     });
     if (!response.ok) {
       throw new NetworkError(SERVICES_API_KEY.Firefly, response.status)
@@ -17696,7 +17826,7 @@ async function FARCASTER() {
   try {
     const [contentType, identifier, start = 0, end = 10] =
       argsToArray(arguments);
-validateParams(farcasterParamsSchema, {
+    validateParams(farcasterParamsSchema, {
       contentType,
       identifier,
       start,
@@ -17722,16 +17852,19 @@ validateParams(farcasterParamsSchema, {
         .join(',')
     );
     const typeMap = {
-  posts:    'farcasterid',
-  replies:  'farcasterpostid',
-  channels: 'farcasterchannels',
-};
+      posts: 'farcasterid',
+      replies: 'farcasterpostid',
+      channels: 'farcasterchannels',
+    };
     url.searchParams.set('type', typeMap[contentType]);
     url.searchParams.set('start', String(start));
-    url.searchParams.set('end',   String(end));
+    url.searchParams.set('end', String(end));
+
+    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url: url.toString(), serviceName: 'Firefly', headers: { 'x-api-key': apiKey } });
 
-    const response = await fetch(url.toString(), {
-      headers: { 'x-api-key': apiKey },
+    const response = await fetch(finalUrl, {
+      method: 'GET',
+      headers: HEADERS,
     });
     if (!response.ok) {
       throw new NetworkError(
@@ -17840,12 +17973,12 @@ async function BLOCKSCOUT() {
 }
 
 async function BASE() {
-try {
+  try {
     const [type, address, startDate, endDate, page, limit] = argsToArray(arguments);
-   validateParams(baseParamsSchema, { type, address, startDate, endDate, page, limit });
+    validateParams(baseParamsSchema, { type, address, startDate, endDate, page, limit });
     const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Basescan);
     if (!API_KEY) throw new MissingApiKeyError(SERVICES_API_KEY.Basescan)
-  
+
     return await handleScanRequest({
       type,
       address,
@@ -17858,9 +17991,9 @@ try {
       chainId: CHAIN_ID_MAP.base,
       network: 'base'
     })
-} catch (error) {
-  return errorMessageHandler(error, 'BASE')
-}
+  } catch (error) {
+    return errorMessageHandler(error, 'BASE')
+  }
 }
 async function GNOSIS() {
   try {
@@ -17901,9 +18034,9 @@ async function GNOSIS() {
 
 async function NEYNAR() {
   try {
-     const neynarParamsSchema = objectType({
-  username: stringType().nonempty()
-});
+    const neynarParamsSchema = objectType({
+      username: stringType().nonempty()
+    });
 
     const [username] = argsToArray(arguments);
 
@@ -17917,11 +18050,18 @@ async function NEYNAR() {
 
     const url = `https://api.neynar.com/v2/farcaster/followers?fid=${fid}`;
 
-    const response = await fetch(url, {
-      headers: {
-        'x-api-key': apiKey,
-        'x-neynar-experimental': 'false',
-      }
+    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({
+      url: url.toString(), serviceName: 'Firefly',
+        headers: {
+          'x-api-key': apiKey,
+          'x-neynar-experimental': 'false'
+        }
+      
+    });
+
+    const response = await fetch(finalUrl, {
+      method: 'GET',
+      headers: HEADERS,
     });
     if (!response.ok) {
       throw new NetworkError(SERVICES_API_KEY.Neynar, response.status)
@@ -18056,20 +18196,20 @@ async function COINGECKO() {
         break
       }
       case 'market': {
-        const map = { all:'', base:'base-ecosystem', meme:'meme-token', aiagents:'ai-agents', bitcoin:'bitcoin-ecosystem', ethereum:'ethereum-ecosystem', hyperliquid:'hyperliquid-ecosystem', pump:'pump-ecosystem', solana:'solana-ecosystem' };
+        const map = { all: '', base: 'base-ecosystem', meme: 'meme-token', aiagents: 'ai-agents', bitcoin: 'bitcoin-ecosystem', ethereum: 'ethereum-ecosystem', hyperliquid: 'hyperliquid-ecosystem', pump: 'pump-ecosystem', solana: 'solana-ecosystem' };
         const _category = map[param1] || '';
         const trend = param2 ? `&price_change_percentage=${param2}` : '';
-        url = `https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&include_tokens=top&page=1&per_page=100${_category?`&category=${_category}`:''}${trend}`;
+        url = `https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&include_tokens=top&page=1&per_page=100${_category ? `&category=${_category}` : ''}${trend}`;
         break
       }
       case 'stablecoins': {
-        const _category = param1==='all'? 'stablecoins' : param1;
+        const _category = param1 === 'all' ? 'stablecoins' : param1;
         const trend = param2 ? `&price_change_percentage=${param2}` : '';
         url = `https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&category=${_category}&order=market_cap_desc&page=1&per_page=100${trend}`;
         break
       }
       case 'derivatives': {
-        url = (!param1 || param1==='all')
+        url = (!param1 || param1 === 'all')
           ? 'https://api.coingecko.com/api/v3/derivatives'
           : `https://api.coingecko.com/api/v3/derivatives/exchanges/${param1}?include_tickers=all`;
         break
@@ -18084,17 +18224,17 @@ async function COINGECKO() {
       throw new NetworkError(SERVICES_API_KEY.Coingecko, res.status)
     }
 
-    if (category==='price') {
+    if (category === 'price') {
       const out = {};
       for (const [token, prices] of Object.entries(json))
-        for (const [cur,val] of Object.entries(prices))
-          out[`${token.charAt(0).toUpperCase()+token.slice(1)}_${cur.toUpperCase()}`]=val;
+        for (const [cur, val] of Object.entries(prices))
+          out[`${token.charAt(0).toUpperCase() + token.slice(1)}_${cur.toUpperCase()}`] = val;
       return [out]
     }
 
     const data = Array.isArray(json) ? json : [json];
-    return data.map(item=>{
-      const flat={};
+    return data.map(item => {
+      const flat = {};
       for (const [key, value] of Object.entries(item)) {
         if (typeof value !== 'object' || value === null) {
           flat[key] = value;
@@ -18102,22 +18242,24 @@ async function COINGECKO() {
       }
       return flat
     })
-  } catch(err) {
-    return errorMessageHandler(err,'COINGECKO')
+  } catch (err) {
+    return errorMessageHandler(err, 'COINGECKO')
   }
 }
 
 async function EOA() {
+  console.log('EOA');
   try {
     const [addresses, category, chains, startTime, endTime, page = 1, offset = 10] =
       argsToArray(arguments);
     validateParams(eoaParamsSchema, { addresses, category, chains, startTime, endTime, page, offset });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
+    console.log('apiKey', apiKey);
     if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Etherscan)
 
-    const INPUTS = addresses.split(',').map(s=>s.trim()).filter(Boolean);
-    const CHAINS = chains.split(',').map(s=>s.trim()).filter(Boolean);
+    const INPUTS = addresses.split(',').map(s => s.trim()).filter(Boolean);
+    const CHAINS = chains.split(',').map(s => s.trim()).filter(Boolean);
 
     const ADDRESS_MAP = {};
     for (const inp of INPUTS) {
@@ -18131,10 +18273,16 @@ async function EOA() {
       }
     }
     const ADDRS = Object.keys(ADDRESS_MAP);
+    console.log('ADDRS', ADDRS);
     const out = [];
 
     async function fetchJSON(url) {
-      const res = await fetch(url);
+      const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: {} });
+      console.log('finalUrl', finalUrl, HEADERS);
+      const res = await fetch(finalUrl, {
+        method: 'GET',
+        headers: HEADERS,
+      });
       if (!res.ok) throw new NetworkError(SERVICES_API_KEY.Etherscan, res.status)
       const json = await res.json();
 
@@ -18147,32 +18295,38 @@ async function EOA() {
 
 
     for (const chain of CHAINS) {
+      console.log('chain', chain);
       const chainId = CHAIN_ID_MAP[chain];
       if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
+      console.log('chain', chain);
+
 
       if (category === 'balance') {
+        console.log('balance');
         // chunk 20
-        for (let i=0; i<ADDRS.length; i+=20) {
-          const slice = ADDRS.slice(i,i+20).join(',');
+        for (let i = 0; i < ADDRS.length; i += 20) {
+          const slice = ADDRS.slice(i, i + 20).join(',');
           const url =
-            `https://api.etherscan.io/v2/api?chainid=${chainId}`+
-            `&module=account&action=addresstokenbalance&address=${slice}`+
+            `https://api.etherscan.io/v2/api?chainid=${chainId}` +
+            `&module=account&action=addresstokenbalance&address=${slice}` +
             `&page=${page}&offset=${offset}&apikey=${apiKey}`;
           const data = await fetchJSON(url);
           if (!Array.isArray(data)) return data
-          data.forEach((item, idx) => out.push({ chain, address: ADDRS[i+idx], name: ADDRESS_MAP[ADDRS[i+idx]], ...item }));
+          data.forEach((item, idx) => out.push({ chain, address: ADDRS[i + idx], name: ADDRESS_MAP[ADDRS[i + idx]], ...item }));
         }
       } else {
         // txns
+        console.log('startTime', startTime, 'endTime', endTime, chain, apiKey);
         const sb = await fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(startTime), chain, apiKey);
         const eb = await fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(endTime), chain, apiKey);
+        console.log('sb', sb, 'eb', eb);
         if (!sb) throw new ValidationError(`Invalid startTime: ${startTime}`)
         if (!eb) throw new ValidationError(`Invalid endTime: ${endTime}`)
         for (const addr of ADDRS) {
           const url =
-            `https://api.etherscan.io/v2/api?chainid=${chainId}`+
-            `&module=account&action=tokentx&address=${addr}`+
-            `&startblock=${sb}&endblock=${eb}`+
+            `https://api.etherscan.io/v2/api?chainid=${chainId}` +
+            `&module=account&action=tokentx&address=${addr}` +
+            `&startblock=${sb}&endblock=${eb}` +
             `&page=${page}&offset=${offset}&sort=asc&apikey=${apiKey}`;
           const data = await fetchJSON(url);
           if (!Array.isArray(data)) return data
@@ -18216,8 +18370,8 @@ async function SAFE() {
 
     const url = `https://api.safe.global/tx-service/${chainId}/api/v2/safes/${resolved}/multisig-transactions?limit=${limit}&offset=${offset}`;
 
-
-    const res = await fetch(url, { headers: { Authorization: `Bearer ${apiKey}` } });
+      const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: { Authorization: `Bearer ${apiKey}` } });
+    const res = await fetch(finalUrl, { headers: HEADERS });
     if (!res.ok) throw new NetworkError(SERVICES_API_KEY.Safe, res.status)
     const json = await res.json();
 
@@ -18247,20 +18401,20 @@ async function DEFILLAMA() {
 
     switch (category) {
       case 'protocols':
-        json = Array.isArray(json) ? json.slice(0,500) : [];
+        json = Array.isArray(json) ? json.slice(0, 500) : [];
         break
       case 'yields':
-        json = Array.isArray(json.data) ? json.data.slice(0,500) : [];
+        json = Array.isArray(json.data) ? json.data.slice(0, 500) : [];
         break
       case 'dex':
       case 'fees':
-        json = Array.isArray(json.protocols) ? json.protocols.slice(0,500) : [];
+        json = Array.isArray(json.protocols) ? json.protocols.slice(0, 500) : [];
         break
     }
 
     return (Array.isArray(json) ? json : [json]).map(item => {
       const out = {};
-      for (const [k,v] of Object.entries(item)) {
+      for (const [k, v] of Object.entries(item)) {
         if (v === null || typeof v !== 'object') out[k] = v;
       }
       return out
@@ -18296,7 +18450,7 @@ async function UNISWAP() {
       // flatten nested
       return json.map(item => {
         const flat = {};
-        Object.entries(item).forEach(([k,v]) => {
+        Object.entries(item).forEach(([k, v]) => {
           if (v === null || typeof v !== 'object') flat[k] = v;
         });
         return flat

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/formulajs",
-  "version": "4.4.11-mod-71",
+  "version": "4.4.11-mod-68-patch-8",
   "description": "JavaScript implementation of most Microsoft Excel formula functions",
   "author": "Formulajs",
   "publishConfig": {