@midwayjs/express 3.20.4 → 4.0.0-beta.1

package/dist/config/config.default.d.ts

@@ -1,7 +1,12 @@
 import { Options, OptionsJson, OptionsText, OptionsUrlencoded } from 'body-parser';
 import { CookieOptions } from 'express';
-export declare const express: {
-    contextLoggerFormat: (info: any) => string;
+export declare const express: {};
+export declare const midwayLogger: {
+    clients: {
+        appLogger: {
+            contextFormat: (info: any) => string;
+        };
+    };
 };
 export declare const cookieParser: {
     enable?: boolean;

package/dist/config/config.default.js

@@ -1,26 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bodyParser = exports.cookieParser = exports.express = void 0;
-exports.express = {
-    contextLoggerFormat: info => {
-        var _a, _b;
-        const req = info.ctx;
-        // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
-        const userId = ((_a = req === null || req === void 0 ? void 0 : req['session']) === null || _a === void 0 ? void 0 : _a['userId']) || '-';
-        const traceId = (_b = req.traceId) !== null && _b !== void 0 ? _b : '-';
-        const use = Date.now() - info.ctx.startTime;
-        const label = userId +
-            '/' +
-            req.ip +
-            '/' +
-            traceId +
-            '/' +
-            use +
-            'ms ' +
-            req.method +
-            ' ' +
-            req.url;
-        return `${info.timestamp} ${info.LEVEL} ${info.pid} [${label}] ${info.message}`;
+exports.bodyParser = exports.cookieParser = exports.midwayLogger = exports.express = void 0;
+exports.express = {};
+exports.midwayLogger = {
+    clients: {
+        appLogger: {
+            contextFormat: info => {
+                const req = info.ctx;
+                // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
+                const userId = req?.['session']?.['userId'] || '-';
+                const traceId = req.traceId ?? '-';
+                const use = Date.now() - info.ctx.startTime;
+                const label = userId +
+                    '/' +
+                    req.ip +
+                    '/' +
+                    traceId +
+                    '/' +
+                    use +
+                    'ms ' +
+                    req.method +
+                    ' ' +
+                    req.url;
+                return `${info.timestamp} ${info.LEVEL} ${info.pid} [${label}] ${info.message}`;
+            },
+        },
     },
 };
 exports.cookieParser = {

package/dist/configuration.js

@@ -23,14 +23,14 @@ let ExpressConfiguration = class ExpressConfiguration {
         });
     }
     async onReady() {
-        var _a, _b;
-        const keys = (_a = this.configService.getConfiguration('express.keys')) !== null && _a !== void 0 ? _a : this.configService.getConfiguration('keys');
+        const keys = this.configService.getConfiguration('express.keys') ??
+            this.configService.getConfiguration('keys');
         const cookieParserConfig = this.configService.getConfiguration('cookieParser');
         if (cookieParserConfig.enable) {
             // add cookie parser middleware
             this.expressFramework
                 .getMiddleware()
-                .insertFirst(cookieParser((_b = cookieParserConfig.secret) !== null && _b !== void 0 ? _b : keys, cookieParserConfig.options));
+                .insertFirst(cookieParser(cookieParserConfig.secret ?? keys, cookieParserConfig.options));
         }
         // add body parser
         const bodyparserConfig = this.configService.getConfiguration('bodyParser');
@@ -52,6 +52,7 @@ let ExpressConfiguration = class ExpressConfiguration {
         }
     }
 };
+exports.ExpressConfiguration = ExpressConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
@@ -70,7 +71,7 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], ExpressConfiguration.prototype, "init", null);
-ExpressConfiguration = __decorate([
+exports.ExpressConfiguration = ExpressConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'express',
         imports: [session],
@@ -81,5 +82,4 @@ ExpressConfiguration = __decorate([
         ],
     })
 ], ExpressConfiguration);
-exports.ExpressConfiguration = ExpressConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/framework.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { BaseFramework, IMidwayBootstrapOptions, MiddlewareRespond, MidwayFrameworkType, RouterInfo } from '@midwayjs/core';
+import { BaseFramework, IMidwayBootstrapOptions, MiddlewareRespond, RouterInfo } from '@midwayjs/core';
 import { IMidwayExpressApplication, IMidwayExpressConfigurationOptions, Context } from './interface';
 import type { IRouter, IRouterHandler, Response, NextFunction } from 'express';
 import { Server } from 'net';
@@ -11,7 +11,6 @@ export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpress
     configure(): IMidwayExpressConfigurationOptions;
     applicationInitialize(options: Partial<IMidwayBootstrapOptions>): Promise<void>;
     run(): Promise<void>;
-    getFrameworkType(): MidwayFrameworkType;
     /**
      * wrap controller string to middleware function
      */

package/dist/framework.js

@@ -46,7 +46,6 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         this.app.use = this.app.useMiddleware;
     }
     async run() {
-        var _a;
         debug(`[express]: use middlewares = "${this.getMiddleware().getNames()}"`);
         // restore use method
         this.app.use = this.app.originUse;
@@ -80,10 +79,9 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
             this.filterManager
                 .runErrorFilter(err, req, res, next)
                 .then(data => {
-                var _a, _b;
                 const { result, error } = data;
                 if (error) {
-                    const status = (_b = (_a = error.status) !== null && _a !== void 0 ? _a : res.statusCode) !== null && _b !== void 0 ? _b : 500;
+                    const status = error.status ?? res.statusCode ?? 500;
                     // 5xx
                     if (status >= 500) {
                         try {
@@ -120,9 +118,9 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         };
         // https config
         if (serverOptions.key && serverOptions.cert) {
-            serverOptions.key = core_1.PathFileUtil.getFileContentSync(serverOptions.key);
-            serverOptions.cert = core_1.PathFileUtil.getFileContentSync(serverOptions.cert);
-            serverOptions.ca = core_1.PathFileUtil.getFileContentSync(serverOptions.ca);
+            serverOptions.key = core_1.PathFileUtils.getFileContentSync(serverOptions.key);
+            serverOptions.cert = core_1.PathFileUtils.getFileContentSync(serverOptions.cert);
+            serverOptions.ca = core_1.PathFileUtils.getFileContentSync(serverOptions.ca);
             process.env.MIDWAY_HTTP_SSL = 'true';
             if (serverOptions.http2) {
                 this.server = require('http2').createSecureServer(serverOptions, this.app);
@@ -141,7 +139,7 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         }
         // register httpServer to applicationContext
         this.applicationContext.registerObject(core_1.HTTP_SERVER_KEY, this.server);
-        const customPort = (_a = process.env.MIDWAY_HTTP_PORT) !== null && _a !== void 0 ? _a : this.configurationOptions.port;
+        const customPort = process.env.MIDWAY_HTTP_PORT ?? this.configurationOptions.port;
         if (customPort) {
             new Promise(resolve => {
                 const args = [customPort];
@@ -156,9 +154,6 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
             });
         }
     }
-    getFrameworkType() {
-        return core_1.MidwayFrameworkType.WEB_EXPRESS;
-    }
     /**
      * wrap controller string to middleware function
      */
@@ -215,7 +210,6 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         });
     }
     async loadMidwayController() {
-        var _a, _b;
         this.webRouterService = await this.applicationContext.getAsync(core_1.MidwayWebRouterService, [
             {
                 globalPrefix: this.configurationOptions.globalPrefix,
@@ -230,7 +224,7 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
             this.logger.debug(`Load Controller "${routerInfo.controllerId}", prefix=${routerInfo.prefix}`);
             // new router
             const newRouter = this.createRouter(routerInfo.routerOptions);
-            routerInfo.middleware = (_a = routerInfo.middleware) !== null && _a !== void 0 ? _a : [];
+            routerInfo.middleware = routerInfo.middleware ?? [];
             // add router middleware
             if (routerInfo.middleware.length) {
                 const routerMiddlewareFn = await this.expressMiddlewareService.compose(routerInfo.middleware, this.app);
@@ -241,7 +235,7 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
             for (const routeInfo of routes) {
                 const routeMiddlewareList = [];
                 // routeInfo middleware
-                routeInfo.middleware = (_b = routeInfo.middleware) !== null && _b !== void 0 ? _b : [];
+                routeInfo.middleware = routeInfo.middleware ?? [];
                 if (routeInfo.middleware.length) {
                     const routeMiddlewareFn = await this.expressMiddlewareService.compose(routeInfo.middleware, this.app);
                     routeMiddlewareList.push(routeMiddlewareFn);
@@ -287,11 +281,11 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         return process.env.MIDWAY_HTTP_PORT;
     }
     getFrameworkName() {
-        return 'midway:express';
+        return 'express';
     }
 };
-MidwayExpressFramework = __decorate([
+exports.MidwayExpressFramework = MidwayExpressFramework;
+exports.MidwayExpressFramework = MidwayExpressFramework = __decorate([
     (0, core_1.Framework)()
 ], MidwayExpressFramework);
-exports.MidwayExpressFramework = MidwayExpressFramework;
 //# sourceMappingURL=framework.js.map

package/dist/middlewareService.js

@@ -117,12 +117,12 @@ let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
         return composeFn;
     }
 };
-MidwayExpressMiddlewareService = __decorate([
+exports.MidwayExpressMiddlewareService = MidwayExpressMiddlewareService;
+exports.MidwayExpressMiddlewareService = MidwayExpressMiddlewareService = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object])
 ], MidwayExpressMiddlewareService);
-exports.MidwayExpressMiddlewareService = MidwayExpressMiddlewareService;
 function wrapMiddleware(mw, options) {
     // support options.enable
     if (options.enable === false)

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.20.4",
+  "version": "4.0.0-beta.1",
   "description": "Midway Web Framework for Express",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test"
   },
   "keywords": [
@@ -24,14 +24,14 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/mock": "^3.20.4",
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1",
     "@types/body-parser": "1.19.5",
     "@types/express": "4.17.21",
     "fs-extra": "11.3.0"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/express-session": "^3.20.4",
+    "@midwayjs/express-session": "^4.0.0-beta.1",
     "body-parser": "1.20.3",
     "cookie-parser": "^1.4.6",
     "express": "4.21.2"
@@ -44,5 +44,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "c3fb65a7ada8829635f3c6af5ef83c65c3a43d79"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.