topbit 3.1.9 → 3.2.1

package/README.cn.md

@@ -848,8 +848,6 @@ app.run(1234)
     //最大解析的文件数量
     maxFiles      : 12,
 
-    daemon        : false, //开启守护进程
-
     /*
       开启守护进程模式后，如果设置路径不为空字符串，则会把pid写入到此文件，可用于服务管理。
     */
@@ -935,9 +933,6 @@ app.run(1234)
     //url最大长度
     maxUrlLength: 2048,
 
-    //请求上下文缓存池最大数量。
-    maxpool: 4096,
-
     //子进程汇报资源信息的定时器毫秒数。
     monitorTimeSlice: 640,
 
@@ -972,9 +967,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

@@ -812,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.
     */
@@ -899,9 +897,6 @@ Full configuration options for app initialization are as follows. Please read th
     // Max URL length
     maxUrlLength: 2048,
 
-    // Max number of request context cache pool.
-    maxpool: 4096,
-
     // Timer milliseconds for child process resource reporting.
     monitorTimeSlice: 640,
 
@@ -936,9 +931,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/loader.js

@@ -4,26 +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.85
 })
 
 if (app.isWorker) {
   app.get('/', async ctx => {
     ctx.ok('ok')
   })
-
-  let ld = new Loader()
-
-  ld.init(app)
 }
 
-app.sched('none')
-  .autoWorker(12)
-  .printServInfo(100)
-  .daemon(1234, 5)
+let ld = new Loader()
+
+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,8 +32,8 @@ const app = new Topbit({
     loadInfoType : args.loadtype,
     globalLog : false,
     logType: 'stdio',
-    loadInfoFile : args.loadstdio ? '' : '/tmp/topbit-loadinfo.log',
-    maxLoadRate: 0.56
+    loadInfoFile : args.load ? '' : '/tmp/topbit-loadinfo.log',
+    maxLoadRate: 0.6
 });
 
 app.get('/', async c => {
@@ -46,7 +46,7 @@ app.get('/test', async c => {
     for (let i = 0; i < 90000; i++) {
         sum += Math.random() * i;
     }
-    c.to({sum});
+    c.setHeader(`x-test-${Math.floor(Math.random() * 100)}`, sum).to({sum});
 }, {group: 'test', name : 'test'});
 
 app.post('/test', async c => {
@@ -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

@@ -101,7 +101,9 @@ new Loader({
     const UserModel = require('./model/user')
     service.userModel = new UserModel(service)
   }
-}).init(app)
+}).init(app, () => {
+  app.run(1234)
+})
 ```
 
 ---
@@ -236,7 +238,9 @@ new Loader({
       service[name + 'Model'] = new Model(service)
     }
   }
-}).init(app)
+}).daemonInit(app, () => {
+  app.daemon(1234, 2)
+})
 ```
 
 ---

package/docs/topbit-loader.md

@@ -99,7 +99,9 @@ new Loader({
     const UserModel = require('./model/user')
     service.userModel = new UserModel(service)
   }
-}).init(app)
+}).init(app, () => {
+  app.run(1234)
+})
 ```
 
 ---
@@ -236,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.9",
+  "version": "3.2.1",
   "description": "A Server-side web framework support http/1.1 and http/2",
   "main": "src/topbit.js",
   "directories": {

package/src/http1.js

@@ -7,7 +7,6 @@ const process = require('node:process');
 const logger = require('./logger.js');
 const {fpurl} = require('./fastParseUrl.js');
 const Context = require('./context1.js');
-const ctxpool = require('./ctxpool.js');
 const checkHeaderLimit = require('./headerLimit.js');
 const sendmsg = require('./sendmsg.js');
 
@@ -25,9 +24,6 @@ class Http1 {
     this.isWorker = options.isWorker;
 
     this.logger = logger;
-    ctxpool.max = this.config.maxpool;
-
-    this.ctxpool = ctxpool;
     this.Context = Context;
     this.fpurl = fpurl;
     this.host = '';
@@ -109,7 +105,7 @@ class Http1 {
         return ;
       }
 
-      let ctx = ctxpool.getctx () || new Context();
+      let ctx = new Context();
 
       ctx.bodyLength = 0;
       ctx.maxBody = self.config.maxBody;
@@ -134,10 +130,7 @@ class Http1 {
       ctx.param = rt.args;
       rt = null;
 
-      return self.midware.run(ctx).finally(()=>{
-        ctxpool.free(ctx);
-        ctx = null;
-      });
+      return self.midware.run(ctx);
     };
 
     return callback;

package/src/http2.js

@@ -5,7 +5,6 @@ const fs = require('node:fs');
 const process = require('node:process');
 const logger = require('./logger.js');
 const {fpurl} = require('./fastParseUrl.js');
-const ctxpool = require('./ctxpool.js');
 const Context = require('./context2.js');
 const checkHeaderLimit = require('./headerLimit.js');
 const sendmsg = require('./sendmsg.js');
@@ -25,9 +24,6 @@ class Httpt {
     this.isWorker = options.isWorker;
 
     this.logger = logger;
-    ctxpool.max = this.config.maxpool;
-
-    this.ctxpool = ctxpool;
     this.Context = Context;
     this.fpurl = fpurl;
 
@@ -114,7 +110,7 @@ class Httpt {
         stream.close();
       });
     
-      let ctx = ctxpool.getctx() || new Context();
+      let ctx = new Context();
 
       ctx.bodyLength = 0;
       ctx.maxBody = self.config.maxBody;
@@ -128,10 +124,7 @@ class Httpt {
       ctx.stream = stream;
       ctx.res = ctx.stream;
       ctx.req = ctx.stream;
-     
-      ctx.dataHeaders = {};
       ctx.headers = headers;
-
       ctx.path = urlobj.path;
       ctx.query = urlobj.query;
       ctx.routepath = rt.key;
@@ -141,10 +134,7 @@ class Httpt {
       ctx.param = rt.args;
       rt = null;
 
-      return self.midware.run(ctx).finally(() => {
-        ctxpool.free(ctx);
-        ctx = null;
-      });
+      return self.midware.run(ctx);
     };
     
     return callback;

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

@@ -15,30 +15,13 @@ class Middleware extends MidCore {
     try {
       await this.exec(ctx, ctx.group);
     } catch (err) {
-      
       this.errorHandle(err, '--ERR-res--');
-
       try {
         if (ctx.res && !ctx.res.writableEnded) {
           ctx.res.statusCode = 500;
           ctx.res.end();
         }
       } catch (err) {}
-
-    } finally {
-      ctx.req = null;
-      ctx.res = null;
-      ctx.data = null;
-      ctx.box = null;
-      ctx.service = null;
-      ctx.requestCall = null;
-      ctx.headers = null;
-      ctx.body = null;
-      ctx.rawBody = null;
-      ctx.files = null;
-      ctx.param = null;
-      ctx.user = null;
-      ctx = null;
     }
   }
 

package/src/middleware2.js

@@ -16,9 +16,7 @@ class Middleware extends MidCore {
     try {
       await this.exec(ctx, ctx.group);
     } catch (err) {
-      
       this.errorHandle(err, '--ERR-RESPONSE--');
-
       if (ctx.stream && !ctx.stream.destroyed && ctx.stream.writable) {
         try {
           if (!ctx.stream.headersSent) {
@@ -30,24 +28,7 @@ class Middleware extends MidCore {
           ctx.stream.end();
         } catch (err) {}
       }
-    } finally {
-      ctx.data = null;
-      ctx.dataHeaders = null;
-      ctx.stream = null;
-      ctx.req = null;
-      ctx.res = null;
-      ctx.service = null;
-      ctx.box = null;
-      ctx.requestCall = null;
-      ctx.body = null;
-      ctx.headers = null;
-      ctx.rawBody = null;
-      ctx.files = null;
-      ctx.param = null;
-      ctx.user = null;
-      ctx = null;
     }
-
   }
 
   /** 这是最终添加的请求中间件。基于洋葱模型，这个中间件最先执行，所以最后会返回响应结果。 */

package/src/topbit.js

@@ -140,7 +140,6 @@ class Topbit {
    * - globalLog {bool} 启用全局日志。
    * - maxBody {number} 表示POST/PUT提交表单的最大字节数，包括上传文件。
    * - maxFiles {number} 最大上传文件数量，超过则不处理。
-   * - daemon {bool} 启用守护进程模式。
    * - pidFile {string} 保存Master进程PID的文件路径。
    * - logFile {string} 日志文件。
    * - errorLogFile {string} 错误日志文件。
@@ -156,7 +155,6 @@ class Topbit {
    * - memFactor {number} 控制内存最大使用量的系数，范围从 -0.45 ～ 0.45，会使用基本系数加上此值并乘以内存总量。默认值0.28。
    *      RSS基本系数是0.52。不要设置的太低，提供比较低的值是为了测试使用。
    * - maxUrlLength 最大URL长度，包括path和querystring
-   * - maxpool 请求上下文的最大缓存池数量。
    * - loadMonitor true|false，表示是否启用负载监控功能，在daemon模式有效，默认为true。
    * - monitorTimeSlice 子进程获取系统占用资源的定时器时间片，毫秒值，默认为500。
    * - maxQuery 最大允许的querystring的参数，默认为12。
@@ -172,6 +170,9 @@ class Topbit {
       throw new Error('topbit遵循单例模式，不能构造多次。你可以在多进程或多线程中构造新的实例。');
 
     __instance__ += 1;
+
+    this._is_listening = false;
+    this._is_daemon_listening = false;
   
     this.config = {
       //此配置表示POST/PUT提交表单的最大字节数，也是上传文件的最大限制，
@@ -238,8 +239,6 @@ class Topbit {
   
       maxUrlLength: 1152,
   
-      maxpool : 8192,
-  
       //子进程汇报资源信息的定时器毫秒数。
       monitorTimeSlice: 500,
   
@@ -337,10 +336,6 @@ class Topbit {
         case 'maxUrlLength':
           optionsCheck(k, options[k], this.config, {type: 'number', min: 1, max: 4096});
           break;
-        
-        case 'maxpool':
-          optionsCheck(k, options[k], this.config, {type: 'number', min: 2, max: 50000});
-          break;
   
         case 'monitorTimeSlice':
           optionsCheck(k, options[k], this.config, {type: 'number', min: 5, max: 10000});
@@ -856,71 +851,6 @@ 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)
-      })
-    }
-  
-    //如果发现更改了service指向，则让this.httpServ.service重新指向this.service。
-    if (this.service !== this.httpServ.service) {
-      this.httpServ.service = this.service;
-    }
-  
-    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
 
   /**
    * 
@@ -1148,7 +1078,6 @@ class Topbit {
         cpu: {user:0, system:0},
         cputm : 1000000
       };
-      
     });
 
     let exitTip = () => {
@@ -1218,6 +1147,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 端口号
@@ -1225,6 +1224,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';
@@ -1236,14 +1237,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;