@fileverse-dev/formulajs 4.4.11-mod-74 → 4.4.11-mod-76

package/lib/cjs/index.cjs

@@ -13132,6 +13132,7 @@ const UTILITY = {
 };
 const MAX_PAGE_LIMIT = 250;
 
+// if data block need API key
 const SERVICES_API_KEY = {
   Etherscan: 'Etherscan',
   Coingecko: 'Coingecko',
@@ -13264,17 +13265,17 @@ function removeUrlParams(url, paramsToRemove) {
 function getUrlAndHeaders({ url, serviceName, headers = {} }) {
     // Check if proxy is enabled in localStorage
     const apiKeyLS = window.localStorage.getItem(SERVICES_API_KEY[serviceName]);
-    if(SERVICES_API_KEY[serviceName] && (!apiKeyLS || apiKeyLS === '')) {
-        throw new MissingApiKeyError(SERVICES_API_KEY[serviceName])
-    }
     const isProxyModeEnabledValue = apiKeyLS === 'DEFAULT_PROXY_MODE';
 
     // Check if proxy URL exists for this service
     const proxyConfig = PROXY_MAP[serviceName];
 
+    if (!proxyConfig && SERVICES_API_KEY[serviceName] && (!apiKeyLS || apiKeyLS === '')) {
+        throw new MissingApiKeyError(SERVICES_API_KEY[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);
+    if ((isProxyModeEnabledValue || !apiKeyLS || apiKeyLS === '') && proxyConfig) {
         // Remove specified parameters from the target URL
         const cleanedUrl = removeUrlParams(url, proxyConfig.removeParams);
 
@@ -13297,7 +13298,7 @@ function getUrlAndHeaders({ url, serviceName, headers = {} }) {
 }
 
 const fromTimeStampToBlock = async (timestamp, chain, apiKey) => {
-  if (!timestamp || !chain || !apiKey) return
+  if (!timestamp || !chain) 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 { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: {} });
@@ -17708,9 +17709,6 @@ async function FIREFLY() {
     });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Firefly);
-    if (!apiKey) {
-      throw new MissingApiKeyError(SERVICES_API_KEY.Firefly)
-    }
 
     const url = new URL('https://openapi.firefly.land/v1/fileverse/fetch');
     url.searchParams
@@ -17770,9 +17768,6 @@ async function LENS() {
     const apiKey = window.localStorage.getItem(
       SERVICES_API_KEY.Firefly
     );
-    if (!apiKey) {
-      throw new MissingApiKeyError(SERVICES_API_KEY.Firefly)
-    }
 
     const url = new URL(
       'https://openapi.firefly.land/v1/fileverse/fetch'
@@ -17834,9 +17829,6 @@ async function FARCASTER() {
     const apiKey = window.localStorage.getItem(
       SERVICES_API_KEY.Firefly
     );
-    if (!apiKey) {
-      throw new MissingApiKeyError(SERVICES_API_KEY.Firefly)
-    }
 
     const url = new URL(
       'https://openapi.firefly.land/v1/fileverse/fetch'
@@ -17975,7 +17967,6 @@ async function BASE() {
     const [type, address, startDate, endDate, page, limit] = argsToArray(arguments);
     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,
@@ -18011,7 +18002,6 @@ async function GNOSIS() {
     const apiKey = window.localStorage.getItem(
       SERVICES_API_KEY.Gnosisscan
     );
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Gnosisscan)
 
     return await handleScanRequest({
       type,
@@ -18041,7 +18031,6 @@ async function NEYNAR() {
     validateParams(neynarParamsSchema, { username });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Neynar);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Neynar)
 
     const fid = await fromUsernameToFid$1.fromUsernameToFid(username, apiKey);
     if (!fid) throw new ValidationError(`Invalid username: ${username}`)
@@ -18049,7 +18038,7 @@ async function NEYNAR() {
     const url = `https://api.neynar.com/v2/farcaster/followers?fid=${fid}`;
 
     const { URL: finalUrl, HEADERS } = getUrlAndHeaders({
-      url: url.toString(), serviceName: 'Firefly',
+      url: url.toString(), serviceName: 'Neynar',
         headers: {
           'x-api-key': apiKey,
           'x-neynar-experimental': 'false'
@@ -18154,7 +18143,6 @@ async function ETHERSCAN() {
     if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Etherscan)
 
     return await handleScanRequest({
       type,
@@ -18180,7 +18168,6 @@ async function COINGECKO() {
     validateParams(coingeckoParamsSchema, { category, param1, param2 });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Coingecko);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Coingecko)
 
     const headers = {
       accept: 'application/json',
@@ -18247,14 +18234,12 @@ async function 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);
-    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);
@@ -18271,7 +18256,6 @@ async function EOA() {
       }
     }
     const ADDRS = Object.keys(ADDRESS_MAP);
-    console.log('ADDRS', ADDRS);
     const out = [];
 
     async function fetchJSON(url) {
@@ -18346,7 +18330,6 @@ async function SAFE() {
     validateParams(safeParamsSchema, { address, utility, chain, limit, offset });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Safe);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Safe)
 
     const chainId = SAFE_CHAIN_MAP[chain];
     if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
@@ -18383,7 +18366,6 @@ async function DEFILLAMA() {
     const [category] = argsToArray(arguments);
     validateParams(defillamaParamsSchema, { category });
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Defillama);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Defillama)
     const url = CATEGORY_URLS[category];
     if (!url) throw new ValidationError(`Invalid category: ${category}`)
     const res = await fetch(url);

package/lib/esm/index.mjs

@@ -13130,6 +13130,7 @@ const UTILITY = {
 };
 const MAX_PAGE_LIMIT = 250;
 
+// if data block need API key
 const SERVICES_API_KEY = {
   Etherscan: 'Etherscan',
   Coingecko: 'Coingecko',
@@ -13262,17 +13263,17 @@ function removeUrlParams(url, paramsToRemove) {
 function getUrlAndHeaders({ url, serviceName, headers = {} }) {
     // Check if proxy is enabled in localStorage
     const apiKeyLS = window.localStorage.getItem(SERVICES_API_KEY[serviceName]);
-    if(SERVICES_API_KEY[serviceName] && (!apiKeyLS || apiKeyLS === '')) {
-        throw new MissingApiKeyError(SERVICES_API_KEY[serviceName])
-    }
     const isProxyModeEnabledValue = apiKeyLS === 'DEFAULT_PROXY_MODE';
 
     // Check if proxy URL exists for this service
     const proxyConfig = PROXY_MAP[serviceName];
 
+    if (!proxyConfig && SERVICES_API_KEY[serviceName] && (!apiKeyLS || apiKeyLS === '')) {
+        throw new MissingApiKeyError(SERVICES_API_KEY[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);
+    if ((isProxyModeEnabledValue || !apiKeyLS || apiKeyLS === '') && proxyConfig) {
         // Remove specified parameters from the target URL
         const cleanedUrl = removeUrlParams(url, proxyConfig.removeParams);
 
@@ -13295,7 +13296,7 @@ function getUrlAndHeaders({ url, serviceName, headers = {} }) {
 }
 
 const fromTimeStampToBlock = async (timestamp, chain, apiKey) => {
-  if (!timestamp || !chain || !apiKey) return
+  if (!timestamp || !chain) 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 { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: {} });
@@ -17706,9 +17707,6 @@ async function FIREFLY() {
     });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Firefly);
-    if (!apiKey) {
-      throw new MissingApiKeyError(SERVICES_API_KEY.Firefly)
-    }
 
     const url = new URL('https://openapi.firefly.land/v1/fileverse/fetch');
     url.searchParams
@@ -17768,9 +17766,6 @@ async function LENS() {
     const apiKey = window.localStorage.getItem(
       SERVICES_API_KEY.Firefly
     );
-    if (!apiKey) {
-      throw new MissingApiKeyError(SERVICES_API_KEY.Firefly)
-    }
 
     const url = new URL(
       'https://openapi.firefly.land/v1/fileverse/fetch'
@@ -17832,9 +17827,6 @@ async function FARCASTER() {
     const apiKey = window.localStorage.getItem(
       SERVICES_API_KEY.Firefly
     );
-    if (!apiKey) {
-      throw new MissingApiKeyError(SERVICES_API_KEY.Firefly)
-    }
 
     const url = new URL(
       'https://openapi.firefly.land/v1/fileverse/fetch'
@@ -17973,7 +17965,6 @@ async function BASE() {
     const [type, address, startDate, endDate, page, limit] = argsToArray(arguments);
     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,
@@ -18009,7 +18000,6 @@ async function GNOSIS() {
     const apiKey = window.localStorage.getItem(
       SERVICES_API_KEY.Gnosisscan
     );
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Gnosisscan)
 
     return await handleScanRequest({
       type,
@@ -18039,7 +18029,6 @@ async function NEYNAR() {
     validateParams(neynarParamsSchema, { username });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Neynar);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Neynar)
 
     const fid = await fromUsernameToFid$1.fromUsernameToFid(username, apiKey);
     if (!fid) throw new ValidationError(`Invalid username: ${username}`)
@@ -18047,7 +18036,7 @@ async function NEYNAR() {
     const url = `https://api.neynar.com/v2/farcaster/followers?fid=${fid}`;
 
     const { URL: finalUrl, HEADERS } = getUrlAndHeaders({
-      url: url.toString(), serviceName: 'Firefly',
+      url: url.toString(), serviceName: 'Neynar',
         headers: {
           'x-api-key': apiKey,
           'x-neynar-experimental': 'false'
@@ -18152,7 +18141,6 @@ async function ETHERSCAN() {
     if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Etherscan)
 
     return await handleScanRequest({
       type,
@@ -18178,7 +18166,6 @@ async function COINGECKO() {
     validateParams(coingeckoParamsSchema, { category, param1, param2 });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Coingecko);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Coingecko)
 
     const headers = {
       accept: 'application/json',
@@ -18245,14 +18232,12 @@ async function 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);
-    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);
@@ -18269,7 +18254,6 @@ async function EOA() {
       }
     }
     const ADDRS = Object.keys(ADDRESS_MAP);
-    console.log('ADDRS', ADDRS);
     const out = [];
 
     async function fetchJSON(url) {
@@ -18344,7 +18328,6 @@ async function SAFE() {
     validateParams(safeParamsSchema, { address, utility, chain, limit, offset });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Safe);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Safe)
 
     const chainId = SAFE_CHAIN_MAP[chain];
     if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
@@ -18381,7 +18364,6 @@ async function DEFILLAMA() {
     const [category] = argsToArray(arguments);
     validateParams(defillamaParamsSchema, { category });
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Defillama);
-    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Defillama)
     const url = CATEGORY_URLS[category];
     if (!url) throw new ValidationError(`Invalid category: ${category}`)
     const res = await fetch(url);

package/package.json

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