@midwayjs/web 3.0.2 → 3.0.6

package/config/config.default.js

@@ -9,7 +9,6 @@ module.exports = appInfo => {
   const exports = {};
 
   exports.rundir = path.join(appInfo.appDir, 'run');
-
   // 修改默认的日志名
   exports.midwayLogger = {
     clients: {

package/dist/base.js

@@ -114,7 +114,8 @@ const createAppWorkerLoader = () => {
                     appDir: this.appDir,
                     baseDir: this.baseDir,
                     ignore: ['**/app/extend/**'],
-                }).then(r => {
+                    application: this.app,
+                }).then(_ => {
                     debug('[egg]: global context: init complete');
                 });
             }

package/dist/configuration.js

@@ -21,7 +21,10 @@ let EggConfiguration = class EggConfiguration {
     async onReady() {
         // ps: 本想在这里清理掉egg添加的中间件，但是这里的数组已经只有一个 midway root middleware，其他的 getter 都是 egg 加进去的，但是不会被中间件执行，所以不需要清理
         // 去掉为了 egg-socket.io 报错扫进去的 session
-        this.app.middleware = this.app.middleware.slice(0);
+        this.app.middleware =
+            Array.isArray(this.app.middleware) && this.app.middleware.length
+                ? this.app.middleware.slice()
+                : [];
     }
     async onServerReady() {
         // trigger server didReady
@@ -72,6 +75,25 @@ EggConfiguration = __decorate([
                     },
                     egg: {
                         dumpConfig: true,
+                        contextLoggerFormat: info => {
+                            const ctx = info.ctx;
+                            // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
+                            const userId = ctx.userId || '-';
+                            const traceId = (ctx.tracer && ctx.tracer.traceId) || '-';
+                            const use = Date.now() - ctx.startTime;
+                            const label = userId +
+                                '/' +
+                                ctx.ip +
+                                '/' +
+                                traceId +
+                                '/' +
+                                use +
+                                'ms ' +
+                                ctx.method +
+                                ' ' +
+                                ctx.url;
+                            return `${info.timestamp} ${info.LEVEL} ${info.pid} [${label}] ${info.message}`;
+                        },
                     },
                 },
                 test: {

package/dist/framework/web.d.ts

@@ -26,7 +26,7 @@ export declare class MidwayWebFramework extends BaseFramework<Application, Conte
     getFrameworkType(): MidwayFrameworkType;
     run(): Promise<void>;
     getLogger(name?: string): any;
-    setContextLoggerClass(BaseContextLogger: any): void;
+    setContextLoggerClass(): void;
     generateMiddleware(middlewareId: any): Promise<any>;
     beforeStop(): Promise<void>;
 }

package/dist/framework/web.js

@@ -16,7 +16,6 @@ const router_1 = require("@eggjs/router");
 const logger_1 = require("@midwayjs/logger");
 const path_1 = require("path");
 const util_1 = require("util");
-const logger_2 = require("../logger");
 const debug = (0, util_1.debuglog)('midway:debug');
 class EggControllerGenerator extends core_1.WebControllerGenerator {
     constructor(app) {
@@ -69,11 +68,15 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         if (!this.isClusterMode) {
             await this.initSingleProcessEgg();
         }
+        else {
+            // get app in cluster mode
+            this.app = options['application'];
+        }
         // 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`);
             }
         };
         // insert error handler
@@ -136,8 +139,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         }, ['createAnonymousContext']);
         // if use midway logger will be use midway custom context logger
         debug(`[egg]: overwrite BaseContextLoggerClass to "${processType}"`);
-        this.setContextLoggerClass(this.configService.getConfiguration('egg.ContextLoggerClass') ||
-            logger_2.MidwayEggContextLogger);
+        this.setContextLoggerClass();
     }
     async loadMidwayController() {
         await this.generator.loadMidwayController(this.configurationOptions.globalPrefix, newRouter => {
@@ -211,9 +213,17 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         }
         return this.appLogger;
     }
-    setContextLoggerClass(BaseContextLogger) {
-        this.BaseContextLoggerClass = BaseContextLogger;
-        this.app.ContextLogger = BaseContextLogger;
+    setContextLoggerClass() {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const self = this;
+        class MidwayEggContextLogger extends logger_1.MidwayContextLogger {
+            constructor(ctx, appLogger) {
+                super(ctx, appLogger, {
+                    contextFormat: self.contextLoggerFormat,
+                });
+            }
+        }
+        this.app.ContextLogger = MidwayEggContextLogger;
     }
     async generateMiddleware(middlewareId) {
         const mwIns = await this.getApplicationContext().getAsync(middlewareId);

package/dist/logger.d.ts

@@ -1,5 +1,5 @@
-import { ILogger, MidwayContextLogger } from '@midwayjs/logger';
-import { Application, Context } from 'egg';
+import { ILogger } from '@midwayjs/logger';
+import { Application } from 'egg';
 declare class MidwayLoggers extends Map<string, ILogger> {
     app: Application;
     /**
@@ -29,8 +29,5 @@ declare class MidwayLoggers extends Map<string, ILogger> {
     reload(): void;
 }
 export declare const createLoggers: (app: Application, processType: 'agent' | 'app') => MidwayLoggers;
-export declare class MidwayEggContextLogger extends MidwayContextLogger<Context> {
-    formatContextLabel(): string;
-}
 export {};
 //# sourceMappingURL=logger.d.ts.map

package/dist/logger.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayEggContextLogger = exports.createLoggers = void 0;
+exports.createLoggers = void 0;
 const logger_1 = require("@midwayjs/logger");
 const path_1 = require("path");
 const fs_1 = require("fs");
@@ -171,25 +171,4 @@ const createLoggers = (app, processType) => {
     return loggers;
 };
 exports.createLoggers = createLoggers;
-class MidwayEggContextLogger extends logger_1.MidwayContextLogger {
-    formatContextLabel() {
-        const ctx = this.ctx;
-        // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
-        const userId = ctx.userId || '-';
-        const traceId = (ctx.tracer && ctx.tracer.traceId) || '-';
-        const use = Date.now() - ctx.startTime;
-        return (userId +
-            '/' +
-            ctx.ip +
-            '/' +
-            traceId +
-            '/' +
-            use +
-            'ms ' +
-            ctx.method +
-            ' ' +
-            ctx.url);
-    }
-}
-exports.MidwayEggContextLogger = MidwayEggContextLogger;
 //# sourceMappingURL=logger.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.0.2",
+  "version": "3.0.6",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -27,12 +27,14 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.2",
-    "@midwayjs/logger": "^2.14.0",
-    "@midwayjs/mock": "^3.0.2",
+    "@midwayjs/decorator": "^3.0.6",
+    "@midwayjs/logger": "^2.15.0",
+    "@midwayjs/mock": "^3.0.6",
+    "axios": "^0.25.0",
     "dayjs": "1.10.7",
     "egg-logger": "2.7.1",
     "egg-mock": "4.2.0",
+    "egg-scripts": "2.15.2",
     "egg-socket.io": "4.1.6",
     "egg-view-nunjucks": "2.3.0",
     "fake-egg": "1.0.0",
@@ -44,7 +46,7 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.0.2",
+    "@midwayjs/core": "^3.0.6",
     "egg": "^2.28.0",
     "find-up": "5.0.0",
     "mkdirp": "^1.0.4"
@@ -57,5 +59,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "ca77247d229978a736e79bb208579c014ed226fc"
+  "gitHead": "afaa5b59a2be85e915233a9268c0e05965dd5c61"
 }