@abtnode/router-provider 1.16.45-beta-20250609-082716-b6b0592b → 1.16.45-beta-20250610-112229-2eb0face
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/index.js +15 -5
- package/package.json +7 -7
package/lib/index.js
CHANGED
|
@@ -6,6 +6,7 @@ const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
|
|
|
6
6
|
const logger = require('@abtnode/logger')(`${require('../package.json').name}:provider:index`);
|
|
7
7
|
/* eslint-disable import/order */
|
|
8
8
|
const debug = require('debug')(`${require('../package.json').name}:provider:index`);
|
|
9
|
+
const sleep = require('@abtnode/util/lib/sleep');
|
|
9
10
|
|
|
10
11
|
const Nginx = require('./nginx');
|
|
11
12
|
const Default = require('./default');
|
|
@@ -97,12 +98,21 @@ const checkDockerInstalled = async () => {
|
|
|
97
98
|
|
|
98
99
|
const clearDockerContainer = async () => {
|
|
99
100
|
try {
|
|
100
|
-
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
101
|
+
let attempts = 0;
|
|
102
|
+
const maxAttempts = 10;
|
|
103
|
+
|
|
104
|
+
while (attempts < maxAttempts) {
|
|
105
|
+
const list = await promiseSpawn('docker ps -a -q --filter "name=^blocklet-"');
|
|
106
|
+
if (!list) {
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
await promiseSpawn('docker rm -f $(docker ps -a -q --filter "name=^blocklet-")');
|
|
111
|
+
await sleep(1000);
|
|
112
|
+
attempts++;
|
|
104
113
|
}
|
|
105
|
-
|
|
114
|
+
|
|
115
|
+
logger.error('Failed to remove all containers');
|
|
106
116
|
} catch (e) {
|
|
107
117
|
logger.error(e);
|
|
108
118
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abtnode/router-provider",
|
|
3
|
-
"version": "1.16.45-beta-
|
|
3
|
+
"version": "1.16.45-beta-20250610-112229-2eb0face",
|
|
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-
|
|
36
|
-
"@abtnode/db-cache": "1.16.45-beta-
|
|
37
|
-
"@abtnode/logger": "1.16.45-beta-
|
|
38
|
-
"@abtnode/router-templates": "1.16.45-beta-
|
|
39
|
-
"@abtnode/util": "1.16.45-beta-
|
|
35
|
+
"@abtnode/constant": "1.16.45-beta-20250610-112229-2eb0face",
|
|
36
|
+
"@abtnode/db-cache": "1.16.45-beta-20250610-112229-2eb0face",
|
|
37
|
+
"@abtnode/logger": "1.16.45-beta-20250610-112229-2eb0face",
|
|
38
|
+
"@abtnode/router-templates": "1.16.45-beta-20250610-112229-2eb0face",
|
|
39
|
+
"@abtnode/util": "1.16.45-beta-20250610-112229-2eb0face",
|
|
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": "d35fb6c907c29f4466fa965c079e1662dc77e582"
|
|
66
66
|
}
|