@midwayjs/core 3.0.7 → 3.0.11

package/dist/common/fileDetector.d.ts

@@ -1,8 +1,10 @@
 import { IFileDetector, IMidwayContainer } from '../interface';
 export declare abstract class AbstractFileDetector<T> implements IFileDetector {
     options: T;
+    extraDetectorOptions: T;
     constructor(options: any);
     abstract run(container: IMidwayContainer): any;
+    setExtraDetectorOptions(detectorOptions: T): void;
 }
 export declare class DirectoryFileDetector extends AbstractFileDetector<{
     loadDir: string | string[];

package/dist/common/fileDetector.js

@@ -6,6 +6,10 @@ const glob_1 = require("@midwayjs/glob");
 class AbstractFileDetector {
     constructor(options) {
         this.options = options;
+        this.extraDetectorOptions = {};
+    }
+    setExtraDetectorOptions(detectorOptions) {
+        this.extraDetectorOptions = detectorOptions;
     }
 }
 exports.AbstractFileDetector = AbstractFileDetector;
@@ -29,11 +33,13 @@ class DirectoryFileDetector extends AbstractFileDetector {
         this.directoryFilterArray = [];
     }
     run(container) {
-        const loadDirs = [].concat(this.options.loadDir || []);
+        const loadDirs = []
+            .concat(this.options.loadDir || [])
+            .concat(this.extraDetectorOptions.loadDir || []);
         for (const dir of loadDirs) {
-            const fileResults = (0, glob_1.run)(DEFAULT_PATTERN.concat(this.options.pattern || []), {
+            const fileResults = (0, glob_1.run)(DEFAULT_PATTERN.concat(this.options.pattern || []).concat(this.extraDetectorOptions.pattern || []), {
                 cwd: dir,
-                ignore: DEFAULT_IGNORE_PATTERN.concat(this.options.ignore || []),
+                ignore: DEFAULT_IGNORE_PATTERN.concat(this.options.ignore || []).concat(this.extraDetectorOptions.ignore || []),
             });
             for (const file of fileResults) {
                 if (this.directoryFilterArray.length) {

package/dist/context/container.js

@@ -14,6 +14,7 @@ const environmentService_1 = require("../service/environmentService");
 const configService_1 = require("../service/configService");
 const EventEmitter = require("events");
 const error_1 = require("../error");
+const extend_1 = require("../util/extend");
 const debug = util.debuglog('midway:debug');
 const debugBind = util.debuglog('midway:bind');
 class ContainerConfiguration {
@@ -21,6 +22,7 @@ class ContainerConfiguration {
         this.container = container;
         this.loadedMap = new WeakMap();
         this.namespaceList = [];
+        this.detectorOptionsList = [];
     }
     load(module) {
         let namespace = decorator_1.MAIN_MODULE_KEY;
@@ -51,6 +53,9 @@ class ContainerConfiguration {
                     namespace = configurationOptions.namespace;
                     this.namespaceList.push(namespace);
                 }
+                if (configurationOptions.detectorOptions) {
+                    this.detectorOptionsList.push(configurationOptions.detectorOptions);
+                }
                 debug(`[core]: load configuration in namespace="${namespace}"`);
                 this.addImports(configurationOptions.imports);
                 this.addImportObjects(configurationOptions.importObjects);
@@ -164,6 +169,9 @@ class ContainerConfiguration {
     getNamespaceList() {
         return this.namespaceList;
     }
+    getDetectorOptionsList() {
+        return this.detectorOptionsList;
+    }
 }
 class MidwayContainer {
     constructor(parent) {
@@ -219,6 +227,7 @@ class MidwayContainer {
         return this._namespaceSet;
     }
     load(module) {
+        var _a;
         this.isLoad = true;
         if (module) {
             // load configuration
@@ -228,6 +237,11 @@ class MidwayContainer {
                 this.namespaceSet.add(ns);
                 debug(`[core]: load configuration in namespace="${ns}" complete`);
             }
+            const detectorOptionsMerged = {};
+            for (const detectorOptions of configuration.getDetectorOptionsList()) {
+                (0, extend_1.extend)(true, detectorOptionsMerged, detectorOptions);
+            }
+            (_a = this.fileDetector) === null || _a === void 0 ? void 0 : _a.setExtraDetectorOptions(detectorOptionsMerged);
         }
     }
     loadDefinitions() {

package/dist/error/framework.d.ts

@@ -13,6 +13,7 @@ export declare const FrameworkErrorEnum: {
     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);
@@ -50,4 +51,7 @@ export declare class MidwaySingletonInjectRequestError extends MidwayError {
 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.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;
+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,
@@ -15,6 +15,7 @@ exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     USE_WRONG_METHOD: 10009,
     SINGLETON_INJECT_REQUEST: 10010,
     MISSING_IMPORTS: 10011,
+    UTIL_HTTP_TIMEOUT: 10012,
 });
 class MidwayCommonError extends base_1.MidwayError {
     constructor(message) {
@@ -100,4 +101,10 @@ class MidwayMissingImportComponentError extends base_1.MidwayError {
     }
 }
 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

@@ -243,7 +243,8 @@ export interface IMidwayContainer extends IObjectFactory, IObjectLifeCycle {
  */
 export declare type IApplicationContext = IMidwayContainer;
 export interface IFileDetector {
-    run(container: IMidwayContainer): any;
+    run(container: IMidwayContainer, fileDetectorOptions?: Record<string, any>): any;
+    setExtraDetectorOptions(detectorOptions: Record<string, any>): any;
 }
 export interface IConfigService {
     add(configFilePaths: any[]): any;

package/dist/service/loggerService.js

@@ -21,7 +21,7 @@ const levelTransform = level => {
     switch (level) {
         case 'NONE':
         case Infinity: // egg logger 的 none 是这个等级
-            return null;
+            return 'none';
         case 0:
         case 'DEBUG':
         case 'debug':

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.7",
+  "version": "3.0.11",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,10 +21,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.7",
+    "@midwayjs/decorator": "^3.0.10",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
+    "raw-body": "2.5.0",
     "sinon": "13.0.1"
   },
   "peerDependencies": {
@@ -44,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "4ba1e30c46c231abd4188d358f7c9683c9591c54"
+  "gitHead": "a85e2c88a19b0c0e5d2990d04a3c3c1754e2392d"
 }