@midwayjs/core 3.0.4-beta.1 → 3.0.9

package/dist/baseFramework.d.ts

@@ -1,6 +1,6 @@
 import { CommonMiddlewareUnion, IConfigurationOptions, IMidwayApplication, IMidwayBootstrapOptions, IMidwayContainer, IMidwayContext, IMidwayFramework, CommonFilterUnion, CommonMiddleware, MiddlewareRespond } from './interface';
 import { FrameworkType } from '@midwayjs/decorator';
-import { ILogger, LoggerOptions } from '@midwayjs/logger';
+import { ILogger, LoggerOptions, LoggerContextFormat } from '@midwayjs/logger';
 import { MidwayEnvironmentService } from './service/environmentService';
 import { MidwayConfigService } from './service/configService';
 import { MidwayInformationService } from './service/informationService';
@@ -15,8 +15,8 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
     protected logger: ILogger;
     protected appLogger: ILogger;
     protected defaultContext: {};
-    protected BaseContextLoggerClass: any;
-    protected ContextLoggerApplyLogger: string;
+    protected contextLoggerApplyLogger: string;
+    protected contextLoggerFormat: LoggerContextFormat;
     protected middlewareManager: ContextMiddlewareManager<CTX, ResOrNext, Next>;
     protected filterManager: FilterManager<CTX, ResOrNext, Next>;
     protected composeMiddleware: any;
@@ -49,7 +49,6 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
     abstract applicationInitialize(options: IMidwayBootstrapOptions): any;
     abstract getFrameworkType(): FrameworkType;
     abstract run(): Promise<void>;
-    setContextLoggerClass(BaseContextLogger: any): void;
     protected createContextLogger(ctx: CTX, name?: string): ILogger;
     stop(): Promise<void>;
     getAppDir(): string;
@@ -78,7 +77,6 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
     createLogger(name: string, option?: LoggerOptions): ILogger;
     getProjectName(): string;
     getFrameworkName(): string;
-    getDefaultContextLoggerClass(): any;
     useMiddleware(Middleware: CommonMiddlewareUnion<CTX, ResOrNext, Next>): void;
     getMiddleware(): ContextMiddlewareManager<CTX, ResOrNext, Next>;
     useFilter(Filter: CommonFilterUnion<CTX, ResOrNext, Next>): void;

package/dist/baseFramework.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseFramework = void 0;
 const interface_1 = require("./interface");
 const decorator_1 = require("@midwayjs/decorator");
-const logger_1 = require("@midwayjs/logger");
 const requestContainer_1 = require("./context/requestContainer");
 const environmentService_1 = require("./service/environmentService");
 const configService_1 = require("./service/configService");
@@ -32,12 +31,11 @@ class BaseFramework {
         this.composeMiddleware = null;
     }
     async init() {
-        var _a, _b, _c;
+        var _a, _b;
         this.configurationOptions = (_a = this.configure()) !== null && _a !== void 0 ? _a : {};
-        this.BaseContextLoggerClass =
-            (_b = this.configurationOptions.ContextLoggerClass) !== null && _b !== void 0 ? _b : this.getDefaultContextLoggerClass();
-        this.ContextLoggerApplyLogger =
-            (_c = this.configurationOptions.ContextLoggerApplyLogger) !== null && _c !== void 0 ? _c : 'appLogger';
+        this.contextLoggerApplyLogger =
+            (_b = this.configurationOptions.contextLoggerApplyLogger) !== null && _b !== void 0 ? _b : 'appLogger';
+        this.contextLoggerFormat = this.configurationOptions.contextLoggerFormat;
         this.logger = this.loggerService.getLogger('coreLogger');
         this.appLogger = this.loggerService.getLogger('appLogger');
         return this;
@@ -86,12 +84,11 @@ class BaseFramework {
     getApplication() {
         return this.app;
     }
-    setContextLoggerClass(BaseContextLogger) {
-        this.BaseContextLoggerClass = BaseContextLogger;
-    }
     createContextLogger(ctx, name) {
-        const appLogger = this.getLogger(name !== null && name !== void 0 ? name : this.ContextLoggerApplyLogger);
-        return new this.BaseContextLoggerClass(ctx, appLogger);
+        const appLogger = this.getLogger(name !== null && name !== void 0 ? name : this.contextLoggerApplyLogger);
+        return appLogger.createContextLogger(ctx, {
+            contextFormat: this.contextLoggerFormat,
+        });
     }
     async stop() {
         await this.beforeStop();
@@ -162,9 +159,6 @@ class BaseFramework {
                 };
                 return ctx;
             },
-            setContextLoggerClass: (BaseContextLogger) => {
-                return this.setContextLoggerClass(BaseContextLogger);
-            },
             addConfigObject: (obj) => {
                 this.configService.addObject(obj);
             },
@@ -249,9 +243,6 @@ class BaseFramework {
     getFrameworkName() {
         return this.getFrameworkType().name;
     }
-    getDefaultContextLoggerClass() {
-        return logger_1.MidwayContextLogger;
-    }
     useMiddleware(Middleware) {
         this.middlewareManager.insertLast(Middleware);
     }

package/dist/context/container.js

@@ -165,8 +165,6 @@ class ContainerConfiguration {
         return this.namespaceList;
     }
 }
-class ObjectCreateEventTarget extends EventEmitter {
-}
 class MidwayContainer {
     constructor(parent) {
         this._resolverFactory = null;
@@ -189,7 +187,7 @@ class MidwayContainer {
     }
     get objectCreateEventTarget() {
         if (!this._objectCreateEventTarget) {
-            this._objectCreateEventTarget = new ObjectCreateEventTarget();
+            this._objectCreateEventTarget = new EventEmitter();
         }
         return this._objectCreateEventTarget;
     }
@@ -228,7 +226,7 @@ class MidwayContainer {
             configuration.load(module);
             for (const ns of configuration.getNamespaceList()) {
                 this.namespaceSet.add(ns);
-                debug(`[core]: load configuration in namespace="${ns} complete"`);
+                debug(`[core]: load configuration in namespace="${ns}" complete`);
             }
         }
     }
@@ -294,6 +292,7 @@ class MidwayContainer {
             const refManaged = new managedResolverFactory_1.ManagedReference();
             refManaged.args = propertyMeta.args;
             refManaged.name = propertyMeta.value;
+            refManaged.injectMode = propertyMeta['injectMode'];
             definition.properties.set(propertyMeta['targetKey'], refManaged);
         }
         // inject custom properties

package/dist/context/managedResolverFactory.d.ts

@@ -1,11 +1,12 @@
 /**
  * 管理对象解析构建
  */
-import { IManagedInstance, ObjectIdentifier } from '@midwayjs/decorator';
+import { IManagedInstance, InjectModeEnum, ObjectIdentifier } from '@midwayjs/decorator';
 import { IManagedResolver, IObjectDefinition, IManagedResolverFactoryCreateOptions, IMidwayContainer } from '../interface';
 export declare class ManagedReference implements IManagedInstance {
     type: string;
     name: string;
+    injectMode: InjectModeEnum;
     args?: any;
 }
 /**

package/dist/context/managedResolverFactory.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManagedResolverFactory = exports.ManagedReference = void 0;
+/**
+ * 管理对象解析构建
+ */
+const decorator_1 = require("@midwayjs/decorator");
 const constants_1 = require("../common/constants");
 const interface_1 = require("../interface");
 const util = require("util");
@@ -24,13 +28,23 @@ class RefResolver {
         return constants_1.KEYS.REF_ELEMENT;
     }
     resolve(managed, originName) {
+        var _a;
         const mr = managed;
+        if (mr.injectMode === decorator_1.InjectModeEnum.Class &&
+            !((_a = this.factory.context.parent) !== null && _a !== void 0 ? _a : this.factory.context).hasDefinition(mr.name)) {
+            throw new error_1.MidwayMissingImportComponentError(originName);
+        }
         return this.factory.context.get(mr.name, mr.args, {
             originName,
         });
     }
     async resolveAsync(managed, originName) {
+        var _a;
         const mr = managed;
+        if (mr.injectMode === decorator_1.InjectModeEnum.Class &&
+            !((_a = this.factory.context.parent) !== null && _a !== void 0 ? _a : this.factory.context).hasDefinition(mr.name)) {
+            throw new error_1.MidwayMissingImportComponentError(originName);
+        }
         return this.factory.context.getAsync(mr.name, mr.args, {
             originName,
         });

package/dist/error/framework.d.ts

@@ -12,6 +12,8 @@ export declare const FrameworkErrorEnum: {
     readonly DUPLICATE_ROUTER: "MIDWAY_10008";
     readonly USE_WRONG_METHOD: "MIDWAY_10009";
     readonly SINGLETON_INJECT_REQUEST: "MIDWAY_10010";
+    readonly MISSING_IMPORTS: "MIDWAY_10011";
+    readonly UTIL_HTTP_TIMEOUT: "MIDWAY_10012";
 };
 export declare class MidwayCommonError extends MidwayError {
     constructor(message: string);
@@ -46,4 +48,10 @@ export declare class MidwayUseWrongMethodError extends MidwayError {
 export declare class MidwaySingletonInjectRequestError extends MidwayError {
     constructor(singletonScopeName: string, requestScopeName: string);
 }
+export declare class MidwayMissingImportComponentError extends MidwayError {
+    constructor(originName: string);
+}
+export declare class MidwayUtilHttpClientTimeoutError extends MidwayError {
+    constructor(message: string);
+}
 //# sourceMappingURL=framework.d.ts.map

package/dist/error/framework.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwaySingletonInjectRequestError = exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
+exports.MidwayUtilHttpClientTimeoutError = exports.MidwayMissingImportComponentError = exports.MidwaySingletonInjectRequestError = exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
 const base_1 = require("./base");
 exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     UNKNOWN: 10000,
@@ -14,6 +14,8 @@ exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     DUPLICATE_ROUTER: 10008,
     USE_WRONG_METHOD: 10009,
     SINGLETON_INJECT_REQUEST: 10010,
+    MISSING_IMPORTS: 10011,
+    UTIL_HTTP_TIMEOUT: 10012,
 });
 class MidwayCommonError extends base_1.MidwayError {
     constructor(message) {
@@ -92,4 +94,17 @@ class MidwaySingletonInjectRequestError extends base_1.MidwayError {
     }
 }
 exports.MidwaySingletonInjectRequestError = MidwaySingletonInjectRequestError;
+class MidwayMissingImportComponentError extends base_1.MidwayError {
+    constructor(originName) {
+        const text = `"${originName}" can't inject and maybe forgot add "{imports: [***]}" in @Configuration.`;
+        super(text, exports.FrameworkErrorEnum.MISSING_IMPORTS);
+    }
+}
+exports.MidwayMissingImportComponentError = MidwayMissingImportComponentError;
+class MidwayUtilHttpClientTimeoutError extends base_1.MidwayError {
+    constructor(message) {
+        super(message, exports.FrameworkErrorEnum.UTIL_HTTP_TIMEOUT);
+    }
+}
+exports.MidwayUtilHttpClientTimeoutError = MidwayUtilHttpClientTimeoutError;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -28,6 +28,7 @@ export * from './common/fileDetector';
 export * from './common/webGenerator';
 export * from './common/middlewareManager';
 export * from './util/pathToRegexp';
+export * from './util/httpclient';
 export * from './common/filterManager';
 export * from './common/applicationManager';
 export * from './setup';

package/dist/index.js

@@ -63,6 +63,7 @@ __exportStar(require("./common/fileDetector"), exports);
 __exportStar(require("./common/webGenerator"), exports);
 __exportStar(require("./common/middlewareManager"), exports);
 __exportStar(require("./util/pathToRegexp"), exports);
+__exportStar(require("./util/httpclient"), exports);
 __exportStar(require("./common/filterManager"), exports);
 __exportStar(require("./common/applicationManager"), exports);
 __exportStar(require("./setup"), exports);

package/dist/interface.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ObjectIdentifier, IManagedInstance, IMethodAspect, ScopeEnum, FrameworkType } from '@midwayjs/decorator';
-import { ILogger, LoggerOptions } from '@midwayjs/logger';
+import { ILogger, LoggerOptions, LoggerContextFormat } from '@midwayjs/logger';
 import * as EventEmitter from 'events';
 import { ContextMiddlewareManager } from './common/middlewareManager';
 import _default from './config/config.default';
@@ -427,8 +427,8 @@ export interface IMidwayBootstrapOptions {
 export interface IConfigurationOptions {
     logger?: ILogger;
     appLogger?: ILogger;
-    ContextLoggerClass?: any;
-    ContextLoggerApplyLogger?: string;
+    contextLoggerApplyLogger?: string;
+    contextLoggerFormat?: LoggerContextFormat;
 }
 export interface IMidwayFramework<APP extends IMidwayApplication<CTX>, CTX extends IMidwayContext, CONFIG extends IConfigurationOptions, ResOrNext = unknown, Next = unknown> {
     app: APP;
@@ -450,7 +450,6 @@ export interface IMidwayFramework<APP extends IMidwayApplication<CTX>, CTX exten
     getCoreLogger(): ILogger;
     createLogger(name: string, options: LoggerOptions): ILogger;
     getProjectName(): string;
-    getDefaultContextLoggerClass(): any;
     useMiddleware(Middleware: CommonMiddlewareUnion<CTX, ResOrNext, Next>): void;
     getMiddleware(): ContextMiddlewareManager<CTX, ResOrNext, Next>;
     applyMiddleware(lastMiddleware?: CommonMiddleware<CTX, ResOrNext, Next>): Promise<MiddlewareRespond<CTX, ResOrNext, Next>>;

package/dist/setup.js

@@ -38,14 +38,14 @@ async function initializeGlobalApplicationContext(globalOptions) {
     // bind inner service
     applicationContext.bindClass(_1.MidwayEnvironmentService);
     applicationContext.bindClass(_1.MidwayInformationService);
+    applicationContext.bindClass(_1.MidwayAspectService);
     applicationContext.bindClass(_1.MidwayDecoratorService);
     applicationContext.bindClass(_1.MidwayConfigService);
-    applicationContext.bindClass(_1.MidwayAspectService);
     applicationContext.bindClass(_1.MidwayLoggerService);
+    applicationContext.bindClass(_1.MidwayApplicationManager);
     applicationContext.bindClass(_1.MidwayFrameworkService);
     applicationContext.bindClass(_1.MidwayMiddlewareService);
     applicationContext.bindClass(_1.MidwayLifeCycleService);
-    applicationContext.bindClass(_1.MidwayApplicationManager);
     // bind preload module
     if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
         for (const preloadModule of globalOptions.preloadModules) {

package/dist/util/httpclient.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="node" />
+import http = require('http');
+declare type MethodType = 'GET' | 'POST';
+declare type MimeType = 'text' | 'json' | undefined;
+interface IOptions {
+    method?: MethodType;
+    headers?: any;
+    contentType?: MimeType;
+    dataType?: MimeType;
+    data?: any;
+    timeout?: number;
+}
+export interface IResponse extends http.IncomingMessage {
+    status: number;
+    data: Buffer | string | any;
+}
+export declare class HttpClient {
+    request(url: string, options?: IOptions): Promise<IResponse>;
+}
+export {};
+//# sourceMappingURL=httpclient.d.ts.map

package/dist/util/httpclient.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpClient = void 0;
+const http = require("http");
+const https = require("https");
+const url = require("url");
+const util_1 = require("util");
+const error_1 = require("../error");
+const debug = (0, util_1.debuglog)('request-client');
+const URL = url.URL;
+const mimeMap = {
+    text: 'application/text',
+    json: 'application/json',
+    octet: 'application/octet-stream',
+};
+class HttpClient {
+    async request(url, options = {}) {
+        debug(`request '${url}'`);
+        const whatwgUrl = new URL(url);
+        const client = whatwgUrl.protocol === 'https:' ? https : http;
+        const contentType = options.contentType;
+        const dataType = options.dataType;
+        const method = options.method || 'GET';
+        const timeout = options.timeout || 5000;
+        const headers = {
+            Accept: mimeMap[dataType] || mimeMap.octet,
+            ...options.headers,
+        };
+        let data;
+        if (method === 'GET' && options.data) {
+            for (const key of Object.keys(options.data)) {
+                whatwgUrl.searchParams.set(key, options.data[key]);
+            }
+            headers['Content-Length'] = 0;
+        }
+        else if (options.data) {
+            data = Buffer.from(JSON.stringify(options.data));
+            headers['Content-Type'] = mimeMap[contentType] || mimeMap.octet;
+            headers['Content-Length'] = data.byteLength;
+        }
+        return new Promise((resolve, reject) => {
+            const req = client.request(whatwgUrl.toString(), {
+                method,
+                headers,
+            }, res => {
+                res.setTimeout(timeout, () => {
+                    res.destroy(new Error('Response Timeout'));
+                });
+                res.on('error', error => {
+                    reject(error);
+                });
+                const chunks = [];
+                res.on('data', chunk => {
+                    chunks.push(chunk);
+                });
+                res.on('end', () => {
+                    let data = Buffer.concat(chunks);
+                    if (dataType === 'text' || dataType === 'json') {
+                        data = data.toString('utf8');
+                    }
+                    if (dataType === 'json') {
+                        try {
+                            data = JSON.parse(data);
+                        }
+                        catch (e) {
+                            return reject(new Error('[httpclient] Unable to parse response data'));
+                        }
+                    }
+                    Object.assign(res, {
+                        status: res.statusCode,
+                        data,
+                    });
+                    debug(`request '${url}' resolved with status ${res.statusCode}`);
+                    resolve(res);
+                });
+            });
+            req.setTimeout(timeout, () => {
+                req.destroy(new error_1.MidwayUtilHttpClientTimeoutError('Request Timeout'));
+            });
+            req.on('error', error => {
+                reject(error);
+            });
+            if (method !== 'GET') {
+                req.end(data);
+            }
+            else {
+                req.end();
+            }
+        });
+    }
+}
+exports.HttpClient = HttpClient;
+//# sourceMappingURL=httpclient.js.map

package/dist/util/index.d.ts

@@ -38,7 +38,7 @@ export declare function joinURLPath(...strArray: any[]): string;
  * @param constructors
  * @since 2.0.0
  */
-export declare function delegateTargetPrototypeMethod(derivedCtor: any, constructors: any[]): void;
+export declare function delegateTargetPrototypeMethod(derivedCtor: any, constructors: any[], otherMethods?: string[]): void;
 /**
  * 代理目标原型上的特定方法
  * @param derivedCtor

package/dist/util/index.js

@@ -114,7 +114,7 @@ exports.joinURLPath = joinURLPath;
  * @param constructors
  * @since 2.0.0
  */
-function delegateTargetPrototypeMethod(derivedCtor, constructors) {
+function delegateTargetPrototypeMethod(derivedCtor, constructors, otherMethods) {
     constructors.forEach(baseCtor => {
         Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => {
             if (name !== 'constructor' && !/^_/.test(name)) {
@@ -124,6 +124,9 @@ function delegateTargetPrototypeMethod(derivedCtor, constructors) {
             }
         });
     });
+    if (otherMethods) {
+        delegateTargetMethod(derivedCtor, otherMethods);
+    }
 }
 exports.delegateTargetPrototypeMethod = delegateTargetPrototypeMethod;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.4-beta.1",
+  "version": "3.0.9",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,18 +21,19 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.4-beta.1",
+    "@midwayjs/decorator": "^3.0.7",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
-    "sinon": "12.0.1"
+    "raw-body": "2.4.3",
+    "sinon": "13.0.1"
   },
   "peerDependencies": {
     "@midwayjs/decorator": "*"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "^2.14.0",
+    "@midwayjs/logger": "^2.15.0",
     "class-transformer": "^0.5.1",
     "picomatch": "2.3.1"
   },
@@ -44,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "52bc37e7a570806c121b33a0e8ac1cd084445f5d"
+  "gitHead": "6fbf54fb8840844c229d2cf11b30128c67cbeaf1"
 }