@midwayjs/core 3.0.14-beta.1 → 3.1.2

package/LICENSE

@@ -0,0 +1,21 @@
+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.

package/dist/baseFramework.d.ts

@@ -1,5 +1,4 @@
 import { CommonMiddlewareUnion, IConfigurationOptions, IMidwayApplication, IMidwayBootstrapOptions, IMidwayContainer, IMidwayContext, IMidwayFramework, CommonFilterUnion, CommonMiddleware, MiddlewareRespond } from './interface';
-import { FrameworkType } from '@midwayjs/decorator';
 import { ILogger, LoggerOptions, LoggerContextFormat } from '@midwayjs/logger';
 import { MidwayEnvironmentService } from './service/environmentService';
 import { MidwayConfigService } from './service/configService';
@@ -47,7 +46,6 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
     getCurrentEnvironment(): string;
     getApplication(): APP;
     abstract applicationInitialize(options: IMidwayBootstrapOptions): any;
-    abstract getFrameworkType(): FrameworkType;
     abstract run(): Promise<void>;
     protected createContextLogger(ctx: CTX, name?: string): ILogger;
     stop(): Promise<void>;

package/dist/baseFramework.js

@@ -86,9 +86,36 @@ class BaseFramework {
     }
     createContextLogger(ctx, name) {
         const appLogger = this.getLogger(name !== null && name !== void 0 ? name : this.contextLoggerApplyLogger);
-        return appLogger.createContextLogger(ctx, {
-            contextFormat: this.contextLoggerFormat,
-        });
+        if (name) {
+            let ctxLoggerCache = ctx.getAttr(interface_1.REQUEST_CTX_LOGGER_CACHE_KEY);
+            if (!ctxLoggerCache) {
+                ctxLoggerCache = new Map();
+                ctx.setAttr(interface_1.REQUEST_CTX_LOGGER_CACHE_KEY, ctxLoggerCache);
+            }
+            if (!name) {
+                name = 'appLogger';
+            }
+            // if logger exists
+            if (ctxLoggerCache.has(name)) {
+                return ctxLoggerCache.get(name);
+            }
+            // create new context logger
+            const ctxLogger = appLogger.createContextLogger(ctx, {
+                contextFormat: this.contextLoggerFormat,
+            });
+            ctxLoggerCache.set(name, ctxLogger);
+            return ctxLogger;
+        }
+        else {
+            // avoid maximum call stack size exceeded
+            if (ctx['_logger']) {
+                return ctx['_logger'];
+            }
+            ctx['_logger'] = appLogger.createContextLogger(ctx, {
+                contextFormat: this.contextLoggerFormat,
+            });
+            return ctx['_logger'];
+        }
     }
     async stop() {
         await this.beforeStop();
@@ -117,7 +144,9 @@ class BaseFramework {
                 return this.getConfiguration(key);
             },
             getFrameworkType: () => {
-                return this.getFrameworkType();
+                if (this['getFrameworkType']) {
+                    return this['getFrameworkType']();
+                }
             },
             getProcessType: () => {
                 return interface_1.MidwayProcessTypeEnum.APPLICATION;
@@ -241,7 +270,7 @@ class BaseFramework {
         return this.informationService.getProjectName();
     }
     getFrameworkName() {
-        return this.getFrameworkType().name;
+        return '';
     }
     useMiddleware(middleware) {
         this.middlewareManager.insertLast(middleware);

package/dist/common/applicationManager.js

@@ -15,7 +15,9 @@ let MidwayApplicationManager = class MidwayApplicationManager {
     }
     addFramework(namespace, framework) {
         this.globalFrameworkMap.set(namespace, framework);
-        this.globalFrameworkTypeMap.set(framework.getFrameworkType(), framework);
+        if (framework['getFrameworkType']) {
+            this.globalFrameworkTypeMap.set(framework['getFrameworkType'](), framework);
+        }
     }
     getFramework(namespaceOrFrameworkType) {
         if (typeof namespaceOrFrameworkType === 'string') {

package/dist/config/config.default.js

@@ -13,8 +13,7 @@ exports.default = (appInfo) => {
                 dir: (0, path_1.join)(logRoot, 'logs', appInfo.name),
                 level: isDevelopment ? 'info' : 'warn',
                 consoleLevel: isDevelopment ? 'info' : 'warn',
-                auditFileDir: (0, path_1.join)(logRoot, 'logs', appInfo.name, '.audit'),
-                errorDir: (0, path_1.join)(logRoot, 'logs', appInfo.name),
+                auditFileDir: '.audit',
             },
             clients: {
                 coreLogger: {

package/dist/context/container.js

@@ -79,7 +79,7 @@ class ContainerConfiguration {
         }
     }
     addImports(imports = []) {
-        var _a, _b, _c;
+        var _a;
         // 处理 imports
         for (let importPackage of imports) {
             if (!importPackage)
@@ -92,8 +92,8 @@ class ContainerConfiguration {
                 this.load(importPackage);
             }
             else if ('component' in importPackage) {
-                if ((_a = importPackage) === null || _a === void 0 ? void 0 : _a.enabledEnvironment) {
-                    if ((_c = (_b = importPackage) === null || _b === void 0 ? void 0 : _b.enabledEnvironment) === null || _c === void 0 ? void 0 : _c.includes(this.container
+                if (importPackage === null || importPackage === void 0 ? void 0 : importPackage.enabledEnvironment) {
+                    if ((_a = importPackage === null || importPackage === void 0 ? void 0 : importPackage.enabledEnvironment) === null || _a === void 0 ? void 0 : _a.includes(this.container
                         .get(environmentService_1.MidwayEnvironmentService)
                         .getCurrentEnvironment())) {
                         this.load(importPackage.component);
@@ -228,7 +228,6 @@ class MidwayContainer {
     }
     load(module) {
         var _a;
-        this.isLoad = true;
         if (module) {
             // load configuration
             const configuration = new ContainerConfiguration(this);
@@ -242,6 +241,7 @@ class MidwayContainer {
                 (0, extend_1.extend)(true, detectorOptionsMerged, detectorOptions);
             }
             (_a = this.fileDetector) === null || _a === void 0 ? void 0 : _a.setExtraDetectorOptions(detectorOptionsMerged);
+            this.isLoad = true;
         }
     }
     loadDefinitions() {

package/dist/error/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/interface.d.ts

@@ -182,6 +182,7 @@ export interface IManagedResolverFactoryCreateOptions {
 export declare const REQUEST_CTX_KEY = "ctx";
 export declare const REQUEST_OBJ_CTX_KEY = "_req_ctx";
 export declare const HTTP_SERVER_KEY = "_midway_http_server";
+export declare const REQUEST_CTX_LOGGER_CACHE_KEY = "_midway_ctx_logger_cache";
 export declare type HandlerFunction = (
 /**
  * decorator uuid key
@@ -330,6 +331,7 @@ export interface IMidwayBaseApplication<CTX extends IMidwayContext> {
      */
     getEnv(): string;
     /**
+     * @deprecated
      * Get current framework type in MidwayFrameworkType enum
      */
     getFrameworkType(): FrameworkType;
@@ -444,7 +446,6 @@ export interface IMidwayFramework<APP extends IMidwayApplication<CTX>, CTX exten
     getApplicationContext(): IMidwayContainer;
     getConfiguration(key?: string): any;
     getCurrentEnvironment(): string;
-    getFrameworkType(): FrameworkType;
     getFrameworkName(): string;
     getAppDir(): string;
     getBaseDir(): string;

package/dist/interface.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.MidwayProcessTypeEnum = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.ObjectLifeCycleEvent = void 0;
+exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.MidwayProcessTypeEnum = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.ObjectLifeCycleEvent = void 0;
 var ObjectLifeCycleEvent;
 (function (ObjectLifeCycleEvent) {
     ObjectLifeCycleEvent["BEFORE_BIND"] = "beforeBind";
@@ -12,6 +12,7 @@ var ObjectLifeCycleEvent;
 exports.REQUEST_CTX_KEY = 'ctx';
 exports.REQUEST_OBJ_CTX_KEY = '_req_ctx';
 exports.HTTP_SERVER_KEY = '_midway_http_server';
+exports.REQUEST_CTX_LOGGER_CACHE_KEY = '_midway_ctx_logger_cache';
 var MidwayProcessTypeEnum;
 (function (MidwayProcessTypeEnum) {
     MidwayProcessTypeEnum["APPLICATION"] = "APPLICATION";

package/dist/service/frameworkService.js

@@ -94,12 +94,6 @@ let MidwayFrameworkService = class MidwayFrameworkService {
         }
         // init aspect module
         await this.aspectService.loadAspect();
-        // some preload module init
-        const modules = (0, decorator_1.listPreloadModule)();
-        for (const module of modules) {
-            // preload init context
-            await this.applicationContext.getAsync(module);
-        }
     }
     getMainApp() {
         var _a;

package/dist/service/loggerService.d.ts

@@ -1,13 +1,13 @@
 import { MidwayConfigService } from './configService';
 import { ServiceFactory } from '../common/serviceFactory';
-import { ILogger } from '@midwayjs/logger';
+import { ILogger, LoggerOptions } from '@midwayjs/logger';
 import { IMidwayContainer } from '../interface';
 export declare class MidwayLoggerService extends ServiceFactory<ILogger> {
     readonly applicationContext: IMidwayContainer;
     configService: MidwayConfigService;
     constructor(applicationContext: IMidwayContainer);
     protected init(): void;
-    protected createClient(config: any, name?: string): void;
+    protected createClient(config: LoggerOptions, name?: string): void;
     getName(): string;
     createLogger(name: any, config: any): ILogger;
     getLogger(name: string): ILogger;

package/dist/setup.js

@@ -72,7 +72,9 @@ async function initializeGlobalApplicationContext(globalOptions) {
         .concat(globalOptions.imports)
         .concat(globalOptions.configurationModule)) {
         // load configuration and component
-        applicationContext.load(configurationModule);
+        if (configurationModule) {
+            applicationContext.load(configurationModule);
+        }
     }
     // bind user code module
     applicationContext.ready();
@@ -92,9 +94,11 @@ async function initializeGlobalApplicationContext(globalOptions) {
     // it will be delay framework initialize in egg cluster mode
     if (!globalOptions.lazyInitializeFramework) {
         // init logger
-        await applicationContext.getAsync(_1.MidwayLoggerService, [
-            applicationContext,
-        ]);
+        const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService, [applicationContext]);
+        if (loggerService.getLogger('appLogger')) {
+            // register global logger
+            applicationContext.registerObject('logger', loggerService.getLogger('appLogger'));
+        }
         // framework/config/plugin/logger/app decorator support
         await applicationContext.getAsync(_1.MidwayFrameworkService, [
             applicationContext,
@@ -104,6 +108,12 @@ async function initializeGlobalApplicationContext(globalOptions) {
         await applicationContext.getAsync(_1.MidwayLifeCycleService, [
             applicationContext,
         ]);
+        // some preload module init
+        const modules = (0, decorator_1.listPreloadModule)();
+        for (const module of modules) {
+            // preload init context
+            await applicationContext.getAsync(module);
+        }
     }
     return applicationContext;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.14-beta.1",
+  "version": "3.1.2",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
+  "gitHead": "4ff3aa892b76d016f0ea123c7f9520d054d5c96b"
 }