@eggjs/onerror 4.0.0-beta.20 → 4.0.0-beta.21

package/dist/lib/error_view.d.ts

@@ -1,158 +1,154 @@
-import { OnerrorError } from "koa-onerror";
-import { StackFrame } from "stack-trace";
-import { Context } from "egg";
-
-//#region src/lib/error_view.d.ts
-interface FrameSource {
-  pre: string[];
-  line: string;
-  post: string[];
+import { type StackFrame } from 'stack-trace';
+import type { OnerrorError } from 'koa-onerror';
+import type { Context } from 'egg';
+export interface FrameSource {
+    pre: string[];
+    line: string;
+    post: string[];
 }
-interface Frame extends StackFrame {
-  context?: FrameSource;
+export interface Frame extends StackFrame {
+    context?: FrameSource;
 }
-declare class ErrorView {
-  ctx: Context;
-  error: OnerrorError;
-  request: Context['request'];
-  app: Context['app'];
-  assets: Map<string, string>;
-  viewTemplate: string;
-  codeContext: number;
-  _filterHeaders: string[];
-  constructor(ctx: Context, error: OnerrorError, template: string);
-  /**
-   * get html error page
-   *
-   * @return {String} html page
-   */
-  toHTML(): string;
-  /**
-   * compile view
-   *
-   * @param {String} tpl - template
-   * @param {Object} locals - data used by template
-   */
-  compileView(tpl: string, locals: Record<string, unknown>): string;
-  /**
-   * check if the frame is node native file.
-   *
-   * @param {Frame} frame - current frame
-   */
-  isNode(frame: Frame): boolean;
-  /**
-   * check if the frame is app modules.
-   *
-   * @param {Object} frame - current frame
-   */
-  isApp(frame: Frame): boolean;
-  /**
-   * cache file asserts
-   *
-   * @param {String} key - assert key
-   * @param {String} value - assert content
-   */
-  setAssets(key: string, value: string): void;
-  /**
-   * get cache file asserts
-   *
-   * @param {String} key - assert key
-   */
-  getAssets(key: string): string | undefined;
-  /**
-   * get frame source
-   *
-   * @param {Object} frame - current frame
-   */
-  getFrameSource(frame: StackFrame): FrameSource;
-  /**
-   * parse error and return frame stack
-   */
-  parseError(): Frame[];
-  /**
-   * get stack context
-   *
-   * @param {Object} frame - current frame
-   */
-  getContext(frame: Frame): {
-    start?: undefined;
-    pre?: undefined;
-    line?: undefined;
-    post?: undefined;
-  } | {
-    start: number;
-    pre: string;
-    line: string;
-    post: string;
-  };
-  /**
-   * get frame classes, let view identify the frame
-   *
-   * @param {any} frame - current frame
-   * @param {any} index - current index
-   */
-  getFrameClasses(frame: Frame, index: number): string;
-  /**
-   * serialize frame and return meaningful data
-   *
-   * @param {Object} frame - current frame
-   */
-  serializeFrame(frame: Frame): {
-    extname: string;
-    file: string;
-    method: string;
-    line: number;
-    column: number;
-    context: {
-      start?: undefined;
-      pre?: undefined;
-      line?: undefined;
-      post?: undefined;
+export declare class ErrorView {
+    ctx: Context;
+    error: OnerrorError;
+    request: Context['request'];
+    app: Context['app'];
+    assets: Map<string, string>;
+    viewTemplate: string;
+    codeContext: number;
+    _filterHeaders: string[];
+    constructor(ctx: Context, error: OnerrorError, template: string);
+    /**
+     * get html error page
+     *
+     * @return {String} html page
+     */
+    toHTML(): string;
+    /**
+     * compile view
+     *
+     * @param {String} tpl - template
+     * @param {Object} locals - data used by template
+     */
+    compileView(tpl: string, locals: Record<string, unknown>): string;
+    /**
+     * check if the frame is node native file.
+     *
+     * @param {Frame} frame - current frame
+     */
+    isNode(frame: Frame): boolean;
+    /**
+     * check if the frame is app modules.
+     *
+     * @param {Object} frame - current frame
+     */
+    isApp(frame: Frame): boolean;
+    /**
+     * cache file asserts
+     *
+     * @param {String} key - assert key
+     * @param {String} value - assert content
+     */
+    setAssets(key: string, value: string): void;
+    /**
+     * get cache file asserts
+     *
+     * @param {String} key - assert key
+     */
+    getAssets(key: string): string | undefined;
+    /**
+     * get frame source
+     *
+     * @param {Object} frame - current frame
+     */
+    getFrameSource(frame: StackFrame): FrameSource;
+    /**
+     * parse error and return frame stack
+     */
+    parseError(): Frame[];
+    /**
+     * get stack context
+     *
+     * @param {Object} frame - current frame
+     */
+    getContext(frame: Frame): {
+        start?: undefined;
+        pre?: undefined;
+        line?: undefined;
+        post?: undefined;
     } | {
-      start: number;
-      pre: string;
-      line: string;
-      post: string;
+        start: number;
+        pre: string;
+        line: string;
+        post: string;
+    };
+    /**
+     * get frame classes, let view identify the frame
+     *
+     * @param {any} frame - current frame
+     * @param {any} index - current index
+     */
+    getFrameClasses(frame: Frame, index: number): string;
+    /**
+     * serialize frame and return meaningful data
+     *
+     * @param {Object} frame - current frame
+     */
+    serializeFrame(frame: Frame): {
+        extname: string;
+        file: string;
+        method: string;
+        line: number;
+        column: number;
+        context: {
+            start?: undefined;
+            pre?: undefined;
+            line?: undefined;
+            post?: undefined;
+        } | {
+            start: number;
+            pre: string;
+            line: string;
+            post: string;
+        };
+        classes: string;
+    };
+    /**
+     * serialize base data
+     *
+     * @param {Object} stack - frame stack
+     * @param {Function} frameFormatter - frame formatter function
+     */
+    serializeData(stack: Frame[], frameFormatter: (frame: Frame, index: number) => any): {
+        code: any;
+        message: string;
+        name: string;
+        status: number;
+        frames: any[];
+    };
+    /**
+     * serialize request object
+     */
+    serializeRequest(): {
+        url: string;
+        httpVersion: string;
+        method: string;
+        connection: string | undefined;
+        headers: {
+            key: string;
+            value: string | string[] | undefined;
+        }[];
+        cookies: {
+            key: string;
+            value: string | undefined;
+        }[];
+    };
+    /**
+     * serialize app info object
+     */
+    serializeAppInfo(): {
+        baseDir: string;
+        config: string;
     };
-    classes: string;
-  };
-  /**
-   * serialize base data
-   *
-   * @param {Object} stack - frame stack
-   * @param {Function} frameFormatter - frame formatter function
-   */
-  serializeData(stack: Frame[], frameFormatter: (frame: Frame, index: number) => any): {
-    code: any;
-    message: string;
-    name: string;
-    status: number;
-    frames: any[];
-  };
-  /**
-   * serialize request object
-   */
-  serializeRequest(): {
-    url: string;
-    httpVersion: string;
-    method: string;
-    connection: string | undefined;
-    headers: {
-      key: string;
-      value: string | string[] | undefined;
-    }[];
-    cookies: {
-      key: string;
-      value: string | undefined;
-    }[];
-  };
-  /**
-   * serialize app info object
-   */
-  serializeAppInfo(): {
-    baseDir: string;
-    config: string;
-  };
 }
-//#endregion
-export { ErrorView, Frame, FrameSource };

package/dist/lib/error_view.js

@@ -1,4 +1,241 @@
-import "../utils-S1o8_vNA.js";
-import { ErrorView } from "../error_view-mAkjBkEW.js";
-
-export { ErrorView };
+// modify from https://github.com/poppinss/youch/blob/develop/src/Youch/index.js
+import fs from 'node:fs';
+import path from 'node:path';
+import util from 'node:util';
+import { parse } from 'cookie';
+import Mustache from 'mustache';
+import stackTrace, {} from 'stack-trace';
+import { detectErrorMessage } from "./utils.js";
+const startingSlashRegex = /\\|\//;
+export class ErrorView {
+    ctx;
+    error;
+    request;
+    app;
+    assets;
+    viewTemplate;
+    codeContext = 5;
+    _filterHeaders = ['cookie', 'connection'];
+    constructor(ctx, error, template) {
+        this.ctx = ctx;
+        this.error = error;
+        this.request = ctx.request;
+        this.app = ctx.app;
+        this.assets = new Map();
+        this.viewTemplate = template;
+    }
+    /**
+     * get html error page
+     *
+     * @return {String} html page
+     */
+    toHTML() {
+        const stack = this.parseError();
+        const data = this.serializeData(stack, (frame, index) => {
+            const serializedFrame = this.serializeFrame(frame);
+            serializedFrame.classes = this.getFrameClasses(frame, index);
+            return serializedFrame;
+        });
+        return this.compileView(this.viewTemplate, {
+            ...data,
+            appInfo: this.serializeAppInfo(),
+            request: this.serializeRequest(),
+        });
+    }
+    /**
+     * compile view
+     *
+     * @param {String} tpl - template
+     * @param {Object} locals - data used by template
+     */
+    compileView(tpl, locals) {
+        return Mustache.render(tpl, locals);
+    }
+    /**
+     * check if the frame is node native file.
+     *
+     * @param {Frame} frame - current frame
+     */
+    isNode(frame) {
+        if (frame.isNative()) {
+            return true;
+        }
+        const filename = frame.getFileName() || '';
+        return !path.isAbsolute(filename) && filename[0] !== '.';
+    }
+    /**
+     * check if the frame is app modules.
+     *
+     * @param {Object} frame - current frame
+     */
+    isApp(frame) {
+        if (this.isNode(frame)) {
+            return false;
+        }
+        const filename = frame.getFileName() || '';
+        return !filename.includes('node_modules' + path.sep);
+    }
+    /**
+     * cache file asserts
+     *
+     * @param {String} key - assert key
+     * @param {String} value - assert content
+     */
+    setAssets(key, value) {
+        this.assets.set(key, value);
+    }
+    /**
+     * get cache file asserts
+     *
+     * @param {String} key - assert key
+     */
+    getAssets(key) {
+        return this.assets.get(key);
+    }
+    /**
+     * get frame source
+     *
+     * @param {Object} frame - current frame
+     */
+    getFrameSource(frame) {
+        const filename = frame.getFileName();
+        const lineNumber = frame.getLineNumber();
+        let contents = this.getAssets(filename);
+        if (!contents) {
+            contents = fs.existsSync(filename) ? fs.readFileSync(filename, 'utf8') : '';
+            this.setAssets(filename, contents);
+        }
+        const lines = contents.split(/\r?\n/);
+        return {
+            pre: lines.slice(Math.max(0, lineNumber - (this.codeContext + 1)), lineNumber - 1),
+            line: lines[lineNumber - 1],
+            post: lines.slice(lineNumber, lineNumber + this.codeContext),
+        };
+    }
+    /**
+     * parse error and return frame stack
+     */
+    parseError() {
+        const stack = stackTrace.parse(this.error);
+        return stack.map((frame) => {
+            if (!this.isNode(frame)) {
+                frame.context = this.getFrameSource(frame);
+            }
+            return frame;
+        });
+    }
+    /**
+     * get stack context
+     *
+     * @param {Object} frame - current frame
+     */
+    getContext(frame) {
+        if (!frame.context) {
+            return {};
+        }
+        return {
+            start: frame.getLineNumber() - (frame.context.pre || []).length,
+            pre: frame.context.pre.join('\n'),
+            line: frame.context.line,
+            post: frame.context.post.join('\n'),
+        };
+    }
+    /**
+     * get frame classes, let view identify the frame
+     *
+     * @param {any} frame - current frame
+     * @param {any} index - current index
+     */
+    getFrameClasses(frame, index) {
+        const classes = [];
+        if (index === 0) {
+            classes.push('active');
+        }
+        if (!this.isApp(frame)) {
+            classes.push('native-frame');
+        }
+        return classes.join(' ');
+    }
+    /**
+     * serialize frame and return meaningful data
+     *
+     * @param {Object} frame - current frame
+     */
+    serializeFrame(frame) {
+        const filename = frame.getFileName();
+        const relativeFileName = filename.includes(process.cwd())
+            ? filename.replace(process.cwd(), '').replace(startingSlashRegex, '')
+            : filename;
+        const extname = path.extname(filename).replace('.', '');
+        return {
+            extname,
+            file: relativeFileName,
+            method: frame.getFunctionName(),
+            line: frame.getLineNumber(),
+            column: frame.getColumnNumber(),
+            context: this.getContext(frame),
+            classes: '',
+        };
+    }
+    /**
+     * serialize base data
+     *
+     * @param {Object} stack - frame stack
+     * @param {Function} frameFormatter - frame formatter function
+     */
+    serializeData(stack, frameFormatter) {
+        const code = Reflect.get(this.error, 'code') ?? Reflect.get(this.error, 'type');
+        let message = detectErrorMessage(this.ctx, this.error);
+        if (code) {
+            message = `${message} (code: ${code})`;
+        }
+        return {
+            code,
+            message,
+            name: this.error.name,
+            status: this.error.status,
+            frames: stack instanceof Array ? stack.filter(frame => frame.getFileName()).map(frameFormatter) : [],
+        };
+    }
+    /**
+     * serialize request object
+     */
+    serializeRequest() {
+        const headers = [];
+        Object.keys(this.request.headers).forEach(key => {
+            if (this._filterHeaders.includes(key)) {
+                return;
+            }
+            headers.push({
+                key,
+                value: this.request.headers[key],
+            });
+        });
+        const parsedCookies = parse(this.request.headers.cookie || '');
+        const cookies = Object.keys(parsedCookies).map(key => {
+            return { key, value: parsedCookies[key] };
+        });
+        return {
+            url: this.request.url,
+            httpVersion: this.request.req.httpVersion,
+            method: this.request.method,
+            connection: this.request.headers.connection,
+            headers,
+            cookies,
+        };
+    }
+    /**
+     * serialize app info object
+     */
+    serializeAppInfo() {
+        let config = this.app.config;
+        if ('dumpConfigToObject' in this.app && typeof this.app.dumpConfigToObject === 'function') {
+            config = this.app.dumpConfigToObject().config.config;
+        }
+        return {
+            baseDir: this.app.config.baseDir,
+            config: util.inspect(config),
+        };
+    }
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"error_view.js","sourceRoot":"","sources":["../../src/lib/error_view.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAEhF,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,UAAU,EAAE,EAAmB,MAAM,aAAa,CAAC;AAG1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAGhD,MAAM,kBAAkB,GAAG,OAAO,CAAC;AAYnC,MAAM,OAAO,SAAS;IACpB,GAAG,CAAU;IACb,KAAK,CAAe;IACpB,OAAO,CAAqB;IAC5B,GAAG,CAAiB;IACpB,MAAM,CAAsB;IAC5B,YAAY,CAAS;IAErB,WAAW,GAAG,CAAC,CAAC;IAChB,cAAc,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAE1C,YAAY,GAAY,EAAE,KAAmB,EAAE,QAAgB;QAC7D,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACtD,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YACnD,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC7D,OAAO,eAAe,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE;YACzC,GAAG,IAAI;YACP,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE;YAChC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE;SACjC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,GAAW,EAAE,MAA+B;QACtD,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAY;QACjB,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;IAC3D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,KAAY;QAChB,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;QAC3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,GAAW,EAAE,KAAa;QAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,KAAiB;QAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;QACzC,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5E,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEtC,OAAO;YACL,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC;YAClF,IAAI,EAAE,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;YAC3B,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;SAC7D,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,UAAU;QACR,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAY,EAAE,EAAE;YAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,KAAY;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO;YACL,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,MAAM;YAC/D,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;YACjC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;YACxB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;SACpC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,KAAY,EAAE,KAAa;QACzC,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,KAAY;QACzB,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACvD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;YACrE,CAAC,CAAC,QAAQ,CAAC;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAExD,OAAO;YACL,OAAO;YACP,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE,KAAK,CAAC,eAAe,EAAE;YAC/B,IAAI,EAAE,KAAK,CAAC,aAAa,EAAE;YAC3B,MAAM,EAAE,KAAK,CAAC,eAAe,EAAE;YAC/B,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YAC/B,OAAO,EAAE,EAAE;SACZ,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,aAAa,CAAC,KAAc,EAAE,cAAoD;QAChF,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChF,IAAI,OAAO,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,GAAG,GAAG,OAAO,WAAW,IAAI,GAAG,CAAC;QACzC,CAAC;QACD,OAAO;YACL,IAAI;YACJ,OAAO;YACP,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;YACrB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;YACzB,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE;SACrG,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,MAAM,OAAO,GAA4D,EAAE,CAAC;QAE5E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC9C,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtC,OAAO;YACT,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,GAAG;gBACH,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;aACjC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnD,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;YACrB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW;YACzC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC3B,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU;YAC3C,OAAO;YACP,OAAO;SACR,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAC7B,IAAI,oBAAoB,IAAI,IAAI,CAAC,GAAG,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;YAC1F,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;QACvD,CAAC;QACD,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAiB;YAC1C,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;SAC7B,CAAC;IACJ,CAAC;CACF"}

package/dist/lib/utils.d.ts

@@ -1,10 +1,6 @@
-import { OnerrorError } from "koa-onerror";
-import { Application, Context } from "egg";
-
-//#region src/lib/utils.d.ts
-declare function detectErrorMessage(ctx: Context, err: OnerrorError): string;
-declare function detectStatus(err: OnerrorError): number;
-declare function accepts(ctx: Context): "json" | "js" | "html";
-declare function isProd(app: Application): boolean;
-//#endregion
-export { accepts, detectErrorMessage, detectStatus, isProd };
+import type { Context, Application } from 'egg';
+import type { OnerrorError } from 'koa-onerror';
+export declare function detectErrorMessage(ctx: Context, err: OnerrorError): string;
+export declare function detectStatus(err: OnerrorError): number;
+export declare function accepts(ctx: Context): "html" | "json" | "js";
+export declare function isProd(app: Application): boolean;

package/dist/lib/utils.js

@@ -1,3 +1,29 @@
-import { accepts, detectErrorMessage, detectStatus, isProd } from "../utils-S1o8_vNA.js";
-
-export { accepts, detectErrorMessage, detectStatus, isProd };
+export function detectErrorMessage(ctx, err) {
+    // detect json parse error
+    if (err.status === 400 &&
+        err.name === 'SyntaxError' &&
+        ctx.request.is('application/json', 'application/vnd.api+json', 'application/csp-report')) {
+        return 'Problems parsing JSON';
+    }
+    return err.message;
+}
+export function detectStatus(err) {
+    // detect status
+    let status = err.status || 500;
+    if (status < 200) {
+        // invalid status consider as 500, like urllib will return -1 status
+        status = 500;
+    }
+    return status;
+}
+export function accepts(ctx) {
+    if (ctx.acceptJSON)
+        return 'json';
+    if (ctx.acceptJSONP)
+        return 'js';
+    return 'html';
+}
+export function isProd(app) {
+    return app.config.env !== 'local' && app.config.env !== 'unittest';
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxHQUFZLEVBQUUsR0FBaUI7SUFDaEUsMEJBQTBCO0lBQzFCLElBQ0UsR0FBRyxDQUFDLE1BQU0sS0FBSyxHQUFHO1FBQ2xCLEdBQUcsQ0FBQyxJQUFJLEtBQUssYUFBYTtRQUMxQixHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsRUFBRSwwQkFBMEIsRUFBRSx3QkFBd0IsQ0FBQyxFQUN4RixDQUFDO1FBQ0QsT0FBTyx1QkFBdUIsQ0FBQztJQUNqQyxDQUFDO0lBQ0QsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDO0FBQ3JCLENBQUM7QUFFRCxNQUFNLFVBQVUsWUFBWSxDQUFDLEdBQWlCO0lBQzVDLGdCQUFnQjtJQUNoQixJQUFJLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FBQztJQUMvQixJQUFJLE1BQU0sR0FBRyxHQUFHLEVBQUUsQ0FBQztRQUNqQixvRUFBb0U7UUFDcEUsTUFBTSxHQUFHLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBRUQsTUFBTSxVQUFVLE9BQU8sQ0FBQyxHQUFZO0lBQ2xDLElBQUksR0FBRyxDQUFDLFVBQVU7UUFBRSxPQUFPLE1BQU0sQ0FBQztJQUNsQyxJQUFJLEdBQUcsQ0FBQyxXQUFXO1FBQUUsT0FBTyxJQUFJLENBQUM7SUFDakMsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQUVELE1BQU0sVUFBVSxNQUFNLENBQUMsR0FBZ0I7SUFDckMsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxPQUFPLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLEtBQUssVUFBVSxDQUFDO0FBQ3JFLENBQUMifQ==

package/dist/types.d.ts

@@ -1,2 +1,6 @@
-import "./config.default-BeF-r3l_.js";
-import "./types-DOaNcV87.js";
+import type { OnerrorConfig } from './config/config.default.ts';
+declare module 'egg' {
+    interface EggAppConfig {
+        onerror: OnerrorConfig;
+    }
+}

package/dist/types.js

@@ -1,3 +1,2 @@
-import "./types-DQoXDiso.js";
-
-export {  };
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/onerror",
-  "version": "4.0.0-beta.20",
+  "version": "4.0.0-beta.21",
   "publishConfig": {
     "access": "public"
   },
@@ -33,7 +33,7 @@
     "stack-trace": "^0.0.10"
   },
   "peerDependencies": {
-    "egg": "4.1.0-beta.20"
+    "egg": "4.1.0-beta.21"
   },
   "devDependencies": {
     "@types/mustache": "^4.2.5",
@@ -41,7 +41,7 @@
     "tsdown": "^0.15.4",
     "typescript": "^5.9.3",
     "vitest": "4.0.0-beta.16",
-    "@eggjs/mock": "7.0.0-beta.20"
+    "@eggjs/mock": "7.0.0-beta.21"
   },
   "type": "module",
   "exports": {
@@ -64,6 +64,6 @@
     "lint": "oxlint --type-aware",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
-    "build": "tsdown"
+    "build": "tsdown && rimraf dist && tsc -b --clean && tsc && cp src/lib/onerror_page.mustache.html dist/lib/onerror_page.mustache.html"
   }
 }