@abtnode/router-provider 1.16.43-beta-20250424-125523-08a65a5c → 1.16.43-beta-20250425-130658-8da18f4d

package/lib/nginx/index.js

@@ -4,6 +4,7 @@ const { NginxConfFile } = require('nginx-conf');
 const fs = require('fs-extra');
 const os = require('os');
 const fg = require('fast-glob');
+const semver = require('semver');
 const path = require('path');
 const shelljs = require('shelljs');
 const kill = require('fkill');
@@ -393,6 +394,11 @@ class NginxProvider extends BaseProvider {
       capabilities.modsecurity = modulePaths.some((x) => toLower(x).includes('modsecurity'));
     }
 
+    const result = shelljs.exec(`${this.binPath} -v`, { silent: true });
+    if (result.code === 0) {
+      capabilities.version = semver.coerce((result.stderr || result.stdout).split('/').pop())?.version || '';
+    }
+
     return capabilities;
   }
 
@@ -865,13 +871,24 @@ class NginxProvider extends BaseProvider {
     const crtPath = `${joinNginxPath(this.certDir, certificateFileName.replace('*', '-'))}.crt`;
     const keyPath = `${joinNginxPath(this.certDir, certificateFileName.replace('*', '-'))}.key`;
 
-    let listen = `${this.httpsPort} ssl ${this.capabilities.httpV2 ? 'http2' : ''}`.trim();
+    // Handle HTTP/2 configuration based on Nginx version
+    let listen = `${this.httpsPort} ssl`;
+    let http2Config = '';
+    if (this.capabilities.httpV2) {
+      if (this.capabilities.version && semver.gte(this.capabilities.version, '1.25.1')) {
+        http2Config = 'http2 on';
+      } else {
+        listen += ' http2';
+      }
+    }
     if (serverName === '_') {
       listen = `${listen} default_server`;
     }
-
     httpsServerUnit._add('server_name', serverName);
     httpsServerUnit._add('listen', listen);
+    if (http2Config) {
+      httpsServerUnit._add('http2', 'on');
+    }
     httpsServerUnit._add('ssl_certificate', crtPath);
     httpsServerUnit._add('ssl_certificate_key', keyPath);
     httpsServerUnit._add('include', 'includes/ssl');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.43-beta-20250424-125523-08a65a5c",
+  "version": "1.16.43-beta-20250425-130658-8da18f4d",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,10 +32,10 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.16.43-beta-20250424-125523-08a65a5c",
-    "@abtnode/logger": "1.16.43-beta-20250424-125523-08a65a5c",
-    "@abtnode/router-templates": "1.16.43-beta-20250424-125523-08a65a5c",
-    "@abtnode/util": "1.16.43-beta-20250424-125523-08a65a5c",
+    "@abtnode/constant": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/logger": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/router-templates": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/util": "1.16.43-beta-20250425-130658-8da18f4d",
     "@arcblock/http-proxy": "^1.19.1",
     "@arcblock/is-valid-domain": "^1.0.5",
     "axios": "^1.7.9",
@@ -51,6 +51,7 @@
     "object-hash": "^3.0.0",
     "port-used": "^2.0.8",
     "promise-retry": "^2.0.1",
+    "semver": "^7.6.3",
     "shelljs": "^0.8.5",
     "tar": "^6.1.11",
     "ufo": "^1.5.3",
@@ -60,5 +61,5 @@
     "bluebird": "^3.7.2",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "499de9f28770298a819122ba16a7f2b3cc78c7ee"
+  "gitHead": "b5195a0290d5ced00bb716a709548b1a56356134"
 }