@emoyly/problem 7.0.6 → 8.0.0

package/cjs/defaults/others.d.ts

@@ -1,37 +1,37 @@
 export declare const otherErrors: {
-    unknown: {
-        status: number;
-        title: string;
-        type: string;
+    readonly unknown: {
+        readonly status: 500;
+        readonly title: "Unknown error";
+        readonly type: "/errors/defaults/others/unknown";
     };
-    corsError: {
-        status: number;
-        title: string;
-        type: string;
+    readonly corsError: {
+        readonly status: 401;
+        readonly title: "Request not allowed by CORS policy";
+        readonly type: "/errors/defaults/others/corsdenied";
     };
-    problemParseError: {
-        status: number;
-        title: string;
-        type: string;
+    readonly problemParseError: {
+        readonly status: 1000;
+        readonly title: "Could not parse problem details";
+        readonly type: "/errors/defaults/others/problemparseerror";
     };
-    problemJsonError: {
-        status: number;
-        title: string;
-        type: string;
+    readonly problemJsonError: {
+        readonly status: 1000;
+        readonly title: "Could not parse problem JSON";
+        readonly type: "/errors/defaults/others/problemjsonerror";
     };
-    notAnError: {
-        status: number;
-        title: string;
-        type: string;
+    readonly notAnError: {
+        readonly status: 1000;
+        readonly title: "Not an error";
+        readonly type: "/errors/defaults/others/notanerror";
     };
-    networkError: {
-        status: number;
-        title: string;
-        type: string;
+    readonly networkError: {
+        readonly status: 1000;
+        readonly title: "Network error";
+        readonly type: "/errors/defaults/others/networkerror";
     };
-    inputValidationError: {
-        status: number;
-        title: string;
-        type: string;
+    readonly inputValidationError: {
+        readonly status: 400;
+        readonly title: "Input failed validation";
+        readonly type: "/errors/defaults/others/validationerror";
     };
 };

package/cjs/middleware/axios.js

@@ -11,7 +11,7 @@ class AxiosMiddleware extends base_js_1.MiddlewareBase {
         }, options);
     }
     interceptor = async (error) => {
-        const problems = await this.parse(error);
+        const problems = this.parse(error);
         this.emit(problems);
         return Promise.reject(problems);
     };

package/cjs/middleware/base.d.ts

@@ -19,7 +19,7 @@ export declare abstract class MiddlewareBase {
     /**
      * Parse input using parsers
      */
-    parse: (input: unknown) => Promise<Problem[]>;
+    parse: (input: unknown) => Problem[];
     fallback: ProblemOpts;
     problemListeners: ProblemListener[];
     protected emit: (list: Problem[]) => void;

package/cjs/middleware/base.js

@@ -19,7 +19,7 @@ class MiddlewareBase {
     /**
      * Parse input using parsers
      */
-    parse = async (input) => {
+    parse = (input) => {
         const problems = (0, getProblems_js_1.getProblems)(input, this.options.parsers);
         if (!problems || !Array.isArray(problems) || problems.length < 1) {
             if (this.enableFallback)
@@ -27,13 +27,13 @@ class MiddlewareBase {
                         ...this.fallback,
                         'errorObject': input,
                         'stack': (typeof input === 'object' && input !== null && 'stack' in input && typeof input.stack === 'string') ? input.stack : undefined,
-                        'middleware': this.name
+                        'source': `middleware:${this.name}`
                     })];
             return [];
         }
         for (const p of problems) {
-            if (!p.middleware)
-                p.middleware = this.name;
+            if (!p.source)
+                p.source = `middleware:${this.name}`;
         }
         return problems;
     };

package/cjs/middleware/express.js

@@ -4,38 +4,20 @@ exports.ExpressMiddleware = void 0;
 const base_js_1 = require("./base.js");
 const problem_js_1 = require("../problem.js");
 const index_js_1 = require("../defaults/index.js");
-const defaults_js_1 = require("../util/defaults.js");
 class ExpressMiddleware extends base_js_1.MiddlewareBase {
     name = 'express';
     middleware = (error, req, res, next) => {
-        this.parse(error)
-            .then(problems => {
-            for (const problem of problems) {
-                if (problem.instance === defaults_js_1.defaultInstance) {
-                    problem.instance = req.originalUrl;
-                }
+        const problems = this.parse(error);
+        for (const problem of problems) {
+            if (!problem.instance) {
+                problem.instance = req.originalUrl;
             }
-            this.emit(problems);
-            res
-                .contentType('application/problem+json')
-                .status(problems[0]?.status ?? 500)
-                .json(problems.map(val => val.toObject()));
-        })
-            .catch(err => {
-            res
-                .contentType('application/problem+json')
-                .status(500)
-                .json([
-                new problem_js_1.Problem({
-                    ...index_js_1.otherErrors.unknown,
-                    'instance': req.originalUrl,
-                    'status': 500,
-                    'stack': err?.stack,
-                    'errorObject': err,
-                }).toObject()
-            ]);
-            throw err;
-        });
+        }
+        this.emit(problems);
+        res
+            .contentType('application/problem+json')
+            .status(problems[0]?.status ?? 500)
+            .json(problems.map(val => val.toObject()));
     };
     /**
      * This function applies the middleware to your Express application. Put this at the very end of your middleware/routes.

package/cjs/parsers/axios.js

@@ -4,13 +4,11 @@ const others_js_1 = require("../defaults/others.js");
 const problem_js_1 = require("../problem.js");
 const getProblems_js_1 = require("../util/getProblems.js");
 const misc_js_1 = require("../util/misc.js");
-function isAxiosError(payload) {
-    return typeof payload === 'object' && payload !== null && 'isAxiosError' in payload && payload.isAxiosError === true;
-}
+const axios_1 = require("axios");
 const parse = (input) => {
     if (typeof input !== 'object' || input == null)
         return [];
-    if (!isAxiosError(input))
+    if (!(0, axios_1.isAxiosError)(input))
         return [];
     const request = input.request;
     if (input?.response?.data) {
@@ -19,13 +17,14 @@ const parse = (input) => {
             return problems;
     }
     if (input?.response) {
-        const opts = (0, misc_js_1.getHttpError)(input.response.status);
+        const opts = (0, misc_js_1.getCodeDefaults)(input.response.status);
         if (opts)
             return [new problem_js_1.Problem({
                     ...opts,
                     'instance': input?.config?.url,
                     'stack': input?.stack,
-                    'errorObject': input
+                    'errorObject': input,
+                    'source': 'parser:axios'
                 })];
     }
     // TODO: Fix this, this seems bad
@@ -37,7 +36,8 @@ const parse = (input) => {
                     ...others_js_1.otherErrors.networkError,
                     'instance': input?.config?.url,
                     'stack': input?.stack,
-                    'errorObject': input
+                    'errorObject': input,
+                    'source': 'parser:axios'
                 })];
         }
         // Probably a ClientRequest
@@ -46,7 +46,8 @@ const parse = (input) => {
                     ...others_js_1.otherErrors.networkError,
                     'instance': input?.config?.url,
                     'stack': input?.stack,
-                    'errorObject': input
+                    'errorObject': input,
+                    'source': 'parser:axios'
                 })];
         }
     }

package/cjs/parsers/jsonwebtoken.js

@@ -75,6 +75,7 @@ const parse = (input) => {
             return [new problem_js_1.Problem({
                     ...found.result,
                     'errorObject': input,
+                    'source': 'parser:jsonwebtoken'
                 })];
         }
     }
@@ -85,6 +86,7 @@ const parse = (input) => {
                 'detail': `The JSON Web Token expired at ${input.expiredAt}`,
                 'status': 400,
                 'errorObject': input,
+                'source': 'parser:jsonwebtoken'
             })];
     }
     else if (input instanceof jsonwebtoken_1.NotBeforeError && input.name === 'NotBeforeError') {
@@ -94,6 +96,7 @@ const parse = (input) => {
                 'detail': `The JSON Web Token is not valid before ${input.date}`,
                 'status': 400,
                 'errorObject': input,
+                'source': 'parser:jsonwebtoken'
             })];
     }
 };

package/cjs/parsers/mikroorm.js

@@ -13,6 +13,7 @@ const parse = (input) => {
             ..._4xx_js_1.statusCodes['404'],
             'stack': input.stack,
             'errorObject': input,
+            'source': 'parser:mikroorm'
         })
     ];
 };

package/cjs/parsers/tsoa.js

@@ -7,7 +7,7 @@ const parse = (input) => {
     if (!(input instanceof tsoa_1.ValidateError)) {
         return;
     }
-    // TODO: Give actual useful responses instead of this shit
+    // TODO: Give actual useful responses instead of this 💩
     return [
         new problem_js_1.Problem({
             ...others_js_1.otherErrors.inputValidationError,
@@ -17,7 +17,8 @@ const parse = (input) => {
                 'fields': input.fields,
             },
             'stack': input.stack,
-            'errorObject': input
+            'errorObject': input,
+            'source': 'parser:tsoa'
         })
     ];
 };

package/cjs/parsers/zod.js

@@ -15,7 +15,8 @@ const parse = (input) => {
             'errorObject': input,
             'data': {
                 'issues': input.issues
-            }
+            },
+            'source': 'parser:zod'
         })];
 };
 exports.default = parse;

package/cjs/problem.d.ts

@@ -1,14 +1,14 @@
-import type { IProblem, ProblemOpts, JsonProblem } from './typings/problem.js';
+import type { IProblem, ProblemOpts, JsonProblemOutput } from './typings/problem.js';
 export declare class Problem extends Error implements IProblem {
     type: string;
     title: string;
     status: number;
-    detail: string;
-    instance: string;
+    detail: string | undefined;
+    instance: string | undefined;
     errorObject?: unknown;
-    __problemVersion: string;
+    readonly __problemVersion = "8.0.0";
     data: unknown;
-    middleware?: string;
-    constructor({ type, title, status, detail, instance, stack, errorObject, data, middleware }: ProblemOpts);
-    toObject: () => JsonProblem;
+    source?: string;
+    constructor(opts: ProblemOpts);
+    toObject: () => JsonProblemOutput;
 }

package/cjs/problem.js

@@ -1,60 +1,69 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Problem = void 0;
-const defaults_js_1 = require("./util/defaults.js");
+const validation_js_1 = require("./util/validation.js");
 const version_js_1 = require("./util/version.js");
 class Problem extends Error {
-    type = defaults_js_1.defaultType;
-    title = defaults_js_1.defaultTitle;
-    status = 500;
-    detail = defaults_js_1.defaultDetail;
-    instance = defaults_js_1.defaultInstance;
+    type;
+    title;
+    status;
+    detail;
+    instance;
     errorObject;
     __problemVersion = version_js_1.version;
     data = undefined;
-    middleware;
-    constructor({ type, title, status, detail, instance, stack, errorObject, data, middleware }) {
-        super(detail ?? title ?? 'HTTP Problem Details');
-        // TODO: Figure out why i wrote this?
+    source;
+    constructor(opts) {
+        const valid = (0, validation_js_1.validateBasicInput)(opts);
+        if (valid !== true)
+            throw valid;
+        super(opts.detail ?? opts.title ?? 'HTTP Problem Details');
+        // TODO: Figure out if this is still necessary
         Object.setPrototypeOf(this, new.target.prototype);
-        this.type = type;
-        this.title = title;
-        this.status = status;
-        if (detail)
-            this.detail = detail;
-        if (instance)
-            this.instance = instance;
-        if (errorObject)
-            this.errorObject = errorObject;
-        if (middleware)
-            this.middleware = middleware;
-        if (stack) {
-            this.stack = stack;
+        this.type = opts.type;
+        this.title = opts.title;
+        this.status = opts.status;
+        if (opts.detail)
+            this.detail = opts.detail;
+        if (opts.instance)
+            this.instance = opts.instance;
+        if (opts.errorObject)
+            this.errorObject = opts.errorObject;
+        if (opts.source)
+            this.source = opts.source;
+        if (opts.stack) {
+            this.stack = opts.stack;
         }
-        else if (errorObject && typeof errorObject === 'object' && 'stack' in errorObject && typeof errorObject.stack === 'string') {
-            this.stack = errorObject.stack;
+        else if (opts.errorObject && typeof opts.errorObject === 'object' && 'stack' in opts.errorObject && typeof opts.errorObject.stack === 'string') {
+            this.stack = opts.errorObject.stack;
         }
         else {
             if (typeof Error.captureStackTrace === 'function') {
                 Error.captureStackTrace(this, this.constructor);
             }
             else {
-                this.stack = new Error(detail ?? title ?? 'HTTP Problem Details').stack;
+                this.stack = new Error(opts.detail ?? opts.title ?? 'HTTP Problem Details').stack;
             }
         }
-        if (data)
-            this.data = data;
+        if (opts.data)
+            this.data = opts.data;
     }
     toObject = () => {
-        return {
+        const out = {
             'type': this.type,
             'title': this.title,
             'status': this.status,
-            'detail': this.detail,
-            'instance': this.instance,
             '__problemVersion': this.__problemVersion,
-            'data': this.data
         };
+        if (this.detail)
+            out.detail = this.detail;
+        if (this.instance)
+            out.instance = this.instance;
+        if (this.source)
+            out.source = this.source;
+        if (this.data)
+            out.data = this;
+        return out;
     };
 }
 exports.Problem = Problem;