@blocklet/cli 1.16.47-beta-20250807-110715-19ad6b43 → 1.16.47
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.
|
@@ -488,10 +488,6 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
|
|
|
488
488
|
await node.updateNodeStatus(SERVER_STATUS.START_FROM_CRASH);
|
|
489
489
|
}
|
|
490
490
|
|
|
491
|
-
if (process.env.ABT_NODE_ENABLE_ENSURE_BLOCKLET_RUNNING !== 'ignore') {
|
|
492
|
-
printInfo(`Ensure blocklet running: ${chalk.green('on')}`);
|
|
493
|
-
}
|
|
494
|
-
|
|
495
491
|
const isProviderAvailable = await checkRoutingProvider(info.routing, { configDir: path.dirname(configFile) });
|
|
496
492
|
if (!isProviderAvailable) {
|
|
497
493
|
printWarning(
|
|
@@ -605,7 +601,6 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
|
|
|
605
601
|
ABT_NODE_BINARY_NAME,
|
|
606
602
|
ABT_NODE_COMMAND_NAME,
|
|
607
603
|
BLOCKLET_SERVER_RUNNING_BEFORE: isRunning ? '1' : '',
|
|
608
|
-
ABT_NODE_ENABLE_ENSURE_BLOCKLET_RUNNING: process.env.ABT_NODE_ENABLE_ENSURE_BLOCKLET_RUNNING,
|
|
609
604
|
ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL: process.env.ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL,
|
|
610
605
|
ABT_NODE_ENSURE_RUNNING_DEFERRED_TIME: process.env.ABT_NODE_ENSURE_RUNNING_DEFERRED_TIME,
|
|
611
606
|
ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_CPU: process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_CPU,
|
package/lib/process/daemon.js
CHANGED
|
@@ -31,8 +31,6 @@ const { SERVER_STATUS } = require('@abtnode/constant');
|
|
|
31
31
|
|
|
32
32
|
const createServer = require('@abtnode/webapp/blocklet'); // eslint-disable-line
|
|
33
33
|
|
|
34
|
-
const restartRunningComponent = require('../util/restart-running-component');
|
|
35
|
-
|
|
36
34
|
const wallet = getNodeWallet(process.env.ABT_NODE_SK);
|
|
37
35
|
const dataDir = process.env.ABT_NODE_DATA_DIR;
|
|
38
36
|
|
|
@@ -93,15 +91,12 @@ node.onReady(async () => {
|
|
|
93
91
|
console.error('Blocklet Server failed to cleanup dirty maintain state', e);
|
|
94
92
|
}
|
|
95
93
|
|
|
96
|
-
process.env.ABT_NODE_RESTART_RUNNING_COMPONENT = '1';
|
|
97
94
|
try {
|
|
98
95
|
const initialized = await node.isInitialized();
|
|
99
96
|
if (initialized) {
|
|
100
97
|
// 无论之前是否 crash, 当启动 server (非热重启) 时,永远重启之前运行中的组件
|
|
101
98
|
await node.updateNodeStatus(SERVER_STATUS.RUNNING);
|
|
102
|
-
if (
|
|
103
|
-
await restartRunningComponent(wallet, node);
|
|
104
|
-
} else {
|
|
99
|
+
if (runningBefore) {
|
|
105
100
|
logger.info('> Blocklet Server is restarted from running before');
|
|
106
101
|
}
|
|
107
102
|
|
|
@@ -109,8 +104,6 @@ node.onReady(async () => {
|
|
|
109
104
|
}
|
|
110
105
|
} catch (e) {
|
|
111
106
|
console.error('> Blocklet Server failed to restart running blocklets', e);
|
|
112
|
-
} finally {
|
|
113
|
-
process.env.ABT_NODE_RESTART_RUNNING_COMPONENT = '0';
|
|
114
107
|
}
|
|
115
108
|
|
|
116
109
|
try {
|
|
@@ -7,8 +7,8 @@ function getDockerStatusLog(printInfo, nodeInfo) {
|
|
|
7
7
|
? 'On MacOS, you need to install https://orbstack.dev/ and ensure you have sufficient permissions to run Docker.'
|
|
8
8
|
: 'You need to install Docker and ensure you have sufficient permissions to run it.';
|
|
9
9
|
|
|
10
|
-
printInfo('Docker enabled for running blocklets:', enableDocker ? chalk.green('on') : chalk.
|
|
11
|
-
printInfo('Docker installed:', isDockerInstalled ? chalk.green('on') : chalk.
|
|
10
|
+
printInfo('Docker enabled for running blocklets:', enableDocker ? chalk.green('on') : chalk.gray('off'));
|
|
11
|
+
printInfo('Docker installed:', isDockerInstalled ? chalk.green('on') : chalk.gray('off'));
|
|
12
12
|
if (!isDockerInstalled) {
|
|
13
13
|
printInfo('Docker installation:', chalk.yellow(unsupportedDockerMsg));
|
|
14
14
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blocklet/cli",
|
|
3
|
-
"version": "1.16.47
|
|
3
|
+
"version": "1.16.47",
|
|
4
4
|
"description": "Command line tools to manage Blocklet Server",
|
|
5
5
|
"homepage": "https://github.com/ArcBlock/blocklet-server#readme",
|
|
6
6
|
"bin": {
|
|
@@ -35,28 +35,28 @@
|
|
|
35
35
|
"url": "https://github.com/ArcBlock/blocklet-server/issues"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@abtnode/blocklet-services": "1.16.47
|
|
39
|
-
"@abtnode/client": "1.16.47
|
|
40
|
-
"@abtnode/constant": "1.16.47
|
|
41
|
-
"@abtnode/core": "1.16.47
|
|
42
|
-
"@abtnode/db-cache": "1.16.47
|
|
43
|
-
"@abtnode/logger": "1.16.47
|
|
44
|
-
"@abtnode/models": "1.16.47
|
|
45
|
-
"@abtnode/router-provider": "1.16.47
|
|
46
|
-
"@abtnode/util": "1.16.47
|
|
47
|
-
"@abtnode/webapp": "1.16.47
|
|
38
|
+
"@abtnode/blocklet-services": "1.16.47",
|
|
39
|
+
"@abtnode/client": "1.16.47",
|
|
40
|
+
"@abtnode/constant": "1.16.47",
|
|
41
|
+
"@abtnode/core": "1.16.47",
|
|
42
|
+
"@abtnode/db-cache": "1.16.47",
|
|
43
|
+
"@abtnode/logger": "1.16.47",
|
|
44
|
+
"@abtnode/models": "1.16.47",
|
|
45
|
+
"@abtnode/router-provider": "1.16.47",
|
|
46
|
+
"@abtnode/util": "1.16.47",
|
|
47
|
+
"@abtnode/webapp": "1.16.47",
|
|
48
48
|
"@arcblock/did": "1.21.2",
|
|
49
49
|
"@arcblock/event-hub": "1.21.2",
|
|
50
50
|
"@arcblock/ipfs-only-hash": "^0.0.2",
|
|
51
51
|
"@arcblock/jwt": "1.21.2",
|
|
52
52
|
"@arcblock/ws": "1.21.2",
|
|
53
|
-
"@blocklet/constant": "1.16.47
|
|
53
|
+
"@blocklet/constant": "1.16.47",
|
|
54
54
|
"@blocklet/error": "^0.2.5",
|
|
55
55
|
"@blocklet/form-collector": "^0.1.8",
|
|
56
|
-
"@blocklet/images": "1.16.47
|
|
57
|
-
"@blocklet/meta": "1.16.47
|
|
58
|
-
"@blocklet/resolver": "1.16.47
|
|
59
|
-
"@blocklet/store": "1.16.47
|
|
56
|
+
"@blocklet/images": "1.16.47",
|
|
57
|
+
"@blocklet/meta": "1.16.47",
|
|
58
|
+
"@blocklet/resolver": "1.16.47",
|
|
59
|
+
"@blocklet/store": "1.16.47",
|
|
60
60
|
"@blocklet/theme-builder": "^0.4.6",
|
|
61
61
|
"@ocap/client": "1.21.2",
|
|
62
62
|
"@ocap/mcrypto": "1.21.2",
|
|
@@ -154,7 +154,7 @@
|
|
|
154
154
|
"engines": {
|
|
155
155
|
"node": ">=14"
|
|
156
156
|
},
|
|
157
|
-
"gitHead": "
|
|
157
|
+
"gitHead": "02eecfdabe8acf7a10b0cc897958667777d64f79",
|
|
158
158
|
"devDependencies": {
|
|
159
159
|
"@types/fs-extra": "^11.0.4",
|
|
160
160
|
"@types/jest": "^29.5.13"
|