@fileverse-dev/formulajs 4.4.11-mod-8 → 4.4.11-mod-10

package/lib/cjs/index.cjs

@@ -12950,74 +12950,68 @@ function SWITCH() {
 }
 
 const SERVICE_API_KEY = {
-    Etherscan: "ETHERSCAN_API_KEY",
-    Coingecko: "COINGECKO_API_KEY"
+  Etherscan: "ETHERSCAN_API_KEY",
+  Coingecko: "COINGECKO_API_KEY"
 };
 
 async function GETTXLIST(address, page, offset) {
-    const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Etherscan);
-    console.log("FORMULA JS API KEY ETHERSCAN NOT FOUND", API_KEY);
-    const url = `https://api.etherscan.io/api?module=account&action=txlist&address=${address}&startblock=0&endblock=99999999&page=${page}&offset=${offset}&sort=asc&apikey=${API_KEY}`;
-  
-    try {
-      const response = await fetch(url);
-      if (!response.ok) {
-        throw new Error(`HTTP error! Status: ${response.status}`)
-      }
+  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Etherscan);
+  const url = `https://api.etherscan.io/api?module=account&action=txlist&address=${address}&startblock=0&endblock=99999999&page=${page}&offset=${offset}&sort=asc&apikey=${API_KEY}`;
+
+  try {
+    const response = await fetch(url);
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`)
+    }
+    const json = await response.json();
+    if (json.result.includes("Invalid API Key")) {
+      return `${SERVICE_API_KEY.Etherscan}_MISSING`
+    }
+    /*
+    [{blockNumber: '0x1d3d1', timeStamp: '0x5f7e4f', hash: '0x3c3c3c3c', nonce: '0x1',}]
+    */
+    return json.result;
+  } catch (error) {
+    return "ERROR IN FETCHING"
+  }
+}
+
+async function GETPRICE(token, vs_currencies) {
+  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Coingecko);
+  const url = `https://api.coingecko.com/api/v3/simple/price?vs_currencies=${vs_currencies}&ids=${token}`;
+
+  const options = {
+    method: 'GET',
+    headers: { accept: 'application/json', 'x-cg-demo-api-key': `${API_KEY}` },
+  };
+
+  try {
+    const response = await fetch(url, options);
+    if (!response.ok) {
       const json = await response.json();
-      console.log(json.result);
-      if(json.result.includes("Invalid API Key")){
-        return `${SERVICE_API_KEY.Etherscan}_MISSING`
+      if (json.status.error_message.includes("API Key Missing")) {
+        return `${SERVICE_API_KEY.Coingecko}_MISSING`
       }
-      return json.result;
-    } catch (error) {
-      console.error('API call failed:', error);
-      return "ERROR IN FETCHING"
-    }
-  }
-
-  async function GETPRICE(token, vs_currencies, offset) {
-    const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Coingecko);
-    console.log("FORMULA JS API KEY ETHERSCAN NOT FOUND", API_KEY);
-    // const url = 'https://api.coingecko.com/api/v3/simple/price?vs_currencies=usd&ids=bitcoin';
-    const url = `https://api.coingecko.com/api/v3/simple/price?vs_currencies=${vs_currencies}&ids=${token}`;
-  
-    try {
-      const response = await fetch(url);
-      if (!response.ok) {
-        throw new Error(`HTTP error! Status: ${response.status}`)
-      }
-      const jsonResponse = await response.json();
-      //JSON RESPONSE EXAMPLE
-    //   {
-    //     "bitcoin": {
-    //         "usd": 103457,
-    //         "inr": 8854165
-    //     },
-    //     "solana": {
-    //         "usd": 167.56,
-    //         "inr": 14340.55
-    //     }
-    // }
-      console.log(jsonResponse);
-      // if(jsonResponse.result.includes("Invalid API Key")){
-      //   return `${SERVICE_API_KEY.Coingecko}_MISSING`
-      // }
-      const output = {};
-
-      for (const [coin, prices] of Object.entries(jsonResponse)) {
-          for (const [currency, value] of Object.entries(prices)) {
-              const key = `${coin.charAt(0).toUpperCase() + coin.slice(1)}_${currency.toUpperCase()}`;
-            output[key] = value;
-        }
+    }
+    const jsonResponse = await response.json();
+
+    // Free Coingecko API does not require API key, not need to handle API key error
+
+    const output = {};
+    for (const [coin, prices] of Object.entries(jsonResponse)) {
+      for (const [currency, value] of Object.entries(prices)) {
+        const key = `${coin.charAt(0).toUpperCase() + coin.slice(1)}_${currency.toUpperCase()}`;
+        output[key] = value;
       }
-      console.log([output]);
-      return [output];
-    } catch (error) {
-      console.error('API call failed:', error);
-      return "ERROR IN FETCHING"
     }
+    /*
+    [{Bitcon_usd: 1, Bitcoin_eur: 1},{Ethereum_usd: 1, Ethereum_eur: 1}}]
+    */
+    return [output];
+  } catch (error) {
+    return "ERROR IN FETCHING"
   }
+}
 
 const utils = { errors, symbols, date };
 

package/lib/esm/index.mjs

@@ -12948,74 +12948,68 @@ function SWITCH() {
 }
 
 const SERVICE_API_KEY = {
-    Etherscan: "ETHERSCAN_API_KEY",
-    Coingecko: "COINGECKO_API_KEY"
+  Etherscan: "ETHERSCAN_API_KEY",
+  Coingecko: "COINGECKO_API_KEY"
 };
 
 async function GETTXLIST(address, page, offset) {
-    const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Etherscan);
-    console.log("FORMULA JS API KEY ETHERSCAN NOT FOUND", API_KEY);
-    const url = `https://api.etherscan.io/api?module=account&action=txlist&address=${address}&startblock=0&endblock=99999999&page=${page}&offset=${offset}&sort=asc&apikey=${API_KEY}`;
-  
-    try {
-      const response = await fetch(url);
-      if (!response.ok) {
-        throw new Error(`HTTP error! Status: ${response.status}`)
-      }
+  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Etherscan);
+  const url = `https://api.etherscan.io/api?module=account&action=txlist&address=${address}&startblock=0&endblock=99999999&page=${page}&offset=${offset}&sort=asc&apikey=${API_KEY}`;
+
+  try {
+    const response = await fetch(url);
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`)
+    }
+    const json = await response.json();
+    if (json.result.includes("Invalid API Key")) {
+      return `${SERVICE_API_KEY.Etherscan}_MISSING`
+    }
+    /*
+    [{blockNumber: '0x1d3d1', timeStamp: '0x5f7e4f', hash: '0x3c3c3c3c', nonce: '0x1',}]
+    */
+    return json.result;
+  } catch (error) {
+    return "ERROR IN FETCHING"
+  }
+}
+
+async function GETPRICE(token, vs_currencies) {
+  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Coingecko);
+  const url = `https://api.coingecko.com/api/v3/simple/price?vs_currencies=${vs_currencies}&ids=${token}`;
+
+  const options = {
+    method: 'GET',
+    headers: { accept: 'application/json', 'x-cg-demo-api-key': `${API_KEY}` },
+  };
+
+  try {
+    const response = await fetch(url, options);
+    if (!response.ok) {
       const json = await response.json();
-      console.log(json.result);
-      if(json.result.includes("Invalid API Key")){
-        return `${SERVICE_API_KEY.Etherscan}_MISSING`
+      if (json.status.error_message.includes("API Key Missing")) {
+        return `${SERVICE_API_KEY.Coingecko}_MISSING`
       }
-      return json.result;
-    } catch (error) {
-      console.error('API call failed:', error);
-      return "ERROR IN FETCHING"
-    }
-  }
-
-  async function GETPRICE(token, vs_currencies, offset) {
-    const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Coingecko);
-    console.log("FORMULA JS API KEY ETHERSCAN NOT FOUND", API_KEY);
-    // const url = 'https://api.coingecko.com/api/v3/simple/price?vs_currencies=usd&ids=bitcoin';
-    const url = `https://api.coingecko.com/api/v3/simple/price?vs_currencies=${vs_currencies}&ids=${token}`;
-  
-    try {
-      const response = await fetch(url);
-      if (!response.ok) {
-        throw new Error(`HTTP error! Status: ${response.status}`)
-      }
-      const jsonResponse = await response.json();
-      //JSON RESPONSE EXAMPLE
-    //   {
-    //     "bitcoin": {
-    //         "usd": 103457,
-    //         "inr": 8854165
-    //     },
-    //     "solana": {
-    //         "usd": 167.56,
-    //         "inr": 14340.55
-    //     }
-    // }
-      console.log(jsonResponse);
-      // if(jsonResponse.result.includes("Invalid API Key")){
-      //   return `${SERVICE_API_KEY.Coingecko}_MISSING`
-      // }
-      const output = {};
-
-      for (const [coin, prices] of Object.entries(jsonResponse)) {
-          for (const [currency, value] of Object.entries(prices)) {
-              const key = `${coin.charAt(0).toUpperCase() + coin.slice(1)}_${currency.toUpperCase()}`;
-            output[key] = value;
-        }
+    }
+    const jsonResponse = await response.json();
+
+    // Free Coingecko API does not require API key, not need to handle API key error
+
+    const output = {};
+    for (const [coin, prices] of Object.entries(jsonResponse)) {
+      for (const [currency, value] of Object.entries(prices)) {
+        const key = `${coin.charAt(0).toUpperCase() + coin.slice(1)}_${currency.toUpperCase()}`;
+        output[key] = value;
       }
-      console.log([output]);
-      return [output];
-    } catch (error) {
-      console.error('API call failed:', error);
-      return "ERROR IN FETCHING"
     }
+    /*
+    [{Bitcon_usd: 1, Bitcoin_eur: 1},{Ethereum_usd: 1, Ethereum_eur: 1}}]
+    */
+    return [output];
+  } catch (error) {
+    return "ERROR IN FETCHING"
   }
+}
 
 const utils = { errors, symbols, date };
 

package/package.json

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

package/types/cjs/index.d.cts

@@ -1784,7 +1784,7 @@ export function GEOMEAN(...args: any[]): any;
  * @returns
  */
 export function GESTEP(number: any, step: any): any;
-export function GETPRICE(token: any, vs_currencies: any, offset: any): Promise<"ERROR IN FETCHING" | {}[]>;
+export function GETPRICE(token: any, vs_currencies: any): Promise<string | {}[]>;
 export function GETTXLIST(address: any, page: any, offset: any): Promise<any>;
 /**
  * Returns values along an exponential trend.

package/types/esm/index.d.mts

@@ -1784,7 +1784,7 @@ export function GEOMEAN(...args: any[]): any;
  * @returns
  */
 export function GESTEP(number: any, step: any): any;
-export function GETPRICE(token: any, vs_currencies: any, offset: any): Promise<"ERROR IN FETCHING" | {}[]>;
+export function GETPRICE(token: any, vs_currencies: any): Promise<string | {}[]>;
 export function GETTXLIST(address: any, page: any, offset: any): Promise<any>;
 /**
  * Returns values along an exponential trend.