@midwayjs/core 3.1.5 → 3.2.0

package/dist/interface.d.ts

@@ -426,7 +426,6 @@ export interface IMidwayBootstrapOptions {
     globalConfig?: Array<{
         [environmentName: string]: Record<string, any>;
     }> | Record<string, any>;
-    lazyInitializeFramework?: boolean;
 }
 export interface IConfigurationOptions {
     logger?: ILogger;

package/dist/setup.d.ts

@@ -1,4 +1,13 @@
 import { IMidwayBootstrapOptions, IMidwayContainer } from './';
+/**
+ * midway framework main entry, this method bootstrap all service and framework.
+ * @param globalOptions
+ */
 export declare function initializeGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): Promise<IMidwayContainer>;
 export declare function destroyGlobalApplicationContext(applicationContext: IMidwayContainer): Promise<void>;
+/**
+ * prepare applicationContext, it use in egg framework.
+ * @param globalOptions
+ */
+export declare function prepareGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): IMidwayContainer;
 //# sourceMappingURL=setup.d.ts.map

package/dist/setup.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
+exports.prepareGlobalApplicationContext = exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
 const _1 = require("./");
 const config_default_1 = require("./config/config.default");
 const decorator_1 = require("@midwayjs/decorator");
@@ -8,7 +8,55 @@ const util = require("util");
 const path_1 = require("path");
 const logger_1 = require("@midwayjs/logger");
 const debug = util.debuglog('midway:debug');
+/**
+ * midway framework main entry, this method bootstrap all service and framework.
+ * @param globalOptions
+ */
 async function initializeGlobalApplicationContext(globalOptions) {
+    const applicationContext = prepareGlobalApplicationContext(globalOptions);
+    // init logger
+    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,
+        globalOptions,
+    ]);
+    // lifecycle support
+    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;
+}
+exports.initializeGlobalApplicationContext = initializeGlobalApplicationContext;
+async function destroyGlobalApplicationContext(applicationContext) {
+    // stop lifecycle
+    const lifecycleService = await applicationContext.getAsync(_1.MidwayLifeCycleService);
+    await lifecycleService.stop();
+    // stop container
+    await applicationContext.stop();
+    (0, decorator_1.clearBindContainer)();
+    logger_1.loggers.close();
+    global['MIDWAY_APPLICATION_CONTEXT'] = undefined;
+    global['MIDWAY_MAIN_FRAMEWORK'] = undefined;
+}
+exports.destroyGlobalApplicationContext = destroyGlobalApplicationContext;
+/**
+ * prepare applicationContext, it use in egg framework.
+ * @param globalOptions
+ */
+function prepareGlobalApplicationContext(globalOptions) {
     var _a, _b, _c, _d;
     debug('[core]: start "initializeGlobalApplicationContext"');
     debug(`[core]: bootstrap options = ${util.inspect(globalOptions)}`);
@@ -91,43 +139,7 @@ async function initializeGlobalApplicationContext(globalOptions) {
     debug('[core]: Current config = %j', configService.getConfiguration());
     // middleware support
     applicationContext.get(_1.MidwayMiddlewareService, [applicationContext]);
-    // it will be delay framework initialize in egg cluster mode
-    if (!globalOptions.lazyInitializeFramework) {
-        // init logger
-        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,
-            globalOptions,
-        ]);
-        // lifecycle support
-        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;
 }
-exports.initializeGlobalApplicationContext = initializeGlobalApplicationContext;
-async function destroyGlobalApplicationContext(applicationContext) {
-    // stop lifecycle
-    const lifecycleService = await applicationContext.getAsync(_1.MidwayLifeCycleService);
-    await lifecycleService.stop();
-    // stop container
-    await applicationContext.stop();
-    (0, decorator_1.clearBindContainer)();
-    logger_1.loggers.close();
-    global['MIDWAY_APPLICATION_CONTEXT'] = undefined;
-    global['MIDWAY_MAIN_FRAMEWORK'] = undefined;
-}
-exports.destroyGlobalApplicationContext = destroyGlobalApplicationContext;
+exports.prepareGlobalApplicationContext = prepareGlobalApplicationContext;
 //# sourceMappingURL=setup.js.map

package/dist/util/httpclient.d.ts

@@ -14,7 +14,13 @@ export interface IResponse extends http.IncomingMessage {
     status: number;
     data: Buffer | string | any;
 }
+export declare function makeHttpRequest(url: string, options?: IOptions): Promise<IResponse>;
+/**
+ * A simple http client
+ */
 export declare class HttpClient {
+    readonly defaultOptions: Pick<IOptions, 'headers' | 'timeout' | 'method'>;
+    constructor(defaultOptions?: Pick<IOptions, 'headers' | 'timeout' | 'method'>);
     request(url: string, options?: IOptions): Promise<IResponse>;
 }
 export {};

package/dist/util/httpclient.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpClient = void 0;
+exports.HttpClient = exports.makeHttpRequest = void 0;
 const http = require("http");
 const https = require("https");
 const url = require("url");
@@ -13,80 +13,90 @@ const mimeMap = {
     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;
+async function makeHttpRequest(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]);
         }
-        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');
+        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);
                     }
-                    if (dataType === 'json') {
-                        try {
-                            data = JSON.parse(data);
-                        }
-                        catch (e) {
-                            return reject(new Error('[httpclient] Unable to parse response 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);
+                }
+                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();
-            }
         });
+        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.makeHttpRequest = makeHttpRequest;
+/**
+ * A simple http client
+ */
+class HttpClient {
+    constructor(defaultOptions = {}) {
+        this.defaultOptions = defaultOptions;
+    }
+    async request(url, options) {
+        return makeHttpRequest(url, Object.assign(this.defaultOptions, options));
     }
 }
 exports.HttpClient = HttpClient;

package/dist/util/index.js

@@ -86,7 +86,7 @@ exports.safelyGet = safelyGet;
  */
 function parsePrefix(provideId) {
     if (provideId.includes('@')) {
-        return provideId.substr(1);
+        return provideId.slice(1);
     }
     return provideId;
 }

package/dist/util/pathToRegexp.js

@@ -80,7 +80,7 @@ function parse(str, options) {
     }
     // Match any characters still remaining.
     if (index < str.length) {
-        path += str.substr(index);
+        path += str.slice(index);
     }
     // If the path exists, push it onto the end.
     if (path) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.1.5",
+  "version": "3.2.0",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.10",
+    "@midwayjs/decorator": "^3.1.6",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "46a7851ad3ce6fc675bd7e1b7c9dff2c70009104"
+  "gitHead": "cee3e5ddbb4f0cc5f80176a7b1e271e809686a97"
 }