@midwayjs/web 3.0.0-alpha.43 → 3.0.0-beta.10

package/CHANGELOG.md

@@ -3,6 +3,121 @@
 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.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20)
+
+
+### Features
+
+* default add session  & bodyparser support for koa/express/faas ([#1420](https://github.com/midwayjs/midway/issues/1420)) ([cdaff31](https://github.com/midwayjs/midway/commit/cdaff317c3e862a95494a167995a28280af639bf))
+* implement i18n for validate ([#1426](https://github.com/midwayjs/midway/issues/1426)) ([4c7ed2f](https://github.com/midwayjs/midway/commit/4c7ed2ff2e7ccf10f88f62abad230f92f5e76b97))
+
+
+
+
+
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+**Note:** Version bump only for package @midwayjs/web
+
+
+
+
+
+# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+
+### Bug Fixes
+
+* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([b9272e0](https://github.com/midwayjs/midway/commit/b9272e0971003443304b0c53815be31a0061b4bd))
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+
+### Bug Fixes
+
+* middleware with ctx.body ([#1389](https://github.com/midwayjs/midway/issues/1389)) ([77af5c0](https://github.com/midwayjs/midway/commit/77af5c0b456f1843f4dcfd3dbfd2c0aa244c51bd))
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+
+### Bug Fixes
+
+* class transformer method missing ([#1387](https://github.com/midwayjs/midway/issues/1387)) ([074e839](https://github.com/midwayjs/midway/commit/074e8393598dc95e2742f735df75a2191c5fe25d))
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/web
+
+
+
+
+
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+
+### Bug Fixes
+
+* logger close before bootstrap close ([#1370](https://github.com/midwayjs/midway/issues/1370)) ([6cc2720](https://github.com/midwayjs/midway/commit/6cc2720ed3445e8ffccc96d124b80ed7e2517f08))
+
+
+### Features
+
+* add i18n ([#1375](https://github.com/midwayjs/midway/issues/1375)) ([bffefe0](https://github.com/midwayjs/midway/commit/bffefe07afe45777d49b5a76b9ab17fc2b9d9a55))
+* auto transform args to type ([#1372](https://github.com/midwayjs/midway/issues/1372)) ([bb3f7d2](https://github.com/midwayjs/midway/commit/bb3f7d2028a034e1926d9df554849332354c3762))
+* support global prefix url ([#1371](https://github.com/midwayjs/midway/issues/1371)) ([cc5fe44](https://github.com/midwayjs/midway/commit/cc5fe44e1d221590562dc71e1f33ae96093e0da7))
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+
+### Features
+
+* add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3))
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+**Note:** Version bump only for package @midwayjs/web
+
+
+
+
+
+# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
+
+
+### Bug Fixes
+
+* find egg plugin in cwd ([#1236](https://github.com/midwayjs/midway/issues/1236)) ([d9ac0ff](https://github.com/midwayjs/midway/commit/d9ac0ff6d4e7a58a8924636806d3894acf94fcd8))
+
+
+### Features
+
+* add http2 support ([#1242](https://github.com/midwayjs/midway/issues/1242)) ([6cda27e](https://github.com/midwayjs/midway/commit/6cda27e9e22689e46ace543326b43ae21b134911))
+* add view, view-ejs and view-nunjucks ([#1308](https://github.com/midwayjs/midway/issues/1308)) ([a00f44b](https://github.com/midwayjs/midway/commit/a00f44bd769052245cd49d49ab417d621bb89caa))
+
+
+
+
+
 ## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 

package/README.md

@@ -5,7 +5,7 @@
 
 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/agent.js

@@ -1,4 +1,6 @@
 'use strict';
+const { debuglog } = require('util');
+const debug = debuglog('midway:debug');
 
 class AgentBootHook {
   constructor(app) {
@@ -6,15 +8,20 @@ class AgentBootHook {
   }
 
   configDidLoad() {
-    if (this.app.config.midwayFeature['replaceEggLogger']) {
-      // if use midway logger will be use midway custom context logger
-      this.app.ContextLogger = this.app.webFramework.BaseContextLoggerClass;
-    }
+    debug('[egg:lifecycle]: agent configDidLoad');
   }
 
-  async didLoad() {}
+  async didLoad() {
+    debug('[egg:lifecycle]: agent didLoad');
+  }
+
+  async willReady() {
+    debug('[egg:lifecycle]: agent willReady');
+  }
 
-  async willReady() {}
+  async beforeClose() {
+    debug('[egg:lifecycle]: agent beforeClose');
+  }
 }
 
 module.exports = AgentBootHook;

package/app/extend/agent.js

@@ -6,8 +6,4 @@ module.exports = {
   get appDir() {
     return this.loader.appDir;
   },
-
-  get webFramework() {
-    return this.loader.framework;
-  },
 };

package/app/extend/application.js

@@ -2,8 +2,4 @@ module.exports = {
   get baseDir() {
     return this.loader.baseDir;
   },
-
-  get webFramework() {
-    return this.loader.framework;
-  },
 };

package/app.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const pathMatching = require('egg-path-matching');
-const { hasIdentifierMapping } = require('@midwayjs/decorator');
+const { debuglog } = require('util');
+
+const debug = debuglog('midway:debug');
 
 class AppBootHook {
   constructor(app) {
@@ -11,35 +13,30 @@ class AppBootHook {
   }
 
   configDidLoad() {
+    debug('[egg lifecycle]: app configDidLoad');
     // 先清空，防止加载到 midway 中间件出错
     this.coreMiddleware = this.app.loader.config.coreMiddleware;
     this.app.loader.config.coreMiddleware = [];
     this.appMiddleware = this.app.loader.config.appMiddleware;
     this.app.loader.config.appMiddleware = [];
-    if (this.app.config.midwayFeature['replaceEggLogger']) {
-      // if use midway logger will be use midway custom context logger
-      this.app.ContextLogger = this.app.webFramework.BaseContextLoggerClass;
-    }
   }
 
   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);
     }
   }
 
   async willReady() {
-    await this.app.webFramework.loadExtension();
+    debug('[egg lifecycle]: app willReady');
     const middlewareNames = this.coreMiddleware.concat(this.appMiddleware);
     // 等 midway 加载完成后，再去 use 中间件
     for (const name of middlewareNames) {
-      if (hasIdentifierMapping(name)) {
-        const mwIns = await this.app.generateMiddleware(name);
-        mwIns._name = name;
-        this.app.use(mwIns);
+      if (this.app.getApplicationContext().registry.hasDefinition(name)) {
+        await this.app.useMiddleware(name);
       } else {
         // egg
         const options = this.app.config[name] || {};
@@ -60,17 +57,19 @@ class AppBootHook {
             return mw(ctx, next);
           };
           fn._name = mw._name + 'middlewareWrapper';
-          this.app.use(fn);
+          await this.app.useMiddleware(fn);
         }
       }
     }
 
-    this.app.use(this.app.router.middleware());
-    await this.app.webFramework.loadMidwayController();
+    const eggRouterMiddleware = this.app.router.middleware();
+    eggRouterMiddleware._name = 'eggRouterMiddleware';
+    this.app.useMiddleware(eggRouterMiddleware);
+    this.app.emit('application-ready');
   }
 
   async beforeClose() {
-    await this.app.webFramework.stop();
+    debug('[egg lifecycle]: app beforeClose');
   }
 }
 

package/config/config.default.js

@@ -11,14 +11,19 @@ module.exports = appInfo => {
   exports.rundir = path.join(appInfo.appDir, 'run');
 
   // 修改默认的日志名
-  exports.logger = {
-    appLogName: 'midway-web.log',
-    coreLogName: 'midway-core.log',
-    agentLogName: 'midway-agent.log',
-  };
-
-  exports.midwayFeature = {
-    replaceEggLogger: false,
+  exports.midwayLogger = {
+    clients: {
+      coreLogger: {
+        fileLogName: 'midway-core.log',
+      },
+      appLogger: {
+        fileLogName: 'midway-web.log',
+        aliasName: 'logger',
+      },
+      agentLogger: {
+        fileLogName: 'midway-agent.log',
+      },
+    },
   };
 
   exports.pluginOverwrite = false;

package/config/plugin.js

@@ -4,8 +4,10 @@ module.exports = {
   static: false,
   development: false,
   watcher: false,
-  schedulePlus: {
-    enable: true,
-    package: 'midway-schedule',
-  },
+  onerror: true,
+  multipart: true,
+  security: true,
+  logrotator: false,
+  view: false,
+  schedule: false,
 };

package/dist/base.js

@@ -3,17 +3,17 @@ 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 web_1 = require("./framework/web");
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const logger_1 = require("./logger");
 const router_1 = require("@eggjs/router");
-const starter_1 = require("./starter");
+const util_1 = require("util");
 const ROUTER = Symbol('EggCore#router');
 const EGG_LOADER = Symbol.for('egg#loader');
 const EGG_PATH = Symbol.for('egg#eggPath');
 const LOGGERS = Symbol('EggApplication#loggers');
+const debug = (0, util_1.debuglog)('midway:debug');
 let customFramework = null;
 function getFramework() {
     if (customFramework)
@@ -39,6 +39,9 @@ const createAppWorkerLoader = () => {
             this.useEggSocketIO = false;
         }
         getEggPaths() {
+            if ((0, core_1.getCurrentApplicationContext)()) {
+                this.singleProcessMode = true;
+            }
             if (!this.appDir) {
                 // 这里的逻辑是为了兼容老 cluster 模式
                 if (this.app.options.typescript || this.app.options.isTsMode) {
@@ -102,35 +105,37 @@ const createAppWorkerLoader = () => {
             return serverEnv;
         }
         load() {
-            this.framework = new web_1.MidwayWebFramework().configure({
-                processType: 'application',
-                app: this.app,
-                globalConfig: this.app.config,
-            });
-            this.bootstrap = new starter_1.WebBootstrapStarter({
-                isWorker: true,
-                applicationContext: this.app.options.applicationContext,
-            });
-            this.bootstrap
-                .configure({
-                appDir: this.app.appDir,
-            })
-                .load(this.framework);
-            if (this.app.options['midwaySingleton'] !== true) {
-                // 这个代码只会在 egg-cluster 模式下执行
-                this.app.beforeStart(async () => {
-                    await this.bootstrap.init();
-                    super.load();
+            if (!this.singleProcessMode) {
+                // 多进程模式，从 egg-scripts 启动的
+                process.env['EGG_CLUSTER_MODE'] = 'true';
+                debug('[egg]: run with egg-scripts in cluster mode');
+                // 如果不走 bootstrap，就得在这里初始化 applicationContext
+                (0, core_1.initializeGlobalApplicationContext)({
+                    ...this.globalOptions,
+                    appDir: this.appDir,
+                    baseDir: this.baseDir,
+                    ignore: ['**/app/extend/**'],
+                }).then(r => {
+                    debug('[egg]: global context: init complete');
                 });
             }
         }
-        /**
-         * 这个代码只会在单进程 bootstrap.js 模式下执行
-         */
-        async loadOrigin() {
-            await this.bootstrap.init();
+        loadOrigin() {
+            debug('[egg]: application: run load()');
             super.load();
         }
+        loadConfig() {
+            super.loadConfig();
+            if (this.singleProcessMode) {
+                const configService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayConfigService);
+                configService.addObject(this.config);
+                Object.defineProperty(this, 'config', {
+                    get() {
+                        return configService.getConfiguration();
+                    },
+                });
+            }
+        }
         loadMiddleware() {
             super.loadMiddleware();
             if (this.plugins['io']) {
@@ -148,8 +153,11 @@ const createAgentWorkerLoader = () => {
     var _a;
     const AppWorkerLoader = ((_a = require(getFramework())) === null || _a === void 0 ? void 0 : _a.AgentWorkerLoader) ||
         require('egg').AgentWorkerLoader;
-    class EggAppWorkerLoader extends AppWorkerLoader {
+    class EggAgentWorkerLoader extends AppWorkerLoader {
         getEggPaths() {
+            if ((0, core_1.getCurrentApplicationContext)()) {
+                this.singleProcessMode = true;
+            }
             if (!this.appDir) {
                 if (this.app.options.typescript || this.app.options.isTsMode) {
                     process.env.EGG_TYPESCRIPT = 'true';
@@ -212,26 +220,32 @@ const createAgentWorkerLoader = () => {
             return serverEnv;
         }
         load() {
-            this.framework = new web_1.MidwayWebFramework().configure({
-                processType: 'agent',
-                app: this.app,
-                globalConfig: this.app.config,
-            });
-            this.bootstrap = new starter_1.WebBootstrapStarter({
-                isWorker: false,
-            });
-            this.bootstrap
-                .configure({
-                appDir: this.app.appDir,
-            })
-                .load(this.framework);
             this.app.beforeStart(async () => {
-                await this.bootstrap.init();
+                debug('[egg]: start "initializeAgentApplicationContext"');
+                await (0, utils_1.initializeAgentApplicationContext)(this.app, {
+                    ...this.globalOptions,
+                    appDir: this.appDir,
+                    baseDir: this.baseDir,
+                    ignore: ['**/app/extend/**'],
+                });
                 super.load();
+                debug('[egg]: agent load run complete');
             });
         }
+        loadConfig() {
+            super.loadConfig();
+            if (this.singleProcessMode) {
+                const configService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayConfigService);
+                configService.addObject(this.config);
+                Object.defineProperty(this, 'config', {
+                    get() {
+                        return configService.getConfiguration();
+                    },
+                });
+            }
+        }
     }
-    return EggAppWorkerLoader;
+    return EggAgentWorkerLoader;
 };
 exports.createAgentWorkerLoader = createAgentWorkerLoader;
 const createEggApplication = () => {
@@ -250,7 +264,7 @@ const createEggApplication = () => {
         }
         get loggers() {
             if (!this[LOGGERS]) {
-                this[LOGGERS] = (0, logger_1.createLoggers)(this);
+                this[LOGGERS] = (0, logger_1.createLoggers)(this, 'app');
             }
             return this[LOGGERS];
         }
@@ -261,6 +275,12 @@ const createEggApplication = () => {
             const router = (this[ROUTER] = new router_1.EggRouter({ sensitive: true }, this));
             return router;
         }
+        dumpConfig() {
+            var _a, _b;
+            if (((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.egg) === null || _b === void 0 ? void 0 : _b.dumpConfig) !== false) {
+                super.dumpConfig();
+            }
+        }
     }
     return EggApplication;
 };
@@ -281,10 +301,16 @@ const createEggAgent = () => {
         }
         get loggers() {
             if (!this[LOGGERS]) {
-                this[LOGGERS] = (0, logger_1.createLoggers)(this);
+                this[LOGGERS] = (0, logger_1.createLoggers)(this, 'agent');
             }
             return this[LOGGERS];
         }
+        dumpConfig() {
+            var _a, _b;
+            if (((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.egg) === null || _b === void 0 ? void 0 : _b.dumpConfig) !== false) {
+                super.dumpConfig();
+            }
+        }
     }
     return EggAgent;
 };

package/dist/configuration.d.ts

@@ -0,0 +1,13 @@
+import { IMidwayWebApplication } from './interface';
+import { MidwayDecoratorService } from '@midwayjs/core';
+export declare class EggConfiguration {
+    baseDir: any;
+    appDir: any;
+    app: IMidwayWebApplication;
+    decoratorService: MidwayDecoratorService;
+    init(): void;
+    onReady(): Promise<void>;
+    onServerReady(): Promise<void>;
+    onStop(): Promise<void>;
+}
+//# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -0,0 +1,102 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EggConfiguration = void 0;
+const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
+let EggConfiguration = class EggConfiguration {
+    init() {
+        this.decoratorService.registerParameterHandler(decorator_1.WEB_ROUTER_PARAM_KEY, options => {
+            return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1]);
+        });
+    }
+    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');
+    }
+    async onStop() {
+        // TODO flush egg logger and close it
+    }
+};
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", Object)
+], EggConfiguration.prototype, "baseDir", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", Object)
+], EggConfiguration.prototype, "appDir", void 0);
+__decorate([
+    (0, decorator_1.App)(),
+    __metadata("design:type", Object)
+], EggConfiguration.prototype, "app", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayDecoratorService)
+], EggConfiguration.prototype, "decoratorService", void 0);
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], EggConfiguration.prototype, "init", null);
+EggConfiguration = __decorate([
+    (0, decorator_1.Configuration)({
+        namespace: 'egg',
+        importConfigs: [
+            {
+                default: {
+                    midwayLogger: {
+                        clients: {
+                            appLogger: {
+                                fileLogName: 'midway-web.log',
+                                aliasName: 'logger',
+                            },
+                            agentLogger: {
+                                fileLogName: 'midway-agent.log',
+                            },
+                        },
+                    },
+                    egg: {
+                        dumpConfig: true,
+                    },
+                },
+                test: {
+                    egg: {
+                        plugins: {
+                            'egg-mock': {
+                                enable: true,
+                                package: 'egg-mock',
+                            },
+                        },
+                    },
+                },
+                unittest: {
+                    egg: {
+                        plugins: {
+                            'egg-mock': {
+                                enable: true,
+                                package: 'egg-mock',
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    })
+], EggConfiguration);
+exports.EggConfiguration = EggConfiguration;
+//# sourceMappingURL=configuration.js.map