diff --git a/packages/notification/channel/instatus/index.ts b/packages/notification/channel/instatus/index.ts index 343a34e25..41e1b866d 100644 --- a/packages/notification/channel/instatus/index.ts +++ b/packages/notification/channel/instatus/index.ts @@ -27,7 +27,6 @@ import type { AxiosRequestConfig } from 'axios' import http from 'http' import https from 'https' import Joi from 'joi' -import { getErrorMessage } from '../../utils/catch-error-handler.js' import { findIncident, insertIncident as insertIncidentToDatabase, @@ -140,7 +139,15 @@ async function createIncident( await insertIncidentToDatabase({ incidentID, probeID, status, url }) } catch (error: unknown) { - throw new Error(getErrorMessage(error)) + const axiosError = + error instanceof axios.AxiosError ? error : new axios.AxiosError() + throw new Error( + `${axiosError?.message}${ + axiosError?.response?.data + ? `. ${axiosError?.response?.data?.message}` + : '' + }` + ) } } @@ -185,7 +192,15 @@ async function updateIncident( getAxiosConfig(apiKey) ) } catch (error: unknown) { - throw new Error(getErrorMessage(error)) + const axiosError = + error instanceof axios.AxiosError ? error : new axios.AxiosError() + throw new Error( + `${axiosError.message}${ + axiosError?.response?.data + ? `. ${axiosError?.response?.data?.message}` + : '' + }` + ) } await updateIncidentToDatabase({ incidentID, status }) diff --git a/src/plugins/visualization/atlassian-status-page/index.ts b/src/plugins/visualization/atlassian-status-page/index.ts index db40cf537..6671a6ddd 100644 --- a/src/plugins/visualization/atlassian-status-page/index.ts +++ b/src/plugins/visualization/atlassian-status-page/index.ts @@ -27,7 +27,6 @@ import http from 'http' import https from 'https' import Joi from 'joi' -import { getErrorMessage } from '../../../utils/catch-error-handler.js' import { findIncident, insertIncident as insertIncidentToDatabase, @@ -136,7 +135,15 @@ export class AtlassianStatusPageAPI { return incidentID } catch (error: unknown) { - throw new Error(getErrorMessage(error)) + const axiosError = + error instanceof axios.AxiosError ? error : new axios.AxiosError() + throw new Error( + `${axiosError?.message}${ + axiosError?.response?.data + ? `. ${axiosError?.response?.data?.message}` + : '' + }` + ) } } @@ -168,7 +175,15 @@ export class AtlassianStatusPageAPI { this.axiosConfig ) } catch (error: unknown) { - throw new Error(getErrorMessage(error)) + const axiosError = + error instanceof axios.AxiosError ? error : new axios.AxiosError() + throw new Error( + `${axiosError?.message}${ + axiosError?.response?.data + ? `. ${axiosError?.response?.data?.message}` + : '' + }` + ) } await updateIncidentToDatabase({ incidentID, status })