topbit 2.0.0 → 3.0.0

package/bin/new-ctl.js

@@ -79,10 +79,14 @@ function fmt_ctx_param(text) {
 const fs = require('fs')
 
 function makeController(name) {
+  let modname = name
+  if (!(/^[A-Z].*/).test(name)) {
+    modname = name.substring(0, 1).toUpperCase() + name.substring(1)
+  }
 
   return `'use strict'\n\n`
         + (simple_mode ? '' : head_hint)
-        + `class ${name} {\n\n`
+        + `class ${modname} {\n\n`
         + `  constructor() {\n`
         + `    //param用于指定最后的路由参数，默认就是/:id\n`
         + `    //若要改变路由，则可以设置此属性，比如设置为/:name\n`
@@ -109,7 +113,7 @@ function makeController(name) {
         + `${fmt_ctx_param('删除资源')}`
         + `  async _delete(ctx) {\n\n`
         + `  }\n`
-        + `}\n\nmodule.exports = ${name}\n`
+        + `}\n\nmodule.exports = ${modname}\n`
         + (simple_mode ? '' : `${type_context}`)
 
 }
@@ -121,7 +125,7 @@ let limitName = [
   'typeof', 'continue', 'fetch', 'globalThis', 'queueMicrotask'
 ]
 
-let name_preg = /^[a-z_][a-z0-9_\-]{0,50}$/i
+let name_preg = /^[A-Za-z_][A-Za-z0-9_\-]{0,50}$/i
 
 function checkName (name) {
   return name_preg.test(name)

package/demo/allow.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,
@@ -20,29 +20,29 @@ const app = new titbit({
 app.use(async (c, next) => {
   console.log('pre middleware start');
   console.log(c.group, c.name, c.method, c.path);
-  await next();
+  await next(c);
   console.log('pre middleware end');
 }, {pre : true});
 
 app.use(async (c, next) => {
     console.log('middleware 1');
-    await next();
+    await next(c);
     console.log('middleware 1 end');
 }, 'home');
 
 app.use(async (c, next) => {
     console.log('middleware 2');
     c.body.say = '你好';
-    await next();
+    await next(c);
     console.log('middleware 2 end');
 }, {group: 'test', method: 'POST'});
 
 app.use(async (c, next) => {
     console.log('middleware 3');
     if (c.query.say == 'hey') {
-        c.send('你好，test 接口 GET请求结束。');
+        c.to('你好，test 接口 GET请求结束。');
     } else {
-        await next();
+        await next(c);
     }
     console.log('middleware 3 end');
 }, {group: 'test', method : 'GET'});
@@ -50,30 +50,30 @@ app.use(async (c, next) => {
 app.use(async (c, next) => {
     console.log('set body size');
     c.maxBody = 24;
-    await next();
+    await next(c);
 }, {name: 'test-post', pre: true});
 
 app.use(async (c, next) => {
     console.log('middleware 4');
     c.body.x = 12;
-    await next();
+    await next(c);
     console.log('middleware 4 end');
 }, 'test-post');
 
 app.get('/', async c => {
-    c.send('ok');
+    c.to('ok');
 }, 'home');
 
 app.get('/test', async c => {
-    c.send(c.name);
+    c.to(c.name);
 }, {group: 'test', name : 'test'});
 
 app.post('/test', async c => {
-    c.send(c.body);
+    c.to(c.body);
 }, {group: 'test', name : 'test-post'});
 
 app.post('/transmit', async c => {
-    c.send('ok');
+    c.to('ok');
 }, 'transmit');
 
 app.use(async (c, next) => {
@@ -88,7 +88,7 @@ app.use(async (c, next) => {
         }
     };
 
-    await next();
+    await next(c);
 
     console.log(total, 'bytes');
 

package/demo/controller/api.js

@@ -0,0 +1,15 @@
+'use strict'
+
+class Api {
+  constructor() {
+
+  }
+
+  async get(ctx) {
+    ctx.ok([
+      ctx.method, ctx.path, ctx.routepath, ctx.param
+    ])
+  }
+}
+
+module.exports = Api

package/demo/extends.js

@@ -0,0 +1,5 @@
+'use strict'
+
+let toolkit = require('../src/topbit.js').extensions
+
+console.log(toolkit)

package/demo/http2.js

@@ -0,0 +1,34 @@
+'use strict'
+
+'use strict'
+
+process.chdir(__dirname)
+
+let Topbit = require('../src/topbit.js')
+let {Loader} = Topbit
+
+let app = new Topbit({
+  debug: true,
+  globalLog: true,
+  logType: 'stdio',
+  loadInfoFile: '--mem',
+  cert: './cert/localhost-cert.pem',
+  key: './cert/localhost-privkey.pem',
+  http2: true
+})
+
+if (app.isWorker) {
+  app.get('/', async ctx => {
+    ctx.ok('ok')
+  })
+
+  let ld = new Loader()
+
+  ld.init(app)
+}
+
+app.sched('none')
+
+app.autoWorker(3)
+
+app.daemon(1234, 1)

package/demo/http2_proxy_backend.js

@@ -0,0 +1,45 @@
+'use strict'
+
+const Topbit = require('../src/topbit.js')
+
+const app = new Topbit({
+  debug: true,
+  http2: true,
+  loadInfoFile: '/tmp/loadinfo.log',
+  globalLog: true,
+  monitorTimeSlice: 512,
+  timeout: 0
+})
+
+app.use(async (c, next) => {
+  c.setHeader('x-set-key', `${parseInt(Math.random() * 10000) + Date.now()}`)
+  await next(c)
+})
+
+app.get('/header', async c => {
+  c.to(c.headers)
+})
+
+app.get('/', async c => {
+  c.to(Math.random())
+})
+
+app.get('/:name/:age/:mobile/:info', async c => {
+  c.to(c.param)
+})
+
+app.post('/p', async c => {
+  c.to(c.body)
+})
+
+let port = 2022
+let port_ind = process.argv.indexOf('--port')
+
+if (port_ind > 0 && port_ind < process.argv.length - 1) {
+  port = parseInt(process.argv[port_ind + 1])
+
+  if (typeof port !== 'number')
+    port = 2022
+}
+
+app.run(port)

package/demo/http2proxy.js

@@ -0,0 +1,48 @@
+'use strict'
+
+let Topbit = require('../src/topbit.js')
+
+let {Http2Proxy} = Topbit.extensions
+
+let app = new Topbit({
+  debug: true,
+  globalLog: true,
+  loadInfoFile: '--mem',
+  http2: true
+})
+
+if (app.isWorker) {
+  let h2proxy = new Http2Proxy({
+    config: {
+      'x.com': [
+        {
+          url: 'http://localhost:3001',
+          weight: 10,
+          path : '/',
+          reconnDelay: 200,
+          max: 2,
+          headers: {
+            'x-test-key': `${Date.now()}-${Math.random()}`
+          },
+          connectTimeout: 2000
+        },
+
+        {
+          url: 'http://localhost:3002',
+          weight: 4,
+          path : '/',
+          max: 2,
+          reconnDelay: 100,
+          headers: {
+            'x-test-key2': `${Date.now()}-${Math.random()}`
+          }
+        }
+      ]
+    },
+    debug: true
+  })
+
+  h2proxy.init(app)
+}
+
+app.daemon(1234, 2)

package/demo/http_proxy_backend.js

@@ -0,0 +1,44 @@
+'use strict'
+
+const Topbit = require('../src/topbit.js')
+
+const app = new Topbit({
+  debug: true,
+  loadInfoFile: '/tmp/loadinfo.log',
+  globalLog: true,
+  monitorTimeSlice: 512,
+  timeout: 100000
+})
+
+app.use(async (c, next) => {
+  c.setHeader('x-set-key', `${parseInt(Math.random() * 10000) + Date.now()}`)
+  await next(c)
+})
+
+app.get('/header', async c => {
+  c.to(c.headers)
+})
+
+app.get('/', async c => {
+  c.to(Math.random())
+})
+
+app.get('/:name/:age/:mobile/:info', async c => {
+  c.to(c.param)
+})
+
+app.post('/p', async c => {
+  c.to(c.body)
+})
+
+let port = 2022
+let port_ind = process.argv.indexOf('--port')
+
+if (port_ind > 0 && port_ind < process.argv.length - 1) {
+  port = parseInt(process.argv[port_ind + 1])
+
+  if (typeof port !== 'number')
+    port = 2022
+}
+
+app.run(port)

package/demo/httpproxy.js

@@ -0,0 +1,47 @@
+'use strict'
+
+let Topbit = require('../src/topbit.js')
+
+let {Proxy} = Topbit.extensions
+
+let app = new Topbit({
+  debug: true,
+  globalLog: true,
+  loadInfoFile: '--mem',
+})
+
+if (app.isWorker) {
+  let pxy = new Proxy({
+    config: {
+      'x.com': [
+        {
+          url: 'http://localhost:3001',
+          weight: 10,
+          path : '/',
+          reconnDelay: 200,
+          max: 2,
+          headers: {
+            'x-test-key': `${Date.now()}-${Math.random()}`
+          },
+          connectTimeout: 2000
+        },
+
+        {
+          url: 'http://localhost:3002',
+          weight: 4,
+          path : '/',
+          max: 2,
+          reconnDelay: 100,
+          headers: {
+            'x-test-key2': `${Date.now()}-${Math.random()}`
+          }
+        }
+      ]
+    },
+    debug: true
+  })
+
+  pxy.init(app)
+}
+
+app.daemon(1234, 2)

package/demo/loader.js

@@ -0,0 +1,27 @@
+'use strict'
+
+process.chdir(__dirname)
+
+let Topbit = require('../src/topbit.js')
+let {Loader} = Topbit
+
+let app = new Topbit({
+  debug: true,
+  //loadInfoFile: '--mem',
+})
+
+if (app.isWorker) {
+  app.get('/', async ctx => {
+    ctx.ok('ok')
+  })
+
+  let ld = new Loader()
+
+  ld.init(app)
+}
+
+app.sched('none')
+
+app.autoWorker(3)
+
+app.daemon(1234, 1)

package/demo/log.js

@@ -1,4 +1,4 @@
-const titbit = require('../lib/titbit.js');
+const titbit = require('../src/topbit.js');
 const v8 = require('v8');
 const cluster = require('cluster');
 

package/demo/memlimit.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const titbit = require('../lib/titbit.js');
+const titbit = require('../src/topbit.js');
 
 const cluster = require('cluster');
 

package/demo/min.js

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

package/demo/serv.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "topbit",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "A Server-side web framework support http/1.1 and http/2",
   "main": "src/topbit.js",
   "directories": {
@@ -8,10 +8,11 @@
   },
   "bin": {
     "tbload": "bin/loadinfo.sh",
-    "topbit-new-app": "bin/newapp.js"
+    "topbit-new-app": "bin/newapp.js",
+    "new-route": "bin/new-ctl.js"
   },
   "scripts": {
-    "test": "node test/test-service.js",
+    "test": "node test/test-ext.js",
     "test-route": "node test/test-route.js"
   },
   "keywords": [
@@ -32,6 +33,9 @@
     "framework",
     "tidbit",
     "proxy",
+    "http2proxy",
+    "mvc",
+    "api",
     "webserver",
     "backend",
     "serverside"
@@ -47,9 +51,6 @@
   "license": "ISC",
   "author": "BraveWang",
   "type": "commonjs",
-  "scripts": {
-    "test": "echo ok"
-  },
   "dependencies": {
 
   },

package/src/_loadExtends.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const fs = require('node:fs')
+
+let files = fs.readdirSync(`${__dirname}/extends/`, {withFileTypes: true})
+
+for (let i = 0; i < files.length; i++) {
+
+  if (!files[i].isFile()) continue
+
+  if (files[i].name.indexOf('.js') < 0) continue
+
+  if (files[i].name.substring(files[i].name.length - 3) !== '.js') continue
+
+  if (files[i].name[0] === '_' || files[i].name[0] === '!') continue
+
+  let modname = files[i].name.substring(0, files[i].name.length-3)
+
+  let em = require('./extends/'+files[i].name)
+  exports[em.name] = em
+}

package/src/bodyparser.js

@@ -412,7 +412,7 @@ class Bodyparser {
         }
       }
 
-      await next();
+      await next(ctx);
     };
   }
 }

package/src/context1.js

@@ -57,11 +57,8 @@ class Context {
     this.data = ''
     this.dataEncoding = 'utf8'
 
-    this.request   = null
-
-    this.response  = null
-
-    this.reply = null
+    this.req   = null
+    this.res  = null
 
     this.box = {}
 
@@ -71,18 +68,18 @@ class Context {
   }
 
   json(data) {
-    return this.setHeader('content-type', 'application/json').send(data)
+    return this.setHeader('content-type', 'application/json').to(data)
   }
 
   text(data, encoding='utf-8') {
-    return this.setHeader('content-type', `text/plain;charset=${encoding}`).send(data)
+    return this.setHeader('content-type', `text/plain;charset=${encoding}`).to(data)
   }
 
   html(data, encoding='utf-8') {
-    return this.setHeader('content-type', `text/html;charset=${encoding}`).send(data)
+    return this.setHeader('content-type', `text/html;charset=${encoding}`).to(data)
   }
 
-  send(d) {
+  to(d) {
     this.data = d
   }
 
@@ -103,25 +100,25 @@ class Context {
   }
 
   setHeader(name, val) {
-    this.response.setHeader(name, val)
+    this.res.setHeader(name, val)
     return this
   }
 
   sendHeader() {
-    !this.response
-      && !this.response.headersSent
-      && this.response.writeHead(this.response.statusCode)
+    !this.res
+      && !this.res.headersSent
+      && this.res.writeHead(this.res.statusCode)
 
     return this
   }
 
   status(stcode = null) {
     if (stcode === null) {
-      return this.response.statusCode
+      return this.res.statusCode
     }
 
-    if (this.response) {
-      this.response.statusCode = stcode
+    if (this.res) {
+      this.res.statusCode = stcode
     }
 
     return this
@@ -136,7 +133,7 @@ class Context {
    * @param {object} options
    * */
   pipe(filename, options={}) {
-    return ext.pipe(filename, this.reply, options)
+    return ext.pipe(filename, this.res, options)
   }
 
   pipeJson(filename) {
@@ -152,15 +149,18 @@ class Context {
   }
 
   removeHeader(name) {
-    this.reply.removeHeader(name)
+    this.res.removeHeader(name)
     return this
   }
 
   write(data) {
-    this.reply.write(data)
+    this.res.write(data)
     return this
   }
 
 }
 
+Context.prototype.oo = Context.prototype.to
+Context.prototype.ok = Context.prototype.to
+
 module.exports = Context

package/src/context2.js

@@ -60,9 +60,9 @@ class Context {
     //在请求时指向实际的stream
     this.stream = null
 
-    this.request = null
+    this.req = null
 
-    this.reply = null
+    this.res = null
 
     this.box = {}
     
@@ -72,18 +72,18 @@ class Context {
   }
 
   json(data) {
-    return this.setHeader('content-type', 'application/json').send(data)
+    return this.setHeader('content-type', 'application/json').to(data)
   }
 
   text(data, encoding='utf-8') {
-    return this.setHeader('content-type', `text/plain;charset=${encoding}`).send(data)
+    return this.setHeader('content-type', `text/plain;charset=${encoding}`).to(data)
   }
 
   html(data, encoding='utf-8') {
-    return this.setHeader('content-type', `text/html;charset=${encoding}`).send(data)
+    return this.setHeader('content-type', `text/html;charset=${encoding}`).to(data)
   }
 
-  send(d) {
+  to(d) {
     this.data = d
   }
 
@@ -147,7 +147,7 @@ class Context {
       this.sendHeader()
     }
 
-    return ext.pipe(filename, this.reply, options)
+    return ext.pipe(filename, this.res, options)
   }
 
   pipeJson(filename) {
@@ -170,10 +170,13 @@ class Context {
   write(data) {
     this.stream && !this.stream.headersSent && this.stream.respond(this.dataHeaders)
 
-    this.reply.write(data)
+    this.stream.write(data)
     return this
   }
 
 }
 
+Context.prototype.oo = Context.prototype.to
+Context.prototype.ok = Context.prototype.to
+
 module.exports = Context

package/src/ctxpool.js

@@ -10,6 +10,7 @@ let ctxpool = new function () {
     if (this.pool.length > 0) {
       return this.pool.pop()
     }
+
     return null
   }