fix(ilc/server): handle tailor extended errors properly

namecheap · Apr 3, 2024 · 8b5150e · 8b5150e
1 parent 2666d3c
commit 8b5150e
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 10 deletions.
diff --git a/ilc/common/CacheWrapper.js b/ilc/common/CacheWrapper.js
@@ -1,7 +1,7 @@
 const extendError = require('@namecheap/error-extender');
 
 const errors = {};
-errors.CacheWrapperError = extendError('CacheWrapperError');
+errors.CacheWrapperError = extendError('CacheWrapperError', { defaultData: {} });
 
 class CacheWrapper {
     #cacheRenewPromise = {};

diff --git a/ilc/common/guard/errors.js b/ilc/common/guard/errors.js
@@ -2,7 +2,7 @@ const extendError = require('@namecheap/error-extender');
 
 const errors = {};
 
-errors.GuardError = extendError('GuardError');
+errors.GuardError = extendError('GuardError', { defaultData: {} });
 errors.GuardTransitionHookError = extendError('GuardTransitionHookError', {
     parent: errors.GuardError,
 });

diff --git a/ilc/package-lock.json b/ilc/package-lock.json
diff --git a/ilc/package.json b/ilc/package.json
@@ -45,6 +45,7 @@
     "newrelic": "^11.1.0",
     "node-html-parser": "^6.1.10",
     "parseurl": "^1.3.3",
+    "safe-json-stringify": "^1.2.0",
     "serve-static": "^1.15.0",
     "single-spa": "5.6.0",
     "source-map-support": "^0.5.21",

diff --git a/ilc/server/errorHandler/ErrorHandler.js b/ilc/server/errorHandler/ErrorHandler.js
@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { StatusCodes, getReasonPhrase } = require('http-status-codes');
+const safeJsonStringify = require('safe-json-stringify');
 const uuidv4 = require('uuid/v4');
 const extendError = require('@namecheap/error-extender');
 const config = require('config');
@@ -65,7 +66,7 @@ module.exports = class ErrorHandler {
             const handlingError = new ErrorHandlingError({
                 message: 'Additional error in error handling',
                 cause: causeErr,
-                data: { errorId },
+                data: { errorId, originalError: safeJsonStringify(err) },
             });
             this.#logger.error(handlingError);
             this.#writeStaticError(nres);

diff --git a/ilc/server/registry/errors.ts b/ilc/server/registry/errors.ts
@@ -1,5 +1,5 @@
 import extendError from '@namecheap/error-extender';
 
-export const RegistryError = extendError('RegistryError');
+export const RegistryError = extendError('RegistryError', { defaultData: {} });
 export const ValidationRegistryError = extendError('ValidationRegistryError', { parent: RegistryError });
 export const NotFoundRegistryError = extendError('NotFoundRegistryError', { parent: RegistryError });
diff --git a/ilc/server/tailor/errors.js b/ilc/server/tailor/errors.js
@@ -1,7 +1,7 @@
 const extendError = require('@namecheap/error-extender');
 
 const errors = {};
-errors.TailorError = extendError('TailorError');
+errors.TailorError = extendError('TailorError', { defaultData: {} });
 errors.FragmentError = extendError('FragmentError', { parent: errors.TailorError });
 errors.FragmentRequestError = extendError('FragmentRequestError', { parent: errors.TailorError });
 errors.FragmentWarn = extendError('FragmentWarn', { parent: errors.TailorError });

diff --git a/registry/server/errorHandler/httpErrors.ts b/registry/server/errorHandler/httpErrors.ts
@@ -1,6 +1,6 @@
 import extendError from '@namecheap/error-extender';
 
-export const HttpError = extendError('HttpError');
+export const HttpError = extendError('HttpError', { defaultData: {} });
 export const NotFoundError = extendError('NotFoundError', {
     parent: HttpError,
 });

diff --git a/registry/server/templates/errors.ts b/registry/server/templates/errors.ts
@@ -1,6 +1,6 @@
 import errorExtender from '@namecheap/error-extender';
 
 export default {
-    FetchIncludeError: errorExtender('FetchIncludeError'),
-    InvalidTemplateError: errorExtender('InvalidTemplateError'),
+    FetchIncludeError: errorExtender('FetchIncludeError', { defaultData: {} }),
+    InvalidTemplateError: errorExtender('InvalidTemplateError', { defaultData: {} }),
 };
diff --git a/registry/server/util/helpers.ts b/registry/server/util/helpers.ts
@@ -1,6 +1,5 @@
 import Joi, { ValidationError } from 'joi';
 import _fp from 'lodash/fp';
-import { type ExtendedError } from '@namecheap/error-extender';
 
 export const joiErrorToResponse = _fp.compose<
     Array<Joi.ValidationError>,

diff --git a/registry/server/versioning/errors.ts b/registry/server/versioning/errors.ts
@@ -1,6 +1,6 @@
 import extendError from '@namecheap/error-extender';
 
-export const VersioningError = extendError('VersioningError');
+export const VersioningError = extendError('VersioningError', { defaultData: {} });
 export const NonRevertableError = extendError<{ reason: string }>('NonRevertableError', { parent: VersioningError });
 export const NonExistingVersionError = extendError('NonExistingVersionError', {
     parent: VersioningError,