v6.1.4: fix resolve during fetch errors

ufw0x · Apr 13, 2022 · 810afdf · 810afdf
1 parent 805e2a5
commit 810afdf
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 37 deletions.
diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -49,19 +49,22 @@ var getAssets = async (options) => {
   let assets = Promise.all(
     (Object.keys(options.accounts)).map((blockchain) =>{
 
-      const address = options.accounts[blockchain];
-
-      return fetch(`https://public.depay.fi/accounts/${blockchain}/${address}/assets`)
-        .catch((error) => { console.log(error); resolve(); })
-        .then((response) => response.json())
-        .then(async (assets) => {
-          return await ensureNativeTokenAsset({
-            address,
-            options,
-            assets: filterAssets({ assets, blockchain, options }).map((asset) => Object.assign(asset, { blockchain })),
-            blockchain
+      return new Promise((resolve, reject)=>{
+        const address = options.accounts[blockchain];
+        fetch(`https://public.depay.fi/accounts/${blockchain}/${address}/assets`)
+          .catch((error) => { console.log(error); resolve(); })
+          .then((response) => response.json())
+          .then(async (assets) => {
+            return await ensureNativeTokenAsset({
+              address,
+              options,
+              assets: filterAssets({ assets, blockchain, options }).map((asset) => Object.assign(asset, { blockchain })),
+              blockchain
+            })
           })
-        }).catch((error) => { console.log(error); })
+          .then(resolve)
+          .catch((error) => { console.log(error); resolve(); });
+      })
     }),
   ).then((responses) => responses.flat());
 

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -50,19 +50,22 @@
     let assets = Promise.all(
       (Object.keys(options.accounts)).map((blockchain) =>{
 
-        const address = options.accounts[blockchain];
-
-        return fetch(`https://public.depay.fi/accounts/${blockchain}/${address}/assets`)
-          .catch((error) => { console.log(error); resolve(); })
-          .then((response) => response.json())
-          .then(async (assets) => {
-            return await ensureNativeTokenAsset({
-              address,
-              options,
-              assets: filterAssets({ assets, blockchain, options }).map((asset) => Object.assign(asset, { blockchain })),
-              blockchain
+        return new Promise((resolve, reject)=>{
+          const address = options.accounts[blockchain];
+          fetch(`https://public.depay.fi/accounts/${blockchain}/${address}/assets`)
+            .catch((error) => { console.log(error); resolve(); })
+            .then((response) => response.json())
+            .then(async (assets) => {
+              return await ensureNativeTokenAsset({
+                address,
+                options,
+                assets: filterAssets({ assets, blockchain, options }).map((asset) => Object.assign(asset, { blockchain })),
+                blockchain
+              })
             })
-          }).catch((error) => { console.log(error); })
+            .then(resolve)
+            .catch((error) => { console.log(error); resolve(); });
+        })
       }),
     ).then((responses) => responses.flat());
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-assets",
   "moduleName": "Web3Assets",
-  "version": "6.1.3",
+  "version": "6.1.4",
   "description": "",
   "main": "dist/umd/index.js",
   "module": "dist/esm/index.js",

diff --git a/src/getAssets.js b/src/getAssets.js
@@ -47,19 +47,22 @@ export default async (options) => {
   let assets = Promise.all(
     (Object.keys(options.accounts)).map((blockchain) =>{
 
-      const address = options.accounts[blockchain]
-
-      return fetch(`https://public.depay.fi/accounts/${blockchain}/${address}/assets`)
-        .catch((error) => { console.log(error); resolve() })
-        .then((response) => response.json())
-        .then(async (assets) => {
-          return await ensureNativeTokenAsset({
-            address,
-            options,
-            assets: filterAssets({ assets, blockchain, options }).map((asset) => Object.assign(asset, { blockchain })),
-            blockchain
+      return new Promise((resolve, reject)=>{
+        const address = options.accounts[blockchain]
+        fetch(`https://public.depay.fi/accounts/${blockchain}/${address}/assets`)
+          .catch((error) => { console.log(error); resolve() })
+          .then((response) => response.json())
+          .then(async (assets) => {
+            return await ensureNativeTokenAsset({
+              address,
+              options,
+              assets: filterAssets({ assets, blockchain, options }).map((asset) => Object.assign(asset, { blockchain })),
+              blockchain
+            })
           })
-        }).catch((error) => { console.log(error) })
+          .then(resolve)
+          .catch((error) => { console.log(error); resolve() })
+      })
     }),
   ).then((responses) => responses.flat())