@midwayjs/express 3.0.4-beta.1 → 3.0.4

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

@@ -1,5 +1,8 @@
 import { Options, OptionsJson, OptionsText, OptionsUrlencoded } from 'body-parser';
 import { CookieOptions } from 'express';
+export declare const express: {
+    contextLoggerFormat: (info: any) => string;
+};
 export declare const cookieParser: {
     secret?: string | string[];
     options?: CookieOptions;

package/dist/config/config.default.js

@@ -1,6 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bodyParser = exports.cookieParser = void 0;
+exports.bodyParser = exports.cookieParser = exports.express = void 0;
+exports.express = {
+    contextLoggerFormat: info => {
+        var _a;
+        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 = '-';
+        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 = {};
 exports.bodyParser = {
     enable: true,

package/dist/framework.d.ts

@@ -3,7 +3,6 @@ import { BaseFramework, IMidwayBootstrapOptions, MiddlewareRespond, MidwayFramew
 import { IMidwayExpressApplication, IMidwayExpressConfigurationOptions, Context } from './interface';
 import type { IRouter, IRouterHandler, Response, NextFunction } from 'express';
 import { Server } from 'net';
-import { MidwayExpressContextLogger } from './logger';
 export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpressApplication, Context, IMidwayExpressConfigurationOptions, Response, NextFunction> {
     app: IMidwayExpressApplication;
     private server;
@@ -31,6 +30,5 @@ export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpress
     getServer(): Server;
     getPort(): string;
     getFrameworkName(): string;
-    getDefaultContextLoggerClass(): typeof MidwayExpressContextLogger;
 }
 //# sourceMappingURL=framework.d.ts.map

package/dist/framework.js

@@ -10,7 +10,6 @@ exports.MidwayExpressFramework = void 0;
 const core_1 = require("@midwayjs/core");
 const decorator_1 = require("@midwayjs/decorator");
 const express = require("express");
-const logger_1 = require("./logger");
 const middlewareService_1 = require("./middlewareService");
 const util_1 = require("util");
 const util_2 = require("./util");
@@ -246,9 +245,6 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
     getFrameworkName() {
         return 'midway:express';
     }
-    getDefaultContextLoggerClass() {
-        return logger_1.MidwayExpressContextLogger;
-    }
 };
 MidwayExpressFramework = __decorate([
     (0, decorator_1.Framework)()

package/dist/index.d.ts

@@ -2,5 +2,4 @@ export * from './interface';
 export { MidwayExpressFramework as Framework } from './framework';
 export { ExpressConfiguration as Configuration } from './configuration';
 export * from './middlewareService';
-export * from './logger';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -17,5 +17,4 @@ Object.defineProperty(exports, "Framework", { enumerable: true, get: function ()
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.ExpressConfiguration; } });
 __exportStar(require("./middlewareService"), exports);
-__exportStar(require("./logger"), exports);
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.0.4-beta.1",
+  "version": "3.0.4",
   "description": "Midway Web Framework for Express",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -23,16 +23,16 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.4-beta.1",
-    "@midwayjs/logger": "^2.14.0",
-    "@midwayjs/mock": "^3.0.4-beta.1",
+    "@midwayjs/decorator": "^3.0.4",
+    "@midwayjs/logger": "^2.15.0",
+    "@midwayjs/mock": "^3.0.4",
     "@types/body-parser": "1.19.2",
     "@types/express": "4.17.13",
     "fs-extra": "10.0.0"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.4-beta.1",
-    "@midwayjs/express-session": "^3.0.4-beta.1",
+    "@midwayjs/core": "^3.0.4",
+    "@midwayjs/express-session": "^3.0.4",
     "body-parser": "1.19.1",
     "cookie-parser": "^1.4.6",
     "express": "4.17.2"
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "52bc37e7a570806c121b33a0e8ac1cd084445f5d"
+  "gitHead": "c2a37dd026c7bf3e855f4498691f572ef61396e3"
 }

package/dist/logger.d.ts

@@ -1,6 +0,0 @@
-import { MidwayContextLogger } from '@midwayjs/logger';
-import { Context } from './interface';
-export declare class MidwayExpressContextLogger extends MidwayContextLogger<Context> {
-    formatContextLabel(): string;
-}
-//# sourceMappingURL=logger.d.ts.map

package/dist/logger.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayExpressContextLogger = void 0;
-const logger_1 = require("@midwayjs/logger");
-class MidwayExpressContextLogger extends logger_1.MidwayContextLogger {
-    formatContextLabel() {
-        var _a;
-        const req = this.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 = '-';
-        const use = Date.now() - this.ctx.startTime;
-        return (userId +
-            '/' +
-            req.ip +
-            '/' +
-            traceId +
-            '/' +
-            use +
-            'ms ' +
-            req.method +
-            ' ' +
-            req.url);
-    }
-}
-exports.MidwayExpressContextLogger = MidwayExpressContextLogger;
-//# sourceMappingURL=logger.js.map