@midwayjs/web 4.0.0-alpha.1 → 4.0.0-beta.2

package/README.md

@@ -9,4 +9,4 @@ Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 
-[MIT]((http://github.com/midwayjs/midway/blob/master/LICENSE))
+[MIT]((https://github.com/midwayjs/midway/blob/master/LICENSE))

package/dist/cluster.js

@@ -23,7 +23,7 @@ else {
 (0, core_1.prepareGlobalApplicationContext)({
     appDir,
     baseDir,
-    ignore: ['**/app/extend/**', '**/app/public/**'],
+    // ignore: ['**/app/extend/**', '**/app/public/**'],
 });
 if (!isAgent) {
     debug('[egg]: run with egg-scripts in worker and init midway container complete');

package/dist/config/config.default.js

@@ -15,6 +15,25 @@ exports.default = appInfo => {
             appLogger: {
                 fileLogName: 'midway-web.log',
                 aliasName: 'logger',
+                contextFormat: info => {
+                    const ctx = info.ctx;
+                    // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
+                    const userId = ctx.userId || '-';
+                    const traceId = ctx.traceId ?? ctx.tracer?.traceId ?? '-';
+                    const use = Date.now() - ctx.startTime;
+                    const label = userId +
+                        '/' +
+                        ctx.ip +
+                        '/' +
+                        traceId +
+                        '/' +
+                        use +
+                        'ms ' +
+                        ctx.method +
+                        ' ' +
+                        ctx.url;
+                    return `${info.timestamp} ${info.LEVEL} ${info.pid} [${label}] ${info.message}`;
+                },
             },
             agentLogger: {
                 fileLogName: 'midway-agent.log',
@@ -23,25 +42,6 @@ exports.default = appInfo => {
     });
     exports.egg = {
         dumpConfig: true,
-        contextLoggerFormat: info => {
-            const ctx = info.ctx;
-            // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
-            const userId = ctx.userId || '-';
-            const traceId = ctx.traceId ?? ctx.tracer?.traceId ?? '-';
-            const use = Date.now() - ctx.startTime;
-            const label = userId +
-                '/' +
-                ctx.ip +
-                '/' +
-                traceId +
-                '/' +
-                use +
-                'ms ' +
-                ctx.method +
-                ' ' +
-                ctx.url;
-            return `${info.timestamp} ${info.LEVEL} ${info.pid} [${label}] ${info.message}`;
-        },
         queryParseMode: 'extended',
     };
     exports.pluginOverwrite = false;

package/dist/framework/web.js

@@ -15,6 +15,7 @@ const router_1 = require("@eggjs/router");
 const logger_1 = require("@midwayjs/logger");
 const path_1 = require("path");
 const util_1 = require("util");
+const net_1 = require("net");
 const debug = (0, util_1.debuglog)('midway:debug');
 class EggControllerGenerator extends core_1.WebControllerGenerator {
     constructor(app, webRouterService) {
@@ -173,9 +174,9 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             };
             // 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.callback());
@@ -200,7 +201,10 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             this.getApplicationContext().registerObject(core_1.HTTP_SERVER_KEY, this.server);
             const eggConfig = this.configService.getConfiguration('egg');
             if (!this.isClusterMode && eggConfig) {
-                const customPort = process.env.MIDWAY_HTTP_PORT ?? eggConfig.port;
+                let customPort = process.env.MIDWAY_HTTP_PORT ?? eggConfig.port;
+                if (customPort === 0) {
+                    customPort = await getFreePort();
+                }
                 if (customPort) {
                     new Promise(resolve => {
                         const args = [customPort];
@@ -221,15 +225,15 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         if (name) {
             return this.app.loggers[name] || logger_1.loggers.getLogger(name);
         }
-        return this.appLogger;
+        return this.loggerService.getLogger(this.frameworkLoggerName);
     }
     setContextLoggerClass() {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const self = this;
+        const contextFormat = this.configService.getConfiguration('midwayLogger.clients.appLogger.contextFormat');
         class MidwayEggContextLogger extends logger_1.MidwayContextLogger {
             constructor(ctx, appLogger) {
                 super(ctx, appLogger, {
-                    contextFormat: self.contextLoggerFormat,
+                    contextFormat,
                 });
             }
         }
@@ -260,4 +264,19 @@ __decorate([
 exports.MidwayWebFramework = MidwayWebFramework = __decorate([
     (0, core_1.Framework)()
 ], MidwayWebFramework);
+async function getFreePort() {
+    return new Promise((resolve, reject) => {
+        const server = (0, net_1.createServer)();
+        server.listen(0, () => {
+            try {
+                const port = server.address().port;
+                server.close();
+                resolve(port);
+            }
+            catch (err) {
+                reject(err);
+            }
+        });
+    });
+}
 //# sourceMappingURL=web.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-beta.2",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -29,16 +29,16 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/logger": "^3.0.0",
-    "@midwayjs/mock": "^4.0.0-alpha.1",
+    "@midwayjs/mock": "^4.0.0-beta.2",
     "@types/koa": "2.15.0",
     "dayjs": "1.11.13",
-    "egg-logger": "3.6.0",
+    "egg-logger": "3.6.1",
     "egg-mock": "4.2.1",
-    "egg-scripts": "3.0.1",
+    "egg-scripts": "3.1.0",
     "egg-socket.io": "4.1.6",
     "egg-view-nunjucks": "2.3.0",
     "fake-egg": "1.0.0",
-    "fs-extra": "11.2.0",
+    "fs-extra": "11.3.0",
     "is-type-of": "^2.1.0",
     "mm": "3.4.0",
     "mz-modules": "^2.1.0",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^4.0.0-alpha.1",
+    "@midwayjs/core": "^4.0.0-beta.2",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
     "egg-path-matching": "^2.1.0",
     "find-up": "5.0.0",
     "mkdirp": "1.0.4",
-    "qs": "6.13.1"
+    "qs": "6.14.0"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -63,7 +63,7 @@
     "url": "https://github.com/midwayjs/midway.git"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=20"
   },
-  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
+  "gitHead": "53bfef4c5279da5f09025e4610bdbf64f94f60bd"
 }