@fileverse-dev/fortune-react 1.0.50 → 1.0.51

package/es/components/Workbook/index.d.ts

@@ -1,6 +1,7 @@
 import { Settings, Context, CellWithRowAndCol, Sheet as SheetType, Op, CellMatrix, api } from "@fileverse-dev/fortune-core";
 import React from "react";
 import "./index.css";
+import { getCryptoPrice } from "../../utils/cryptoApi";
 import { generateAPIs } from "./api";
 export type WorkbookInstance = ReturnType<typeof generateAPIs>;
 type AdditionalProps = {
@@ -9,7 +10,7 @@ type AdditionalProps = {
 };
 declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalProps & React.RefAttributes<{
     applyOp: (ops: Op[]) => void;
-    getCryptoPrice: typeof import("../../utils/cryptoApi").getCryptoPrice;
+    getCryptoPrice: typeof getCryptoPrice;
     getCellValue: (row: number, column: number, options?: api.CommonOptions & {
         type?: "rt" | "m" | "v" | "mc" | "f" | "ct" | "qp" | "spl" | "bg" | "lo" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle | undefined;
     }) => any;

package/es/components/Workbook/index.js

@@ -19,6 +19,7 @@ import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, g
 import React, { useMemo, useState, useCallback, useEffect, useRef, useImperativeHandle } from "react";
 import "./index.css";
 import produce, { applyPatches, enablePatches, produceWithPatches } from "immer";
+import { getCryptoPrice } from "../../utils/cryptoApi";
 import _ from "lodash";
 import Sheet from "../Sheet";
 import WorkbookContext from "../../context";
@@ -322,6 +323,9 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     var _a, _b;
     (_b = (_a = mergedSettings.hooks) === null || _a === void 0 ? void 0 : _a.afterActivateSheet) === null || _b === void 0 ? void 0 : _b.call(_a, context.currentSheetId);
   }, [context.currentSheetId]);
+  useEffect(function () {
+    getCryptoPrice("bitcoin", "usd");
+  }, []);
   useEffect(function () {
     var _a, _b;
     setContext(function (ctx) {

package/es/utils/cryptoApi.js

@@ -113,42 +113,69 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
-var COINGECKO_API = "https://api.coingecko.com/api/v3/simple/price";
+var COINGECKO_API = "https://api.coingecko.com/api/v3/simple/price?ids=bitcoin,ethereum,solana&vs_currencies=usd,eur,gbp,jpy,cny,inr,cad,aud,nzd,sek,pln";
 var CACHE_DURATION = 60 * 1000;
+var CRYPTO_LIST = ["bitcoin", "ethereum", "solana"];
+var FIAT_LIST = ["usd", "eur", "gbp", "jpy", "cny", "inr", "cad", "aud", "nzd", "sek", "pln"];
 var priceCache = {};
 export function getCryptoPrice(crypto, fiat) {
   var _a;
   return __awaiter(this, void 0, void 0, function () {
-    var key, now, url, resp, data, price;
+    var key, now, data, price;
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
           key = "".concat(crypto, "-").concat(fiat).toLowerCase();
           now = Date.now();
-          console.log("Fetching crypto price for ".concat(key), priceCache);
           if (priceCache[key] && now - priceCache[key].timestamp < CACHE_DURATION) {
-            console.log("Using cached price for ".concat(key));
+            return [2, priceCache[key].price];
+          } else if (priceCache[key]) {
+            fetchCall(COINGECKO_API).then(function (data) {
+              updatePriceCache(data, now);
+            });
             return [2, priceCache[key].price];
           }
-          url = "".concat(COINGECKO_API, "?ids=").concat(crypto, "&vs_currencies=").concat(fiat);
-          return [4, fetch(url)];
+          return [4, fetchCall(COINGECKO_API)];
         case 1:
-          resp = _b.sent();
-          if (!resp.ok) throw new Error("Failed to fetch crypto price");
-          return [4, resp.json()];
-        case 2:
           data = _b.sent();
           price = (_a = data[crypto]) === null || _a === void 0 ? void 0 : _a[fiat];
           if (typeof price !== "number") throw new Error("Invalid price data");
-          priceCache[key] = {
-            price: price,
-            timestamp: now
-          };
+          updatePriceCache(data, now);
           return [2, price];
       }
     });
   });
 }
+function updatePriceCache(data, timestamp) {
+  CRYPTO_LIST.forEach(function (crypto) {
+    FIAT_LIST.forEach(function (fiat) {
+      var _a;
+      var price = (_a = data[crypto]) === null || _a === void 0 ? void 0 : _a[fiat];
+      if (typeof price === "number") {
+        var key = "".concat(crypto, "-").concat(fiat).toLowerCase();
+        priceCache[key] = {
+          price: price,
+          timestamp: timestamp
+        };
+      }
+    });
+  });
+}
+var fetchCall = function fetchCall(url) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+      return [2, new Promise(function (resolve, reject) {
+        fetch(url).then(function (response) {
+          return response.json();
+        }).then(function (data) {
+          return resolve(data);
+        }).catch(function (error) {
+          return reject(error);
+        });
+      })];
+    });
+  });
+};
 export function clearCryptoPriceCache() {
   Object.keys(priceCache).forEach(function (key) {
     return delete priceCache[key];

package/lib/components/Workbook/index.d.ts

@@ -1,6 +1,7 @@
 import { Settings, Context, CellWithRowAndCol, Sheet as SheetType, Op, CellMatrix, api } from "@fileverse-dev/fortune-core";
 import React from "react";
 import "./index.css";
+import { getCryptoPrice } from "../../utils/cryptoApi";
 import { generateAPIs } from "./api";
 export type WorkbookInstance = ReturnType<typeof generateAPIs>;
 type AdditionalProps = {
@@ -9,7 +10,7 @@ type AdditionalProps = {
 };
 declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalProps & React.RefAttributes<{
     applyOp: (ops: Op[]) => void;
-    getCryptoPrice: typeof import("../../utils/cryptoApi").getCryptoPrice;
+    getCryptoPrice: typeof getCryptoPrice;
     getCellValue: (row: number, column: number, options?: api.CommonOptions & {
         type?: "rt" | "m" | "v" | "mc" | "f" | "ct" | "qp" | "spl" | "bg" | "lo" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle | undefined;
     }) => any;

package/lib/components/Workbook/index.js

@@ -9,6 +9,7 @@ var _fortuneCore = require("@fileverse-dev/fortune-core");
 var _react = _interopRequireWildcard(require("react"));
 require("./index.css");
 var _immer = _interopRequireWildcard(require("immer"));
+var _cryptoApi = require("../../utils/cryptoApi");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _Sheet = _interopRequireDefault(require("../Sheet"));
 var _context = _interopRequireDefault(require("../../context"));
@@ -331,6 +332,9 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
     var _a, _b;
     (_b = (_a = mergedSettings.hooks) === null || _a === void 0 ? void 0 : _a.afterActivateSheet) === null || _b === void 0 ? void 0 : _b.call(_a, context.currentSheetId);
   }, [context.currentSheetId]);
+  (0, _react.useEffect)(function () {
+    (0, _cryptoApi.getCryptoPrice)("bitcoin", "usd");
+  }, []);
   (0, _react.useEffect)(function () {
     var _a, _b;
     setContext(function (ctx) {

package/lib/utils/cryptoApi.js

@@ -120,42 +120,69 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
     };
   }
 };
-var COINGECKO_API = "https://api.coingecko.com/api/v3/simple/price";
+var COINGECKO_API = "https://api.coingecko.com/api/v3/simple/price?ids=bitcoin,ethereum,solana&vs_currencies=usd,eur,gbp,jpy,cny,inr,cad,aud,nzd,sek,pln";
 var CACHE_DURATION = 60 * 1000;
+var CRYPTO_LIST = ["bitcoin", "ethereum", "solana"];
+var FIAT_LIST = ["usd", "eur", "gbp", "jpy", "cny", "inr", "cad", "aud", "nzd", "sek", "pln"];
 var priceCache = {};
 function getCryptoPrice(crypto, fiat) {
   var _a;
   return __awaiter(this, void 0, void 0, function () {
-    var key, now, url, resp, data, price;
+    var key, now, data, price;
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
           key = "".concat(crypto, "-").concat(fiat).toLowerCase();
           now = Date.now();
-          console.log("Fetching crypto price for ".concat(key), priceCache);
           if (priceCache[key] && now - priceCache[key].timestamp < CACHE_DURATION) {
-            console.log("Using cached price for ".concat(key));
+            return [2, priceCache[key].price];
+          } else if (priceCache[key]) {
+            fetchCall(COINGECKO_API).then(function (data) {
+              updatePriceCache(data, now);
+            });
             return [2, priceCache[key].price];
           }
-          url = "".concat(COINGECKO_API, "?ids=").concat(crypto, "&vs_currencies=").concat(fiat);
-          return [4, fetch(url)];
+          return [4, fetchCall(COINGECKO_API)];
         case 1:
-          resp = _b.sent();
-          if (!resp.ok) throw new Error("Failed to fetch crypto price");
-          return [4, resp.json()];
-        case 2:
           data = _b.sent();
           price = (_a = data[crypto]) === null || _a === void 0 ? void 0 : _a[fiat];
           if (typeof price !== "number") throw new Error("Invalid price data");
-          priceCache[key] = {
-            price: price,
-            timestamp: now
-          };
+          updatePriceCache(data, now);
           return [2, price];
       }
     });
   });
 }
+function updatePriceCache(data, timestamp) {
+  CRYPTO_LIST.forEach(function (crypto) {
+    FIAT_LIST.forEach(function (fiat) {
+      var _a;
+      var price = (_a = data[crypto]) === null || _a === void 0 ? void 0 : _a[fiat];
+      if (typeof price === "number") {
+        var key = "".concat(crypto, "-").concat(fiat).toLowerCase();
+        priceCache[key] = {
+          price: price,
+          timestamp: timestamp
+        };
+      }
+    });
+  });
+}
+var fetchCall = function fetchCall(url) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+      return [2, new Promise(function (resolve, reject) {
+        fetch(url).then(function (response) {
+          return response.json();
+        }).then(function (data) {
+          return resolve(data);
+        }).catch(function (error) {
+          return reject(error);
+        });
+      })];
+    });
+  });
+};
 function clearCryptoPriceCache() {
   Object.keys(priceCache).forEach(function (key) {
     return delete priceCache[key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.0.50",
+  "version": "1.0.51",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.0.50",
+    "@fileverse-dev/fortune-core": "1.0.51",
     "@fileverse/ui": "^4.1.7-patch-16",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",