:add: modifyCreateServer method.

zyao89 · zyao89 · commit 546768642924 · 2019-10-17T22:13:08.000+08:00
diff --git a/plugins/commands/serve/index.js b/plugins/commands/serve/index.js
@@ -9,11 +9,11 @@ module.exports = function serveCommand(api, opts) {
     const chalk = require('chalk');
 
     api.beforeServer(params => {
-        api.applyPluginHooks('beforeDevServer', params);
+        return api.applyPluginHooks('beforeDevServer', params);
     });
 
     api.afterServer(params => {
-        api.applyPluginHooks('afterDevServer', params);
+        return api.applyPluginHooks('afterDevServer', params);
     });
 
     // serve
@@ -37,7 +37,7 @@ Examples:
     micro-app serve --type vusion --open-soft-link
           `.trim(),
     }, args => {
-        process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+        process.env.NODE_ENV = args.mode || process.env.NODE_ENV || 'development';
 
         const runServe = require('../start/serve');
         return runServe(api, args, opts);
diff --git a/plugins/commands/start/index.js b/plugins/commands/start/index.js
@@ -24,7 +24,7 @@ Examples:
     micro-app start --type vusion
           `.trim(),
     }, args => {
-        process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+        process.env.NODE_ENV = args.mode || process.env.NODE_ENV || 'production';
 
         const runServe = require('./serve');
         return runServe(api, args, opts);
diff --git a/plugins/commands/start/methods.js b/plugins/commands/start/methods.js
@@ -6,7 +6,16 @@ module.exports = api => {
         type: api.API_TYPE.EVENT,
         description: '服务启动前事件',
     });
+    api.registerMethod('afterServer', {
+        type: api.API_TYPE.EVENT,
+        description: '服务启动后事件',
+    });
+    api.registerMethod('modifyCreateServer', {
+        type: api.API_TYPE.MODIFY,
+        description: '修改内部服务创建事件, 自定义 Node 服务, 需返回 Promise.resolve({ host, port, url })',
+    });
 
+    // 以下只在内置服务中触发.
     api.registerMethod('onServerInit', {
         type: api.API_TYPE.EVENT,
         description: '服务初始化时事件',
@@ -36,8 +45,4 @@ module.exports = api => {
         description: '服务从业务逻辑出来后事件',
     });
 
-    api.registerMethod('afterServer', {
-        type: api.API_TYPE.EVENT,
-        description: '服务启动后事件',
-    });
 };
diff --git a/plugins/commands/start/serve.js b/plugins/commands/start/serve.js
@@ -2,6 +2,7 @@
 
 module.exports = function runServe(api, args, opts) {
     const chalk = require('chalk');
+    const _ = require('lodash');
 
     const logger = api.logger;
 
@@ -12,11 +13,17 @@ module.exports = function runServe(api, args, opts) {
 
     api.applyPluginHooks('beforeServer', { args });
 
-    const createServer = require('../../../src/server/createServer');
+    // custom server
+    const createServer = api.applyPluginHooks('modifyCreateServer', require('../../../src/server/createServer'));
+    if (!createServer || !_.isFunction(createServer)) {
+        logger.throw('[Plugin] api.modifyCreateServer() must be return function !');
+    }
 
     return createServer(api, args)
         .then(({ host, port, url }) => {
-            api.logger.info(`Open Browser, URL: ${chalk.yellow(url)}`);
+            if (url && _.isString(url)) {
+                logger.info(`Open Browser, URL: ${chalk.yellow(url)}`);
+            }
             api.applyPluginHooks('afterServer', { args, host, port, url });
         }).catch(err => {
             api.applyPluginHooks('afterServer', { args, err });
diff --git a/plugins/commands/start/start.test.js b/plugins/commands/start/start.test.js
@@ -108,4 +108,42 @@ describe('Command start', () => {
 
     });
 
+    it('modifyCreateServer', async () => {
+
+        const { service } = require('../../../bin/base');
+
+        const plugin = service.plugins.find(item => item.id === 'cli:plugins-commands-start');
+        expect(typeof plugin).toEqual('object');
+
+        service.init();
+
+        expect(plugin._api).not.toBeUndefined();
+
+        const argv = plugin._api.parseArgv();
+        expect(argv).not.toBeNull();
+        expect(argv).not.toBeUndefined();
+
+        plugin._api.modifyCreateServer(() => {
+
+            return function(api, args) {
+
+                expect(args).not.toBeNull();
+                expect(args).not.toBeUndefined();
+
+                return Promise.resolve({
+                    host: 'a',
+                    port: 22,
+                    url: 'abc',
+                });
+            };
+        });
+
+        await service.runCommand('start', getArgvs());
+
+        expect(service.commands.start).not.toBeNull();
+        expect(service.commands.start).not.toBeUndefined();
+        expect(typeof service.commands.start).toEqual('object');
+
+    });
+
 });
diff --git a/plugins/extends/server/index.js b/plugins/extends/server/index.js
@@ -11,6 +11,14 @@ module.exports = function extendServer(api, opts) {
 
     const logger = api.logger;
 
+    api.extendMethod('parseArgv', {
+        description: 'resolve parse command argv.',
+    }, function() {
+        const yParser = require('yargs-parser');
+        const argv = yParser(process.argv.slice(2));
+        return argv;
+    });
+
     api.extendConfig('selfServerConfig', {
         cache: true,
         description: '当前工程下的服务配置',
diff --git a/src/server/createServer.js b/src/server/createServer.js
@@ -6,8 +6,6 @@ const koaConvert = require('koa-convert');
 const _ = require('lodash');
 const tryRequire = require('try-require');
 
-const HookEvent = require('./HookEvent');
-
 module.exports = function(api, args = {}) {
     const logger = api.logger;
     // const isDev = api.mode === 'development';
@@ -28,6 +26,7 @@ module.exports = function(api, args = {}) {
     });
 
     // init hook
+    const HookEvent = require('./HookEvent');
     const _HookEvent = new HookEvent(app); // 兼容
     initHooks(_HookEvent, serverConfig, logger);
 
@@ -61,7 +60,6 @@ module.exports = function(api, args = {}) {
                 reject(err);
                 return;
             }
-            console.log('\r\n');
             logger.success(`Server running... listen on ${port}, host: ${host}`);
 
             api.applyPluginHooks('onServerRunSuccess', { host, port, args });
diff --git a/yarn.lock b/yarn.lock
@@ -3325,20 +3325,20 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-husky@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-3.0.8.tgz#8de3fed26ce9b43034ef51013c4ad368b6b74ea8"
-  integrity sha512-HFOsgcyrX3qe/rBuqyTt+P4Gxn5P0seJmr215LAZ/vnwK3jWB3r0ck7swbzGRUbufCf9w/lgHPVbF/YXQALgfQ==
+husky@^3.0.9:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-3.0.9.tgz#a2c3e9829bfd6b4957509a9500d2eef5dbfc8044"
+  integrity sha512-Yolhupm7le2/MqC1VYLk/cNmYxsSsqKkTyBhzQHhPK1jFnC89mmmNVuGtLNabjDI6Aj8UNIr0KpRNuBkiC4+sg==
   dependencies:
     chalk "^2.4.2"
+    ci-info "^2.0.0"
     cosmiconfig "^5.2.1"
     execa "^1.0.0"
     get-stdin "^7.0.0"
-    is-ci "^2.0.0"
     opencollective-postinstall "^2.0.2"
     pkg-dir "^4.2.0"
     please-upgrade-node "^3.2.0"
-    read-pkg "^5.1.1"
+    read-pkg "^5.2.0"
     run-node "^1.0.0"
     slash "^3.0.0"
 
@@ -5854,7 +5854,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^5.1.1:
+read-pkg@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
   integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
