topbit 3.1.8 → 3.2.0

package/README.cn.md

@@ -62,7 +62,8 @@ const app = new Topbit({
   debug: true
 })
 
-app.run(1234)
+//输出服务信息并运行服务
+app.printServInfo().run(1234)
 
 ```
 
@@ -112,7 +113,7 @@ app.get('/', async ctx => {
     ctx.to('success')
 })
 
-app.run(1234)
+app.printServInfo().run(1234)
 
 ```
 
@@ -159,7 +160,7 @@ app.put('/p', async c => {
 })
 
 //默认监听0.0.0.0，参数和原生接口listen一致。
-app.run(8080)
+app.printServInfo().run(8080)
 
 ```
 
@@ -847,8 +848,6 @@ app.run(1234)
     //最大解析的文件数量
     maxFiles      : 12,
 
-    daemon        : false, //开启守护进程
-
     /*
       开启守护进程模式后，如果设置路径不为空字符串，则会把pid写入到此文件，可用于服务管理。
     */
@@ -971,9 +970,9 @@ app.run(1234)
       this.config.debug && console.error(errname, err)
     },
 
-    //最大负载率百分比，默认为75表示当CPU使用率超过75%，则会自动创建子进程。
+    //最大负载率百分比，默认为0.75表示当CPU使用率超过75%，则会自动创建子进程。
     //必须通过autoWorker开启自动负载模式才有效。
-    maxLoadRate: 75,
+    maxLoadRate: 0.75,
 
     //http2协议的http2Stream超时，若不设置，-1表示和timeout一致。
     streamTimeout: -1,

package/README.md

@@ -46,7 +46,8 @@ const app = new Topbit({
   debug: true
 })
 
-app.run(1234)
+//in debug mode, output service info
+app.printServInfo().run(1234)
 ```
 
 When no routes are added, Topbit adds a default route:
@@ -72,7 +73,7 @@ app.get('/', async ctx => {
 })
 
 // Defaults to listening on 0.0.0.0, parameters are consistent with the native listen interface.
-app.run(1234)
+app.printServInfo().run(1234)
 
 ```
 
@@ -94,7 +95,7 @@ app.get('/', async ctx => {
     ctx.to('success')
 })
 
-app.run(1234)
+app.printServInfo().run(1234)
 
 ```
 
@@ -141,7 +142,7 @@ app.put('/p', async c => {
 })
 
 // Defaults to listening on 0.0.0.0
-app.run(8080)
+app.printServInfo().run(8080)
 
 ```
 
@@ -811,8 +812,6 @@ Full configuration options for app initialization are as follows. Please read th
     // Max number of files to parse
     maxFiles      : 12,
 
-    daemon        : false, // Enable daemon mode
-
     /*
       After enabling daemon mode, if path is not empty string, pid is written to this file. Used for service management.
     */
@@ -935,9 +934,9 @@ Full configuration options for app initialization are as follows. Please read th
       this.config.debug && console.error(errname, err)
     },
 
-    // Max load rate percentage. Default 75 means if CPU usage > 75%, automatically create child process.
+    // Max load rate percentage. Default 0.75 means if CPU usage > 75%, automatically create child process.
     // Must enable auto load mode via autoWorker.
-    maxLoadRate: 75,
+    maxLoadRate: 0.75,
 
     // http2 protocol http2Stream timeout. If not set, -1 means consistent with timeout.
     streamTimeout: -1,

package/demo/http2.js

@@ -44,7 +44,6 @@ if (app.isWorker) {
 
 
 app.sched('none')
-
-app.autoWorker(3)
-
-app.daemon(1234, 1)
+  .autoWorker(3)
+  .printServInfo()
+  .daemon(1234, 2)

package/demo/loader.js

@@ -4,27 +4,50 @@ process.chdir(__dirname)
 
 let Topbit = require('../src/topbit.js')
 let {Loader} = Topbit
+const npargv = Topbit.npargv
+
+let {args} = npargv({
+  '--loadtype': {
+    name: 'loadtype',
+    default: 'text',
+    limit: ['text', 'json', 'orgjson', 'obj', 'orgobj']
+  },
+  '--load': {
+    name: 'load',
+    default: false
+  },
+  '-w': {
+    name: 'worker',
+    default: 2,
+    min: 1,
+    max: 5
+  }
+})
 
 let app = new Topbit({
   debug: true,
-  loadInfoFile: '--mem',
+  loadMonitor: true,
+  loadInfoType : args.loadtype,
+  globalLog : false,
+  logType: 'stdio',
+  loadInfoFile : args.load ? '' : '/tmp/topbit-loadinfo.log',
+  maxLoadRate: 0.6
 })
 
 if (app.isWorker) {
   app.get('/', async ctx => {
     ctx.ok('ok')
   })
-
-  let ld = new Loader()
-
-  ld.init(app)
 }
 
-app.sched('none')
+let ld = new Loader()
 
-app.autoWorker(12)
-
-app.daemon(1234, 5)
+ld.daemonInit(app, () => {
+  app.sched('none')
+    .autoWorker(12)
+    .printServInfo(100)
+    .daemon(1234, args.worker)
+})
 
 //console.log(app.midware.midGroup)
 //console.log({...app.router})

package/demo/monitor.js

@@ -9,8 +9,8 @@ let {args} = npargv({
     default: 'text',
     limit: ['text', 'json', 'orgjson', 'obj', 'orgobj']
   },
-  '--loadstdio': {
-    name: 'loadstdio',
+  '--load': {
+    name: 'load',
     default: false
   },
 
@@ -32,7 +32,7 @@ const app = new Topbit({
     loadInfoType : args.loadtype,
     globalLog : false,
     logType: 'stdio',
-    loadInfoFile : args.loadstdio ? '' : '/tmp/topbit-loadinfo.log',
+    loadInfoFile : args.load ? '' : '/tmp/topbit-loadinfo.log',
     maxLoadRate: 0.56
 });
 
@@ -75,7 +75,6 @@ app.use(async (c, next) => {
 
 }, {pre: true, method: 'POST', name: 'transmit'});
 
-
 app.autoWorker(4)
 
-app.daemon(2034, 1)
+app.printServInfo().daemon(2034, 1)

package/docs/en/topbit-loader.md

@@ -61,8 +61,11 @@ if (app.isWorker) {
   new Loader().init(app)
 }
 
-app.autoWorker(16)   // Max elastic workers
-app.daemon(443, 4)   // 4 base workers
+// Max elastic workers
+app.autoWorker(16)
+  //delay 100ms, output service info
+  .printServInfo(100)
+  .daemon(443, 4)   // 4 base workers
 ```
 
 Run `node app.js` → full-featured service is up!
@@ -98,7 +101,9 @@ new Loader({
     const UserModel = require('./model/user')
     service.userModel = new UserModel(service)
   }
-}).init(app)
+}).init(app, () => {
+  app.run(1234)
+})
 ```
 
 ---
@@ -233,7 +238,9 @@ new Loader({
       service[name + 'Model'] = new Model(service)
     }
   }
-}).init(app)
+}).daemonInit(app, () => {
+  app.daemon(1234, 2)
+})
 ```
 
 ---

package/docs/topbit-loader.md

@@ -59,8 +59,11 @@ if (app.isWorker) {
   new Loader().init(app)
 }
 
-app.autoWorker(16)      // 最大弹性进程数
-app.daemon(443, 4)      // 4 个基础进程
+// 最大弹性进程数
+app.autoWorker(16)
+  //延迟100ms后输出服务运行信息
+  .printServInfo(100)
+  .daemon(443, 4)      // 4 个基础进程
 ```
 
 只需执行 `node app.js` 即可启动完整服务！
@@ -96,7 +99,9 @@ new Loader({
     const UserModel = require('./model/user')
     service.userModel = new UserModel(service)
   }
-}).init(app)
+}).init(app, () => {
+  app.run(1234)
+})
 ```
 
 ---
@@ -233,7 +238,9 @@ new Loader({
       service[name + 'Model'] = new Model(service)
     }
   }
-}).init(app)
+}).daemonInit(app, () => {
+  app.daemon(1234, 2)
+})
 ```
 
 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "topbit",
-  "version": "3.1.8",
+  "version": "3.2.0",
   "description": "A Server-side web framework support http/1.1 and http/2",
   "main": "src/topbit.js",
   "directories": {

package/src/loader/loader.js

@@ -17,8 +17,8 @@ class TopbitLoader {
     let appDir = '.';
     
     this.globalMidTable = [];
-    this.groupMidTable = {};
-    this.fileMidTable = {};
+    this.groupMidTable = Object.create(null);
+    this.fileMidTable = Object.create(null);
 
     if (typeof options !== 'object') {
       options = {};
@@ -159,10 +159,7 @@ class TopbitLoader {
     }
   }
 
-  /**
-   * 初始化入口 (Async)
-   */
-  async init(app) {
+  async _coreinit(app) {
     // 注入应用基础信息到 service，供 Controller 或 Model 使用
     Object.defineProperties(app.service, {
       __prepath__: {
@@ -189,6 +186,26 @@ class TopbitLoader {
     app.service.__topbit_loader__ = true;
   }
 
+  /**
+   * 初始化入口 (Async)，提供回调函数在完成后执行
+   */
+  async init(app, cb) {
+    await this._coreinit(app);
+    if (cb && typeof cb === 'function') {
+      cb(app);
+    }
+  }
+
+  async daemonInit(app, cb) {
+    if (app.isWorker) {
+      await this._coreinit(app);
+    }
+
+    if (cb && typeof cb === 'function') {
+      cb(app);
+    }
+  }
+
   loadController(app) {
     if (app.service.__topbit_loader__ && !this.config.multi) {
       outWarning('您已经使用topbit-loader加载过路由，多次加载容易导致路由冲突，重复操作将会被终止。');

package/src/topbit.js

@@ -39,7 +39,7 @@ const ErrorLog = require('./lib/errorlog.js')
 let __instance__ = 0;
 
 let _topbit_server_running = `
-:.:.:.:.:.:.topbit in service.:.:.:.:.:.:
+:.:.:.:.:\x1b[34;5m.\x1b[0m:\x1b[36;5m.\x1b[0m topbit in service \x1b[36;5m.\x1b[0m:\x1b[34;5m.\x1b[0m:.:.:.:.:
 `;
 
 let _topbit_home_page = `<!DOCTYPE html><html>
@@ -140,7 +140,6 @@ class Topbit {
    * - globalLog {bool} 启用全局日志。
    * - maxBody {number} 表示POST/PUT提交表单的最大字节数，包括上传文件。
    * - maxFiles {number} 最大上传文件数量，超过则不处理。
-   * - daemon {bool} 启用守护进程模式。
    * - pidFile {string} 保存Master进程PID的文件路径。
    * - logFile {string} 日志文件。
    * - errorLogFile {string} 错误日志文件。
@@ -172,6 +171,9 @@ class Topbit {
       throw new Error('topbit遵循单例模式，不能构造多次。你可以在多进程或多线程中构造新的实例。');
 
     __instance__ += 1;
+
+    this._is_listening = false;
+    this._is_daemon_listening = false;
   
     this.config = {
       //此配置表示POST/PUT提交表单的最大字节数，也是上传文件的最大限制，
@@ -856,98 +858,64 @@ class Topbit {
   clearService() {
     for (let k in this.service) delete this.service[k];
   }
-  
-  /** 
-   * 根据配置情况确定运行HTTP/1.1还是HTTP/2
-   * @param {number} port 端口号
-   * @param {string} host IP地址，可以是IPv4或IPv6
-   * 0.0.0.0 对应使用IPv6则是::
-  */
-  run(port=2368, host='0.0.0.0') {
-    if (typeof port === 'object') {
-      if (port.host && typeof port.host === 'string') host = port.host;
-      if (port.port && typeof port.port === 'number' && port.port > 0 && port.port <= 65535) port = port.port;
-    }
 
-    if (this.config.server.SNICallback && typeof this.config.server.SNICallback === 'function' && !this.config.https) {
-      this.config.https = true;
-    }
-  
-    this.router.argsRouteSort();
-  
-    this.rundata.host = (typeof port == 'number' ? host : '');
-    this.rundata.port = port;
-  
-    //如果没有添加路由则添加默认路由
-    if (this.router.count === 0) {
-      this.router.get('/*', async c => {
-        c.setHeader('content-type', 'text/html; charset=utf-8').to(_topbit_home_page)
-      })
+  /**
+   * 
+   * @param {number} timeout - default 0
+   * @param {boolean} debug - default true(true表示只有debug模式才会输出)
+   * @returns 
+   */
+  printServInfo(timeout=0, debug=true) {
+    if (typeof timeout === 'boolean') {
+      debug = timeout
+      timeout = 0
     }
-  
-    //如果发现更改了service指向，则让this.httpServ.service重新指向this.service。
-    if (this.service !== this.httpServ.service) {
-      this.httpServ.service = this.service;
+
+    if (!debug || (debug && this.config.debug)) {
+      if (timeout > 0) {
+        setTimeout(() => {
+          this._corePrintServ()
+        }, timeout)
+      } else {
+        queueMicrotask(() => {
+          this._corePrintServ()
+        })
+      }
     }
+
+    return this
+  }
+
+  _corePrintServ() {
+    let {port, host} = this.rundata
   
-    this.midware.addFromCache();
-  
-    this.config.parseBody && this.add(this.bodyparser);
-  
-    this.add(this.httpServ);
-  
-    let m = null;
-    while((m = this.__pre_mids__.pop()) !== undefined) {
-      this.add(m.callback, m.options);
+    /**
+    * 输出路由表，如果是启用了cluster，则通过发送消息的方式让master进程输出。
+    * */
+    if (typeof port === 'string' && port.indexOf('.sock') > 0) {
+      host = '';
     }
-    
-    //必须放在最后，用于返回最终数据。
-    this.midware.addFinal();
-  
-    if (this.config.useLimit) {
-      let connlimit = new this.connfilter(this.limit, this.rundata);
-      this.on('connection', connlimit.callback);
-    } else {
-      this.on('connection', (sock) => {
-        this.rundata.conn++;
-        sock.on('close', () => {
-          this.rundata.conn--;
-        });
-  
+
+    let is_https = this.config.https;
+
+    let protocol = this.config.http2
+                    ? ('http2' + (is_https ? '[https]' : ''))
+                    : (is_https ? 'https' : 'http');
+
+    if (cluster.isMaster) { 
+      this.router.printTable();
+      console.log(`PID: ${process.pid}, Listen ${host}:${port}, Protocol: ${protocol}`);
+      console.log(_topbit_server_running);
+    } else if (process.send && typeof process.send === 'function') {
+      process.send({type:'_route-table', 
+        route: this.router.getTable(),
+        listen: `Listen: ${host}${host.length > 0 ? ':' : ''}${port}, `,
+        protocol: `Protocol: ${protocol}`
       });
     }
-    
-    /**
-     * 输出路由表，如果是启用了cluster，则通过发送消息的方式让master进程输出。
-     * */
-    if (this.config.debug) {
-      if (typeof port === 'string' && port.indexOf('.sock') > 0) {
-        host = '';
-      }
-  
-      let is_https = this.config.https;
-  
-      let protocol = this.config.http2
-                      ? ('http2' + (is_https ? '[https]' : ''))
-                      : (is_https ? 'https' : 'http');
-  
-      if (cluster.isMaster) { 
-        this.router.printTable();
-        console.log(`PID: ${process.pid}, Listen ${host}:${port}, Protocol: ${protocol}`);
-        console.log(_topbit_server_running);
-      } else if (process.send && typeof process.send === 'function') {
-        process.send({type:'_route-table', 
-          route: this.router.getTable(),
-          listen: `Listen: ${host}${host.length > 0 ? ':' : ''}${port}, `,
-          protocol: `Protocol: ${protocol}`
-        });
-      }
-    }
-  
-    this.server = this.httpServ.run(port, host);
-    return this.server;
+
+    return this
   }
-  //run end
 
   /**
    * @param {string} evt
@@ -968,8 +936,9 @@ class Topbit {
       count: 0,
       mode: mode,
       callback: callback
-    };
-    return true;
+    }
+
+    return this;
   }
 
   getMsgEvent(evt) {
@@ -1047,11 +1016,13 @@ class Topbit {
   }
 
   autoWorker(max) {
-    if (typeof max === 'number' && max > 0) {
-      this.workerCount.max = max;
+    if (!isNaN(max) && typeof max === 'number' && max >= 0) {
+      this.workerCount.max = max > 0 ? max : os.cpus().length;
     } else {
-      throw new Error('autoWorker参数必须是一个大于0的数字，表示最大允许创建多少个子进程处理请求。');
+      throw new Error('autoWorker参数必须是一个>=0的数字，表示最大允许创建多少个子进程处理请求。');
     }
+
+    return this;
   }
 
   /**
@@ -1066,6 +1037,8 @@ class Topbit {
     } else {
       return cluster.schedulingPolicy;
     }
+
+    return this;
   }
 
   _checkDaemonArgs() {
@@ -1112,7 +1085,6 @@ class Topbit {
         cpu: {user:0, system:0},
         cputm : 1000000
       };
-      
     });
 
     let exitTip = () => {
@@ -1182,6 +1154,76 @@ class Topbit {
 
   }
 
+  /**
+   * 根据配置情况确定运行HTTP/1.1还是HTTP/2
+   * @param {number} port 端口号
+   * @param {string} host IP地址，可以是IPv4或IPv6
+   * 0.0.0.0 对应使用IPv6则是::
+  */
+  run(port=2368, host='0.0.0.0') {
+    if (this._is_listening) return this.server;
+
+    if (typeof port === 'object') {
+      if (port.host && typeof port.host === 'string') host = port.host;
+      if (port.port && typeof port.port === 'number' && port.port > 0 && port.port <= 65535) port = port.port;
+    }
+
+    if (this.config.server.SNICallback && typeof this.config.server.SNICallback === 'function' && !this.config.https) {
+      this.config.https = true;
+    }
+
+    this._is_listening = true;
+  
+    this.router.argsRouteSort();
+  
+    this.rundata.host = (typeof port == 'number' ? host : '');
+    this.rundata.port = port;
+  
+    //如果没有添加路由则添加默认路由
+    if (this.router.count === 0) {
+      this.router.get('/*', async c => {
+        c.setHeader('content-type', 'text/html; charset=utf-8').to(_topbit_home_page)
+      })
+    }
+  
+    //如果发现更改了service指向，则让this.httpServ.service重新指向this.service。
+    if (this.service !== this.httpServ.service) {
+      this.httpServ.service = this.service;
+    }
+  
+    //必须要坚持先加载再listen的原则。
+    this.midware.addFromCache();
+  
+    this.config.parseBody && this.add(this.bodyparser);
+  
+    this.add(this.httpServ);
+  
+    let m = null;
+    while((m = this.__pre_mids__.pop()) !== undefined) {
+      this.add(m.callback, m.options);
+    }
+    
+    //必须放在最后，用于返回最终数据。
+    this.midware.addFinal();
+  
+    if (this.config.useLimit) {
+      let connlimit = new this.connfilter(this.limit, this.rundata);
+      this.on('connection', connlimit.callback);
+    } else {
+      this.on('connection', (sock) => {
+        this.rundata.conn++;
+        sock.on('close', () => {
+          this.rundata.conn--;
+        });
+  
+      });
+    }
+
+    this.server = this.httpServ.run(port, host);
+    return this.server;
+  }
+  //run end
+
   /**
    * 这个函数是可以用于运维部署，此函数默认会根据CPU核数创建对应的子进程处理请求。
    * @param {number} port 端口号
@@ -1189,6 +1231,8 @@ class Topbit {
    * @param {number} num，要创建的子进程数量，0表示自动，这时候根据CPU核心数量创建。
   */
   daemon(port=2368, host='0.0.0.0', num=0) {
+    if (this._is_daemon_listening) return this;
+
     if (typeof host === 'number') {
       num = host;
       host = '0.0.0.0';
@@ -1200,14 +1244,16 @@ class Topbit {
       if (port.port && typeof port.port === 'number' && port.port > 0 && port.port <= 65535) port = port.port;
     }
 
+    this._is_daemon_listening = true;
     //确保自动创建的worker在终止时不会误认为是系统错误。
     setTimeout(() => {
       this.errorBreakCount += 1;
     }, this.workerErrorTime + 120);
 
-    this._checkDaemonArgs();
+    //暂时去掉，并且屏蔽daemon选项。
+    //this._checkDaemonArgs();
     
-    if (cluster.isMaster) {
+    if (cluster.isPrimary || cluster.isMaster) {
       let osCPUS = os.cpus().length;
       if (num > (osCPUS * 2) ) {
         num = 0;