@talismn/balances-react 0.0.0-pr660-20230329012844 → 0.0.0-pr667-20230403022535

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @talismn/balances-react
 
-## 0.0.0-pr660-20230329012844
+## 0.0.0-pr667-20230403022535
 
 ### Minor Changes
 
@@ -13,17 +13,16 @@
 - 6643a4e4: fix: ported useDbCache related perf fixes to @talismn/balances-react
 - Updated dependencies [3068bd60]
 - Updated dependencies [6643a4e4]
-- Updated dependencies [fa4d115f]
 - Updated dependencies [79f6ccf6]
 - Updated dependencies [6643a4e4]
 - Updated dependencies [c24dc1fb]
-  - @talismn/chain-connector@0.0.0-pr660-20230329012844
-  - @talismn/connection-meta@0.0.0-pr660-20230329012844
-  - @talismn/balances@0.0.0-pr660-20230329012844
-  - @talismn/token-rates@0.0.0-pr660-20230329012844
-  - @talismn/chaindata-provider-extension@0.0.0-pr660-20230329012844
-  - @talismn/chaindata-provider@0.0.0-pr660-20230329012844
-  - @talismn/chain-connector-evm@0.0.0-pr660-20230329012844
+  - @talismn/chain-connector@0.0.0-pr667-20230403022535
+  - @talismn/connection-meta@0.0.0-pr667-20230403022535
+  - @talismn/balances@0.0.0-pr667-20230403022535
+  - @talismn/token-rates@0.0.0-pr667-20230403022535
+  - @talismn/chaindata-provider-extension@0.0.0-pr667-20230403022535
+  - @talismn/chaindata-provider@0.0.0-pr667-20230403022535
+  - @talismn/chain-connector-evm@0.0.0-pr667-20230403022535
 
 ## 0.3.3
 

package/dist/talismn-balances-react.cjs.dev.js

@@ -184,7 +184,7 @@ const useDbCacheProvider = () => {
   // debounce every 500ms to prevent hammering UI with updates
   reactUse.useDebounce(() => {
     setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances));
-  }, 500, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances]);
+  }, 500, [chainList, evmNetworkList, tokenList, rawBalances, tokenRates$1]);
   const refInitialized = react.useRef(false);
 
   // force an update as soon as all datasources are fetched, so UI can display data ASAP
@@ -193,14 +193,14 @@ const useDbCacheProvider = () => {
       setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances));
       refInitialized.current = true;
     }
-  }, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances]);
+  }, [chainList, evmNetworkList, rawBalances, tokenList, tokenRates$1]);
   return dbData;
 };
 const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr660-20230329012844",
+	version: "0.0.0-pr667-20230403022535",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -503,25 +503,10 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     id
   }) => id);
   const addressesByToken = Object.fromEntries(tokenIds.map(tokenId => [tokenId, addresses]));
-  const subscriptionId = balances.createSubscriptionId();
-
-  // TODO: Create subscriptions in a service worker, where we can detect page closes
-  // and therefore reliably delete the subscriptionId when the user closes our dapp
-  //
-  // For more information, check out https://developer.chrome.com/blog/page-lifecycle-api/#faqs
-  // and scroll down to:
-  // - `What is the back/forward cache?`, and
-  // - `If I can't run asynchronous APIs in the frozen or terminated states, how can I save data to IndexedDB?
-  //
-  // For now, we'll just last-ditch remove the subscriptionId (it works surprisingly well!) in the beforeunload event
-  window.onbeforeunload = () => {
-    balances.deleteSubscriptionId();
-  };
   const updateDb = balances$1 => {
     const putBalances = Object.entries(balances$1.toJSON()).map(([id, balance]) => ({
       id,
-      ...balance,
-      status: balances.BalanceStatusLive(subscriptionId)
+      ...balance
     }));
     balances.db.transaction("rw", balances.db.balances, async () => await balances.db.balances.bulkPut(putBalances));
   };
@@ -540,7 +525,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances$1) => {
       // log errors
       if (error) {
-        if (error?.type === "STALE_RPC_ERROR" || error?.type === "WEBSOCKET_ALLOCATION_EXHAUSTED_ERROR") return balances.db.balances.where({
+        if (error?.type === "STALE_RPC_ERROR") return balances.db.balances.where({
           source: balanceModule.type,
           chainId: error.chainId
         }).filter(balance => {
@@ -563,7 +548,15 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
       unsub.then(unsubscribe => {
         setTimeout(unsubscribe, 2_000);
       });
-      balances.deleteSubscriptionId();
+      balances.db.balances.where({
+        source: balanceModule.type
+      }).filter(balance => {
+        if (!Object.keys(addressesByModuleToken).includes(balance.tokenId)) return false;
+        if (!addressesByModuleToken[balance.tokenId].includes(balance.address)) return false;
+        return true;
+      }).modify({
+        status: "cache"
+      });
     };
   });
   const unsubscribeAll = () => {
@@ -652,7 +645,7 @@ function useBalances(addressesByToken) {
     balances: balances$1
   } = useDbCache();
   const hydrate = useBalancesHydrate();
-  return react.useMemo(() => new balances.Balances(balances.deriveStatuses([...balances.getValidSubscriptionIds()], balances$1.filter(balance => {
+  return react.useMemo(() => new balances.Balances(balances$1.filter(balance => {
     // check that this balance is included in our queried balance modules
     if (!balanceModules.map(({
       type
@@ -669,7 +662,7 @@ function useBalances(addressesByToken) {
 
     // keep this balance
     return true;
-  })),
+  }),
   // hydrate balance chains, evmNetworks, tokens and tokenRates
   hydrate), [balances$1, hydrate, balanceModules, addressesByToken]);
 }

package/dist/talismn-balances-react.cjs.prod.js

@@ -184,7 +184,7 @@ const useDbCacheProvider = () => {
   // debounce every 500ms to prevent hammering UI with updates
   reactUse.useDebounce(() => {
     setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances));
-  }, 500, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances]);
+  }, 500, [chainList, evmNetworkList, tokenList, rawBalances, tokenRates$1]);
   const refInitialized = react.useRef(false);
 
   // force an update as soon as all datasources are fetched, so UI can display data ASAP
@@ -193,14 +193,14 @@ const useDbCacheProvider = () => {
       setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances));
       refInitialized.current = true;
     }
-  }, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances]);
+  }, [chainList, evmNetworkList, rawBalances, tokenList, tokenRates$1]);
   return dbData;
 };
 const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr660-20230329012844",
+	version: "0.0.0-pr667-20230403022535",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -503,25 +503,10 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     id
   }) => id);
   const addressesByToken = Object.fromEntries(tokenIds.map(tokenId => [tokenId, addresses]));
-  const subscriptionId = balances.createSubscriptionId();
-
-  // TODO: Create subscriptions in a service worker, where we can detect page closes
-  // and therefore reliably delete the subscriptionId when the user closes our dapp
-  //
-  // For more information, check out https://developer.chrome.com/blog/page-lifecycle-api/#faqs
-  // and scroll down to:
-  // - `What is the back/forward cache?`, and
-  // - `If I can't run asynchronous APIs in the frozen or terminated states, how can I save data to IndexedDB?
-  //
-  // For now, we'll just last-ditch remove the subscriptionId (it works surprisingly well!) in the beforeunload event
-  window.onbeforeunload = () => {
-    balances.deleteSubscriptionId();
-  };
   const updateDb = balances$1 => {
     const putBalances = Object.entries(balances$1.toJSON()).map(([id, balance]) => ({
       id,
-      ...balance,
-      status: balances.BalanceStatusLive(subscriptionId)
+      ...balance
     }));
     balances.db.transaction("rw", balances.db.balances, async () => await balances.db.balances.bulkPut(putBalances));
   };
@@ -540,7 +525,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances$1) => {
       // log errors
       if (error) {
-        if (error?.type === "STALE_RPC_ERROR" || error?.type === "WEBSOCKET_ALLOCATION_EXHAUSTED_ERROR") return balances.db.balances.where({
+        if (error?.type === "STALE_RPC_ERROR") return balances.db.balances.where({
           source: balanceModule.type,
           chainId: error.chainId
         }).filter(balance => {
@@ -563,7 +548,15 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
       unsub.then(unsubscribe => {
         setTimeout(unsubscribe, 2_000);
       });
-      balances.deleteSubscriptionId();
+      balances.db.balances.where({
+        source: balanceModule.type
+      }).filter(balance => {
+        if (!Object.keys(addressesByModuleToken).includes(balance.tokenId)) return false;
+        if (!addressesByModuleToken[balance.tokenId].includes(balance.address)) return false;
+        return true;
+      }).modify({
+        status: "cache"
+      });
     };
   });
   const unsubscribeAll = () => {
@@ -652,7 +645,7 @@ function useBalances(addressesByToken) {
     balances: balances$1
   } = useDbCache();
   const hydrate = useBalancesHydrate();
-  return react.useMemo(() => new balances.Balances(balances.deriveStatuses([...balances.getValidSubscriptionIds()], balances$1.filter(balance => {
+  return react.useMemo(() => new balances.Balances(balances$1.filter(balance => {
     // check that this balance is included in our queried balance modules
     if (!balanceModules.map(({
       type
@@ -669,7 +662,7 @@ function useBalances(addressesByToken) {
 
     // keep this balance
     return true;
-  })),
+  }),
   // hydrate balance chains, evmNetworks, tokens and tokenRates
   hydrate), [balances$1, hydrate, balanceModules, addressesByToken]);
 }

package/dist/talismn-balances-react.esm.js

@@ -4,7 +4,7 @@ import { ChainConnector } from '@talismn/chain-connector';
 import { ChainConnectorEvm } from '@talismn/chain-connector-evm';
 import { connectionMetaDb } from '@talismn/connection-meta';
 import { ChaindataProviderExtension } from '@talismn/chaindata-provider-extension';
-import { db as db$1, createSubscriptionId, deleteSubscriptionId, balances, BalanceStatusLive, Balances, deriveStatuses, getValidSubscriptionIds } from '@talismn/balances';
+import { db as db$1, balances, Balances } from '@talismn/balances';
 import { db, fetchTokenRates } from '@talismn/token-rates';
 import { useLiveQuery } from 'dexie-react-hooks';
 import { useDebounce } from 'react-use';
@@ -175,7 +175,7 @@ const useDbCacheProvider = () => {
   // debounce every 500ms to prevent hammering UI with updates
   useDebounce(() => {
     setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates, rawBalances));
-  }, 500, [chainList, evmNetworkList, tokenList, tokenRates, rawBalances]);
+  }, 500, [chainList, evmNetworkList, tokenList, rawBalances, tokenRates]);
   const refInitialized = useRef(false);
 
   // force an update as soon as all datasources are fetched, so UI can display data ASAP
@@ -184,14 +184,14 @@ const useDbCacheProvider = () => {
       setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates, rawBalances));
       refInitialized.current = true;
     }
-  }, [chainList, evmNetworkList, tokenList, tokenRates, rawBalances]);
+  }, [chainList, evmNetworkList, rawBalances, tokenList, tokenRates]);
   return dbData;
 };
 const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr660-20230329012844",
+	version: "0.0.0-pr667-20230403022535",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -494,25 +494,10 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     id
   }) => id);
   const addressesByToken = Object.fromEntries(tokenIds.map(tokenId => [tokenId, addresses]));
-  const subscriptionId = createSubscriptionId();
-
-  // TODO: Create subscriptions in a service worker, where we can detect page closes
-  // and therefore reliably delete the subscriptionId when the user closes our dapp
-  //
-  // For more information, check out https://developer.chrome.com/blog/page-lifecycle-api/#faqs
-  // and scroll down to:
-  // - `What is the back/forward cache?`, and
-  // - `If I can't run asynchronous APIs in the frozen or terminated states, how can I save data to IndexedDB?
-  //
-  // For now, we'll just last-ditch remove the subscriptionId (it works surprisingly well!) in the beforeunload event
-  window.onbeforeunload = () => {
-    deleteSubscriptionId();
-  };
   const updateDb = balances => {
     const putBalances = Object.entries(balances.toJSON()).map(([id, balance]) => ({
       id,
-      ...balance,
-      status: BalanceStatusLive(subscriptionId)
+      ...balance
     }));
     db$1.transaction("rw", db$1.balances, async () => await db$1.balances.bulkPut(putBalances));
   };
@@ -531,7 +516,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     const unsub = balances(balanceModule, addressesByModuleToken, (error, balances) => {
       // log errors
       if (error) {
-        if (error?.type === "STALE_RPC_ERROR" || error?.type === "WEBSOCKET_ALLOCATION_EXHAUSTED_ERROR") return db$1.balances.where({
+        if (error?.type === "STALE_RPC_ERROR") return db$1.balances.where({
           source: balanceModule.type,
           chainId: error.chainId
         }).filter(balance => {
@@ -554,7 +539,15 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
       unsub.then(unsubscribe => {
         setTimeout(unsubscribe, 2_000);
       });
-      deleteSubscriptionId();
+      db$1.balances.where({
+        source: balanceModule.type
+      }).filter(balance => {
+        if (!Object.keys(addressesByModuleToken).includes(balance.tokenId)) return false;
+        if (!addressesByModuleToken[balance.tokenId].includes(balance.address)) return false;
+        return true;
+      }).modify({
+        status: "cache"
+      });
     };
   });
   const unsubscribeAll = () => {
@@ -643,7 +636,7 @@ function useBalances(addressesByToken) {
     balances
   } = useDbCache();
   const hydrate = useBalancesHydrate();
-  return useMemo(() => new Balances(deriveStatuses([...getValidSubscriptionIds()], balances.filter(balance => {
+  return useMemo(() => new Balances(balances.filter(balance => {
     // check that this balance is included in our queried balance modules
     if (!balanceModules.map(({
       type
@@ -660,7 +653,7 @@ function useBalances(addressesByToken) {
 
     // keep this balance
     return true;
-  })),
+  }),
   // hydrate balance chains, evmNetworks, tokens and tokenRates
   hydrate), [balances, hydrate, balanceModules, addressesByToken]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances-react",
-  "version": "0.0.0-pr660-20230329012844",
+  "version": "0.0.0-pr667-20230403022535",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "UNLICENSED",
@@ -26,13 +26,13 @@
     "clean": "rm -rf dist && rm -rf .turbo rm -rf node_modules"
   },
   "dependencies": {
-    "@talismn/balances": "^0.0.0-pr660-20230329012844",
-    "@talismn/chain-connector": "^0.0.0-pr660-20230329012844",
-    "@talismn/chain-connector-evm": "^0.0.0-pr660-20230329012844",
-    "@talismn/chaindata-provider": "^0.0.0-pr660-20230329012844",
-    "@talismn/chaindata-provider-extension": "^0.0.0-pr660-20230329012844",
-    "@talismn/connection-meta": "^0.0.0-pr660-20230329012844",
-    "@talismn/token-rates": "^0.0.0-pr660-20230329012844",
+    "@talismn/balances": "^0.0.0-pr667-20230403022535",
+    "@talismn/chain-connector": "^0.0.0-pr667-20230403022535",
+    "@talismn/chain-connector-evm": "^0.0.0-pr667-20230403022535",
+    "@talismn/chaindata-provider": "^0.0.0-pr667-20230403022535",
+    "@talismn/chaindata-provider-extension": "^0.0.0-pr667-20230403022535",
+    "@talismn/connection-meta": "^0.0.0-pr667-20230403022535",
+    "@talismn/token-rates": "^0.0.0-pr667-20230403022535",
     "anylogger": "^1.0.11",
     "blueimp-md5": "2.19.0",
     "dexie": "^3.2.3",