@fileverse-dev/formulajs 4.4.11-mod-68-patch-9 → 4.4.11-mod-73

package/lib/cjs/index.cjs

@@ -13144,42 +13144,44 @@ const SERVICES_API_KEY = {
   Defillama: 'Defillama'
 };
 
+const stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
+
 // Proxy map configuration
 const PROXY_MAP = {
     Etherscan: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Basescan: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Gnosisscan: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Coingecko: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Firefly: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Neynar: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     Safe: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     Defillama: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     GnosisPay: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     // Add more services as needed. It can be direct url instead of ENV variable
@@ -13211,12 +13213,11 @@ function removeUrlParams(url, paramsToRemove) {
 /**
  * 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')
+ * @param {string} serviceName - [OPTIONAL] The name of the service (e.g., 'EOA')
+ * @param {object} headers - [OPTIONAL] 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';
@@ -13240,30 +13241,23 @@ function getUrlAndHeaders({ url, serviceName, headers = {} }) {
         };
     }
 
-
     return {
         URL: url,
         HEADERS: {
             ...headers,
-            method: 'GET',
         }
     };
 }
 
 const fromTimeStampToBlock = async (timestamp, chain, apiKey) => {
-  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);
 
@@ -13425,7 +13419,7 @@ async function handleScanRequest({
     }
     url += `&page=${page}&offset=${offset}`;
   }
-    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({url, serviceName: 'Etherscan', headers: {}});
+    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({url, serviceName: apiInfo.apiKeyName, headers: {}});
     const res = await fetch(finalUrl, {
         method: 'GET',
         headers: HEADERS,
@@ -18257,7 +18251,6 @@ async function EOA() {
     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);
@@ -18280,7 +18273,6 @@ async function EOA() {
 
     async function fetchJSON(url) {
       const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: {} });
-      console.log('finalUrl', finalUrl, HEADERS);
       const res = await fetch(finalUrl, {
         method: 'GET',
         headers: HEADERS,
@@ -18297,14 +18289,10 @@ 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(',');
@@ -18318,10 +18306,8 @@ async function EOA() {
         }
       } 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) {

package/lib/esm/index.mjs

@@ -13142,42 +13142,44 @@ const SERVICES_API_KEY = {
   Defillama: 'Defillama'
 };
 
+const stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
+
 // Proxy map configuration
 const PROXY_MAP = {
     Etherscan: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Basescan: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Gnosisscan: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Coingecko: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Firefly: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Neynar: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     Safe: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     Defillama: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     GnosisPay: {
-        url: "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy",
+        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     // Add more services as needed. It can be direct url instead of ENV variable
@@ -13209,12 +13211,11 @@ function removeUrlParams(url, paramsToRemove) {
 /**
  * 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')
+ * @param {string} serviceName - [OPTIONAL] The name of the service (e.g., 'EOA')
+ * @param {object} headers - [OPTIONAL] 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';
@@ -13238,30 +13239,23 @@ function getUrlAndHeaders({ url, serviceName, headers = {} }) {
         };
     }
 
-
     return {
         URL: url,
         HEADERS: {
             ...headers,
-            method: 'GET',
         }
     };
 }
 
 const fromTimeStampToBlock = async (timestamp, chain, apiKey) => {
-  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);
 
@@ -13423,7 +13417,7 @@ async function handleScanRequest({
     }
     url += `&page=${page}&offset=${offset}`;
   }
-    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({url, serviceName: 'Etherscan', headers: {}});
+    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({url, serviceName: apiInfo.apiKeyName, headers: {}});
     const res = await fetch(finalUrl, {
         method: 'GET',
         headers: HEADERS,
@@ -18255,7 +18249,6 @@ async function EOA() {
     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);
@@ -18278,7 +18271,6 @@ async function EOA() {
 
     async function fetchJSON(url) {
       const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: {} });
-      console.log('finalUrl', finalUrl, HEADERS);
       const res = await fetch(finalUrl, {
         method: 'GET',
         headers: HEADERS,
@@ -18295,14 +18287,10 @@ 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(',');
@@ -18316,10 +18304,8 @@ async function EOA() {
         }
       } 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) {

package/package.json

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