topbit 3.2.0 → 3.2.1

package/README.cn.md

@@ -933,9 +933,6 @@ app.run(1234)
     //url最大长度
     maxUrlLength: 2048,
 
-    //请求上下文缓存池最大数量。
-    maxpool: 4096,
-
     //子进程汇报资源信息的定时器毫秒数。
     monitorTimeSlice: 640,
 

package/README.md

@@ -897,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,
 

package/demo/loader.js

@@ -31,7 +31,7 @@ let app = new Topbit({
   globalLog : false,
   logType: 'stdio',
   loadInfoFile : args.load ? '' : '/tmp/topbit-loadinfo.log',
-  maxLoadRate: 0.6
+  maxLoadRate: 0.85
 })
 
 if (app.isWorker) {

package/demo/monitor.js

@@ -33,7 +33,7 @@ const app = new Topbit({
     globalLog : false,
     logType: 'stdio',
     loadInfoFile : args.load ? '' : '/tmp/topbit-loadinfo.log',
-    maxLoadRate: 0.56
+    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 => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "topbit",
-  "version": "3.2.0",
+  "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/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

@@ -155,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。
@@ -240,8 +239,6 @@ class Topbit {
   
       maxUrlLength: 1152,
   
-      maxpool : 8192,
-  
       //子进程汇报资源信息的定时器毫秒数。
       monitorTimeSlice: 500,
   
@@ -339,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});