@midwayjs/web 3.0.0-beta.3 → 3.0.0-beta.7

package/CHANGELOG.md

@@ -3,6 +3,54 @@
 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.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)
 
 

package/dist/configuration.d.ts

@@ -1,11 +1,9 @@
 import { IMidwayWebApplication } from './interface';
-import { MidwayWebFramework } from './framework/web';
 import { MidwayDecoratorService } from '@midwayjs/core';
 export declare class EggConfiguration {
     baseDir: any;
     appDir: any;
     app: IMidwayWebApplication;
-    webFramework: MidwayWebFramework;
     decoratorService: MidwayDecoratorService;
     init(): void;
     onReady(container: any): Promise<void>;

package/dist/configuration.js

@@ -11,18 +11,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EggConfiguration = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const web_1 = require("./framework/web");
 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.originArgs[0], options.originArgs[1]);
+            return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1]);
         });
     }
     async onReady(container) { }
     async onServerReady() {
         // trigger server didReady
-        await this.webFramework.run();
         this.app.messenger.emit('egg-ready');
     }
     async onStop() {
@@ -41,10 +39,6 @@ __decorate([
     (0, decorator_1.App)(),
     __metadata("design:type", Object)
 ], EggConfiguration.prototype, "app", void 0);
-__decorate([
-    (0, decorator_1.Inject)(),
-    __metadata("design:type", web_1.MidwayWebFramework)
-], EggConfiguration.prototype, "webFramework", void 0);
 __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)

package/dist/framework/web.d.ts

@@ -1,12 +1,21 @@
-import { BaseFramework, IMidwayBootstrapOptions } from '@midwayjs/core';
+import { BaseFramework, IMidwayBootstrapOptions, RouterInfo, WebControllerGenerator } from '@midwayjs/core';
 import { MidwayFrameworkType } from '@midwayjs/decorator';
 import { IMidwayWebConfigurationOptions } from '../interface';
+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);
+    createRouter(routerOptions: any): EggRouter;
+    generateController(routeInfo: RouterInfo): (ctx: any, next: any) => Promise<void>;
+}
 export declare class MidwayWebFramework extends BaseFramework<Application, Context, IMidwayWebConfigurationOptions> {
     protected loggers: {
         [name: string]: EggLogger;
     };
-    generator: any;
+    generator: EggControllerGenerator;
     private server;
     private agent;
     private isClusterMode;
@@ -23,4 +32,5 @@ export declare class MidwayWebFramework extends BaseFramework<Application, Conte
     generateMiddleware(middlewareId: string): Promise<any>;
     beforeStop(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=web.d.ts.map

package/dist/framework/web.js

@@ -30,8 +30,8 @@ class EggControllerGenerator extends core_1.WebControllerGenerator {
         router.prefix(routerOptions.prefix);
         return router;
     }
-    generateController(controllerMapping, routeArgsInfo, routerResponseData) {
-        return this.generateKoaController(controllerMapping, routeArgsInfo, routerResponseData);
+    generateController(routeInfo) {
+        return this.generateKoaController(routeInfo);
     }
 }
 let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
@@ -66,26 +66,6 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         application.agent = agent;
         agent.application = application;
         debug('[egg]: init single process egg end');
-        // https config
-        if (this.configurationOptions.key && this.configurationOptions.cert) {
-            this.configurationOptions.key = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.key);
-            this.configurationOptions.cert = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.cert);
-            this.configurationOptions.ca = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.ca);
-            if (this.configurationOptions.http2) {
-                this.server = require('http2').createSecureServer(this.configurationOptions, this.app.callback());
-            }
-            else {
-                this.server = require('https').createServer(this.configurationOptions, this.app.callback());
-            }
-        }
-        else {
-            if (this.configurationOptions.http2) {
-                this.server = require('http2').createServer(this.app.callback());
-            }
-            else {
-                this.server = require('http').createServer(this.app.callback());
-            }
-        }
     }
     async applicationInitialize(options) {
         if (!this.isClusterMode) {
@@ -94,13 +74,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         // insert error handler
         this.app.use(async (ctx, next) => {
             // this.app.createAnonymousContext(ctx);
-            const { result, error } = await (await this.getMiddleware())(ctx, next);
-            if (error) {
-                throw error;
-            }
-            if (result) {
-                ctx.body = result;
-            }
+            await (await this.getMiddleware())(ctx, next);
         });
         this.generator = new EggControllerGenerator(this.app, this.applicationContext, this.appLogger);
         this.overwriteApplication('app');
@@ -135,9 +109,6 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         });
         debug(`[egg]: overwrite properties to "${processType}"`);
         this.defineApplicationProperties({
-            generateController: (controllerMapping) => {
-                return this.generator.generateController(controllerMapping);
-            },
             generateMiddleware: async (middlewareId) => {
                 return this.generateMiddleware(middlewareId);
             },
@@ -156,7 +127,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             logger_2.MidwayEggContextLogger);
     }
     async loadMidwayController() {
-        await this.generator.loadMidwayController(newRouter => {
+        await this.generator.loadMidwayController(this.configurationOptions.globalPrefix, newRouter => {
             this.app.use(newRouter.middleware());
         });
     }
@@ -164,11 +135,32 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         return decorator_1.MidwayFrameworkType.WEB;
     }
     async run() {
+        var _a;
         // load controller
         await this.loadMidwayController();
         // restore use method
         this.app.use = this.app.originUse;
         if (!this.isClusterMode) {
+            // https config
+            if (this.configurationOptions.key && this.configurationOptions.cert) {
+                this.configurationOptions.key = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.key);
+                this.configurationOptions.cert = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.cert);
+                this.configurationOptions.ca = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.ca);
+                if (this.configurationOptions.http2) {
+                    this.server = require('http2').createSecureServer(this.configurationOptions, this.app.callback());
+                }
+                else {
+                    this.server = require('https').createServer(this.configurationOptions, this.app.callback());
+                }
+            }
+            else {
+                if (this.configurationOptions.http2) {
+                    this.server = require('http2').createServer(this.app.callback());
+                }
+                else {
+                    this.server = require('http').createServer(this.app.callback());
+                }
+            }
             // emit egg-ready message in agent and application
             this.app.messenger.broadcast('egg-ready', undefined);
             // emit `server` event in app
@@ -176,9 +168,10 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             // register httpServer to applicationContext
             this.getApplicationContext().registerObject(core_1.HTTP_SERVER_KEY, this.server);
             const eggConfig = this.configService.getConfiguration('egg');
-            if (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 = [eggConfig.port];
+                    const args = [customPort];
                     if (eggConfig.hostname) {
                         args.push(eggConfig.hostname);
                     }
@@ -186,6 +179,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
                         resolve();
                     });
                     this.server.listen(...args);
+                    process.env.MIDWAY_HTTP_PORT = String(customPort);
                 });
             }
         }

package/dist/interface.d.ts

@@ -1,28 +1,27 @@
 /// <reference types="node" />
-import { Context as EggContext, Application as EggApplication, EggLogger, EggAppConfig } from 'egg';
-import { IMidwayContainer, IMidwayContext, Context as IMidwayBaseContext, IMidwayApplication, IMidwayBaseApplication, IConfigurationOptions } from '@midwayjs/core';
-import { DefaultState, Middleware, Next } from 'koa';
+import { Context as EggContext, Application as EggApplication, EggAppConfig } from 'egg';
+import { IMidwayContainer, IMidwayContext, Context as IMidwayBaseContext, IMidwayApplication, IMidwayBaseApplication, IConfigurationOptions, NextFunction as BaseNextFunction } from '@midwayjs/core';
+import { DefaultState, Middleware } from 'koa';
 import { ILogger, LoggerOptions } from '@midwayjs/logger';
 export interface IMidwayWebBaseApplication {
     applicationContext: IMidwayContainer;
-    getLogger(name?: string): EggLogger & ILogger;
-    getCoreLogger(): EggLogger & ILogger;
-    generateController?(controllerMapping: string): any;
+    getLogger(name?: string): ILogger;
+    getCoreLogger(): ILogger;
     generateMiddleware?(middlewareId: string): Promise<Middleware<DefaultState, EggContext>>;
-    createLogger(name: string, options: LoggerOptions): EggLogger & ILogger;
+    createLogger(name: string, options: LoggerOptions): ILogger;
 }
 declare module 'egg' {
     interface EggAppInfo {
         appDir: string;
     }
-    interface Application extends IMidwayBaseApplication, IMidwayWebBaseApplication {
+    interface Application extends IMidwayBaseApplication<Context>, IMidwayWebBaseApplication {
         createAnonymousContext(...args: any[]): EggContext;
         getCoreLogger(): EggLogger & ILogger;
         getLogger(name?: string): EggLogger & ILogger;
         createLogger(name: string, options: LoggerOptions): EggLogger & ILogger;
     }
     interface Context<ResponseBodyT = any> extends IMidwayBaseContext {
-        getLogger(name?: string): EggLogger & ILogger;
+        getLogger(name?: string): ILogger;
     }
     interface EggAppConfig {
         midwayFeature: {
@@ -36,7 +35,8 @@ export interface Application extends IMidwayWebApplication {
 export interface Context<ResponseBodyT = unknown> extends IMidwayWebContext<ResponseBodyT> {
 }
 export declare type IMidwayWebContext<ResponseBodyT = unknown> = IMidwayContext<EggContext<ResponseBodyT>>;
-export declare type IMidwayWebNext = Next;
+export declare type IMidwayWebNext = BaseNextFunction;
+export declare type NextFunction = BaseNextFunction;
 export interface IMidwayWebConfigurationOptions extends IConfigurationOptions {
     app?: IMidwayWebApplication;
     plugins?: {
@@ -73,8 +73,20 @@ export interface IMidwayWebConfigurationOptions extends IConfigurationOptions {
      * http2 support
      */
     http2?: boolean;
+    /**
+     * http global prefix
+     */
+    globalPrefix?: string;
 }
+/**
+ * @deprecated since version 3.0.0
+ * Please use IMiddleware from @midwayjs/core
+ */
 export declare type MidwayWebMiddleware = Middleware<DefaultState, Context>;
+/**
+ * @deprecated since version 3.0.0
+ * Please use IMiddleware from @midwayjs/core
+ */
 export interface IWebMiddleware {
     resolve(): MidwayWebMiddleware;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.7",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -27,8 +27,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.3",
-    "@midwayjs/mock": "^3.0.0-beta.3",
+    "@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",
@@ -43,8 +43,8 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.0.0-beta.3",
-    "@midwayjs/logger": "^3.0.0-beta.3",
+    "@midwayjs/core": "^3.0.0-beta.7",
+    "@midwayjs/logger": "^3.0.0-beta.7",
     "egg": "^2.28.0",
     "extend2": "^1.0.0",
     "find-up": "^5.0.0",
@@ -58,5 +58,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a46b7f83d1cb161ec312f2892a9b33ff2d290d7e"
+  "gitHead": "24590729121d9110e2d960db5b5e587cf55a1efc"
 }