@blocklet/cli 1.16.42 → 1.16.43-beta-20250419-231352-c78ac93d

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.
Files changed (4) hide show
  1. package/README.md +2 -2
  2. package/lib/commands/blocklet/deploy.js +4 -5
  3. package/lib/commands/server/start.js +10 -2
  4. package/package.json +24 -24
package/README.md CHANGED
@@ -28,7 +28,7 @@ Powered By
28
28
  / ___ \| | | (__| |_) | | (_) | (__| <
29
29
  /_/ \_\_| \___|____/|_|\___/ \___|_|\_\
30
30
 
31
- Blocklet CLI v1.16.41
31
+ Blocklet CLI v1.16.42
32
32
 
33
33
  Usage: blocklet server [options] [command]
34
34
 
@@ -43,7 +43,7 @@ Options:
43
43
  Commands:
44
44
  start [options] Start Blocklet Server
45
45
  init [options] Init Blocklet Server config
46
- status Show Blocklet Server and blocklet status
46
+ status [options] Show Blocklet Server and blocklet status
47
47
  logs Show Blocklet Server and blocklet log files
48
48
  stop [options] Stop Blocklet Server and blocklets
49
49
  rescue [options] Start all blocklets in current running server
package/lib/commands/blocklet/deploy.js CHANGED
@@ -369,11 +369,10 @@ const deployToLocal = async (dir, opts) => {
369
369
  const nodeInfo = await node.getNodeInfo();
370
370
  const endpoint = `http://127.0.0.1:${nodeInfo.port}`;
371
371
 
372
- const { accessKeyId, accessKeySecret } = await node.createAccessKey({
373
- teamDid: nodeInfo.did,
374
- remark: 'Local CLI',
375
- passport: ROLES.ADMIN,
376
- });
372
+ const { accessKeyId, accessKeySecret } = await node.createAccessKey(
373
+ { teamDid: nodeInfo.did, remark: 'Local CLI', passport: ROLES.ADMIN },
374
+ { user: { fullName: 'Local CLI' } }
375
+ );
377
376
 
378
377
  try {
379
378
  await deploy(dir, {
package/lib/commands/server/start.js CHANGED
@@ -260,7 +260,7 @@ const startService = async (logDir, maxMemoryRestart, environments) => {
260
260
  await ensureEndpointHealthy({
261
261
  port: servicePort,
262
262
  protocol: 'tcp',
263
- timeout: 30 * 1000,
263
+ timeout: 60 * 1000,
264
264
  minConsecutiveTime: 2000,
265
265
  });
266
266
  }); // prettier-ignore
@@ -572,6 +572,9 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
572
572
  ABT_NODE_ENABLE_ENSURE_BLOCKLET_RUNNING: process.env.ABT_NODE_ENABLE_ENSURE_BLOCKLET_RUNNING,
573
573
  ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL: process.env.ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL,
574
574
  ABT_NODE_ENSURE_RUNNING_DEFERRED_TIME: process.env.ABT_NODE_ENSURE_RUNNING_DEFERRED_TIME,
575
+ ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_CPU: process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_CPU,
576
+ ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_MEMORY: process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_MEMORY,
577
+ ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_DISK: process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_DISK,
575
578
  ...(config.env || {}),
576
579
  };
577
580
  if (process.env.DEBUG) {
@@ -586,6 +589,11 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
586
589
  const servicePort = await startService(logDir, maxMemoryRestart, environments);
587
590
  environments.ABT_NODE_SERVICE_PORT = servicePort;
588
591
 
592
+ // clear daemon error log to avoid misleading error messages if start failed
593
+ if (fs.existsSync(daemonErrorLogFile)) {
594
+ fs.truncateSync(daemonErrorLogFile, 0);
595
+ }
596
+
589
597
  // check localhost listening
590
598
  await wrapSpinner('Starting server daemon...', async () => {
591
599
  // start daemon
@@ -608,7 +616,7 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
608
616
  await ensureEndpointHealthy({
609
617
  protocol: 'tcp',
610
618
  port: info.port,
611
- timeout: 30 * 1000, // wait up to 30 seconds
619
+ timeout: 60 * 1000, // wait up to 60 seconds
612
620
  minConsecutiveTime: 2000,
613
621
  });
614
622
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blocklet/cli",
3
- "version": "1.16.42",
3
+ "version": "1.16.43-beta-20250419-231352-c78ac93d",
4
4
  "description": "Command line tools to manage Blocklet Server",
5
5
  "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
6
6
  "bin": {
@@ -35,30 +35,30 @@
35
35
  "url": "https://github.com/ArcBlock/blocklet-server/issues"
36
36
  },
37
37
  "dependencies": {
38
- "@abtnode/blocklet-services": "1.16.42",
39
- "@abtnode/client": "1.16.42",
40
- "@abtnode/constant": "1.16.42",
41
- "@abtnode/core": "1.16.42",
42
- "@abtnode/logger": "1.16.42",
43
- "@abtnode/router-provider": "1.16.42",
44
- "@abtnode/util": "1.16.42",
45
- "@abtnode/webapp": "1.16.42",
46
- "@arcblock/did": "1.20.0",
47
- "@arcblock/event-hub": "1.20.0",
38
+ "@abtnode/blocklet-services": "1.16.43-beta-20250419-231352-c78ac93d",
39
+ "@abtnode/client": "1.16.43-beta-20250419-231352-c78ac93d",
40
+ "@abtnode/constant": "1.16.43-beta-20250419-231352-c78ac93d",
41
+ "@abtnode/core": "1.16.43-beta-20250419-231352-c78ac93d",
42
+ "@abtnode/logger": "1.16.43-beta-20250419-231352-c78ac93d",
43
+ "@abtnode/router-provider": "1.16.43-beta-20250419-231352-c78ac93d",
44
+ "@abtnode/util": "1.16.43-beta-20250419-231352-c78ac93d",
45
+ "@abtnode/webapp": "1.16.43-beta-20250419-231352-c78ac93d",
46
+ "@arcblock/did": "1.20.1",
47
+ "@arcblock/event-hub": "1.20.1",
48
48
  "@arcblock/ipfs-only-hash": "^0.0.2",
49
- "@arcblock/jwt": "1.20.0",
50
- "@arcblock/ws": "1.20.0",
51
- "@blocklet/constant": "1.16.42",
49
+ "@arcblock/jwt": "1.20.1",
50
+ "@arcblock/ws": "1.20.1",
51
+ "@blocklet/constant": "1.16.43-beta-20250419-231352-c78ac93d",
52
52
  "@blocklet/form-collector": "^0.1.8",
53
- "@blocklet/images": "1.16.42",
54
- "@blocklet/meta": "1.16.42",
55
- "@blocklet/resolver": "1.16.42",
56
- "@blocklet/store": "1.16.42",
57
- "@blocklet/theme-builder": "^0.1.10",
58
- "@ocap/client": "1.20.0",
59
- "@ocap/mcrypto": "1.20.0",
60
- "@ocap/util": "1.20.0",
61
- "@ocap/wallet": "1.20.0",
53
+ "@blocklet/images": "1.16.43-beta-20250419-231352-c78ac93d",
54
+ "@blocklet/meta": "1.16.43-beta-20250419-231352-c78ac93d",
55
+ "@blocklet/resolver": "1.16.43-beta-20250419-231352-c78ac93d",
56
+ "@blocklet/store": "1.16.43-beta-20250419-231352-c78ac93d",
57
+ "@blocklet/theme-builder": "^0.1.11",
58
+ "@ocap/client": "1.20.1",
59
+ "@ocap/mcrypto": "1.20.1",
60
+ "@ocap/util": "1.20.1",
61
+ "@ocap/wallet": "1.20.1",
62
62
  "@vercel/ncc": "^0.38.3",
63
63
  "archiver": "^7.0.1",
64
64
  "async": "^3.2.4",
@@ -152,7 +152,7 @@
152
152
  "engines": {
153
153
  "node": ">=14"
154
154
  },
155
- "gitHead": "04e4adf8f2c1d6289850c66159c0a68ea946d5e6",
155
+ "gitHead": "207acad34e8ccf318cd7539c1ac717cee7951b53",
156
156
  "devDependencies": {
157
157
  "@types/fs-extra": "^11.0.4",
158
158
  "@types/jest": "^29.5.13"