@midwayjs/web 3.0.0-alpha.10 → 3.0.0-alpha.37

package/CHANGELOG.md

@@ -3,17 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [3.0.0-alpha.2](https://github.com/midwayjs/midway/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2021-08-05)
-
-**Note:** Version bump only for package @midwayjs/web
-
-
+## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 
+### Bug Fixes
 
-# [3.0.0-alpha.1](https://github.com/midwayjs/midway/compare/v2.12.1...v3.0.0-alpha.1) (2021-08-04)
-
-**Note:** Version bump only for package @midwayjs/web
+* task redefine context logger ([#1213](https://github.com/midwayjs/midway/issues/1213)) ([f8887c9](https://github.com/midwayjs/midway/commit/f8887c94b234b0156b8b4c6ad728c97a748c5a4f))
 
 
 

package/app/extend/context.js

@@ -1,5 +1,6 @@
 'use strict';
 const rc = Symbol('Context#RequestContext');
+const ctxLogger = Symbol('Context#ContextLogger');
 const { MidwayRequestContainer } = require('@midwayjs/core');
 
 module.exports = {
@@ -13,4 +14,15 @@ module.exports = {
   get startTime() {
     return this['starttime'];
   },
+
+  get logger() {
+    if (this[ctxLogger]) {
+      return this[ctxLogger];
+    }
+    return this.getLogger('logger');
+  },
+
+  set logger(customLogger) {
+    this[ctxLogger] = customLogger;
+  },
 };

package/app.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const pathMatching = require('egg-path-matching');
+const { hasIdentifierMapping } = require('@midwayjs/decorator');
 
 class AppBootHook {
   constructor(app) {
@@ -35,7 +36,7 @@ class AppBootHook {
     const middlewareNames = this.coreMiddleware.concat(this.appMiddleware);
     // 等 midway 加载完成后，再去 use 中间件
     for (const name of middlewareNames) {
-      if (this.app.getApplicationContext().registry.hasDefinition(name)) {
+      if (hasIdentifierMapping(name)) {
         const mwIns = await this.app.generateMiddleware(name);
         mwIns._name = name;
         this.app.use(mwIns);

package/dist/application.js

@@ -5,16 +5,16 @@ const path_1 = require("path");
 const base_1 = require("./base");
 const EGG_LOADER = Symbol.for('egg#loader');
 const EGG_PATH = Symbol.for('egg#eggPath');
-const EggAppWorkerLoader = base_1.createAppWorkerLoader();
-const BaseEggApplication = base_1.createEggApplication();
-const EggAgentWorkerLoader = base_1.createAgentWorkerLoader();
-const BaseEggAgent = base_1.createEggAgent();
+const EggAppWorkerLoader = (0, base_1.createAppWorkerLoader)();
+const BaseEggApplication = (0, base_1.createEggApplication)();
+const EggAgentWorkerLoader = (0, base_1.createAgentWorkerLoader)();
+const BaseEggAgent = (0, base_1.createEggAgent)();
 class EggApplication extends BaseEggApplication {
     get [EGG_LOADER]() {
         return EggAppWorkerLoader;
     }
     get [EGG_PATH]() {
-        return path_1.join(__dirname, '../');
+        return (0, path_1.join)(__dirname, '../');
     }
 }
 exports.Application = EggApplication;
@@ -23,7 +23,7 @@ class EggAgent extends BaseEggAgent {
         return EggAgentWorkerLoader;
     }
     get [EGG_PATH]() {
-        return path_1.join(__dirname, '../');
+        return (0, path_1.join)(__dirname, '../');
     }
 }
 exports.Agent = EggAgent;

package/dist/base.js

@@ -21,8 +21,8 @@ function getFramework() {
     /**
      * create real egg loader and application object
      */
-    const pkg = core_1.safeRequire(path_1.join(process.env.MIDWAY_PROJECT_APPDIR || process.cwd(), 'package.json'), false);
-    customFramework = core_1.safelyGet('egg.framework', pkg);
+    const pkg = (0, core_1.safeRequire)((0, path_1.join)(process.env.MIDWAY_PROJECT_APPDIR || process.cwd(), 'package.json'), false);
+    customFramework = (0, core_1.safelyGet)('egg.framework', pkg);
     if (customFramework) {
         return customFramework;
     }
@@ -44,19 +44,22 @@ const createAppWorkerLoader = () => {
                 if (this.app.options.typescript || this.app.options.isTsMode) {
                     process.env.EGG_TYPESCRIPT = 'true';
                 }
-                const result = utils_1.parseNormalDir(this.app.options['baseDir'], this.app.options.isTsMode);
+                const result = (0, utils_1.parseNormalDir)(this.app.options['baseDir'], this.app.options.isTsMode);
                 this.baseDir = result.baseDir;
                 this.options.baseDir = this.baseDir;
                 this.appDir = this.app.appDir = result.appDir;
             }
             const result = super.getEggPaths();
-            const monorepoRoot = utils_1.findLernaRoot();
+            const monorepoRoot = (0, utils_1.findLernaRoot)();
             if (monorepoRoot) {
                 result.push(monorepoRoot);
             }
             if (process.env.MIDWAY_EGG_PLUGIN_PATH) {
                 result.push(process.env.MIDWAY_EGG_PLUGIN_PATH);
             }
+            if (process.cwd() !== this.appDir) {
+                result.push(this.appDir);
+            }
             const pathSet = new Set(result);
             return Array.from(pathSet);
         }
@@ -76,13 +79,13 @@ const createAppWorkerLoader = () => {
         getServerEnv() {
             // 这里和 egg 不同的是，一是修改了根路径，二是增加了环境变量
             let serverEnv = this.options.env;
-            let envPath = path_1.join(this.appDir, 'config/env');
-            if (!serverEnv && fs_1.existsSync(envPath)) {
-                serverEnv = fs_1.readFileSync(envPath, 'utf8').trim();
+            let envPath = (0, path_1.join)(this.appDir, 'config/env');
+            if (!serverEnv && (0, fs_1.existsSync)(envPath)) {
+                serverEnv = (0, fs_1.readFileSync)(envPath, 'utf8').trim();
             }
-            envPath = path_1.join(this.appDir, 'config/serverEnv');
-            if (!serverEnv && fs_1.existsSync(envPath)) {
-                serverEnv = fs_1.readFileSync(envPath, 'utf8').trim();
+            envPath = (0, path_1.join)(this.appDir, 'config/serverEnv');
+            if (!serverEnv && (0, fs_1.existsSync)(envPath)) {
+                serverEnv = (0, fs_1.readFileSync)(envPath, 'utf8').trim();
             }
             if (!serverEnv) {
                 serverEnv = process.env.MIDWAY_SERVER_ENV || process.env.EGG_SERVER_ENV;
@@ -151,19 +154,22 @@ const createAgentWorkerLoader = () => {
                 if (this.app.options.typescript || this.app.options.isTsMode) {
                     process.env.EGG_TYPESCRIPT = 'true';
                 }
-                const result = utils_1.parseNormalDir(this.app.options['baseDir'], this.app.options.isTsMode);
+                const result = (0, utils_1.parseNormalDir)(this.app.options['baseDir'], this.app.options.isTsMode);
                 this.baseDir = result.baseDir;
                 this.options.baseDir = this.baseDir;
                 this.appDir = this.app.appDir = result.appDir;
             }
             const result = super.getEggPaths();
-            const monorepoRoot = utils_1.findLernaRoot();
+            const monorepoRoot = (0, utils_1.findLernaRoot)();
             if (monorepoRoot) {
                 result.push(monorepoRoot);
             }
             if (process.env.MIDWAY_EGG_PLUGIN_PATH) {
                 result.push(process.env.MIDWAY_EGG_PLUGIN_PATH);
             }
+            if (process.cwd() !== this.appDir) {
+                result.push(this.appDir);
+            }
             const pathSet = new Set(result);
             return Array.from(pathSet);
         }
@@ -183,13 +189,13 @@ const createAgentWorkerLoader = () => {
         getServerEnv() {
             // 这里和 egg 不同的是，一是修改了根路径，二是增加了环境变量
             let serverEnv = this.options.env;
-            let envPath = path_1.join(this.appDir, 'config/env');
-            if (!serverEnv && fs_1.existsSync(envPath)) {
-                serverEnv = fs_1.readFileSync(envPath, 'utf8').trim();
+            let envPath = (0, path_1.join)(this.appDir, 'config/env');
+            if (!serverEnv && (0, fs_1.existsSync)(envPath)) {
+                serverEnv = (0, fs_1.readFileSync)(envPath, 'utf8').trim();
             }
-            envPath = path_1.join(this.appDir, 'config/serverEnv');
-            if (!serverEnv && fs_1.existsSync(envPath)) {
-                serverEnv = fs_1.readFileSync(envPath, 'utf8').trim();
+            envPath = (0, path_1.join)(this.appDir, 'config/serverEnv');
+            if (!serverEnv && (0, fs_1.existsSync)(envPath)) {
+                serverEnv = (0, fs_1.readFileSync)(envPath, 'utf8').trim();
             }
             if (!serverEnv) {
                 serverEnv = process.env.MIDWAY_SERVER_ENV || process.env.EGG_SERVER_ENV;
@@ -244,7 +250,7 @@ const createEggApplication = () => {
         }
         get loggers() {
             if (!this[LOGGERS]) {
-                this[LOGGERS] = logger_1.createLoggers(this);
+                this[LOGGERS] = (0, logger_1.createLoggers)(this);
             }
             return this[LOGGERS];
         }
@@ -275,7 +281,7 @@ const createEggAgent = () => {
         }
         get loggers() {
             if (!this[LOGGERS]) {
-                this[LOGGERS] = logger_1.createLoggers(this);
+                this[LOGGERS] = (0, logger_1.createLoggers)(this);
             }
             return this[LOGGERS];
         }

package/dist/framework/singleProcess.js

@@ -43,7 +43,7 @@ class MidwayWebSingleProcessFramework {
     async initialize(options) {
         const opts = {
             baseDir: options.appDir,
-            framework: path_1.resolve(__dirname, '../application'),
+            framework: (0, path_1.resolve)(__dirname, '../application'),
             plugins: this.configurationOptions.plugins,
             mode: 'single',
             isTsMode: this.isTsMode || true,
@@ -62,10 +62,20 @@ class MidwayWebSingleProcessFramework {
             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);
-            this.server = require('https').createServer(this.configurationOptions, this.app.callback());
+            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 {
-            this.server = require('http').createServer(this.app.callback());
+            if (this.configurationOptions.http2) {
+                this.server = require('http2').createServer(this.app.callback());
+            }
+            else {
+                this.server = require('http').createServer(this.app.callback());
+            }
         }
         if (options.isMainFramework === undefined) {
             await this.loadExtension();

package/dist/framework/web.js

@@ -114,7 +114,7 @@ class MidwayWebFramework extends koa_1.MidwayKoaBaseFramework {
         });
         // register config
         this.getApplicationContext().registerDataHandler(decorator_1.CONFIG_KEY, key => {
-            return key ? core_1.safelyGet(key, this.app.config) : this.app.config;
+            return key ? (0, core_1.safelyGet)(key, this.app.config) : this.app.config;
         });
         // register logger
         this.getApplicationContext().registerDataHandler(decorator_1.LOGGER_KEY, key => {

package/dist/logger.js

@@ -35,32 +35,32 @@ const levelTransform = level => {
     }
 };
 function isEmptyFile(p) {
-    const content = fs_1.readFileSync(p, {
+    const content = (0, fs_1.readFileSync)(p, {
         encoding: 'utf8',
     });
     return content === null || content === undefined || content === '';
 }
 function checkEggLoggerExistsAndBackup(dir, fileName) {
-    const file = path_1.isAbsolute(fileName) ? fileName : path_1.join(dir, fileName);
-    if (fs_1.existsSync(file) && !fs_1.lstatSync(file).isSymbolicLink()) {
+    const file = (0, path_1.isAbsolute)(fileName) ? fileName : (0, path_1.join)(dir, fileName);
+    if ((0, fs_1.existsSync)(file) && !(0, fs_1.lstatSync)(file).isSymbolicLink()) {
         // 如果是空文件，则直接删了，否则加入备份队列
         if (isEmptyFile(file)) {
             // midway 的软链在 windows 底下也不会创建出来，在 windows 底下就不做文件删除了
             if (!isWindows) {
-                fs_1.unlinkSync(file);
+                (0, fs_1.unlinkSync)(file);
             }
         }
         else {
-            const timeFormat = utils_1.getCurrentDateString();
-            fs_1.renameSync(file, file + '.' + timeFormat + '_eggjs_bak');
+            const timeFormat = (0, utils_1.getCurrentDateString)();
+            (0, fs_1.renameSync)(file, file + '.' + timeFormat + '_eggjs_bak');
         }
     }
 }
 function removeSymbol(dir, fileName) {
-    const file = path_1.isAbsolute(fileName) ? fileName : path_1.join(dir, fileName);
-    if (fs_1.existsSync(file) && fs_1.lstatSync(file).isSymbolicLink()) {
+    const file = (0, path_1.isAbsolute)(fileName) ? fileName : (0, path_1.join)(dir, fileName);
+    if ((0, fs_1.existsSync)(file) && (0, fs_1.lstatSync)(file).isSymbolicLink()) {
         if (!isWindows) {
-            fs_1.unlinkSync(file);
+            (0, fs_1.unlinkSync)(file);
         }
     }
 }

package/dist/utils.js

@@ -8,19 +8,19 @@ const fs_1 = require("fs");
 const parseNormalDir = (baseDir, isTypescript = true) => {
     if (isTypescript) {
         // 这里要么就是 src 目录，要么就已经是根目录
-        if (!fs_1.existsSync(path_1.join(baseDir, 'package.json'))) {
-            baseDir = path_1.basename(baseDir);
+        if (!(0, fs_1.existsSync)((0, path_1.join)(baseDir, 'package.json'))) {
+            baseDir = (0, path_1.basename)(baseDir);
         }
-        const isTypeScriptEnv = bootstrap_1.isTypeScriptEnvironment();
+        const isTypeScriptEnv = (0, bootstrap_1.isTypeScriptEnvironment)();
         if (isTypeScriptEnv) {
             return {
-                baseDir: path_1.join(baseDir, 'src'),
+                baseDir: (0, path_1.join)(baseDir, 'src'),
                 appDir: baseDir,
             };
         }
         else {
             return {
-                baseDir: path_1.join(baseDir, 'dist'),
+                baseDir: (0, path_1.join)(baseDir, 'dist'),
                 appDir: baseDir,
             };
         }
@@ -36,8 +36,8 @@ const parseNormalDir = (baseDir, isTypescript = true) => {
 exports.parseNormalDir = parseNormalDir;
 const findLernaRoot = (findRoot = process.cwd()) => {
     const userHome = process.env.HOME;
-    return find_up_1.sync(directory => {
-        if (find_up_1.sync.exists(path_1.join(directory, 'lerna.json'))) {
+    return (0, find_up_1.sync)(directory => {
+        if (find_up_1.sync.exists((0, path_1.join)(directory, 'lerna.json'))) {
             return directory;
         }
         if (directory === userHome) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.0.0-alpha.10+f8cccb92",
+  "version": "3.0.0-alpha.37+574e016e",
   "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-alpha.2",
-    "@midwayjs/mock": "^3.0.0-alpha.10+f8cccb92",
+    "@midwayjs/decorator": "^3.0.0-alpha.37+574e016e",
+    "@midwayjs/mock": "^3.0.0-alpha.37+574e016e",
     "dayjs": "^1.10.4",
     "egg-socket.io": "^4.1.6",
     "egg-view-nunjucks": "^2.2.0",
@@ -41,17 +41,17 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/bootstrap": "^3.0.0-alpha.10+f8cccb92",
-    "@midwayjs/core": "^3.0.0-alpha.10+f8cccb92",
-    "@midwayjs/koa": "^3.0.0-alpha.10+f8cccb92",
-    "@midwayjs/logger": "^2.11.3",
+    "@midwayjs/bootstrap": "^3.0.0-alpha.37+574e016e",
+    "@midwayjs/core": "^3.0.0-alpha.37+574e016e",
+    "@midwayjs/koa": "^3.0.0-alpha.37+574e016e",
+    "@midwayjs/logger": "^2.13.0",
     "debug": "^4.1.1",
     "egg": "^2.28.0",
     "egg-logger": "^2.4.2",
     "egg-path-matching": "^1.0.1",
     "extend2": "^1.0.0",
     "find-up": "^5.0.0",
-    "midway-schedule": "^3.0.0-alpha.10+f8cccb92",
+    "midway-schedule": "^2.12.9",
     "mkdirp": "^1.0.4"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
@@ -59,5 +59,8 @@
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "f8cccb92aaef82e7c43c6eb5ef2518256ef99a1e"
+  "engines": {
+    "node": ">=10.10.0"
+  },
+  "gitHead": "574e016e6bdc4be94f2ee8f82ada1670011911f1"
 }