npm - topbit - Versions diffs - 3.0.8 → 3.1.1 - Mend

topbit 3.0.8 → 3.1.1

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 (14) hide show

package/README.cn.md +2 -2
package/README.md +2 -2
package/demo/allow.js +28 -8
package/demo/group-api.js +1 -1
package/demo/group-api2.js +1 -1
package/demo/monitor.js +81 -0
package/package.json +1 -1
package/src/extends/Http2Pool.js +143 -309
package/src/extends/http2proxy.js +39 -141
package/src/extends/proxy.js +16 -17
package/src/monitor.js +102 -90
package/src/topbit.js +8 -8
package/test/test-route-sort.js +1 -1
package/test/test-route2.js +1 -1

package/src/extends/http2proxy.js CHANGED Viewed

@@ -1,7 +1,7 @@
 'use strict'
 const http2 = require('node:http2')
-const Http2Pool = require('./Http2Pool')
+const Http2Pool = require('./Http2Pool.js')
 let error_502_text = `<!DOCTYPE html><html>
       <head>
@@ -52,6 +52,19 @@ function fmtpath(path) {
   return `${path}*`
 }
+// 主机名提取 (IPv6 兼容优化版)
+function extractHostname(host) {
+  if (!host) return ''
+  if (host.charCodeAt(0) === 91) { // '[' IPv6
+      const end = host.indexOf(']')
+      return end > -1 ? host.substring(0, end + 1) : host
+  }
+  const idx = host.indexOf(':')
+  if (idx === -1) return host
+  if (host.indexOf(':', idx + 1) !== -1) return host // 裸 IPv6
+  return host.substring(0, idx)
+}
 let Http2Proxy = function (options = {}) {
   if (!(this instanceof Http2Proxy)) return Http2Proxy(options)
@@ -188,8 +201,8 @@ Http2Proxy.prototype.checkAndSetConfig = function (backend_obj, tmp) {
   }
-  if (tmp.max && typeof tmp.max === 'number' && tmp.max > 1)
-    backend_obj.max = tmp.max
+  if (tmp.maxConnect && typeof tmp.maxConnect === 'number' && tmp.maxConnect > 1)
+    backend_obj.maxConnect = tmp.maxConnect
   if (tmp.debug !== undefined) backend_obj.debug = tmp.debug
@@ -244,8 +257,7 @@ Http2Proxy.prototype.setHostProxy = function (cfg) {
         weight: 1,
         weightCount: 0,
         reconnDelay: 500,
-        max: 50,
-        maxConnect: tmp.maxConnect || 0,
+        maxConnect: tmp.maxConnect || 10,
         debug: this.debug,
         h2Pool: null,
         timeout: this.timeout,
@@ -268,7 +280,6 @@ Http2Proxy.prototype.setHostProxy = function (cfg) {
       backend_obj.h2Pool = new Http2Pool({
         debug: backend_obj.debug,
-        max: backend_obj.max,
         url: backend_obj.url,
         connectOptions: backend_obj.connectOptions,
         parent: backend_obj,
@@ -338,23 +349,6 @@ Http2Proxy.prototype.getBackend = function (c, host) {
     }
   }
-  if (!pr.alive) {
-    pr.h2Pool && pr.h2Pool.delayConnect()
-    for (let i = prlist.length - 1; i >= 0 ; i--) {
-      pr = prlist[i]
-      if (pr.alive) {
-        return pr
-      } else {
-        pr.h2Pool && pr.h2Pool.delayConnect()
-      }
-    }
-    return null
-  }
   return pr
 }
@@ -401,22 +395,7 @@ Http2Proxy.prototype.mid = function () {
   return async (c, next) => {
-    let host = c.host
-    let hind = c.host.length - 1
-    if (hind > 4) {
-      let eind = hind - 5
-      while (hind >= eind) {
-        if (c.host[hind] === ':') {
-          host = c.host.substring(0, hind)
-          break
-        }
-        hind--
-      }
-    }
+    let host = extractHostname(c.host)
     if (!self.hostProxy[host] || !self.hostProxy[host][c.routepath]) {
       if (self.full) {
@@ -427,25 +406,7 @@ Http2Proxy.prototype.mid = function () {
     }
     let pr = self.getBackend(c, host)
-    if (!pr) {
-      pr = self.getBackend(c, host)
-      if (!pr) {
-        await c.ext.delay(9)
-        pr = self.getBackend(c, host)
-        if (!pr) {
-          for (let i = 0; i < 200; i++) {
-            await c.ext.delay(6 + i)
-            pr = self.getBackend(c, host)
-            if (pr) break
-          }
-        }
-        if (!pr) return c.status(503).to(error_503_text)
-      }
-    }
+    if (!pr) return c.status(503).to(error_503_text)
     if (self.addIP && c.headers['x-real-ip']) {
       c.headers['x-real-ip'] += `,${c.ip}`
@@ -454,7 +415,6 @@ Http2Proxy.prototype.mid = function () {
     }
     let hii = pr.h2Pool
-    let session_client
     try {
       if (pr.headers) {
@@ -462,73 +422,38 @@ Http2Proxy.prototype.mid = function () {
       }
       if (pr.rewrite) {
-        let rpath = pr.rewrite(c, c.major >= 2 ? c.headers[':path'] : c.request.url)
+        let rpath = pr.rewrite(c, c.major > 1 ? c.headers[':path'] : c.req.url)
         if (rpath) {
           let path_typ = typeof rpath
           if (path_typ === 'object' && rpath.redirect) {
             return c.setHeader('location', rpath.redirect)
           } else if (path_typ === 'string') {
-            c.headers[':path'] = rpath
+            if (c.major > 1)
+              c.headers[':path'] = rpath
+            else c.req.url = rpath
           }
         }
       }
-      session_client = await hii.getSession()
-      if (session_client.deny) {
-        for (let i = 0; i < 50; i++) {
-          await c.ext.delay(5 + i)
-          session_client = await hii.getSession()
-          if (!session_client.deny) break
-        }
-        if (session_client.deny)
-          return c.status(429).to('服务繁忙，请稍后再试')
-      }
       await new Promise(async (rv, rj) => {
         let resolved = false
         let rejected = false
         let request_stream = c.stream
         let stm = null
-        stm = await hii.request(
-                            c.major === 2 ? c.headers : this.fmtHeaders(c.headers, c),
-                            session_client
-                          ).catch(err => {
-                            rejected = true
-                            rj(err)
-                            stm = null
-                          })
+        stm = await hii.request(c.major > 1 ? c.headers : this.fmtHeaders(c.headers, c))
+                      .catch(err => {
+                          rejected = true
+                          rj(err)
+                          stm = null
+                      })
         if (!stm) {
           rj(new Error('request failed'))
           return false
         }
-        let timeout_handler = () => {
-          timeout_timer = null
-          //强制的异常结束，这意味着session的其他stream也会出现问题。
-          try {
-            !stm.closed && stm.close(http2.constants.NGHTTP2_CANCEL)
-            stm.destroy()
-            if (session_client.session && !session_client.session.destroyed) {
-              session_client.session.destroy()
-            }
-          } catch(e) {}
-          if (!resolved && !rejected) {
-            rejected = true
-            rj(new Error('force destroy stream, request timeout'))
-          }
-        }
-        session_client.aliveStreams++
-        let timeout_timer = setTimeout(timeout_handler, pr.timeout + 5000)
         c.stream.on('timeout', () => {
           stm.close(http2.constants.NGHTTP2_CANCEL)
           //stm.destroy()
@@ -541,11 +466,6 @@ Http2Proxy.prototype.mid = function () {
         })
         c.stream.on('error', err => {
-          if (timeout_timer) {
-            clearTimeout(timeout_timer)
-            timeout_timer = null
-          }
           stm.close(http2.constants.NGHTTP2_INTERNAL_ERROR)
           stm.destroy()
         })
@@ -562,11 +482,6 @@ Http2Proxy.prototype.mid = function () {
         })
         stm.on('aborted', err => {
-          if (timeout_timer) {
-            clearTimeout(timeout_timer)
-            timeout_timer = null
-          }
           !stm.destroyed && stm.destroy()
           if (!resolved && !rejected) {
@@ -576,13 +491,6 @@ Http2Proxy.prototype.mid = function () {
         })
         stm.on('close', () => {
-          if (timeout_timer) {
-            clearTimeout(timeout_timer)
-            timeout_timer = null
-          }
-          stm.removeAllListeners()
           if (stm.rstCode === http2.constants.NGHTTP2_NO_ERROR) {
             if (!resolved && !rejected) {
               resolved = true
@@ -594,13 +502,9 @@ Http2Proxy.prototype.mid = function () {
               rj(new Error(`stream close, exit code ${stm.rstCode}`))
             }
           }
-          session_client.aliveStreams--
         })
         stm.on('response', (headers, flags) => {
-          timeout_timer && clearTimeout(timeout_timer)
-          timeout_timer = setTimeout(timeout_handler, pr.timeout + 5000)
           if (c.res && c.res.writable) {
             if (c.res.respond) {
               c.res.respond(headers)
@@ -636,25 +540,21 @@ Http2Proxy.prototype.mid = function () {
           stm.end()
         })
-        let data_count = 0
-        stm.on('data', chunk => {
-          data_count++
-          c.res && c.res.writable && c.res.write(chunk)
+        const onDrain = () => stm.resume()
+        if (c.res) c.res.on('drain', onDrain)
-          if (data_count >= 111) {
-            data_count = 0
-            timeout_timer && clearTimeout(timeout_timer)
-            timeout_timer = setTimeout(timeout_handler, pr.timeout + 5000)
+        stm.on('data', chunk => {
+          if (c.res && c.res.writable) {
+            if (c.res.write(chunk) === false) {
+              stm.pause()
+            }
           }
         })
         stm.on('end', () => {
-          if (timeout_timer) {
-            clearTimeout(timeout_timer)
-            timeout_timer = null
-          }
-          stm.close()
+          if (c.res) c.res.removeListener('drain', onDrain)
+          !stm.closed && stm.close()
           if (!resolved && !rejected) {
             resolved = true
@@ -666,8 +566,6 @@ Http2Proxy.prototype.mid = function () {
     } catch (err) {
       self.debug && console.error(err||'request null error')
       c.status(503).to(error_503_text)
-    } finally {
-      session_client = null
     }
   }

package/src/extends/proxy.js CHANGED Viewed

@@ -4,6 +4,20 @@ const urlparse = require('node:url');
 const http = require('node:http');
 const https = require('node:https');
+// 主机名提取 (IPv6 兼容优化版)
+function extractHostname(host) {
+  if (!host) return ''
+  if (host.charCodeAt(0) === 91) { // '[' IPv6
+      const end = host.indexOf(']')
+      return end > -1 ? host.substring(0, end + 1) : host
+  }
+  const idx = host.indexOf(':')
+  if (idx === -1) return host
+  if (host.indexOf(':', idx + 1) !== -1) return host // 裸 IPv6
+  return host.substring(0, idx)
+}
 /**
  * {
  *    host : {}
@@ -406,22 +420,7 @@ class Proxy {
     return async (c, next) => {
-      let host = c.host
-      let hind = c.host.length - 1
-      if (hind > 4) {
-        let eind = hind - 5
-        while (hind >= eind) {
-          if (c.host[hind] === ':') {
-            host = c.host.substring(0, hind)
-            break
-          }
-          hind--
-        }
-      }
+      let host = extractHostname(c.host)
       if (self.hostProxy[host]===undefined || self.hostProxy[host][c.routepath]===undefined) {
         if (self.full) {
@@ -433,7 +432,7 @@ class Proxy {
       let pr = self.getBackend(c, host)
       if (pr === null) {
-        for (let i = 0; i < 200; i++) {
+        for (let i = 0; i < 50; i++) {
           await new Promise((rv, rj) => {setTimeout(rv, 10)})
           pr = self.getBackend(c, host)
           if (pr) break

package/src/monitor.js CHANGED Viewed

@@ -5,6 +5,8 @@ const os = require('node:os');
 const fs = require('node:fs');
 const process = require('node:process');
+const hrtime = process.hrtime
 class Monitor {
   constructor(options) {
@@ -15,6 +17,8 @@ class Monitor {
     this.workerCount = options.workerCount
+    this.isLoadObj = ['obj', 'orgobj'].includes(this.config.loadInfoType)
     this.rundata.cpus = os.cpus().length
     this.loadCount = 0
@@ -24,9 +28,9 @@ class Monitor {
     this.loadCache = null
-    this.cpuLastTime = Date.now() - 1
+    this.cpuLastTime = hrtime.bigint() - 1n
-    this.cpuNowTime = Date.now()
+    this.cpuNowTime = hrtime.bigint()
     //this.cpuPercentFactor = 10 * this.rundata.cpus;
     this.cpuHighRatio = 0
@@ -45,10 +49,36 @@ class Monitor {
     this.life = 20
-    this.maxRate = parseInt(this.config.maxLoadRate * 10)
+    this.maxRate = this.config.maxLoadRate
     this.loadfd = null
+    this.ipcMsgCache = {
+      type: '_load',
+      pid: 0,
+      cpu: null,
+      cputm: 0,
+      mem: null,
+      conn: 0
+    }
+     this.loadjson = {
+        masterPid : process.pid,
+        listen : `${this.rundata.host}:${this.rundata.port}`,
+        CPULoadavg : {
+          '1m' : '0',
+          '5m' : '0',
+          '15m' : '0'
+        },
+        https: this.config.https,
+        http2: this.config.http2,
+        workers : []
+    }
+    queueMicrotask(() => {
+      this.loadjson.listen = `${this.rundata.host}:${this.rundata.port}`
+    })
   }
   autoWorker() {
@@ -65,20 +95,20 @@ class Monitor {
       for (let k in this.workers) {
         cpuratio = (this.workers[k].cpu.user + this.workers[k].cpu.system) / this.workers[k].cputm
-        if (cpuratio >= this.maxRate) {
-          this.cpuHighRatio += 1
+        if (cpuratio > this.maxRate) {
+          this.cpuHighRatio++
         } else {
           if (this.cpuHighRatio > 0) {
-            this.cpuHighRatio -= 1
+            this.cpuHighRatio--
           }
           break
         }
       }
     }
     if (this.cpuHighRatio >= this.workerCount.cur) {
-      this.cpuHighRatio -= 1
+      this.cpuHighRatio--
       if (this.workerCount.cur < this.workerCount.max) {
         if (this.workerCount.canAutoFork) {
@@ -106,7 +136,7 @@ class Monitor {
       if (this.workerCount.cur > this.workerCount.total) {
         if (this.cooling > 0) {
-          this.cooling -= 1
+          this.cooling--
         } else {
           for (let k in this.workers) {
             if (this.workers[k].conn === 0) {
@@ -169,12 +199,16 @@ class Monitor {
       if (will_disconnect) return;
       this.cpuLastTime = this.cpuNowTime
-      this.cpuNowTime = Date.now()
+      this.cpuNowTime = hrtime.bigint()
+      let diffNs = this.cpuNowTime - this.cpuLastTime
+      let diffUs = (Number(diffNs) / 1000) + 0.01
+      //此处是计算微秒的cpu变化，而计算负载正好按照微秒进行
       this.rundata.cpuTime = process.cpuUsage(this.rundata.cpuLast)
       if (mem_count < MAX_MEM_COUNT) {
         this.rundata.mem.rss = process.memoryUsage.rss()
-        mem_count += 1
+        mem_count++
       } else {
         this.rundata.mem = process.memoryUsage()
         mem_count = 0
@@ -182,16 +216,17 @@ class Monitor {
       this.rundata.mem.total = this.rundata.mem.rss + this.rundata.mem.external
-      process.send({
-        type : '_load',
-        pid  : process.pid,
-        cpu  : this.rundata.cpuTime,
-        cputm : this.cpuNowTime - this.cpuLastTime,
-        mem  : this.rundata.mem,
-        conn : this.rundata.conn
-      }, err => {
-        err && this.config.errorHandle(err, '--ERR-WORKER-SEND--')
-        //if (err.code === 'ERR_IPC_CHANNEL_CLOSED') {}
+      const msg = this.ipcMsgCache
+      msg.pid = process.pid
+      msg.cpu = this.rundata.cpuTime
+      msg.cputm = diffUs
+      msg.mem = this.rundata.mem
+      msg.conn = this.rundata.conn
+      process.send(msg, err => {
+        if (err) this.config.errorHandle(err, '--ERR-WORKER-SEND--')
+        // 忽略管道关闭错误
+        //if (err && err.code !== 'ERR_IPC_CHANNEL_CLOSED') {}
       })
       this.rundata.cpuLast = process.cpuUsage()
@@ -201,7 +236,7 @@ class Monitor {
   }
   showLoadInfo(w, id) {
-    if (this.config.loadInfoType == '--null') {
+    if (!this.config.loadInfoType || this.config.loadInfoType === 'null') {
       return
     }
@@ -225,31 +260,30 @@ class Monitor {
     this.loadCount += 1;
     if (this.loadCount < this.workerCount.cur) {
-      return ;
+      return
     }
-    let loadText = this.fmtLoadInfo( this.config.loadInfoType );
+    let load_info = this.fmtLoadInfo(this.config.loadInfoType);
     if (this.config.loadInfoFile === '--mem') {
-      this.loadCache = loadText;
-    }
-    else if (this.loadfd !== null) {
-      fs.write(this.loadfd, loadText, 0, (err, bytes, data) => {
-        err && this.config.debug && this.config.errorHandle(err, '--ERR-WRITE-FILE--');
-        if (!err) {
-          fs.ftruncate(this.loadfd, bytes, e => {});
-        }
-      });
+      this.loadCache = load_info;
+    } else if (this.loadfd !== null) {
+      fs.write(this.loadfd, this.isLoadObj ? JSON.stringify(load_info) : load_info, 0,
+          (err, bytes, data) => {
+              if (err && this.config.debug) this.config.errorHandle(err, '--ERR-WRITE-FILE--');
+              if (!err) {
+                fs.ftruncate(this.loadfd, bytes, e => {});
+              }
+          }
+      );
     } else if (process.ppid > 1 && !this.config.daemon && !this.config.loadInfoFile) {
       console.clear();
       //只有没有开启守护进程才会输出到屏幕
-      console.log(loadText);
+      console.log(load_info);
     }
     this.loadCount = 0;
   }
   checkMem(w, msg) {
@@ -292,26 +326,16 @@ class Monitor {
       let p = null;
       for (let id in this.workers) {
         p = this.workers[id];
         tmp = [(`${p.pid}`).padEnd(9, ' ')];
         t = p.cpu.user + p.cpu.system;
-        tmp.push((( t/(p.cputm * 10) ).toFixed(2) + '%').padEnd(8, ' '),
-          (`${p.conn}`).padEnd(8, ' '),
-          (p.mem.rss / 1048576).toFixed(1).padEnd(8, ' '),
-          (p.mem.heapTotal / 1048576).toFixed(1).padEnd(8, ' '),
-          (p.mem.heapUsed / 1048576).toFixed(1).padEnd(8, ' '),
-          (p.mem.external / 1048576).toFixed(1).padEnd(9, ' '),
-          (p.mem.total / 1048576).toFixed(1)
+        tmp.push((( t * 100 / p.cputm ).toFixed(2) + '%').padEnd(8, ' '),
+            (`${p.conn}`).padEnd(8, ' '),
+            (p.mem.rss / 1048576).toFixed(1).padEnd(8, ' '),
+            (p.mem.heapTotal / 1048576).toFixed(1).padEnd(8, ' '),
+            (p.mem.heapUsed / 1048576).toFixed(1).padEnd(8, ' '),
+            (p.mem.external / 1048576).toFixed(1).padEnd(9, ' '),
+            (p.mem.total / 1048576).toFixed(1)
         );
         cols.push(tmp.join(''));
@@ -323,56 +347,44 @@ class Monitor {
           +`HTTPS: ${this.config.https ? 'true' : 'false'}; HTTP/2: ${this.config.http2 ? 'true' : 'false'}\n`;
     }
-    if (type === 'json') {
-      let loadjson = {
-        masterPid : process.pid,
-        listen : `${this.rundata.host}:${this.rundata.port}`,
-        CPULoadavg : {
-          '1m' : oavg[0].toFixed(2),
-          '5m' : oavg[1].toFixed(2),
-          '15m' : oavg[2].toFixed(2)
-        },
-        https: this.config.https,
-        http2: this.config.http2,
-        workers : []
-      };
+    if (type === 'obj') {
+      let lj = this.loadjson
+      lj.CPULoadavg['1m'] = oavg[0].toFixed(2)
+      lj.CPULoadavg['5m'] = oavg[1].toFixed(2)
+      lj.CPULoadavg['15m'] = oavg[2].toFixed(2)
+      lj.workers = []
       for (let id in this.workers) {
         p = this.workers[id];
-        loadjson.workers.push({
-          pid : p.pid,
-          cpu : `${((p.cpu.user + p.cpu.system)/ (p.cputm * 10) ).toFixed(2)}%`,
-          cputm : p.cputm,
-          mem : {
+        lj.workers.push({
+          pid: p.pid,
+          cpu: `${((p.cpu.user + p.cpu.system) * 100 / p.cputm).toFixed(2)}%`,
+          cputm: p.cputm,
+          mem: {
             rss : (p.mem.rss / 1048576).toFixed(1),
             heap : (p.mem.heapTotal / 1048576).toFixed(1),
             heapused : (p.mem.heapUsed / 1048576).toFixed(1),
             external :  (p.mem.external / 1048576).toFixed(1),
           },
           conn : p.conn
-        });
+        })
       }
-      return JSON.stringify(loadjson);
+      return lj
     }
-    if (type === 'orgjson') {
-      let loadjson = {
-        masterPid : process.pid,
-        listen : `${this.rundata.host}:${this.rundata.port}`,
-        CPULoadavg : {
-          '1m' : oavg[0].toFixed(2),
-          '5m' : oavg[1].toFixed(2),
-          '15m' : oavg[2].toFixed(2)
-        },
-        https: this.config.https,
-        http2: this.config.http2,
-        workers : this.workers
-      };
-      return JSON.stringify(loadjson);
+    if (type === 'orgobj') {
+      let lj = this.loadjson
+      lj.CPULoadavg['1m'] = oavg[0].toFixed(2)
+      lj.CPULoadavg['5m'] = oavg[1].toFixed(2)
+      lj.CPULoadavg['15m'] = oavg[2].toFixed(2)
+      lj.workers = this.workers
+      return lj
     }
-    return '';
+    return null
   }
 }