@midwayjs/mock 3.9.0 → 3.10.1

package/dist/client/rabbitMQ.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="bluebird" />
 import type { Channel, Options } from 'amqplib';
 declare class ChannelManager {
     private connection;
@@ -11,7 +10,7 @@ declare class ChannelManager {
     createChannel(queueName: any): Promise<Channel>;
     sendToQueue(queueName: string, content: Buffer, options?: Options.Publish): boolean;
     sendToExchange(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish): boolean;
-    assertExchange(exchange: string, type: 'direct' | 'topic' | 'headers' | 'fanout' | 'match' | string, options?: Options.AssertExchange): import("bluebird")<import("amqplib").Replies.AssertExchange>;
+    assertExchange(exchange: string, type: 'direct' | 'topic' | 'headers' | 'fanout' | 'match' | string, options?: Options.AssertExchange): Promise<import("amqplib").Replies.AssertExchange>;
     close(): Promise<void>;
 }
 export declare function createRabbitMQProducer(options: {

package/dist/creator.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBootstrap = exports.createLightApp = exports.createFunctionApp = exports.close = exports.createApp = exports.create = void 0;
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
 const logger_1 = require("@midwayjs/logger");
 const utils_1 = require("./utils");
 const util_1 = require("util");
@@ -24,95 +23,121 @@ function formatPath(baseDir, p) {
 async function create(appDir = process.cwd(), options, customFramework) {
     debug(`[mock]: Create app, appDir="${appDir}"`);
     process.env.MIDWAY_TS_MODE = 'true';
-    if (appDir) {
-        // 处理测试的 fixtures
-        if (!(0, path_1.isAbsolute)(appDir)) {
-            appDir = (0, path_1.join)(process.cwd(), 'test', 'fixtures', appDir);
+    try {
+        if (appDir) {
+            // 处理测试的 fixtures
+            if (!(0, path_1.isAbsolute)(appDir)) {
+                appDir = (0, path_1.join)(process.cwd(), 'test', 'fixtures', appDir);
+            }
+            if (!(0, fs_1.existsSync)(appDir)) {
+                throw new core_1.MidwayCommonError(`Path "${appDir}" not exists, please check it.`);
+            }
+        }
+        (0, logger_1.clearAllLoggers)();
+        options = options || {};
+        if (options.baseDir) {
+            (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
         }
-        if (!(0, fs_1.existsSync)(appDir)) {
-            throw new core_1.MidwayCommonError(`Path "${appDir}" not exists, please check it.`);
+        else if (appDir) {
+            options.baseDir = `${appDir}/src`;
+            (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
         }
-    }
-    (0, logger_1.clearAllLoggers)();
-    options = options || {};
-    if (options.baseDir) {
-        (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
-    }
-    else if (appDir) {
-        options.baseDir = `${appDir}/src`;
-        (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
-    }
-    if (options.entryFile) {
-        // start from entry file, like bootstrap.js
-        options.entryFile = formatPath(appDir, options.entryFile);
-        global['MIDWAY_BOOTSTRAP_APP_READY'] = false;
-        // set app in @midwayjs/bootstrap
-        require(options.entryFile);
-        await new Promise((resolve, reject) => {
-            const timeoutHandler = setTimeout(() => {
-                clearInterval(internalHandler);
-                reject(new Error('[midway]: bootstrap timeout'));
-            }, options.bootstrapTimeout || 30 * 1000);
-            const internalHandler = setInterval(() => {
-                if (global['MIDWAY_BOOTSTRAP_APP_READY'] === true) {
+        if (options.entryFile) {
+            // start from entry file, like bootstrap.js
+            options.entryFile = formatPath(appDir, options.entryFile);
+            global['MIDWAY_BOOTSTRAP_APP_READY'] = false;
+            // set app in @midwayjs/bootstrap
+            require(options.entryFile);
+            await new Promise((resolve, reject) => {
+                const timeoutHandler = setTimeout(() => {
                     clearInterval(internalHandler);
-                    clearTimeout(timeoutHandler);
-                    resolve();
+                    reject(new Error('[midway]: bootstrap timeout'));
+                }, options.bootstrapTimeout || 30 * 1000);
+                const internalHandler = setInterval(() => {
+                    if (global['MIDWAY_BOOTSTRAP_APP_READY'] === true) {
+                        clearInterval(internalHandler);
+                        clearTimeout(timeoutHandler);
+                        resolve();
+                    }
+                    else {
+                        debug('[mock]: bootstrap not ready and wait next check');
+                    }
+                }, 200);
+            });
+            return;
+        }
+        if (!options.imports && customFramework) {
+            options.imports = (0, utils_1.transformFrameworkToConfiguration)(customFramework);
+        }
+        if (customFramework === null || customFramework === void 0 ? void 0 : customFramework['Configuration']) {
+            options.imports = customFramework;
+            customFramework = customFramework['Framework'];
+        }
+        if (options.ssl) {
+            const sslConfig = {
+                koa: {
+                    key: (0, path_1.join)(__dirname, '../ssl/ssl.key'),
+                    cert: (0, path_1.join)(__dirname, '../ssl/ssl.pem'),
+                },
+                egg: {
+                    key: (0, path_1.join)(__dirname, '../ssl/ssl.key'),
+                    cert: (0, path_1.join)(__dirname, '../ssl/ssl.pem'),
+                },
+                express: {
+                    key: (0, path_1.join)(__dirname, '../ssl/ssl.key'),
+                    cert: (0, path_1.join)(__dirname, '../ssl/ssl.pem'),
+                },
+            };
+            options.globalConfig = (0, utils_1.mergeGlobalConfig)(options.globalConfig, sslConfig);
+        }
+        const container = new core_1.MidwayContainer();
+        const bindModuleMap = new WeakMap();
+        // 这里设置是因为在 midway 单测中会不断的复用装饰器元信息，又不能清理缓存，所以在这里做一些过滤
+        container.onBeforeBind(target => {
+            bindModuleMap.set(target, true);
+        });
+        const originMethod = container.listModule;
+        container.listModule = key => {
+            const modules = originMethod.call(container, key);
+            if (key === core_1.CONFIGURATION_KEY) {
+                return modules;
+            }
+            return modules.filter((module) => {
+                var _a;
+                if (bindModuleMap.has(module)) {
+                    return true;
                 }
                 else {
-                    debug('[mock]: bootstrap not ready and wait next check');
+                    debug('[mock] Filter "%o" module without binding when list module %s.', (_a = module.name) !== null && _a !== void 0 ? _a : module, key);
+                    return false;
                 }
-            }, 200);
+            });
+        };
+        options.applicationContext = container;
+        await (0, core_1.initializeGlobalApplicationContext)({
+            ...options,
+            appDir,
+            asyncContextManager: (0, async_hooks_context_manager_1.createContextManager)(),
+            imports: []
+                .concat(options.imports)
+                .concat(options.baseDir
+                ? (0, core_1.safeRequire)((0, path_1.join)(options.baseDir, 'configuration'))
+                : []),
         });
-        return;
-    }
-    if (!options.imports && customFramework) {
-        options.imports = (0, utils_1.transformFrameworkToConfiguration)(customFramework);
-    }
-    if (customFramework === null || customFramework === void 0 ? void 0 : customFramework['Configuration']) {
-        options.imports = customFramework;
-        customFramework = customFramework['Framework'];
-    }
-    const container = new core_1.MidwayContainer();
-    const bindModuleMap = new WeakMap();
-    // 这里设置是因为在 midway 单测中会不断的复用装饰器元信息，又不能清理缓存，所以在这里做一些过滤
-    container.onBeforeBind(target => {
-        bindModuleMap.set(target, true);
-    });
-    const originMethod = container.listModule;
-    container.listModule = key => {
-        const modules = originMethod.call(container, key);
-        if (key === core_1.CONFIGURATION_KEY) {
-            return modules;
+        if (customFramework) {
+            return container.getAsync(customFramework);
+        }
+        else {
+            const frameworkService = await container.getAsync(core_1.MidwayFrameworkService);
+            return frameworkService.getMainFramework();
         }
-        return modules.filter((module) => {
-            var _a;
-            if (bindModuleMap.has(module)) {
-                return true;
-            }
-            else {
-                debug('[mock] Filter "%o" module without binding when list module %s.', (_a = module.name) !== null && _a !== void 0 ? _a : module, key);
-                return false;
-            }
-        });
-    };
-    options.applicationContext = container;
-    await (0, core_1.initializeGlobalApplicationContext)({
-        ...options,
-        appDir,
-        asyncContextManager: (0, async_hooks_context_manager_1.createContextManager)(),
-        imports: []
-            .concat(options.imports)
-            .concat(options.baseDir
-            ? (0, core_1.safeRequire)((0, path_1.join)(options.baseDir, 'configuration'))
-            : []),
-    });
-    if (customFramework) {
-        return container.getAsync(customFramework);
     }
-    else {
-        const frameworkService = await container.getAsync(core_1.MidwayFrameworkService);
-        return frameworkService.getMainFramework();
+    catch (err) {
+        // catch for jest beforeAll can't throw error
+        if (process.env.JEST_WORKER_ID) {
+            console.error(err);
+        }
+        throw err;
     }
 }
 exports.create = create;
@@ -130,11 +155,11 @@ async function close(app, options) {
     if ((0, utils_1.isTestEnvironment)()) {
         // clean first
         if (options.cleanLogsDir && !(0, utils_1.isWin32)()) {
-            await (0, fs_extra_1.remove)((0, path_1.join)(app.getAppDir(), 'logs'));
+            await (0, utils_1.removeFile)((0, path_1.join)(app.getAppDir(), 'logs'));
         }
         if (core_1.MidwayFrameworkType.WEB === app.getFrameworkType()) {
             if (options.cleanTempDir && !(0, utils_1.isWin32)()) {
-                await (0, fs_extra_1.remove)((0, path_1.join)(app.getAppDir(), 'run'));
+                await (0, utils_1.removeFile)((0, path_1.join)(app.getAppDir(), 'run'));
             }
         }
         if (options.sleep > 0) {
@@ -170,12 +195,14 @@ async function createFunctionApp(baseDir = process.cwd(), options = {}, customFr
         options.appDir = baseDir;
         debug(`[mock]: Create app, appDir="${options.appDir}"`);
         process.env.MIDWAY_TS_MODE = 'true';
-        // 处理测试的 fixtures
-        if (!(0, path_1.isAbsolute)(options.appDir)) {
-            options.appDir = (0, path_1.join)(process.cwd(), 'test', 'fixtures', options.appDir);
-        }
-        if (!(0, fs_1.existsSync)(options.appDir)) {
-            throw new core_1.MidwayCommonError(`Path "${options.appDir}" not exists, please check it.`);
+        if (options.appDir) {
+            // 处理测试的 fixtures
+            if (!(0, path_1.isAbsolute)(options.appDir)) {
+                options.appDir = (0, path_1.join)(process.cwd(), 'test', 'fixtures', options.appDir);
+            }
+            if (!(0, fs_1.existsSync)(options.appDir)) {
+                throw new core_1.MidwayCommonError(`Path "${options.appDir}" not exists, please check it.`);
+            }
         }
         (0, logger_1.clearAllLoggers)();
         options = options || {};
@@ -197,38 +224,81 @@ async function createFunctionApp(baseDir = process.cwd(), options = {}, customFr
         const app = appManager.getApplication(core_1.MidwayFrameworkType.FAAS);
         const faasConfig = (_b = configService.getConfiguration('faas')) !== null && _b !== void 0 ? _b : {};
         const customPort = (_d = (_c = process.env.MIDWAY_HTTP_PORT) !== null && _c !== void 0 ? _c : faasConfig['port']) !== null && _d !== void 0 ? _d : options['port'];
-        app.callback2 = () => {
-            // mock a real http server response for local dev
-            return async (req, res) => {
-                const url = new URL(req.url, `http://${req.headers.host}`);
-                req.query = Object.fromEntries(url.searchParams);
-                req.path = url.pathname;
-                // 如果需要解析body并且body是个stream，函数网关不会接受比 10m 更大的文件了
-                if (['post', 'put', 'delete'].indexOf(req.method.toLowerCase()) !== -1 &&
-                    !req.body &&
-                    typeof req.on === 'function') {
-                    req.body = await getRawBody(req, {
-                        limit: '10mb',
+        if (options.starter.callback2) {
+            app.callback2 = options.starter.callback2;
+        }
+        else {
+            app.callback2 = () => {
+                // mock a real http server response for local dev
+                return async (req, res) => {
+                    const url = new URL(req.url, `http://${req.headers.host}`);
+                    req.query = Object.fromEntries(url.searchParams);
+                    req.path = url.pathname;
+                    // 如果需要解析body并且body是个stream，函数网关不会接受比 10m 更大的文件了
+                    if (['post', 'put', 'delete'].indexOf(req.method.toLowerCase()) !==
+                        -1 &&
+                        !req.body &&
+                        typeof req.on === 'function') {
+                        req.body = await getRawBody(req, {
+                            limit: '10mb',
+                        });
+                    }
+                    req.getOriginEvent = () => {
+                        var _a;
+                        return ((_a = options.starter) === null || _a === void 0 ? void 0 : _a.createDefaultMockHttpEvent()) || {};
+                    };
+                    req.getOriginContext = () => {
+                        var _a;
+                        return ((_a = options.starter) === null || _a === void 0 ? void 0 : _a.createDefaultMockContext()) || {};
+                    };
+                    const ctx = await framework.wrapHttpRequest(req);
+                    // create event and invoke
+                    const result = await framework.invokeTriggerFunction(ctx, url.pathname, {
+                        isHttpFunction: true,
                     });
-                }
-                const ctx = await framework.wrapHttpRequest(req);
-                // create event and invoke
-                const result = await framework.invokeTriggerFunction(ctx, url.pathname, {
-                    isHttpFunction: true,
-                });
-                const { statusCode, headers, body } = result;
-                if (res.headersSent) {
-                    return;
-                }
-                for (const key in headers) {
-                    res.setHeader(key, headers[key]);
-                }
-                if (res.statusCode !== statusCode) {
-                    res.statusCode = statusCode;
-                }
-                // http trigger only support `Buffer` or a `string` or a `stream.Readable`
-                res.end(body);
+                    const { statusCode, headers, body } = result;
+                    if (res.headersSent) {
+                        return;
+                    }
+                    for (const key in headers) {
+                        res.setHeader(key, headers[key]);
+                    }
+                    if (res.statusCode !== statusCode) {
+                        res.statusCode = statusCode;
+                    }
+                    // http trigger only support `Buffer` or a `string` or a `stream.Readable`
+                    res.end(body);
+                };
             };
+        }
+        app.getServerlessInstance = async (serviceClass, customContext = {}) => {
+            const instance = new Proxy({}, {
+                get: (target, prop) => {
+                    let funcInfo;
+                    if (typeof serviceClass === 'string') {
+                        funcInfo = framework['funMappingStore'].get(`${serviceClass}.${prop}`);
+                    }
+                    else {
+                        funcInfo = Array.from(framework['funMappingStore'].values()).find((item) => {
+                            return (item.id === (0, core_1.getProviderUUId)(serviceClass) &&
+                                item.method === prop);
+                        });
+                    }
+                    if (funcInfo) {
+                        return async (...args) => {
+                            var _a, _b, _c, _d, _e;
+                            const context = app.createAnonymousContext({
+                                originContext: (_b = customContext !== null && customContext !== void 0 ? customContext : (_a = options.starter) === null || _a === void 0 ? void 0 : _a.createDefaultMockContext()) !== null && _b !== void 0 ? _b : {},
+                                originEvent: (_e = (_c = args[0]) !== null && _c !== void 0 ? _c : (_d = options.starter) === null || _d === void 0 ? void 0 : _d.createDefaultMockEvent()) !== null && _e !== void 0 ? _e : {},
+                            });
+                            return framework.invokeTriggerFunction(context, funcInfo.funcHandlerName, {
+                                isHttpFunction: false,
+                            });
+                        };
+                    }
+                },
+            });
+            return instance;
         };
         if (customPort) {
             await new Promise(resolve => {

package/dist/interface.d.ts

@@ -2,8 +2,9 @@ import { IMidwayBootstrapOptions } from '@midwayjs/core';
 export interface MockAppConfigurationOptions extends IMidwayBootstrapOptions {
     cleanLogsDir?: boolean;
     cleanTempDir?: boolean;
+    ssl?: boolean;
 }
-export declare type ComponentModule = {
+export type ComponentModule = {
     Configuration: new () => any;
 };
 //# sourceMappingURL=interface.d.ts.map

package/dist/utils.d.ts

@@ -11,4 +11,6 @@ export declare function transformFrameworkToConfiguration<T extends IMidwayFrame
     [key: string]: any;
     Configuration: any;
 };
+export declare function removeFile(file: string): Promise<void>;
+export declare function mergeGlobalConfig(globalConfig: any, newConfigObject: Record<string, any>): any;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -6,10 +6,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformFrameworkToConfiguration = exports.findFirstExistModule = exports.isWin32 = exports.isTestEnvironment = void 0;
+exports.mergeGlobalConfig = exports.removeFile = exports.transformFrameworkToConfiguration = exports.findFirstExistModule = exports.isWin32 = exports.isTestEnvironment = void 0;
 const core_1 = require("@midwayjs/core");
 const os = require("os");
 const assert = require("assert");
+const promises_1 = require("fs/promises");
 function isTestEnvironment() {
     const testEnv = ['test', 'unittest'];
     return (testEnv.includes(process.env.MIDWAY_SERVER_ENV) ||
@@ -70,4 +71,38 @@ function transformFrameworkToConfiguration(Framework) {
     };
 }
 exports.transformFrameworkToConfiguration = transformFrameworkToConfiguration;
+async function removeFile(file) {
+    try {
+        await (0, promises_1.access)(file, promises_1.constants.W_OK);
+        await (0, promises_1.unlink)(file);
+    }
+    catch (_a) {
+        // ignore
+    }
+}
+exports.removeFile = removeFile;
+function mergeGlobalConfig(globalConfig, newConfigObject) {
+    if (globalConfig) {
+        if (Array.isArray(globalConfig)) {
+            globalConfig.push({
+                default: {
+                    ...newConfigObject,
+                },
+            });
+        }
+        else {
+            globalConfig = {
+                ...newConfigObject,
+                ...globalConfig,
+            };
+        }
+    }
+    else {
+        globalConfig = {
+            ...newConfigObject,
+        };
+    }
+    return globalConfig;
+}
+exports.mergeGlobalConfig = mergeGlobalConfig;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mock",
-  "version": "3.9.0",
+  "version": "3.10.1",
   "description": "create your test app from midway framework",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -27,28 +27,27 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.9.0",
+    "@midwayjs/core": "^3.10.1",
     "@midwayjs/logger": "^2.15.0",
-    "@types/amqplib": "0.8.2",
+    "@types/amqplib": "0.10.1",
     "amqplib": "0.10.3",
     "kafkajs": "2.2.3",
-    "socket.io": "4.5.3",
-    "socket.io-client": "4.5.3",
-    "ws": "8.10.0"
+    "socket.io": "4.5.4",
+    "socket.io-client": "4.5.4",
+    "ws": "8.12.0"
   },
   "dependencies": {
-    "@midwayjs/async-hooks-context-manager": "^3.9.0",
+    "@midwayjs/async-hooks-context-manager": "^3.10.1",
     "@types/superagent": "4.1.14",
     "@types/supertest": "2.0.12",
-    "fs-extra": "10.0.1",
     "js-yaml": "4.1.0",
     "raw-body": "2.5.1",
-    "supertest": "6.3.0"
+    "supertest": "6.3.3"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "5f6603d2c9606fc6fc7ece71f956e89e394efeee"
+  "gitHead": "6bc9f7a97e4188399d2406f5a38bad5aeb983e07"
 }