@abtnode/router-provider 1.16.11-next-ca5f18b5 → 1.16.11-next-3e55bc95
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/default/index.js +1 -1
- package/lib/index.js +1 -1
- package/lib/nginx/index.js +6 -4
- package/lib/nginx/util.js +1 -1
- package/package.json +6 -6
package/lib/default/index.js
CHANGED
package/lib/index.js
CHANGED
|
@@ -40,7 +40,7 @@ const getProvider = (name) => {
|
|
|
40
40
|
/**
|
|
41
41
|
* List routing provider meta and check status
|
|
42
42
|
*/
|
|
43
|
-
const listProviders =
|
|
43
|
+
const listProviders = (configDir) =>
|
|
44
44
|
Promise.all(getProviderNames().map((x) => providerMap.get(x).describe({ configDir })));
|
|
45
45
|
|
|
46
46
|
const findExistsProvider = () => {
|
package/lib/nginx/index.js
CHANGED
|
@@ -154,6 +154,7 @@ class NginxProvider extends BaseProvider {
|
|
|
154
154
|
});
|
|
155
155
|
}
|
|
156
156
|
|
|
157
|
+
// eslint-disable-next-line require-await
|
|
157
158
|
async update({
|
|
158
159
|
routingTable = [],
|
|
159
160
|
certificates = [],
|
|
@@ -276,17 +277,17 @@ class NginxProvider extends BaseProvider {
|
|
|
276
277
|
return result;
|
|
277
278
|
}
|
|
278
279
|
|
|
279
|
-
|
|
280
|
+
start() {
|
|
280
281
|
logger.info('start');
|
|
281
282
|
return this.reload();
|
|
282
283
|
}
|
|
283
284
|
|
|
284
|
-
|
|
285
|
+
restart() {
|
|
285
286
|
logger.info('restart');
|
|
286
287
|
return this.reload();
|
|
287
288
|
}
|
|
288
289
|
|
|
289
|
-
|
|
290
|
+
stop() {
|
|
290
291
|
logger.info('stop');
|
|
291
292
|
|
|
292
293
|
return this._exec('stop');
|
|
@@ -299,6 +300,7 @@ class NginxProvider extends BaseProvider {
|
|
|
299
300
|
}
|
|
300
301
|
}
|
|
301
302
|
|
|
303
|
+
// eslint-disable-next-line require-await
|
|
302
304
|
async validateConfig() {
|
|
303
305
|
const command = `${this.binPath} -t -c ${this.configPath} -p ${this.configDir}`; // eslint-disable-line no-param-reassign
|
|
304
306
|
const result = shelljs.exec(command, { silent: true });
|
|
@@ -1040,7 +1042,7 @@ const hasPortPermission = async (port) => {
|
|
|
1040
1042
|
NginxProvider.getStatus = getNginxStatus;
|
|
1041
1043
|
NginxProvider.exists = () => !!shelljs.which('nginx');
|
|
1042
1044
|
|
|
1043
|
-
NginxProvider.getUsablePorts =
|
|
1045
|
+
NginxProvider.getUsablePorts = () => getUsablePorts('nginx', hasPortPermission);
|
|
1044
1046
|
NginxProvider.hasPortPermission = hasPortPermission;
|
|
1045
1047
|
|
|
1046
1048
|
module.exports = NginxProvider;
|
package/lib/nginx/util.js
CHANGED
|
@@ -49,7 +49,7 @@ const formatError = (errStr) => {
|
|
|
49
49
|
const addTestServer = ({ configPath, port, upstreamPort }) =>
|
|
50
50
|
new Promise((resolve, reject) => {
|
|
51
51
|
// eslint-disable-next-line consistent-return
|
|
52
|
-
NginxConfFile.create(configPath,
|
|
52
|
+
NginxConfFile.create(configPath, (err, conf) => {
|
|
53
53
|
if (err) {
|
|
54
54
|
return reject(err);
|
|
55
55
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abtnode/router-provider",
|
|
3
|
-
"version": "1.16.11-next-
|
|
3
|
+
"version": "1.16.11-next-3e55bc95",
|
|
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,10 +32,10 @@
|
|
|
32
32
|
"url": "https://github.com/ArcBlock/blocklet-server/issues"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@abtnode/constant": "1.16.11-next-
|
|
36
|
-
"@abtnode/logger": "1.16.11-next-
|
|
37
|
-
"@abtnode/router-templates": "1.16.11-next-
|
|
38
|
-
"@abtnode/util": "1.16.11-next-
|
|
35
|
+
"@abtnode/constant": "1.16.11-next-3e55bc95",
|
|
36
|
+
"@abtnode/logger": "1.16.11-next-3e55bc95",
|
|
37
|
+
"@abtnode/router-templates": "1.16.11-next-3e55bc95",
|
|
38
|
+
"@abtnode/util": "1.16.11-next-3e55bc95",
|
|
39
39
|
"@arcblock/http-proxy": "^1.19.1",
|
|
40
40
|
"axios": "^0.27.2",
|
|
41
41
|
"debug": "^4.3.4",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"bluebird": "^3.7.2",
|
|
61
61
|
"fs-extra": "^10.1.0"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "cf0251c2d85c617b03151495b5944061ceb373e5"
|
|
64
64
|
}
|