@midwayjs/koa 3.0.0-beta.11 → 3.0.0-beta.12

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+
+### Features
+
+* custom error code & add @Files/@Fields ([#1438](https://github.com/midwayjs/midway/issues/1438)) ([b0032af](https://github.com/midwayjs/midway/commit/b0032afd2fa9ea0416fe69f4bd0c1a58bea5314e))
+* support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9))
+
+
+
+
+
 # [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
 
 **Note:** Version bump only for package @midwayjs/koa

package/dist/framework.d.ts

@@ -17,7 +17,7 @@ export declare class MidwayKoaFramework extends BaseFramework<IMidwayKoaApplicat
      * @deprecated
      * @param middlewareId
      */
-    generateMiddleware(middlewareId: string): Promise<Middleware<DefaultState, IMidwayKoaContext, any>>;
+    generateMiddleware(middlewareId: any): Promise<Middleware<DefaultState, IMidwayKoaContext, any>>;
     run(): Promise<void>;
     beforeStop(): Promise<void>;
     getFrameworkType(): MidwayFrameworkType;

package/dist/framework.js

@@ -13,6 +13,7 @@ const decorator_1 = require("@midwayjs/decorator");
 const Router = require("@koa/router");
 const koa = require("koa");
 const onerror = require("koa-onerror");
+const utils_1 = require("./utils");
 const COOKIES = Symbol('context#cookies');
 class KoaControllerGenerator extends core_1.WebControllerGenerator {
     constructor(app) {
@@ -52,6 +53,29 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
             enumerable: true,
         });
         const onerrorConfig = this.configService.getConfiguration('onerror');
+        this.app.on('error', (err, ctx) => {
+            ctx = ctx || this.app.createAnonymousContext();
+            const status = (0, utils_1.detectStatus)(err);
+            // 5xx
+            if (status >= 500) {
+                try {
+                    ctx.logger.error(err);
+                }
+                catch (ex) {
+                    this.logger.error(err);
+                    this.logger.error(ex);
+                }
+                return;
+            }
+            // 4xx
+            try {
+                ctx.logger.warn(err);
+            }
+            catch (ex) {
+                this.logger.warn(err);
+                this.logger.error(ex);
+            }
+        });
         onerror(this.app, onerrorConfig);
         const midwayRootMiddleware = async (ctx, next) => {
             this.app.createAnonymousContext(ctx);
@@ -118,7 +142,7 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
         const customPort = (_a = process.env.MIDWAY_HTTP_PORT) !== null && _a !== void 0 ? _a : this.configurationOptions.port;
         if (customPort) {
             new Promise(resolve => {
-                const args = [this.configurationOptions.port];
+                const args = [customPort];
                 if (this.configurationOptions.hostname) {
                     args.push(this.configurationOptions.hostname);
                 }

package/dist/interface.d.ts

@@ -13,7 +13,7 @@ export declare type IMidwayKoaApplication = IMidwayApplication<IMidwayKoaContext
      * @deprecated
      * @param middlewareId
      */
-    generateMiddleware(middlewareId: string): Promise<Middleware<DefaultState, IMidwayKoaContext>>;
+    generateMiddleware(middlewareId: any): Promise<Middleware<DefaultState, IMidwayKoaContext>>;
 }>;
 /**
  * @deprecated use NextFunction definition

package/dist/onerror.d.ts

@@ -0,0 +1,2 @@
+export default function (app: any): void;
+//# sourceMappingURL=onerror.d.ts.map

package/dist/onerror.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function default_1(app) { }
+exports.default = default_1;
+//# sourceMappingURL=onerror.js.map

package/dist/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function detectStatus(err: any): any;
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectStatus = void 0;
+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;
+}
+exports.detectStatus = detectStatus;
+//# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/koa",
-  "version": "3.0.0-beta.11",
+  "version": "3.0.0-beta.12",
   "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.0-beta.11",
-    "@midwayjs/logger": "^3.0.0-beta.11",
-    "@midwayjs/mock": "^3.0.0-beta.11",
+    "@midwayjs/decorator": "^3.0.0-beta.12",
+    "@midwayjs/logger": "^3.0.0-beta.12",
+    "@midwayjs/mock": "^3.0.0-beta.12",
     "@types/koa": "^2.11.4",
     "@types/koa-bodyparser": "^4.3.4",
     "@types/koa-router": "^7.4.1",
@@ -34,8 +34,8 @@
   "dependencies": {
     "@koa/router": "^10.0.0",
     "@midwayjs/cookies": "^1.0.1",
-    "@midwayjs/core": "^3.0.0-beta.11",
-    "@midwayjs/session": "^3.0.0-beta.11",
+    "@midwayjs/core": "^3.0.0-beta.12",
+    "@midwayjs/session": "^3.0.0-beta.12",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "koa-onerror": "^4.1.0"
@@ -48,5 +48,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a2b066fd500e815e799e7f421cd216f12e0e9f8e"
+  "gitHead": "1c46e53eb934248007eeb7fe3920f5ac24e272c6"
 }