@midwayjs/mock 3.12.0-beta.2 → 3.12.1

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/app.js

@@ -0,0 +1,33 @@
+const { createApp, close } = require('./dist');
+const { join } = require('path');
+
+(async () => {
+  process.env.MIDWAY_TS_MODE = 'false';
+  // 查找 process.argv 中的 --port 参数
+  const portIndex = process.argv.findIndex((item) => item === '--port');
+  if (portIndex !== -1) {
+    process.env.MIDWAY_HTTP_PORT = process.argv[portIndex + 1];
+  }
+
+  process.once('SIGINT', onSignal);
+  // kill(3) Ctrl-\
+  process.once('SIGQUIT', onSignal);
+  // kill(15) default
+  process.once('SIGTERM', onSignal);
+
+  const app = await createApp({
+    appDir: process.cwd(),
+    baseDir: join(process.cwd(), 'dist'),
+  });
+
+  process.send({
+    title: 'server-ready',
+    port: process.env.MIDWAY_HTTP_PORT,
+  });
+
+  function onSignal() {
+    close(app).then(() => {
+      process.exit(0);
+    });
+  }
+})();

package/dist/creator.js

@@ -20,13 +20,17 @@ function formatPath(baseDir, p) {
         return (0, path_1.resolve)(baseDir, p);
     }
 }
+function getFileNameWithSuffix(fileName) {
+    return (0, core_1.isTypeScriptEnvironment)() ? `${fileName}.ts` : `${fileName}.js`;
+}
 async function create(appDir, options = {}, customFramework) {
-    debug(`[mock]: Create app, appDir="${appDir}"`);
-    process.env.MIDWAY_TS_MODE = 'true';
+    var _a;
+    process.env.MIDWAY_TS_MODE = (_a = process.env.MIDWAY_TS_MODE) !== null && _a !== void 0 ? _a : 'true';
     if (typeof appDir === 'object') {
         options = appDir;
         appDir = options.appDir || '';
     }
+    debug(`[mock]: Create app, appDir="${appDir}"`);
     try {
         if (appDir) {
             // 处理测试的 fixtures
@@ -71,19 +75,19 @@ async function create(appDir, options = {}, customFramework) {
                 safeLoad: true,
                 enableCache: false,
             });
-            options.fileLoadMode = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
+            options.moduleLoadType = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
         }
         if (options.baseDir) {
-            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, 'interface.ts'), {
+            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, getFileNameWithSuffix('interface')), {
                 safeLoad: true,
-                loadMode: options.fileLoadMode,
+                loadMode: options.moduleLoadType,
             });
         }
         else if (appDir) {
             options.baseDir = `${appDir}/src`;
-            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, 'interface.ts'), {
+            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, getFileNameWithSuffix('interface')), {
                 safeLoad: true,
-                loadMode: options.fileLoadMode,
+                loadMode: options.moduleLoadType,
             });
         }
         if (!options.imports && customFramework) {
@@ -139,9 +143,9 @@ async function create(appDir, options = {}, customFramework) {
             appDir,
             asyncContextManager: (0, async_hooks_context_manager_1.createContextManager)(),
             imports: [].concat(options.imports).concat(options.baseDir
-                ? await (0, core_1.loadModule)((0, path_1.join)(options.baseDir, 'configuration.ts'), {
+                ? await (0, core_1.loadModule)((0, path_1.join)(options.baseDir, getFileNameWithSuffix('configuration')), {
                     safeLoad: true,
-                    loadMode: options.fileLoadMode,
+                    loadMode: options.moduleLoadType,
                 })
                 : []),
         });
@@ -155,7 +159,7 @@ async function create(appDir, options = {}, customFramework) {
                 return mainFramework;
             }
             else {
-                throw new Error('Can not get main framework, please check your configuration.ts.');
+                throw new Error(`Can not get main framework, please check your ${getFileNameWithSuffix('configuration')}.`);
             }
         }
     }
@@ -206,7 +210,8 @@ async function close(app, options) {
 }
 exports.close = close;
 async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
+    process.env.MIDWAY_TS_MODE = (_a = process.env.MIDWAY_TS_MODE) !== null && _a !== void 0 ? _a : 'true';
     if (typeof baseDir === 'object') {
         options = baseDir;
         baseDir = options.appDir || '';
@@ -225,7 +230,7 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
         // load yaml
         try {
             const doc = yaml.load((0, fs_1.readFileSync)((0, path_1.join)(baseDir, 'f.yml'), 'utf8'));
-            starterName = (_a = doc === null || doc === void 0 ? void 0 : doc['provider']) === null || _a === void 0 ? void 0 : _a['starter'];
+            starterName = (_b = doc === null || doc === void 0 ? void 0 : doc['provider']) === null || _b === void 0 ? void 0 : _b['starter'];
             if (starterName) {
                 const m = await (0, core_1.loadModule)(starterName);
                 if (m && m['BootstrapStarter']) {
@@ -241,7 +246,6 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
     if (options.starter) {
         options.appDir = baseDir;
         debug(`[mock]: Create app, appDir="${options.appDir}"`);
-        process.env.MIDWAY_TS_MODE = 'true';
         if (options.appDir) {
             // 处理测试的 fixtures
             if (!(0, path_1.isAbsolute)(options.appDir)) {
@@ -256,19 +260,19 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
             safeLoad: true,
             enableCache: false,
         });
-        options.fileLoadMode = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
+        options.moduleLoadType = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
         options = options || {};
         if (options.baseDir) {
-            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, 'interface.ts'), {
+            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, getFileNameWithSuffix('interface')), {
                 safeLoad: true,
-                loadMode: options.fileLoadMode,
+                loadMode: options.moduleLoadType,
             });
         }
         else if (options.appDir) {
             options.baseDir = `${options.appDir}/src`;
-            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, 'interface.ts'), {
+            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, getFileNameWithSuffix('interface')), {
                 safeLoad: true,
-                loadMode: options.fileLoadMode,
+                loadMode: options.moduleLoadType,
             });
         }
         // new mode
@@ -280,8 +284,8 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
         const framework = frameworkService.getMainFramework();
         const appManager = appCtx.get(core_1.MidwayApplicationManager);
         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'];
+        const faasConfig = (_c = configService.getConfiguration('faas')) !== null && _c !== void 0 ? _c : {};
+        const customPort = (_e = (_d = process.env.MIDWAY_HTTP_PORT) !== null && _d !== void 0 ? _d : faasConfig['port']) !== null && _e !== void 0 ? _e : options['port'];
         if (options.starter.callback2) {
             app.callback2 = options.starter.callback2.bind(options.starter);
         }
@@ -437,7 +441,7 @@ class BootstrapAppStarter {
     async close(options = {}) {
         // eslint-disable-next-line node/no-extraneous-require
         const BootstrapModule = await (0, core_1.loadModule)('@midwayjs/bootstrap', {
-            loadMode: this.options.fileLoadMode,
+            loadMode: this.options.moduleLoadType,
             safeLoad: true,
         });
         if (BootstrapModule === null || BootstrapModule === void 0 ? void 0 : BootstrapModule.Bootstrap) {
@@ -473,7 +477,7 @@ async function createLightApp(baseDir = '', options = {}) {
             safeLoad: true,
             enableCache: false,
         });
-        options.fileLoadMode = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
+        options.moduleLoadType = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
     }
     return createApp(baseDir, {
         ...options,

package/function.js

@@ -0,0 +1,33 @@
+const { createFunctionApp, close } = require('./dist');
+const { join } = require('path');
+
+(async () => {
+  process.env.MIDWAY_TS_MODE = 'false';
+  // 查找 process.argv 中的 --port 参数
+  const portIndex = process.argv.findIndex(item => item === '--port');
+  if (portIndex !== -1) {
+    process.env.MIDWAY_HTTP_PORT = process.argv[portIndex + 1];
+  }
+
+  process.once('SIGINT', onSignal);
+  // kill(3) Ctrl-\
+  process.once('SIGQUIT', onSignal);
+  // kill(15) default
+  process.once('SIGTERM', onSignal);
+
+  const app = await createFunctionApp({
+    appDir: process.cwd(),
+    baseDir: join(process.cwd(), 'dist'),
+  });
+
+  process.send({
+    title: 'server-ready',
+    port: process.env.MIDWAY_HTTP_PORT,
+  });
+
+  function onSignal() {
+    close(app).then(() => {
+      process.exit(0);
+    });
+  }
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mock",
-  "version": "3.12.0-beta.2",
+  "version": "3.12.1",
   "description": "create your test app from midway framework",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -20,24 +20,26 @@
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts",
-    "ssl"
+    "ssl",
+    "app.js",
+    "function.js"
   ],
   "engines": {
     "node": ">=12"
   },
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.11.15",
+    "@midwayjs/core": "^3.12.1",
     "@midwayjs/logger": "^2.15.0",
     "@types/amqplib": "0.10.1",
     "amqplib": "0.10.3",
     "kafkajs": "2.2.4",
-    "socket.io": "4.7.1",
-    "socket.io-client": "4.7.1",
+    "socket.io": "4.7.2",
+    "socket.io-client": "4.7.2",
     "ws": "8.13.0"
   },
   "dependencies": {
-    "@midwayjs/async-hooks-context-manager": "^3.11.15",
+    "@midwayjs/async-hooks-context-manager": "^3.12.1",
     "@types/superagent": "4.1.14",
     "@types/supertest": "2.0.12",
     "js-yaml": "4.1.0",
@@ -49,5 +51,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
+  "gitHead": "48413b87b12354cb8207de6aa58e0a4ca22ea000"
 }