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

package/lib/cjs/index.cjs

@@ -13189,44 +13189,43 @@ class InvalidApiKeyError extends Error {
   }
 }
 
-const stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
-const productionFileverseProxyUrl = `${process.env.NEXT_PUBLIC_PROXY_BASE_URL}/proxy`;
+const fileverseProxyUrl = `${process.env.NEXT_PUBLIC_PROXY_BASE_URL}/proxy`;
 // Proxy map configuration
 const PROXY_MAP = {
     Etherscan: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Basescan: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Gnosisscan: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Coingecko: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Firefly: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Neynar: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['api_key']
     },
     Safe: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['api_key']
     },
     Defillama: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['api_key']
     },
     GnosisPay: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['api_key']
     },
     // Add more services as needed. It can be direct url instead of ENV variable
@@ -13362,9 +13361,16 @@ async function fromEnsNameToAddress(name) {
     return null
   }
 }
+const validateAndGetAddress = async (address) => {
+if(isAddress$1.isAddress(address)) return address
+
+const resolvedAddress = await fromEnsNameToAddress(address);
+if(resolvedAddress) return resolvedAddress
+throw new ValidationError("Invalid address")
+};
 
 var fromEnsNameToAddress$1 = {
-  fromEnsNameToAddress
+  validateAndGetAddress
 };
 
 async function handleScanRequest({
@@ -13385,12 +13391,8 @@ async function handleScanRequest({
     GNOSIS: { url: 'https://api.gnosisscan.io/api', apiKeyName: SERVICES_API_KEY.Gnosisscan }
   };
 
-  if (!isAddress$1.isAddress(address) && type !== 'gas') {
-    const ensName = address;
-    address = await fromEnsNameToAddress$1.fromEnsNameToAddress(address);
-    if (!address) {
-      throw new EnsError(ensName)
-    }
+  if (type !== 'gas') {
+    address = await fromEnsNameToAddress$1.validateAndGetAddress(address);
   }
 
   const apiInfo = API_INFO_MAP[functionName];
@@ -17908,14 +17910,7 @@ async function BLOCKSCOUT() {
       startTimestamp ?? Math.floor((Date.now() - 30 * 24 * 3600 * 1000) / 1000);
     const endTs = endTimestamp;
 
-    let resolvedAddress = address;
-    if (!isAddress$1.isAddress(resolvedAddress)) {
-      const ensName = resolvedAddress;
-      resolvedAddress = await fromEnsNameToAddress$1.fromEnsNameToAddress(ensName);
-      if (!resolvedAddress) {
-        throw new EnsError(ensName)
-      }
-    }
+    const resolvedAddress = await fromEnsNameToAddress$1.validateAndGetAddress(address);
 
     const hostname = BLOCKSCOUT_CHAINS_MAP[chain];
 
@@ -18249,10 +18244,8 @@ async function EOA() {
       if (isAddress$1.isAddress(inp)) {
         ADDRESS_MAP[inp.toLowerCase()] = null;
       } else {
-        const ens = inp;
-        const resolved = await fromEnsNameToAddress$1.fromEnsNameToAddress(ens);
-        if (!resolved) throw new EnsError(ens)
-        ADDRESS_MAP[resolved.toLowerCase()] = ens;
+      const _address = await fromEnsNameToAddress$1.validateAndGetAddress(inp);
+        ADDRESS_MAP[_address.toLowerCase()] = _address;
       }
     }
     const ADDRS = Object.keys(ADDRESS_MAP);
@@ -18334,12 +18327,10 @@ async function SAFE() {
     const chainId = SAFE_CHAIN_MAP[chain];
     if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
 
-    let resolved = address;
-    if (!isAddress$1.isAddress(resolved)) {
-      const ens = resolved;
-      resolved = await fromEnsNameToAddress$1.fromEnsNameToAddress(ens);
-      if (!resolved) throw new EnsError(ens)
-    }
+
+    
+
+    const resolved = await fromEnsNameToAddress$1.validateAndGetAddress(address);
 
 
     const url = `https://api.safe.global/tx-service/${chainId}/api/v2/safes/${resolved}/multisig-transactions?limit=${limit}&offset=${offset}`;

package/lib/esm/index.mjs

@@ -13187,44 +13187,43 @@ class InvalidApiKeyError extends Error {
   }
 }
 
-const stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
-const productionFileverseProxyUrl = `${process.env.NEXT_PUBLIC_PROXY_BASE_URL}/proxy`;
+const fileverseProxyUrl = `${process.env.NEXT_PUBLIC_PROXY_BASE_URL}/proxy`;
 // Proxy map configuration
 const PROXY_MAP = {
     Etherscan: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Basescan: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Gnosisscan: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Coingecko: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Firefly: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['apikey']
     },
     Neynar: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['api_key']
     },
     Safe: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['api_key']
     },
     Defillama: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['api_key']
     },
     GnosisPay: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
+        url: fileverseProxyUrl,
         removeParams: ['api_key']
     },
     // Add more services as needed. It can be direct url instead of ENV variable
@@ -13360,9 +13359,16 @@ async function fromEnsNameToAddress(name) {
     return null
   }
 }
+const validateAndGetAddress = async (address) => {
+if(isAddress$1.isAddress(address)) return address
+
+const resolvedAddress = await fromEnsNameToAddress(address);
+if(resolvedAddress) return resolvedAddress
+throw new ValidationError("Invalid address")
+};
 
 var fromEnsNameToAddress$1 = {
-  fromEnsNameToAddress
+  validateAndGetAddress
 };
 
 async function handleScanRequest({
@@ -13383,12 +13389,8 @@ async function handleScanRequest({
     GNOSIS: { url: 'https://api.gnosisscan.io/api', apiKeyName: SERVICES_API_KEY.Gnosisscan }
   };
 
-  if (!isAddress$1.isAddress(address) && type !== 'gas') {
-    const ensName = address;
-    address = await fromEnsNameToAddress$1.fromEnsNameToAddress(address);
-    if (!address) {
-      throw new EnsError(ensName)
-    }
+  if (type !== 'gas') {
+    address = await fromEnsNameToAddress$1.validateAndGetAddress(address);
   }
 
   const apiInfo = API_INFO_MAP[functionName];
@@ -17906,14 +17908,7 @@ async function BLOCKSCOUT() {
       startTimestamp ?? Math.floor((Date.now() - 30 * 24 * 3600 * 1000) / 1000);
     const endTs = endTimestamp;
 
-    let resolvedAddress = address;
-    if (!isAddress$1.isAddress(resolvedAddress)) {
-      const ensName = resolvedAddress;
-      resolvedAddress = await fromEnsNameToAddress$1.fromEnsNameToAddress(ensName);
-      if (!resolvedAddress) {
-        throw new EnsError(ensName)
-      }
-    }
+    const resolvedAddress = await fromEnsNameToAddress$1.validateAndGetAddress(address);
 
     const hostname = BLOCKSCOUT_CHAINS_MAP[chain];
 
@@ -18247,10 +18242,8 @@ async function EOA() {
       if (isAddress$1.isAddress(inp)) {
         ADDRESS_MAP[inp.toLowerCase()] = null;
       } else {
-        const ens = inp;
-        const resolved = await fromEnsNameToAddress$1.fromEnsNameToAddress(ens);
-        if (!resolved) throw new EnsError(ens)
-        ADDRESS_MAP[resolved.toLowerCase()] = ens;
+      const _address = await fromEnsNameToAddress$1.validateAndGetAddress(inp);
+        ADDRESS_MAP[_address.toLowerCase()] = _address;
       }
     }
     const ADDRS = Object.keys(ADDRESS_MAP);
@@ -18332,12 +18325,10 @@ async function SAFE() {
     const chainId = SAFE_CHAIN_MAP[chain];
     if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
 
-    let resolved = address;
-    if (!isAddress$1.isAddress(resolved)) {
-      const ens = resolved;
-      resolved = await fromEnsNameToAddress$1.fromEnsNameToAddress(ens);
-      if (!resolved) throw new EnsError(ens)
-    }
+
+    
+
+    const resolved = await fromEnsNameToAddress$1.validateAndGetAddress(address);
 
 
     const url = `https://api.safe.global/tx-service/${chainId}/api/v2/safes/${resolved}/multisig-transactions?limit=${limit}&offset=${offset}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/formulajs",
-  "version": "4.4.11-mod-76",
+  "version": "4.4.11-mod-78",
   "description": "JavaScript implementation of most Microsoft Excel formula functions",
   "author": "Formulajs",
   "publishConfig": {
@@ -57,7 +57,8 @@
     "test:coverage": "c8 mocha --recursive",
     "test:watch": "mocha --recursive --watch --parallel --reporter min",
     "types": "tsc",
-    "test:crypto": "npx mocha 'test/crypto-functions/**/*.js' --recursive"
+    "test:crypto": "npx mocha 'test/crypto-functions/**/*.js' --recursive",
+    "prepare": "husky install"
   },
   "dependencies": {
     "bessel": "^1.0.2",
@@ -77,6 +78,7 @@
     "chai": "^5.2.0",
     "eslint": "^9.26.0",
     "globals": "^16.1.0",
+    "husky": "^9.1.7",
     "jsdom": "^26.1.0",
     "mocha": "^11.7.1",
     "mochawesome": "^7.1.3",