npm - topbit - Versions diffs - 3.2.1 → 3.2.3 - Mend

topbit 3.2.1 → 3.2.3

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

package/README.cn.md +0 -10
package/demo/http2.js +33 -1
package/demo/http2_proxy_backend.js +1 -1
package/demo/http2proxy.js +2 -2
package/package.json +1 -1
package/src/extends/http2limit.js +1 -1
package/src/extends/http2proxy.js +21 -6
package/src/extends/proxy.js +19 -3
package/src/lib/balancer.js +76 -0
package/src/topbit.js +10 -2

package/README.cn.md CHANGED Viewed

@@ -1933,16 +1933,6 @@ app.run(1234)
 ### 7. SNI (HTTPS 多域名支持)
-**描述**：用于在同一 IP 地址和端口上支持多个 HTTPS 域名证书的中间件。
-感谢提供源代码。根据代码逻辑，`SNI` 扩展通过 `init` 方法将 `SNICallback` 注入到应用的 `config.server` 配置中，从而利用 Node.js 原生 TLS 的能力实现多域名证书支持。
-以下是补全后的 **SNI** 文档部分：
----
-### 7. SNI (HTTPS 多域名支持)
 **描述**：用于在同一 IP 地址和端口上支持多个 HTTPS 域名证书的中间件。它利用 TLS 协议的 Server Name Indication 特性，根据客户端请求的域名动态加载对应的 SSL 证书。
 **注意**：初始化时会同步读取证书文件，请确保路径正确。如果某个域名的证书读取失败，会在控制台输出错误信息，但不会阻塞其他域名的加载。

package/demo/http2.js CHANGED Viewed

@@ -19,7 +19,15 @@ let app = new Topbit({
   loadInfoFile: '--mem',
   cert: './cert/localhost-cert.pem',
   key: './cert/localhost-privkey.pem',
-  http2: true
+  http2: true,
+  server: {
+    peerMaxConcurrentStreams: 200,
+    settings: {
+      maxConcurrentStreams: 201,
+      maxHeaderListSize: 16384,
+      maxHeaderSize: 16384
+    }
+  }
 })
 if (app.isWorker) {
@@ -42,8 +50,32 @@ if (app.isWorker) {
   })
 }
+app.on('connection', sock => {
+  console.log(sock)
+})
 app.sched('none')
   .autoWorker(3)
   .printServInfo()
   .daemon(1234, 2)
+let settings = {
+  maxConcurrentStreams: 200,
+  maxHeaderListSize: 16384
+}
+app.on('session', sess => {
+  console.log(sess.localSettings, sess.remoteSettings)
+  sess.on('localSettings', s => {
+    console.log('local', s)
+  })
+  sess.on('remoteSettings', s => {
+    console.log('remote', s)
+  })
+  /* sess.settings(settings, (err, setting, dura) => {
+    console.log(setting, dura)
+  }) */
+})

package/demo/http2_proxy_backend.js CHANGED Viewed

@@ -42,4 +42,4 @@ if (port_ind > 0 && port_ind < process.argv.length - 1) {
     port = 2022
 }
-app.run(port)
+app.printServInfo().run(port)

package/demo/http2proxy.js CHANGED Viewed

@@ -14,7 +14,7 @@ let app = new Topbit({
 if (app.isWorker) {
   let h2proxy = new Http2Proxy({
     config: {
-      'x.com': [
+      'v.com': [
         {
           url: 'http://localhost:3001',
           weight: 10,
@@ -45,4 +45,4 @@ if (app.isWorker) {
   h2proxy.init(app)
 }
-app.daemon(1234, 2)
+app.printServInfo().daemon(1234, 2)

package/package.json CHANGED Viewed

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

package/src/extends/http2limit.js CHANGED Viewed

@@ -2,7 +2,7 @@
 /**
  *
- * 基于IP的限制，titbit已经能够处理。
+ * 基于IP的限制，topbit已经能够处理。
  *
  * 此限流针对的是因为http/2协议设计上特点导致单个连接请求密集。
  *

package/src/extends/http2proxy.js CHANGED Viewed

@@ -29,7 +29,7 @@ let error_503_text = `<!DOCTYPE html><html>
           <p>此服务暂时不可用。</p>
         </div>
       </body>
-  </html>`
+  </html>`
 function fmtpath(path) {
   path = path.trim()
@@ -83,6 +83,8 @@ let Http2Proxy = function (options = {}) {
   this.maxBody = 50000000
+  this.realIPHeader = 'x-real-ip'
   //是否启用全代理模式。
   this.full = false
@@ -103,8 +105,18 @@ let Http2Proxy = function (options = {}) {
     family: 4
   }
+  this.balancer = (options.balancer
+                    && options.balancer.select
+                      && typeof options.balancer.select === 'function')
+                    ? options.balancer
+                    : null
   for (let k in options) {
     switch (k) {
+      case 'realIPHeader':
+        this.realIPHeader = options[k]
+        break
       case 'config':
         this.config = options[k]
         break
@@ -323,9 +335,12 @@ Http2Proxy.prototype.checkAlive = function (pr) {
 Http2Proxy.prototype.getBackend = function (c, host) {
   let prlist = this.hostProxy[host][c.routepath]
   let pxybalance = this.proxyBalance[host][c.routepath]
+  if (this.balancer) {
+    return this.balancer.select(c, prlist, pxybalance)
+  }
   let pr
   if (prlist.length === 1) {
@@ -399,7 +414,7 @@ Http2Proxy.prototype.mid = function () {
     if (!self.hostProxy[host] || !self.hostProxy[host][c.routepath]) {
       if (self.full) {
-        return c.status(502).to(error_502_text)
+        return c.status(502).to(error_502_text)
       }
       return await next(c)
@@ -408,10 +423,10 @@ Http2Proxy.prototype.mid = function () {
     let pr = self.getBackend(c, host)
     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}`
+    if (self.addIP && c.headers[self.realIPHeader]) {
+      c.headers[self.realIPHeader] += `,${c.ip}`
     } else {
-      c.headers['x-real-ip'] = c.ip
+      c.headers[self.realIPHeader] = c.ip
     }
     let hii = pr.h2Pool

package/src/extends/proxy.js CHANGED Viewed

@@ -40,6 +40,8 @@ class Proxy {
     this.methods = ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'HEAD', 'PATCH', 'TRACE']
+    this.realIPHeader = 'x-real-ip'
     this.hostProxy = {}
     this.proxyBalance = {}
@@ -104,8 +106,18 @@ class Proxy {
       options = {}
     }
+    this.balancer = (options.balancer
+                    && options.balancer.select
+                      && typeof options.balancer.select === 'function')
+                    ? options.balancer
+                    : null
     for (let k in options) {
       switch (k) {
+        case 'realIPHeader':
+          this.realIPHeader = options[k]
+          break
         case 'host':
         case 'config':
           this.config = options[k]
@@ -375,6 +387,10 @@ class Proxy {
   getBackend(c, host) {
     let prlist = this.hostProxy[host][c.routepath]
     let pb = this.proxyBalance[host][c.routepath]
+    if (this.balancer) {
+      return this.balancer.select(c, prlist, pxybalance)
+    }
     let pr
     if (prlist.length === 1) {
@@ -448,10 +464,10 @@ class Proxy {
       urlobj.headers = c.headers
       urlobj.method = c.method
-      if (self.addIP && urlobj.headers['x-real-ip']) {
-        urlobj.headers['x-real-ip'] += `,${c.ip}`
+      if (self.addIP && urlobj.headers[self.realIPHeader]) {
+        urlobj.headers[self.realIPHeader] += `,${c.ip}`
       } else {
-        urlobj.headers['x-real-ip'] = c.ip
+        urlobj.headers[self.realIPHeader] = c.ip
       }
       let hci = urlobj.protocol == 'https:' ? https : http

package/src/lib/balancer.js ADDED Viewed

@@ -0,0 +1,76 @@
+'use strict'
+const crypto = require('node:crypto')
+/**
+ * 确定性负载均衡器
+ * 支持基于用户 ID 的哈希分发
+ */
+class ConsistentBalancer {
+  constructor(options = {}) {
+    // 定义如何从请求上下文 c 中提取唯一标识
+    // 默认尝试提取 header 中的 user-id，或者使用 IP
+    this.identityFn = options.identityFn || ((c) => {
+      return c.user ? c.user.id : c.ip
+    })
+    this.hashAlgorithm = options.hashAlgorithm || 'sha256'
+  }
+  /**
+   * 负载均衡选择算法
+   * @param {Object} c 请求上下文
+   * @param {Array} prlist 备选后端列表
+   * @param {Object} pxybalance 状态表
+   */
+  select(c, prlist, pxybalance) {
+    if (!prlist || prlist.length === 0) return null
+    if (prlist.length === 1) return prlist[0]
+    // 1. 提取标识符
+    const identity = this.identityFn(c)
+    if (!identity) {
+      // 如果没有标识符，退回到随机/轮询（或者直接用原逻辑）
+      return this.fallback(prlist, pxybalance)
+    }
+    // 2. 过滤健康的后端 (基于你原有的 checkAlive 逻辑)
+    // 注意：pr.h2Pool.ok() 是判断连接池是否正常的关键
+    const aliveBackends = prlist.filter(pr => pr.h2Pool && pr.h2Pool.ok())
+    const targets = aliveBackends.length > 0 ? aliveBackends : prlist
+    // 3. 确定性哈希计算 (Rendezvous Hashing)
+    let maxWeight = -1
+    let selected = targets[0]
+    for (let pr of targets) {
+      // 计算 Hash(identity + server_url)
+      let hash = crypto.createHash(this.hashAlgorithm)
+                  .update(identity + pr.url)
+                  .digest()
+                  .readUInt32BE(0)
+      // 结合权重计算分值 (HRW Hashing 变体)
+      // 使用公式：Score = Hash * (Weight^(1/n)) 或者简单乘法
+      let score = hash * (pr.weight || 1)
+      if (score > maxWeight) {
+        maxWeight = score
+        selected = pr
+      }
+    }
+    return selected
+  }
+  // 兜底逻辑
+  fallback(prlist, pxybalance) {
+    if (pxybalance.stepIndex >= prlist.length) pxybalance.stepIndex = 0
+    return prlist[pxybalance.stepIndex++]
+  }
+}
+module.exports = ConsistentBalancer

package/src/topbit.js CHANGED Viewed

@@ -35,6 +35,7 @@ const TopbitExtends = require('./_loadExtends.js')
 const npargv = require('./lib/npargv.js')
 const zipdata = require('./lib/zipdata.js')
 const ErrorLog = require('./lib/errorlog.js')
+const Balancer = require('./lib/balancer.js')
 let __instance__ = 0;
@@ -780,14 +781,20 @@ class Topbit {
       if (typeof callback === 'function') {
         this.httpServ.requestError = callback;
       }
-      return;
+      return this;
     }
+    if (this.server && this.server.on) {
+      this.server.on(evt, callback);
+      return this;
+    }
     if (!this.eventTable[evt]) {
       this.eventTable[evt] = [ callback ];
     } else {
       this.eventTable[evt].push(callback);
     }
+    return this;
   }
   /**
@@ -1329,5 +1336,6 @@ Topbit.npargv = npargv;
 Topbit.zipdata = zipdata;
 Topbit.ErrorLog = ErrorLog;
 Topbit.extensions = TopbitExtends;
+Topbit.ProxyBalancer = Balancer;
 module.exports = Topbit;