Fix infinite loading on file info (#1977)

* error handling updates

* use ocean.js pre release 3.1.3-next.1

* bump oceanlib

package-lock.json

@@ -15,7 +15,7 @@
         "@coingecko/cryptoformat": "^0.5.4",
         "@loadable/component": "^5.15.2",
         "@oceanprotocol/art": "^3.2.0",
-        "@oceanprotocol/lib": "^3.0.4",
+        "@oceanprotocol/lib": "^3.1.3",
         "@oceanprotocol/typographies": "^0.1.0",
         "@oceanprotocol/use-dark-mode": "^2.4.3",
         "@orbisclub/orbis-sdk": "^0.4.40",
@@ -6077,12 +6077,12 @@
       "integrity": "sha512-PJih7C6LHaWHHj1qgxZsSkEqKphhJrL3G7WuMOxl4N1daDrF6sooDDU+9dZkcHSVPc7cMjkFqLc5fP58NSAobw=="
     },
     "node_modules/@oceanprotocol/lib": {
-      "version": "3.0.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.1.3.tgz",
-      "integrity": "sha512-HG187KtiT6LV8N5RbupcdKMR+6qsYLEmf43H5gnrIjDflachSayc1R629M7FPC29M8RMgqhfCwKLJJN64U+pmw==",
+      "integrity": "sha512-A7LStVhJILhDlaxMQM71cLco3+tyrE6croPG4UTX58lSb7IRuikOgWq0uH78p3sC4si1RBXVsfLprcx0HiZ9Gg==",
       "dependencies": {
         "@oceanprotocol/contracts": "^1.1.14",
-        "cross-fetch": "^3.1.5",
+        "cross-fetch": "^4.0.0",
         "crypto-js": "^4.1.1",
         "decimal.js": "^10.4.1",
         "ethers": "^5.7.2"
@@ -6091,6 +6091,52 @@
         "web3": "^1.8.0"
       }
     },
+    "node_modules/@oceanprotocol/lib/node_modules/cross-fetch": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+      "dependencies": {
+        "node-fetch": "^2.6.12"
+      }
+    },
+    "node_modules/@oceanprotocol/lib/node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@oceanprotocol/lib/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/@oceanprotocol/lib/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/@oceanprotocol/lib/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/@oceanprotocol/typographies": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/@oceanprotocol/typographies/-/typographies-0.1.0.tgz",
@@ -58441,15 +58487,52 @@
       "integrity": "sha512-PJih7C6LHaWHHj1qgxZsSkEqKphhJrL3G7WuMOxl4N1daDrF6sooDDU+9dZkcHSVPc7cMjkFqLc5fP58NSAobw=="
     },
     "@oceanprotocol/lib": {
-      "version": "3.0.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.1.3.tgz",
-      "integrity": "sha512-HG187KtiT6LV8N5RbupcdKMR+6qsYLEmf43H5gnrIjDflachSayc1R629M7FPC29M8RMgqhfCwKLJJN64U+pmw==",
+      "integrity": "sha512-A7LStVhJILhDlaxMQM71cLco3+tyrE6croPG4UTX58lSb7IRuikOgWq0uH78p3sC4si1RBXVsfLprcx0HiZ9Gg==",
       "requires": {
         "@oceanprotocol/contracts": "^1.1.14",
-        "cross-fetch": "^3.1.5",
+        "cross-fetch": "^4.0.0",
         "crypto-js": "^4.1.1",
         "decimal.js": "^10.4.1",
         "ethers": "^5.7.2"
+      },
+      "dependencies": {
+        "cross-fetch": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+          "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+          "requires": {
+            "node-fetch": "^2.6.12"
+          }
+        },
+        "node-fetch": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+          "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        },
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
       }
     },
     "@oceanprotocol/typographies": {

package.json

@@ -30,7 +30,7 @@
     "@coingecko/cryptoformat": "^0.5.4",
     "@loadable/component": "^5.15.2",
     "@oceanprotocol/art": "^3.2.0",
-    "@oceanprotocol/lib": "^3.0.4",
+    "@oceanprotocol/lib": "^3.1.3",
     "@oceanprotocol/typographies": "^0.1.0",
     "@oceanprotocol/use-dark-mode": "^2.4.3",
     "@orbisclub/orbis-sdk": "^0.4.40",

src/@utils/accessDetailsAndPricing.ts

@@ -193,7 +193,7 @@ export async function getOrderPriceAndFees(
         customProviderUrl || asset?.services[0].serviceEndpoint
       ))
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Initialize Provider] Error:', message)
     toast.error(message)
   }

src/@utils/compute.ts

@@ -148,7 +148,7 @@ export async function getComputeEnviroment(
     if (!computeEnvs[asset.chainId][0]) return null
     return computeEnvs[asset.chainId][0]
   } catch (e) {
-    const message = getErrorMessage(JSON.parse(e.message))
+    const message = getErrorMessage(e.message)
     LoggerInstance.error(
       '[Compute to Data] Fetch compute environment:',
       message
@@ -261,7 +261,7 @@ async function getJobs(
       })
     }
   } catch (err) {
-    const message = getErrorMessage(JSON.parse(err.message))
+    const message = getErrorMessage(err.message)
     LoggerInstance.error('[Compute to Data] Error:', message)
     toast.error(message)
   }

src/@utils/nft.ts

@@ -113,7 +113,7 @@ export async function setNftMetadata(
       signal
     )
   } catch (err) {
-    const message = getErrorMessage(JSON.parse(err.message))
+    const message = getErrorMessage(err.message)
     LoggerInstance.error('[Encrypt Data] Error:', message)
     toast.error(message)
   }
@@ -155,7 +155,7 @@ export async function setNFTMetadataAndTokenURI(
       signal
     )
   } catch (err) {
-    const message = getErrorMessage(JSON.parse(err.message))
+    const message = getErrorMessage(err.message)
     LoggerInstance.error('[Encrypt Data] Error:', message)
     toast.error(message)
   }

src/@utils/order.ts

@@ -40,7 +40,7 @@ async function initializeProvider(
     )
     return provider
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.log('[Initialize Provider] Error:', message)
     toast.error(message)
   }

src/@utils/provider.ts

@@ -57,7 +57,7 @@ export async function initializeProviderForCompute(
       accountId
     )
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Initialize Provider] Error:', message)
     toast.error(message)
     return null
@@ -79,7 +79,7 @@ export async function getEncryptedFiles(
     )
     return response
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Provider Encrypt] Error:', message)
     toast.error(message)
   }
@@ -100,9 +100,10 @@ export async function getFileDidInfo(
     )
     return response
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Initialize check file did] Error:', message)
-    toast.error(message)
+    toast.error(`[Initialize check file did] Error: ${message}`)
+    throw new Error(`[Initialize check file did] Error: ${message}`)
   }
 }
 
@@ -137,7 +138,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -154,7 +155,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -173,7 +174,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -193,7 +194,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -213,7 +214,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -242,7 +243,7 @@ export async function downloadFile(
       userCustomParameters
     )
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Provider Get download url] Error:', message)
     toast.error(message)
   }
@@ -256,7 +257,7 @@ export async function checkValidProvider(
     const response = await ProviderInstance.isValidProvider(providerUrl)
     return response
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Provider Check] Error:', message)
     toast.error(message)
   }

src/components/@shared/FormInput/InputElement/Provider/index.tsx

@@ -76,7 +76,7 @@ export default function CustomProvider(props: InputProps): ReactElement {
       // if all good, add provider to formik state
       helpers.setValue({ url: field.value.url, valid: isValid, custom: true })
     } catch (error) {
-      const message = getErrorMessage(JSON.parse(error.message))
+      const message = getErrorMessage(error.message)
       setFieldError(`${field.name}.url`, message)
       LoggerInstance.error('[Custom Provider]:', message)
     } finally {

src/components/Asset/AssetActions/Compute/index.tsx

@@ -445,7 +445,7 @@ export default function Compute({
       setRefetchJobs(!refetchJobs)
       initPriceAndFees()
     } catch (error) {
-      const message = getErrorMessage(JSON.parse(error.message))
+      const message = getErrorMessage(error.message)
       LoggerInstance.error('[Compute] Error:', message)
       setError(message)
       setRetry(true)

src/components/Asset/AssetActions/index.tsx

@@ -95,6 +95,7 @@ export default function AssetActions({
 
         setFileIsLoading(false)
       } catch (error) {
+        setFileIsLoading(false)
         LoggerInstance.error(error.message)
       }
     }

src/components/Profile/History/ComputeJobs/Results.tsx

@@ -72,7 +72,7 @@ export default function Results({
       )
       await downloadFileBrowser(jobResult)
     } catch (error) {
-      const message = getErrorMessage(JSON.parse(error.message))
+      const message = getErrorMessage(error.message)
       LoggerInstance.error('[Provider Get c2d results url] Error:', message)
       toast.error(message)
     }

src/components/Publish/index.tsx

@@ -149,7 +149,7 @@ export default function PublishPage({
           newAbortController()
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Encrypt] Error:', message)
       }