@midwayjs/koa 3.0.4 → 3.0.8

package/dist/framework.js

@@ -52,12 +52,12 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
             enumerable: true,
         });
         const onerrorConfig = this.configService.getConfiguration('onerror');
-        (0, onerror_1.setupOnerror)(this.app, onerrorConfig, this.logger);
+        (0, onerror_1.setupOnError)(this.app, onerrorConfig, this.logger);
         // not found middleware
         const notFound = async (ctx, next) => {
             await next();
-            if (!ctx._matchedRoute) {
-                throw new core_1.httpError.NotFoundError();
+            if (!ctx._matchedRoute && ctx.body === undefined) {
+                throw new core_1.httpError.NotFoundError(`${ctx.path} Not Found`);
             }
         };
         // root middleware

package/dist/interface.d.ts

@@ -3,7 +3,7 @@ import { IConfigurationOptions, IMidwayApplication, IMidwayContext } from '@midw
 import * as koa from 'koa';
 import { Context as KoaContext, DefaultState, Middleware, Next } from 'koa';
 import { RouterParamValue } from '@midwayjs/decorator';
-import { CookieSetOptions } from '@midwayjs/cookies';
+import { Cookies, CookieSetOptions } from '@midwayjs/cookies';
 export declare type IMidwayKoaContext = IMidwayContext<KoaContext>;
 export declare type IMidwayKoaApplication = IMidwayApplication<IMidwayKoaContext, koa<DefaultState, IMidwayKoaContext> & {
     generateController(controllerMapping: string, routeArgsInfo?: RouterParamValue[], routerResponseData?: any[]): Middleware<DefaultState, IMidwayKoaContext>;
@@ -134,6 +134,10 @@ declare module 'koa' {
         body?: any;
         rawBody: string;
     }
+    interface Context {
+        cookies: Cookies;
+        app: Application;
+    }
 }
 export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/onerror.d.ts

@@ -1,2 +1,2 @@
-export declare function setupOnerror(app: any, config: any, logger: any): void;
+export declare function setupOnError(app: any, config: any, logger: any): void;
 //# sourceMappingURL=onerror.d.ts.map

package/dist/onerror.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupOnerror = void 0;
+exports.setupOnError = void 0;
 const http = require("http");
 const utils_1 = require("./utils");
-function setupOnerror(app, config, logger) {
+const decorator_1 = require("@midwayjs/decorator");
+function setupOnError(app, config, logger) {
     const errorOptions = Object.assign({
         // support customize accepts function
         accepts() {
@@ -113,7 +114,15 @@ function setupOnerror(app, config, logger) {
             (0, utils_1.sendToWormhole)(this.req);
         // wrap non-error object
         if (!(err instanceof Error)) {
-            const newError = new Error('non-error thrown: ' + err);
+            let errMsg = err;
+            if (typeof err === 'object') {
+                try {
+                    errMsg = decorator_1.Utils.safeStringify(err);
+                    // eslint-disable-next-line no-empty
+                }
+                catch (e) { }
+            }
+            const newError = new Error('non-error thrown: ' + errMsg);
             // err maybe an object, try to copy the name, message and stack to the new error instance
             if (err) {
                 if (err.name)
@@ -168,10 +177,10 @@ function setupOnerror(app, config, logger) {
             }
         }
         if (type === 'json') {
-            this.body = JSON.stringify(this.body);
+            this.body = decorator_1.Utils.safeStringify(this.body);
         }
         this.res.end(this.body);
     };
 }
-exports.setupOnerror = setupOnerror;
+exports.setupOnError = setupOnError;
 //# sourceMappingURL=onerror.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/koa",
-  "version": "3.0.4",
+  "version": "3.0.8",
   "description": "Midway Web Framework for KOA",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -23,9 +23,9 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.4",
+    "@midwayjs/decorator": "^3.0.7",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.0.4",
+    "@midwayjs/mock": "^3.0.7",
     "@types/koa": "2.13.4",
     "@types/koa-router": "7.4.4",
     "fs-extra": "10.0.0"
@@ -33,8 +33,8 @@
   "dependencies": {
     "@koa/router": "^10.0.0",
     "@midwayjs/cookies": "1.0.1",
-    "@midwayjs/core": "^3.0.4",
-    "@midwayjs/session": "^3.0.4",
+    "@midwayjs/core": "^3.0.7",
+    "@midwayjs/session": "^3.0.7",
     "koa": "2.13.4",
     "koa-bodyparser": "4.3.0"
   },
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "c2a37dd026c7bf3e855f4498691f572ef61396e3"
+  "gitHead": "5e58d30e217ef06096cebf588e19b8ce020a3d96"
 }