topbit 3.0.8 → 3.1.1

package/README.cn.md

@@ -915,7 +915,7 @@ app.run(1234)
     //展示负载信息，需要通过daemon接口开启cluster集群模式
     loadMonitor : true,
 
-    //负载信息的类型，text 、json、--null
+    //负载信息的类型，text 、null, obj, orgobj
     //json类型是给程序通信使用的，方便接口开发
     loadInfoType : 'text',
 
@@ -1921,7 +1921,7 @@ let hxy = new Http2Proxy({
         weight: 10,
         path : '/',
         reconnDelay: 200, // 重连延迟
-        max: 2,
+        maxConnect: 2,
         headers: {
           'x-test-key': `${Date.now()}`
         },

package/README.md

@@ -879,7 +879,7 @@ Full configuration options for app initialization are as follows. Please read th
     // Display load info, requires enabling cluster mode via daemon interface
     loadMonitor : true,
 
-    // Load info type: text, json, --null
+    // Load info type: text, null, obj, orgobj
     // json type is for program communication, convenient for interface development
     loadInfoType : 'text',
 
@@ -1882,7 +1882,7 @@ let hxy = new Http2Proxy({
         weight: 10,
         path : '/',
         reconnDelay: 200, // Reconnection delay
-        max: 2,
+        maxConnect: 2,
         headers: {
           'x-test-key': `${Date.now()}`
         },

package/demo/allow.js

@@ -1,8 +1,21 @@
 'use strict';
 
-const titbit = require('../src/topbit.js');
-
-const app = new titbit({
+const Topbit = require('../src/topbit.js');
+const npargv = Topbit.npargv
+
+let {args} = npargv({
+  '--loadtype': {
+    name: 'load',
+    default: 'text',
+    limit: ['text', 'json', 'orgjson']
+  },
+  '--loadstdio': {
+    name: 'loadstdio',
+    default: false
+  }
+})
+
+const app = new Topbit({
     debug : true,
     allow : new Set(['127.0.0.1']),
     maxIPRequest: 2,
@@ -10,11 +23,11 @@ const app = new titbit({
     useLimit: true,
     maxConn: 2000,
     //http2: true,
-    showLoadInfo: true,
-    loadInfoType : 'text',
+    loadMonitor: true,
+    loadInfoType : args.load,
     globalLog : true,
     logType: 'stdio',
-    loadInfoFile : '/tmp/loadinfo.log'
+    loadInfoFile : args.loadstdio ? '' : '/tmp/loadinfo.log',
 });
 
 app.use(async (c, next) => {
@@ -65,7 +78,12 @@ app.get('/', async c => {
 }, 'home');
 
 app.get('/test', async c => {
-    c.to(c.name);
+    //await c.ext.delay(10)
+    let sum = 0
+    for (let i = 0; i < 1000000; i++) {
+        sum += Math.random() * i;
+    }
+    c.to({sum});
 }, {group: 'test', name : 'test'});
 
 app.post('/test', async c => {
@@ -95,4 +113,6 @@ app.use(async (c, next) => {
 }, {pre: true, method: 'POST', name: 'transmit'});
 
 
-app.daemon(2034, 2);
+app.autoWorker(3)
+
+app.daemon(2034, 1)

package/demo/group-api.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const titbit = require('../lib/titbit.js')
+const titbit = require('../src/topbit.js')
 
 const app = new titbit({
   debug: true,

package/demo/group-api2.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Titbit = require('../lib/titbit.js')
+const Titbit = require('../src/topbit.js')
 
 let app = new Titbit({
   debug: true,

package/demo/monitor.js

@@ -0,0 +1,81 @@
+'use strict';
+
+const Topbit = require('../src/topbit.js');
+const npargv = Topbit.npargv
+
+let {args} = npargv({
+  '--loadtype': {
+    name: 'loadtype',
+    default: 'text',
+    limit: ['text', 'json', 'orgjson', 'obj', 'orgobj']
+  },
+  '--loadstdio': {
+    name: 'loadstdio',
+    default: false
+  },
+
+  '--http2': {
+    name: 'http2',
+    default: false
+  }
+})
+
+const app = new Topbit({
+    debug : true,
+    allow : new Set(['127.0.0.1']),
+    maxIPRequest: 2,
+    unitTime: 10,
+    useLimit: true,
+    maxConn: 2000,
+    http2: args.http2,
+    loadMonitor: true,
+    loadInfoType : args.loadtype,
+    globalLog : false,
+    logType: 'stdio',
+    loadInfoFile : args.loadstdio ? '' : '/tmp/topbit-loadinfo.log',
+    maxLoadRate: 0.56
+});
+
+app.get('/', async c => {
+    c.to('ok');
+}, 'home');
+
+app.get('/test', async c => {
+    //await c.ext.delay(10)
+    let sum = 0
+    for (let i = 0; i < 90000; i++) {
+        sum += Math.random() * i;
+    }
+    c.to({sum});
+}, {group: 'test', name : 'test'});
+
+app.post('/test', async c => {
+    c.to(c.body);
+}, {group: 'test', name : 'test-post'});
+
+app.post('/transmit', async c => {
+    c.to('ok');
+}, 'transmit');
+
+app.use(async (c, next) => {
+    let total = 0;
+    
+    c.box.dataHandle = (data) => {
+        total += data.length;
+        if (total > 32) {
+            c.response.statusCode = 413;
+            c.response.end('太多了，限制32字节以内');
+            return ;
+        }
+    };
+
+    await next(c);
+
+    console.log(total, 'bytes');
+
+}, {pre: true, method: 'POST', name: 'transmit'});
+
+
+app.autoWorker(4)
+
+app.daemon(2034, 1)

package/package.json

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