@midwayjs/web 3.0.0-beta.7 → 3.0.1

package/README.md

@@ -1,11 +1,11 @@
-# midway-web
+# @midwayjs/web
 
-[![Package Quality](http://npm.packagequality.com/shield/midway-web.svg)](http://packagequality.com/#?package=midway-web)
+[![Package Quality](http://npm.packagequality.com/shield/@midwayjs/web.svg)](http://packagequality.com/#?package=@midwayjs/web)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/midwayjs/midway/pulls)
 
 this is a sub package for midway.
 
-Document: [https://midwayjs.org/midway](https://midwayjs.org/midway)
+Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 

package/app.js

@@ -24,10 +24,9 @@ class AppBootHook {
   async didLoad() {
     debug('[egg lifecycle]: app didLoad');
     if (this.app.loader['useEggSocketIO']) {
-      // socketio 下会提前加入 session 中间件，这里删除，防止重复加载
-      if (this.app.middleware.length && this.app.middleware[this.app.middleware.length - 1]._name === 'session') {
-        this.app.middleware.pop();
-      }
+      // egg socket.io 需要这个中间件
+      // const session = this.app.getMiddleware().findItem('session');
+      // this.app.middleware.push(session);
     }
   }
 

package/config/plugin.js

@@ -1,13 +1,14 @@
 'use strict';
 
 module.exports = {
+  onerror: true,
+  security: true,
   static: false,
   development: false,
   watcher: false,
-  onerror: true,
-  multipart: true,
-  security: true,
+  multipart: false,
   logrotator: false,
   view: false,
   schedule: false,
+  i18n: false,
 };

package/dist/base.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEggAgent = exports.createEggApplication = exports.createAgentWorkerLoader = exports.createAppWorkerLoader = void 0;
 const utils_1 = require("./utils");
-const extend = require("extend2");
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
 const fs_1 = require("fs");
@@ -70,7 +69,7 @@ const createAppWorkerLoader = () => {
             if (!this.appInfo) {
                 const appInfo = super.getAppInfo();
                 // ROOT == HOME in prod env
-                this.appInfo = extend(true, appInfo, {
+                this.appInfo = (0, core_1.extend)(true, appInfo, {
                     root: appInfo.env === 'local' || appInfo.env === 'unittest'
                         ? this.appDir
                         : appInfo.root,
@@ -185,7 +184,7 @@ const createAgentWorkerLoader = () => {
             if (!this.appInfo) {
                 const appInfo = super.getAppInfo();
                 // ROOT == HOME in prod env
-                this.appInfo = extend(true, appInfo, {
+                this.appInfo = (0, core_1.extend)(true, appInfo, {
                     root: appInfo.env === 'local' || appInfo.env === 'unittest'
                         ? this.appDir
                         : appInfo.root,

package/dist/configuration.d.ts

@@ -6,7 +6,7 @@ export declare class EggConfiguration {
     app: IMidwayWebApplication;
     decoratorService: MidwayDecoratorService;
     init(): void;
-    onReady(container: any): Promise<void>;
+    onReady(): Promise<void>;
     onServerReady(): Promise<void>;
     onStop(): Promise<void>;
 }

package/dist/configuration.js

@@ -18,7 +18,11 @@ let EggConfiguration = class EggConfiguration {
             return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1]);
         });
     }
-    async onReady(container) { }
+    async onReady() {
+        // ps: 本想在这里清理掉egg添加的中间件，但是这里的数组已经只有一个 midway root middleware，其他的 getter 都是 egg 加进去的，但是不会被中间件执行，所以不需要清理
+        // 去掉为了 egg-socket.io 报错扫进去的 session
+        this.app.middleware = this.app.middleware.slice(0);
+    }
     async onServerReady() {
         // trigger server didReady
         this.app.messenger.emit('egg-ready');

package/dist/framework/web.d.ts

@@ -5,9 +5,7 @@ import { EggRouter } from '@eggjs/router';
 import { Application, Context, EggLogger } from 'egg';
 declare class EggControllerGenerator extends WebControllerGenerator<EggRouter> {
     readonly app: any;
-    readonly applicationContext: any;
-    readonly logger: any;
-    constructor(app: any, applicationContext: any, logger: any);
+    constructor(app: any);
     createRouter(routerOptions: any): EggRouter;
     generateController(routeInfo: RouterInfo): (ctx: any, next: any) => Promise<void>;
 }
@@ -29,7 +27,7 @@ export declare class MidwayWebFramework extends BaseFramework<Application, Conte
     run(): Promise<void>;
     getLogger(name?: string): any;
     setContextLoggerClass(BaseContextLogger: any): void;
-    generateMiddleware(middlewareId: string): Promise<any>;
+    generateMiddleware(middlewareId: any): Promise<any>;
     beforeStop(): Promise<void>;
 }
 export {};

package/dist/framework/web.js

@@ -19,11 +19,9 @@ 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, applicationContext, logger) {
-        super(applicationContext, decorator_1.MidwayFrameworkType.WEB, logger);
+    constructor(app) {
+        super(app);
         this.app = app;
-        this.applicationContext = applicationContext;
-        this.logger = logger;
     }
     createRouter(routerOptions) {
         const router = new router_1.EggRouter(routerOptions, this.app);
@@ -71,12 +69,20 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         if (!this.isClusterMode) {
             await this.initSingleProcessEgg();
         }
+        // not found middleware
+        const notFound = async (ctx, next) => {
+            await next();
+            if (!ctx._matchedRoute) {
+                throw new core_1.httpError.NotFoundError();
+            }
+        };
         // insert error handler
-        this.app.use(async (ctx, next) => {
+        const midwayRootMiddleware = async (ctx, next) => {
             // this.app.createAnonymousContext(ctx);
-            await (await this.getMiddleware())(ctx, next);
-        });
-        this.generator = new EggControllerGenerator(this.app, this.applicationContext, this.appLogger);
+            await (await this.applyMiddleware(notFound))(ctx, next);
+        };
+        this.app.use(midwayRootMiddleware);
+        this.generator = new EggControllerGenerator(this.app);
         this.overwriteApplication('app');
         await new Promise(resolve => {
             this.app.once('application-ready', () => {
@@ -84,7 +90,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
                 resolve();
             });
             this.app.loader.loadOrigin();
-            // hack use method
+            // 这里拦截 app.use 方法，让他可以加到 midway 的 middlewareManager 中
             this.app.originUse = this.app.use;
             this.app.use = this.app.useMiddleware;
             this.app.ready();
@@ -109,6 +115,13 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         });
         debug(`[egg]: overwrite properties to "${processType}"`);
         this.defineApplicationProperties({
+            generateController: (controllerMapping) => {
+                const [controllerId, methodName] = controllerMapping.split('.');
+                return this.generator.generateController({
+                    id: controllerId,
+                    method: methodName,
+                });
+            },
             generateMiddleware: async (middlewareId) => {
                 return this.generateMiddleware(middlewareId);
             },
@@ -128,7 +141,10 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
     }
     async loadMidwayController() {
         await this.generator.loadMidwayController(this.configurationOptions.globalPrefix, newRouter => {
-            this.app.use(newRouter.middleware());
+            var _a;
+            const dispatchFn = newRouter.middleware();
+            dispatchFn._name = `midwayController(${((_a = newRouter === null || newRouter === void 0 ? void 0 : newRouter.opts) === null || _a === void 0 ? void 0 : _a.prefix) || '/'})`;
+            this.app.useMiddleware(dispatchFn);
         });
     }
     getFrameworkType() {
@@ -136,10 +152,13 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
     }
     async run() {
         var _a;
+        // move egg router to last
+        this.app.getMiddleware().findAndInsertLast('eggRouterMiddleware');
         // load controller
         await this.loadMidwayController();
         // restore use method
         this.app.use = this.app.originUse;
+        debug(`[egg]: current middleware = ${this.middlewareManager.getNames()}`);
         if (!this.isClusterMode) {
             // https config
             if (this.configurationOptions.key && this.configurationOptions.cert) {
@@ -170,17 +189,19 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             const eggConfig = this.configService.getConfiguration('egg');
             if (!this.isClusterMode && eggConfig) {
                 const customPort = (_a = process.env.MIDWAY_HTTP_PORT) !== null && _a !== void 0 ? _a : eggConfig.port;
-                new Promise(resolve => {
-                    const args = [customPort];
-                    if (eggConfig.hostname) {
-                        args.push(eggConfig.hostname);
-                    }
-                    args.push(() => {
-                        resolve();
+                if (customPort) {
+                    new Promise(resolve => {
+                        const args = [customPort];
+                        if (eggConfig.hostname) {
+                            args.push(eggConfig.hostname);
+                        }
+                        args.push(() => {
+                            resolve();
+                        });
+                        this.server.listen(...args);
+                        process.env.MIDWAY_HTTP_PORT = String(customPort);
                     });
-                    this.server.listen(...args);
-                    process.env.MIDWAY_HTTP_PORT = String(customPort);
-                });
+                }
             }
         }
     }

package/dist/interface.d.ts

@@ -7,7 +7,7 @@ export interface IMidwayWebBaseApplication {
     applicationContext: IMidwayContainer;
     getLogger(name?: string): ILogger;
     getCoreLogger(): ILogger;
-    generateMiddleware?(middlewareId: string): Promise<Middleware<DefaultState, EggContext>>;
+    generateMiddleware?(middlewareId: any): Promise<Middleware<DefaultState, EggContext>>;
     createLogger(name: string, options: LoggerOptions): ILogger;
 }
 declare module 'egg' {

package/dist/logger.js

@@ -7,7 +7,6 @@ const fs_1 = require("fs");
 const utils_1 = require("./utils");
 const os = require("os");
 const core_1 = require("@midwayjs/core");
-const extend = require("extend2");
 const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:debug');
 const isWindows = os.platform() === 'win32';
@@ -97,7 +96,7 @@ class MidwayLoggers extends Map {
             },
         };
         const midwayLoggerConfig = loggerService.transformEggLogger(options);
-        extend(true, options, midwayLoggerConfig);
+        (0, core_1.extend)(true, options, midwayLoggerConfig);
         if ((_a = options === null || options === void 0 ? void 0 : options.midwayLogger) === null || _a === void 0 ? void 0 : _a.clients) {
             // 从 egg 过来，这里有可能没有 dir
             if (!((_b = options.midwayLogger['default']) === null || _b === void 0 ? void 0 : _b.dir)) {

package/dist/utils.js

@@ -117,12 +117,12 @@ async function initializeAgentApplicationContext(agent, globalOptions) {
         const aspectService = await applicationContext.getAsync(core_1.MidwayAspectService, [applicationContext]);
         // init decorator service
         const decoratorService = await applicationContext.getAsync(core_1.MidwayDecoratorService, [applicationContext]);
-        if (!globalOptions.configurationModule) {
-            globalOptions.configurationModule = [
+        if (!globalOptions.imports) {
+            globalOptions.imports = [
                 (0, core_1.safeRequire)((0, path_1.join)(globalOptions.baseDir, 'configuration')),
             ];
         }
-        for (const configurationModule of [].concat(globalOptions.configurationModule)) {
+        for (const configurationModule of [].concat(globalOptions.imports)) {
             // load configuration and component
             applicationContext.load(configurationModule);
         }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.1",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "link": "npm link"
   },
   "keywords": [
@@ -27,27 +27,26 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.7",
-    "@midwayjs/mock": "^3.0.0-beta.7",
-    "dayjs": "^1.10.7",
-    "egg-logger": "^2.4.2",
-    "egg-mock": "^3.26.0",
-    "egg-socket.io": "^4.1.6",
-    "egg-view-nunjucks": "^2.3.0",
+    "@midwayjs/decorator": "^3.0.0",
+    "@midwayjs/logger": "^2.14.0",
+    "@midwayjs/mock": "^3.0.1",
+    "dayjs": "1.10.7",
+    "egg-logger": "2.7.1",
+    "egg-mock": "4.2.0",
+    "egg-socket.io": "4.1.6",
+    "egg-view-nunjucks": "2.3.0",
     "fake-egg": "1.0.0",
-    "fs-extra": "^8.0.1",
-    "mm": "3",
-    "pedding": "^1.1.0",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1"
+    "fs-extra": "10.0.0",
+    "mm": "3.2.0",
+    "pedding": "1.1.0",
+    "react": "17.0.2",
+    "react-dom": "17.0.2"
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.0.0-beta.7",
-    "@midwayjs/logger": "^3.0.0-beta.7",
+    "@midwayjs/core": "^3.0.1",
     "egg": "^2.28.0",
-    "extend2": "^1.0.0",
-    "find-up": "^5.0.0",
+    "find-up": "5.0.0",
     "mkdirp": "^1.0.4"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
@@ -58,5 +57,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "24590729121d9110e2d960db5b5e587cf55a1efc"
+  "gitHead": "f345b4ed0392e5c3b9e815438ef0a377ad6da076"
 }