@abtnode/router-provider 1.16.45-beta-20250625-064956-91b0fb8f → 1.16.45-beta-20250625-103530-e1f5b0b8
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.
- package/lib/nginx/index.js +11 -3
- package/package.json +7 -7
package/lib/nginx/index.js
CHANGED
|
@@ -296,8 +296,13 @@ class NginxProvider extends BaseProvider {
|
|
|
296
296
|
}
|
|
297
297
|
|
|
298
298
|
if (enableDefaultServer) {
|
|
299
|
-
|
|
300
|
-
|
|
299
|
+
const existDefaultServer = !!sites.find((x) => x.domain === '_');
|
|
300
|
+
if (existDefaultServer) {
|
|
301
|
+
logger.info('default server is declared by blocklet server');
|
|
302
|
+
} else {
|
|
303
|
+
this._addDefaultServer(conf, nodeInfo.port);
|
|
304
|
+
logger.info('add default server success');
|
|
305
|
+
}
|
|
301
306
|
} else {
|
|
302
307
|
this._addDefaultBlackHoleServer(conf);
|
|
303
308
|
logger.info('add default blackhole server success');
|
|
@@ -993,7 +998,10 @@ class NginxProvider extends BaseProvider {
|
|
|
993
998
|
}
|
|
994
999
|
|
|
995
1000
|
_addHttpServerUnit({ conf, serverName, port = '' }) {
|
|
996
|
-
|
|
1001
|
+
let listen = port || this.httpPort;
|
|
1002
|
+
if (serverName === '_') {
|
|
1003
|
+
listen = `${listen} default_server`;
|
|
1004
|
+
}
|
|
997
1005
|
|
|
998
1006
|
conf.nginx.http._add('server');
|
|
999
1007
|
const httpServerUnit = this._getLastServer(conf);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abtnode/router-provider",
|
|
3
|
-
"version": "1.16.45-beta-20250625-
|
|
3
|
+
"version": "1.16.45-beta-20250625-103530-e1f5b0b8",
|
|
4
4
|
"description": "Routing engine implementations for abt node",
|
|
5
5
|
"author": "polunzh <polunzh@gmail.com>",
|
|
6
6
|
"homepage": "https://github.com/ArcBlock/blocklet-server#readme",
|
|
@@ -32,11 +32,11 @@
|
|
|
32
32
|
"url": "https://github.com/ArcBlock/blocklet-server/issues"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@abtnode/constant": "1.16.45-beta-20250625-
|
|
36
|
-
"@abtnode/db-cache": "1.16.45-beta-20250625-
|
|
37
|
-
"@abtnode/logger": "1.16.45-beta-20250625-
|
|
38
|
-
"@abtnode/router-templates": "1.16.45-beta-20250625-
|
|
39
|
-
"@abtnode/util": "1.16.45-beta-20250625-
|
|
35
|
+
"@abtnode/constant": "1.16.45-beta-20250625-103530-e1f5b0b8",
|
|
36
|
+
"@abtnode/db-cache": "1.16.45-beta-20250625-103530-e1f5b0b8",
|
|
37
|
+
"@abtnode/logger": "1.16.45-beta-20250625-103530-e1f5b0b8",
|
|
38
|
+
"@abtnode/router-templates": "1.16.45-beta-20250625-103530-e1f5b0b8",
|
|
39
|
+
"@abtnode/util": "1.16.45-beta-20250625-103530-e1f5b0b8",
|
|
40
40
|
"@arcblock/http-proxy": "^1.19.1",
|
|
41
41
|
"@arcblock/is-valid-domain": "^1.0.5",
|
|
42
42
|
"@ocap/util": "^1.20.14",
|
|
@@ -62,5 +62,5 @@
|
|
|
62
62
|
"bluebird": "^3.7.2",
|
|
63
63
|
"fs-extra": "^11.2.0"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "68ba563213161265ceb38eaec06d43454a341f48"
|
|
66
66
|
}
|