@abtnode/router-provider 1.16.47-beta-20250715-034905-11207b15 → 1.16.47-beta-20250718-075003-940d2e2a

package/lib/nginx/index.js

@@ -99,8 +99,9 @@ class NginxProvider extends BaseProvider {
       throw new Error('invalid configDir');
     }
 
-    if (shelljs.which('nginx')) {
-      this.binPath = shelljs.which('nginx').toString();
+    const whichNginx = shelljs.which('nginx');
+    if (whichNginx) {
+      this.binPath = whichNginx.toString();
     } else {
       throw new Error('invalid nginx binPath');
     }
@@ -841,7 +842,7 @@ class NginxProvider extends BaseProvider {
     conf.nginx.http._add('server');
     const server = this._getLastServer(conf);
     server._add('server_name', blacklistDomains);
-    server._add('listen', `${decideHttpPort()}`);
+    server._add('listen', this.httpPort);
 
     const certPath = `${joinNginxPath(this.certDir, 'abtnode_dummy.crt')}`;
     const keyPath = `${joinNginxPath(this.certDir, 'abtnode_dummy.key')}`;
@@ -849,7 +850,7 @@ class NginxProvider extends BaseProvider {
     if (fs.existsSync(certPath) && fs.existsSync(keyPath)) {
       server._add('ssl_certificate', certPath);
       server._add('ssl_certificate_key', keyPath);
-      server._add('listen', `${decideHttpsPort()} ssl`);
+      server._add('listen', `${this.httpsPort} ssl`);
     }
 
     server._add('return', '444');
@@ -863,7 +864,7 @@ class NginxProvider extends BaseProvider {
     const serverName = '_';
 
     server._add('server_name', serverName);
-    server._add('listen', `${decideHttpPort()} default_server`);
+    server._add('listen', `${this.httpPort} default_server`);
 
     this._addDefaultLocations({ server, daemonPort, serverName });
     server._add('location', '/');
@@ -876,7 +877,7 @@ class NginxProvider extends BaseProvider {
     conf.nginx.http._add('server');
     const server = this._getLastServer(conf);
     server._add('server_name', '_');
-    server._add('listen', `${decideHttpPort()} default_server`);
+    server._add('listen', `${this.httpPort} default_server`);
 
     const certPath = `${joinNginxPath(this.certDir, 'abtnode_dummy.crt')}`;
     const keyPath = `${joinNginxPath(this.certDir, 'abtnode_dummy.key')}`;
@@ -884,7 +885,7 @@ class NginxProvider extends BaseProvider {
     if (fs.existsSync(certPath) && fs.existsSync(keyPath)) {
       server._add('ssl_certificate', certPath);
       server._add('ssl_certificate_key', keyPath);
-      server._add('listen', `${decideHttpsPort()} ssl default_server`);
+      server._add('listen', `${this.httpsPort} ssl default_server`);
     }
 
     server._add('return', '444');
@@ -894,7 +895,7 @@ class NginxProvider extends BaseProvider {
     conf.nginx.http._add('server');
     const server = this._getLastServer(conf);
     server._add('server_name', DOMAIN_FOR_IP_SITE_REGEXP);
-    server._add('listen', `${decideHttpPort()}`);
+    server._add('listen', this.httpPort);
 
     const certPath = `${joinNginxPath(this.certDir, 'abtnode_dummy.crt')}`;
     const keyPath = `${joinNginxPath(this.certDir, 'abtnode_dummy.key')}`;
@@ -902,7 +903,7 @@ class NginxProvider extends BaseProvider {
     if (fs.existsSync(certPath) && fs.existsSync(keyPath)) {
       server._add('ssl_certificate', certPath);
       server._add('ssl_certificate_key', keyPath);
-      server._add('listen', `${decideHttpsPort()} ssl`);
+      server._add('listen', `${this.httpsPort} ssl`);
     }
 
     if (process.env.ABT_NODE_IP_WHITELIST) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.47-beta-20250715-034905-11207b15",
+  "version": "1.16.47-beta-20250718-075003-940d2e2a",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,11 +32,11 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/db-cache": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/logger": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/router-templates": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/util": "1.16.47-beta-20250715-034905-11207b15",
+    "@abtnode/constant": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/db-cache": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/logger": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/router-templates": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/util": "1.16.47-beta-20250718-075003-940d2e2a",
     "@arcblock/http-proxy": "^1.19.1",
     "@arcblock/is-valid-domain": "^1.0.5",
     "@ocap/util": "^1.20.16",
@@ -62,5 +62,5 @@
     "bluebird": "^3.7.2",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "f08ee3ac63c808c93967db43445042b3050a015e"
+  "gitHead": "740ffa603c1de73ccf1bd4d0be497c9a9c7ce936"
 }