@tstdl/base 0.90.2 → 0.90.4

package/api/response.js

@@ -1,6 +1,6 @@
 import { SecretRequirementsError } from '../authentication/errors/secret-requirements.error.js';
 import { SchemaError } from '../schema/schema.error.js';
-import { ApiError, BadRequestError, ForbiddenError, InvalidTokenError, MaxBytesExceededError, MethodNotAllowedError, NotFoundError, NotImplementedError, NotSupportedError, UnauthorizedError, UnsupportedMediaTypeError } from '../errors/index.js';
+import { ApiError, BadRequestError, ForbiddenError, InvalidCredentialsError, InvalidTokenError, MaxBytesExceededError, MethodNotAllowedError, NotFoundError, NotImplementedError, NotSupportedError, UnauthorizedError, UnsupportedMediaTypeError } from '../errors/index.js';
 import { assertString, isDefined, isFunction, isObject, isString } from '../utils/type-guards.js';
 import { deserializeSchemaError, serializeSchemaError } from './default-error-handlers.js';
 const errorHandlers = new Map();
@@ -77,13 +77,14 @@ export function isErrorResponse(response) {
 registerErrorHandler(ApiError, 400, ({ response }) => response, (response) => new ApiError(response));
 registerErrorHandler(BadRequestError, 400, () => undefined, (_, error) => new BadRequestError(error.message));
 registerErrorHandler(ForbiddenError, 403, () => undefined, (_, error) => new ForbiddenError(error.message));
+registerErrorHandler(InvalidCredentialsError, 401, () => undefined, (_, error) => new InvalidCredentialsError(error.message));
 registerErrorHandler(InvalidTokenError, 401, () => undefined, (_, error) => new InvalidTokenError(error.message));
 registerErrorHandler(MaxBytesExceededError, 400, () => undefined, (_, error) => new MaxBytesExceededError(error.message));
+registerErrorHandler(MethodNotAllowedError, 405, () => undefined, (_, error) => new MethodNotAllowedError(error.message));
 registerErrorHandler(NotFoundError, 404, () => undefined, (_, error) => new NotFoundError(error.message));
 registerErrorHandler(NotImplementedError, 501, () => undefined, (_, error) => new NotImplementedError(error.message));
 registerErrorHandler(NotSupportedError, 400, () => undefined, (_, error) => new NotSupportedError(error.message));
-registerErrorHandler(UnauthorizedError, 401, () => undefined, (_, error) => new UnauthorizedError(error.message));
-registerErrorHandler(MethodNotAllowedError, 405, () => undefined, (_, error) => new MethodNotAllowedError(error.message));
-registerErrorHandler(UnsupportedMediaTypeError, 415, () => undefined, (_, error) => new UnsupportedMediaTypeError(error.message));
 registerErrorHandler(SchemaError, 400, serializeSchemaError, (data, error) => deserializeSchemaError(error.message, data));
 registerErrorHandler(SecretRequirementsError, 403, () => undefined, (_, error) => new SecretRequirementsError(error.message));
+registerErrorHandler(UnauthorizedError, 401, () => undefined, (_, error) => new UnauthorizedError(error.message));
+registerErrorHandler(UnsupportedMediaTypeError, 415, () => undefined, (_, error) => new UnsupportedMediaTypeError(error.message));

package/errors/errors.localization.js

@@ -55,9 +55,9 @@ export const germanTstdlErrorsLocalization = {
                 message: getErrorMessage
             },
             HttpError: {
-                header: (error) => (isDefined(error.response)
-                    ? `HTTP Fehler ${error.response.statusCode.toString()}`
-                    : 'HTTP Fehler'),
+                header: (error) => ((isDefined(error.response) && error.response.statusCode != 0)
+                    ? `Http Fehler - ${error.response.statusCode.toString()}`
+                    : 'Http Fehler'),
                 message: (error, context) => context.localizationService.localizeOnce({ enum: HttpErrorReason, value: error.reason })
             },
             SecretRequirementsError: {
@@ -131,9 +131,9 @@ export const englishTstdlErrorsLocalization = {
                 message: getErrorMessage
             },
             HttpError: {
-                header: (error) => (isDefined(error.response)
-                    ? `HTTP error ${error.response.statusCode.toString()}`
-                    : 'HTTP error'),
+                header: (error) => ((isDefined(error.response) && error.response.statusCode != 0)
+                    ? `Http error - ${error.response.statusCode.toString()}`
+                    : 'Http error'),
                 message: (error, context) => context.localizationService.localizeOnce({ enum: HttpErrorReason, value: error.reason })
             },
             SecretRequirementsError: {

package/errors/index.d.ts

@@ -21,3 +21,4 @@ export * from './not-supported.error.js';
 export * from './timeout.error.js';
 export * from './unauthorized.error.js';
 export * from './unsupported-media-type.error.js';
+export * from './utils.js';

package/errors/index.js

@@ -21,3 +21,4 @@ export * from './not-supported.error.js';
 export * from './timeout.error.js';
 export * from './unauthorized.error.js';
 export * from './unsupported-media-type.error.js';
+export * from './utils.js';

package/errors/utils.d.ts

@@ -0,0 +1 @@
+export declare function unwrapError(error: any): any;

package/errors/utils.js

@@ -0,0 +1,8 @@
+export function unwrapError(error) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    const wrappedError = error?.rejection ?? error?.reason ?? error?.error;
+    if ((error instanceof Error) && !(error.message.startsWith('Uncaught') && (wrappedError instanceof Error))) {
+        return error;
+    }
+    return wrappedError;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.90.2",
+  "version": "0.90.4",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

package/utils/format-error.js

@@ -1,3 +1,4 @@
+import { unwrapError } from '../errors/utils.js';
 import { decycle } from './object/decycle.js';
 import { objectKeys } from './object/object.js';
 import { isDefined, isFunction, isUndefined } from './type-guards.js';
@@ -9,25 +10,21 @@ export function formatError(error, options = {}) {
     let stack;
     let rest;
     let extraInfo;
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    const wrappedError = error?.rejection ?? error?.reason ?? error?.error;
-    if ((error instanceof Error) && !(error.message.startsWith('Uncaught') && (wrappedError instanceof Error))) {
-        ({ name, message, stack, ...rest } = error);
+    const actualError = unwrapError(error);
+    if ((actualError instanceof Error)) {
+        ({ name, message, stack, ...rest } = actualError);
         // eslint-disable-next-line @typescript-eslint/unbound-method
-        if (includeExtraInfo && isFunction(error.getExtraInfo)) {
-            extraInfo = error.getExtraInfo();
+        if (includeExtraInfo && isFunction(actualError.getExtraInfo)) {
+            extraInfo = actualError.getExtraInfo();
         }
     }
-    else if (wrappedError instanceof Error) {
-        return formatError(wrappedError, options);
-    }
     if (isUndefined(name) && (isUndefined(message) || message.trim().length == 0)) {
         try {
-            const decycledError = decycle(error);
+            const decycledError = decycle(actualError);
             message = JSON.stringify(decycledError, null, 2);
         }
         catch {
-            throw error;
+            throw actualError;
         }
     }
     const nameString = (options.includeName ?? true) ? `${name ?? 'Error'}: ` : '';