fix: 修复逻辑顺序

Author: zyao89

src/plugins/factory/Application.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Koa = require('koa');
-const { _, logger, isDocker } = require('@micro-app/shared-utils');
+const { _, logger, isDocker, assert } = require('@micro-app/shared-utils');
 
 const Lifecycle = require('./Lifecycle.js');
 const Router = require('./Router.js');
@@ -144,9 +144,14 @@ module.exports = class Application extends Koa {
     }
 
     callback(...args) {
+        return super.callback(...args);
+    }
+
+    listen(server, ...args) {
+        assert(server, 'server must be required');
         const rootRouter = this.rootRouter;
         this.use(rootRouter.routes());
         this.use(rootRouter.allowedMethods());
-        return super.callback(...args);
+        return server.listen(...args);
     }
 };

src/plugins/factory/index.js

@@ -31,6 +31,12 @@ module.exports = async function(api, info = {}) {
         server = createServer(app, { protocol, isOpenHttp2: http2 });
     }
 
+    if (!server) {
+        throw new Error('server is null');
+    }
+
+    app.server = server;
+
     if (entries.length > 0) {
         await entries.reduce((chain, entry) => {
             const runApp = require(entry); // app.js
@@ -51,7 +57,7 @@ module.exports = async function(api, info = {}) {
     });
     const _host = process.env.HOST || apiContext.host || host || '0.0.0.0';
 
-    const ps = [ listen(server, { protocol, host: _host, port: _port }) ];
+    const ps = [ listen(app, { protocol, host: _host, port: _port }) ];
     return Promise.all(ps).then(ress => {
         const res = { ...ress[0] };
         return res; // 只返回第一个配置
@@ -89,11 +95,10 @@ function createServer(app, { protocol, isOpenHttp2 }, options) {
         throw new Error(`Not Support protocol: ${protocol}!`);
     }
 
-    app.server = server;
     return server;
 }
 
-function listen(server, { protocol, host, port }) {
+function listen(app, { protocol, host, port }) {
     return new Promise((resolve, reject) => {
         const errCb = err => {
             if (err) {
@@ -106,8 +111,8 @@ function listen(server, { protocol, host, port }) {
             }
         };
 
-        if (server) {
-            server.listen(port, errCb);
+        if (app) {
+            app.listen(app.server, port, errCb);
         } else {
             reject(new Error(`Not Support protocol: ${protocol}!`));
         }