npm - topbit - Versions diffs - 3.1.7 → 3.1.9 - Mend

topbit 3.1.7 → 3.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/README.cn.md CHANGED Viewed

@@ -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)
 ```

package/README.md CHANGED Viewed

@@ -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)
 ```

package/demo/http2.js CHANGED Viewed

@@ -5,12 +5,17 @@
 process.chdir(__dirname)
 let Topbit = require('../src/topbit.js')
-let {Loader} = Topbit
+let {Loader, npargv} = Topbit
+let {args} = npargv({
+  '--httpc': 'httpc'
+})
 let app = new Topbit({
   debug: true,
   globalLog: true,
   logType: 'stdio',
+  allowHTTP1: args.httpc,
   loadInfoFile: '--mem',
   cert: './cert/localhost-cert.pem',
   key: './cert/localhost-privkey.pem',
@@ -25,10 +30,20 @@ if (app.isWorker) {
   let ld = new Loader()
   ld.init(app)
-}
-app.sched('none')
+  app.get('/httpc/:id', async ctx => {
+    console.log(ctx.headers, ctx.method, ctx.path, ctx.name, ctx.group)
+    ctx.to({
+      major: ctx.major,
+      protocol: ctx.protocol,
+      port: ctx.port,
+      group: ctx.group
+    })
+  })
+}
-app.autoWorker(3)
-app.daemon(1234, 1)
+app.sched('none')
+  .autoWorker(3)
+  .printServInfo()
+  .daemon(1234, 2)

package/demo/loader.js CHANGED Viewed

@@ -21,10 +21,9 @@ if (app.isWorker) {
 }
 app.sched('none')
-app.autoWorker(12)
-app.daemon(1234, 5)
+  .autoWorker(12)
+  .printServInfo(100)
+  .daemon(1234, 5)
 //console.log(app.midware.midGroup)
 //console.log({...app.router})

package/docs/en/topbit-loader.md CHANGED Viewed

@@ -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!

package/docs/topbit-loader.md CHANGED Viewed

@@ -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` 即可启动完整服务！

package/package.json CHANGED Viewed

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

package/src/httpc.js CHANGED Viewed

@@ -6,7 +6,7 @@ const process = require('node:process');
 const checkHeaderLimit = require('./headerLimit.js')
 const sendmsg = require('./sendmsg.js');
-let Httpc = function () {
+function Httpc() {
   if ( !(this instanceof Httpc) ) {
     return new Httpc()
   }

package/src/topbit.js CHANGED Viewed

@@ -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>
@@ -916,39 +916,70 @@ class Topbit {
       });
     }
-    /**
-     * 输出路由表，如果是启用了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;
   }
   //run end
+  /**
+   *
+   * @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
+    }
+    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
+    /**
+    * 输出路由表，如果是启用了cluster，则通过发送消息的方式让master进程输出。
+    * */
+    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}`
+      });
+    }
+    return this
+  }
   /**
    * @param {string} evt
    * @param {function} callback
@@ -968,8 +999,9 @@ class Topbit {
       count: 0,
       mode: mode,
       callback: callback
-    };
-    return true;
+    }
+    return this;
   }
   getMsgEvent(evt) {
@@ -1047,11 +1079,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 +1100,8 @@ class Topbit {
     } else {
       return cluster.schedulingPolicy;
     }
+    return this;
   }
   _checkDaemonArgs() {

package/test/test-bigctx.js CHANGED Viewed

@@ -1,29 +1,32 @@
-const titbit = require('../lib/titbit.js');
+'use'
-var app = new titbit({
+const Topbit = require('../src/topbit.js');
+let app = new Topbit({
   debug: true,
   //http2: true
 });
-var start_time = Date.now();
+let start_time = Date.now()
-var ctx = null;
+let ctx = null
-let total = 20000;
+let total = 20000
-for (let i=0 ;i < total; i++) {
-  ctx = new app.httpServ.Context();
+for (let i=0; i < total; i++) {
+  ctx = new app.httpServ.Context()
   ctx.path = '/';
   ctx.ip = '127.0.0.1';
-  ctx.requestCall = (c) => {
-    c.send('success');
-  };
+  ctx.requestCall = c => {
+    c.to('success')
+  }
   ctx.box.rand = Math.random()
-  ctx = null;
+  ctx = null
 }
-var end_time = Date.now();
+let end_time = Date.now()
 let rtm = end_time - start_time;
-console.log(rtm, 'ms', `${parseInt(total * 1000 / rtm)}/s`);
+console.log(rtm, 'ms', `${parseInt(total * 1000 / rtm)}/s`)

package/test/test-daemon-args.js CHANGED Viewed

@@ -1,7 +1,7 @@
 'use strict'
-const Titbit = require('../lib/titbit.js')
+const Topbit = require('../src/topbit.js')
-const app = new Titbit({debug: true})
+const app = new Topbit({debug: true})
 app.daemon({port:3456, host: '127.0.0.1', worker: 2})