From a7c68e995d912542d9ec8815a86853eac142cd8e Mon Sep 17 00:00:00 2001 From: Bogdan Fazakas Date: Fri, 14 Jul 2023 12:11:38 +0300 Subject: [PATCH] Updates to Provider errors handling (#1745) --- src/services/Provider.ts | 16 ++++++++-------- src/utils/ProviderErrors.ts | 7 ------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/services/Provider.ts b/src/services/Provider.ts index 3332ed5e..764d6319 100644 --- a/src/services/Provider.ts +++ b/src/services/Provider.ts @@ -223,7 +223,7 @@ export class Provider { response.statusText, resolvedResponse ) - throw new Error(resolvedResponse?.error) + throw new Error(JSON.stringify(resolvedResponse)) } /** @@ -278,7 +278,7 @@ export class Provider { response.statusText, resolvedResponse ) - throw new Error(resolvedResponse?.error) + throw new Error(JSON.stringify(resolvedResponse)) } /** @@ -325,7 +325,7 @@ export class Provider { response.statusText, resolvedResponse ) - throw new Error(resolvedResponse?.error) + throw new Error(JSON.stringify(resolvedResponse)) } /** @@ -393,7 +393,7 @@ export class Provider { response.statusText, resolvedResponse ) - throw new Error(resolvedResponse?.error) + throw new Error(JSON.stringify(resolvedResponse)) } /** Initializes the provider for a compute request. @@ -455,7 +455,7 @@ export class Provider { resolvedResponse ) LoggerInstance.error('Payload was:', providerData) - throw new Error(resolvedResponse?.error) + throw new Error(JSON.stringify(resolvedResponse)) } /** @@ -648,7 +648,7 @@ export class Provider { resolvedResponse ) LoggerInstance.error('Payload was:', payload) - throw new Error(resolvedResponse?.error) + throw new Error(JSON.stringify(resolvedResponse)) } /** Get compute status for a specific jobId/documentId/owner. @@ -712,7 +712,7 @@ export class Provider { response.statusText, resolvedResponse ) - throw new Error(resolvedResponse?.error) + throw new Error(JSON.stringify(resolvedResponse)) } /** Get compute result url @@ -823,7 +823,7 @@ export class Provider { resolvedResponse ) LoggerInstance.error('Payload was:', payload) - throw new Error(resolvedResponse?.error) + throw new Error(JSON.stringify(resolvedResponse)) } /** Check for a valid provider at URL diff --git a/src/utils/ProviderErrors.ts b/src/utils/ProviderErrors.ts index 7f6280b4..75cad5c6 100644 --- a/src/utils/ProviderErrors.ts +++ b/src/utils/ProviderErrors.ts @@ -77,23 +77,16 @@ const PREDEFINED_ERRORS = { } export function getErrorMessage(error: Object): string { - LoggerInstance.log('lib error: ', error) const key = Object.keys(error)[0] - LoggerInstance.log('error key: ', key) if (key === 'error') { const message = error[key] - LoggerInstance.log('error message: ', message) const errorMessage = PREDEFINED_ERRORS[key][message] || `Provider request failed: ${message}` - LoggerInstance.log('returned error message: ', message) return errorMessage } else { const errorObject = error[key] - LoggerInstance.log('error message: ', errorObject) const messagekey = Object.keys(error)[1] - LoggerInstance.log('error message key: ', messagekey) const errorMessage = error[messagekey] - LoggerInstance.log('returned error message: ', `${errorMessage} : ${errorObject}`) return `${errorMessage} : ${errorObject}` } }