@fileverse-dev/formulajs 4.4.11-mod-73 → 4.4.11-mod-75

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',
@@ -13144,44 +13145,88 @@ const SERVICES_API_KEY = {
   Defillama: 'Defillama'
 };
 
-const stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
+class ValidationError extends Error {
+  constructor(message) {
+    super(message);
+  }
+}
+
+
+
+class MissingApiKeyError extends Error {
+  constructor(apiKeyName){
+    super(`API key for ${apiKeyName} is missing`);
+  }
+}
+
+
+class RateLimitError extends Error {
+  constructor(apiKeyName){
+    super( `You have reached the rate limit for ${apiKeyName}`);
+    this.api = apiKeyName;
+  }
+}
+
 
+class NetworkError extends Error {
+  constructor(apiKeyName, status){
+    super(status === 429 ? `You have reached the rate limit for  ${apiKeyName}` : `${apiKeyName} API failed with status code: ${status}`  );
+    this.status = status;
+    this.api = apiKeyName;
+  }
+}
+
+class EnsError extends Error {
+  constructor(ensname) {
+    super(`${ensname} is not a supported ens name`);
+  }
+}
+
+class InvalidApiKeyError extends Error {
+  constructor(apiKeyName){
+    super(`Api key is invalid for ${apiKeyName}`);
+      this.api = apiKeyName;
+  }
+}
+
+const stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
+const productionFileverseProxyUrl = `${process.env.NEXT_PUBLIC_PROXY_BASE_URL}/proxy`;
 // Proxy map configuration
 const PROXY_MAP = {
     Etherscan: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Basescan: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Gnosisscan: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Coingecko: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Firefly: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Neynar: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     Safe: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     Defillama: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     GnosisPay: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     // Add more services as needed. It can be direct url instead of ENV variable
@@ -13225,9 +13270,12 @@ function getUrlAndHeaders({ url, serviceName, headers = {} }) {
     // 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);
 
@@ -13319,50 +13367,6 @@ var fromEnsNameToAddress$1 = {
   fromEnsNameToAddress
 };
 
-class ValidationError extends Error {
-  constructor(message) {
-    super(message);
-  }
-}
-
-
-
-class MissingApiKeyError extends Error {
-  constructor(apiKeyName){
-    super(`API key for ${apiKeyName} is missing`);
-  }
-}
-
-
-class RateLimitError extends Error {
-  constructor(apiKeyName){
-    super( `You have reached the rate limit for ${apiKeyName}`);
-    this.api = apiKeyName;
-  }
-}
-
-
-class NetworkError extends Error {
-  constructor(apiKeyName, status){
-    super(status === 429 ? `You have reached the rate limit for  ${apiKeyName}` : `${apiKeyName} API failed with status code: ${status}`  );
-    this.status = status;
-    this.api = apiKeyName;
-  }
-}
-
-class EnsError extends Error {
-  constructor(ensname) {
-    super(`${ensname} is not a supported ens name`);
-  }
-}
-
-class InvalidApiKeyError extends Error {
-  constructor(apiKeyName){
-    super(`Api key is invalid for ${apiKeyName}`);
-      this.api = apiKeyName;
-  }
-}
-
 async function handleScanRequest({
   type,
   address,
@@ -17705,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
@@ -17767,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'
@@ -17831,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'
@@ -17972,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,
@@ -18008,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,
@@ -18038,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}`)
@@ -18046,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'
@@ -18151,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,
@@ -18177,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',
@@ -18244,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);
@@ -18268,7 +18256,6 @@ async function EOA() {
       }
     }
     const ADDRS = Object.keys(ADDRESS_MAP);
-    console.log('ADDRS', ADDRS);
     const out = [];
 
     async function fetchJSON(url) {
@@ -18343,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}`)
@@ -18380,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',
@@ -13142,44 +13143,88 @@ const SERVICES_API_KEY = {
   Defillama: 'Defillama'
 };
 
-const stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
+class ValidationError extends Error {
+  constructor(message) {
+    super(message);
+  }
+}
+
+
+
+class MissingApiKeyError extends Error {
+  constructor(apiKeyName){
+    super(`API key for ${apiKeyName} is missing`);
+  }
+}
+
+
+class RateLimitError extends Error {
+  constructor(apiKeyName){
+    super( `You have reached the rate limit for ${apiKeyName}`);
+    this.api = apiKeyName;
+  }
+}
+
 
+class NetworkError extends Error {
+  constructor(apiKeyName, status){
+    super(status === 429 ? `You have reached the rate limit for  ${apiKeyName}` : `${apiKeyName} API failed with status code: ${status}`  );
+    this.status = status;
+    this.api = apiKeyName;
+  }
+}
+
+class EnsError extends Error {
+  constructor(ensname) {
+    super(`${ensname} is not a supported ens name`);
+  }
+}
+
+class InvalidApiKeyError extends Error {
+  constructor(apiKeyName){
+    super(`Api key is invalid for ${apiKeyName}`);
+      this.api = apiKeyName;
+  }
+}
+
+const stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
+const productionFileverseProxyUrl = `${process.env.NEXT_PUBLIC_PROXY_BASE_URL}/proxy`;
 // Proxy map configuration
 const PROXY_MAP = {
     Etherscan: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Basescan: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Gnosisscan: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Coingecko: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Firefly: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['apikey']
     },
     Neynar: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     Safe: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     Defillama: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     GnosisPay: {
-        url: process.env.NEXT_PUBLIC_PROXY_BASE_URL || stagingFileverseProxyUrl,
+        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
         removeParams: ['api_key']
     },
     // Add more services as needed. It can be direct url instead of ENV variable
@@ -13223,9 +13268,12 @@ function getUrlAndHeaders({ url, serviceName, headers = {} }) {
     // 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);
 
@@ -13317,50 +13365,6 @@ var fromEnsNameToAddress$1 = {
   fromEnsNameToAddress
 };
 
-class ValidationError extends Error {
-  constructor(message) {
-    super(message);
-  }
-}
-
-
-
-class MissingApiKeyError extends Error {
-  constructor(apiKeyName){
-    super(`API key for ${apiKeyName} is missing`);
-  }
-}
-
-
-class RateLimitError extends Error {
-  constructor(apiKeyName){
-    super( `You have reached the rate limit for ${apiKeyName}`);
-    this.api = apiKeyName;
-  }
-}
-
-
-class NetworkError extends Error {
-  constructor(apiKeyName, status){
-    super(status === 429 ? `You have reached the rate limit for  ${apiKeyName}` : `${apiKeyName} API failed with status code: ${status}`  );
-    this.status = status;
-    this.api = apiKeyName;
-  }
-}
-
-class EnsError extends Error {
-  constructor(ensname) {
-    super(`${ensname} is not a supported ens name`);
-  }
-}
-
-class InvalidApiKeyError extends Error {
-  constructor(apiKeyName){
-    super(`Api key is invalid for ${apiKeyName}`);
-      this.api = apiKeyName;
-  }
-}
-
 async function handleScanRequest({
   type,
   address,
@@ -17703,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
@@ -17765,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'
@@ -17829,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'
@@ -17970,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,
@@ -18006,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,
@@ -18036,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}`)
@@ -18044,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'
@@ -18149,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,
@@ -18175,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',
@@ -18242,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);
@@ -18266,7 +18254,6 @@ async function EOA() {
       }
     }
     const ADDRS = Object.keys(ADDRESS_MAP);
-    console.log('ADDRS', ADDRS);
     const out = [];
 
     async function fetchJSON(url) {
@@ -18341,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}`)
@@ -18378,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-73",
+  "version": "4.4.11-mod-75",
   "description": "JavaScript implementation of most Microsoft Excel formula functions",
   "author": "Formulajs",
   "publishConfig": {