@blocklet/cli 1.16.51 → 1.16.52-beta-20250909-073849-4e392ab1

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 (3) hide show
  1. package/README.md +1 -1
  2. package/lib/commands/server/start.js +24 -1
  3. package/package.json +17 -17
package/README.md CHANGED
@@ -28,7 +28,7 @@ Powered By
28
28
  / ___ \| | | (__| |_) | | (_) | (__| <
29
29
  /_/ \_\_| \___|____/|_|\___/ \___|_|\_\
30
30
 
31
- Blocklet CLI v1.16.50
31
+ Blocklet CLI v1.16.51
32
32
 
33
33
  Usage: blocklet server [options] [command]
34
34
 
package/lib/commands/server/start.js CHANGED
@@ -93,6 +93,23 @@ const parseMemoryLimit = () => {
93
93
 
94
94
  const calculatedLimit = parseMemoryLimit();
95
95
 
96
+ /**
97
+ * Copy environment variables from config.env to process.env
98
+ * @param {object} configEnv - Environment variables object from config
99
+ */
100
+ const copyEnvToProcess = (configEnv) => {
101
+ if (!configEnv || typeof configEnv !== 'object') {
102
+ return;
103
+ }
104
+
105
+ Object.keys(configEnv).forEach((key) => {
106
+ const value = configEnv[key];
107
+ if (value !== null && value !== undefined) {
108
+ process.env[key] = String(value);
109
+ }
110
+ });
111
+ };
112
+
96
113
  const updateVersionInConfigFileAndState = async (config, configFile, node) => {
97
114
  const info = await node.getNodeInfo();
98
115
  await node.states.node.updateNodeInfo({
@@ -243,6 +260,9 @@ const startService = async (logDir, maxMemoryRestart, environments) => {
243
260
  }
244
261
 
245
262
  try {
263
+ const instanceCount = getServiceInstanceCount();
264
+ debug('service instance count', instanceCount);
265
+
246
266
  await wrapSpinner('Starting blocklet service...', async () => {
247
267
  await pm2StartOrReload({
248
268
  namespace: 'daemon',
@@ -258,7 +278,7 @@ const startService = async (logDir, maxMemoryRestart, environments) => {
258
278
  kill_timeout: 10_000,
259
279
  execMode: 'cluster',
260
280
  shutdown_with_message: true,
261
- instances: getServiceInstanceCount(),
281
+ instances: instanceCount,
262
282
  time: true,
263
283
  pmx: false,
264
284
  env: {
@@ -753,6 +773,8 @@ const start = async ({ updateDb, enforceLock, forceIntranet, workingDir, mode })
753
773
  process.exit(code);
754
774
  };
755
775
 
776
+ copyEnvToProcess(config.env);
777
+
756
778
  [
757
779
  'SIGINT',
758
780
  'SIGTERM',
@@ -917,3 +939,4 @@ exports.clearStartLock = clearStartLock;
917
939
  exports.createStartLock = createStartLock;
918
940
  exports.isConfigDifferentFromDB = isConfigDifferentFromDB;
919
941
  exports.getDifferentAttributes = getDifferentAttributes;
942
+ exports.copyEnvToProcess = copyEnvToProcess;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blocklet/cli",
3
- "version": "1.16.51",
3
+ "version": "1.16.52-beta-20250909-073849-4e392ab1",
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.51",
39
- "@abtnode/constant": "1.16.51",
40
- "@abtnode/core": "1.16.51",
41
- "@abtnode/db-cache": "1.16.51",
42
- "@abtnode/logger": "1.16.51",
43
- "@abtnode/models": "1.16.51",
44
- "@abtnode/router-provider": "1.16.51",
45
- "@abtnode/util": "1.16.51",
46
- "@abtnode/webapp": "1.16.51",
38
+ "@abtnode/blocklet-services": "1.16.52-beta-20250909-073849-4e392ab1",
39
+ "@abtnode/constant": "1.16.52-beta-20250909-073849-4e392ab1",
40
+ "@abtnode/core": "1.16.52-beta-20250909-073849-4e392ab1",
41
+ "@abtnode/db-cache": "1.16.52-beta-20250909-073849-4e392ab1",
42
+ "@abtnode/logger": "1.16.52-beta-20250909-073849-4e392ab1",
43
+ "@abtnode/models": "1.16.52-beta-20250909-073849-4e392ab1",
44
+ "@abtnode/router-provider": "1.16.52-beta-20250909-073849-4e392ab1",
45
+ "@abtnode/util": "1.16.52-beta-20250909-073849-4e392ab1",
46
+ "@abtnode/webapp": "1.16.52-beta-20250909-073849-4e392ab1",
47
47
  "@arcblock/did": "1.24.0",
48
48
  "@arcblock/event-hub": "1.24.0",
49
49
  "@arcblock/ipfs-only-hash": "^0.0.2",
50
50
  "@arcblock/jwt": "1.24.0",
51
51
  "@arcblock/ws": "1.24.0",
52
- "@blocklet/constant": "1.16.51",
52
+ "@blocklet/constant": "1.16.52-beta-20250909-073849-4e392ab1",
53
53
  "@blocklet/error": "^0.2.5",
54
54
  "@blocklet/form-collector": "^0.1.8",
55
- "@blocklet/images": "1.16.51",
56
- "@blocklet/meta": "1.16.51",
57
- "@blocklet/resolver": "1.16.51",
58
- "@blocklet/server-js": "1.16.51",
59
- "@blocklet/store": "1.16.51",
55
+ "@blocklet/images": "1.16.52-beta-20250909-073849-4e392ab1",
56
+ "@blocklet/meta": "1.16.52-beta-20250909-073849-4e392ab1",
57
+ "@blocklet/resolver": "1.16.52-beta-20250909-073849-4e392ab1",
58
+ "@blocklet/server-js": "1.16.52-beta-20250909-073849-4e392ab1",
59
+ "@blocklet/store": "1.16.52-beta-20250909-073849-4e392ab1",
60
60
  "@blocklet/theme-builder": "^0.4.6",
61
61
  "@ocap/client": "1.24.0",
62
62
  "@ocap/mcrypto": "1.24.0",
@@ -154,7 +154,7 @@
154
154
  "engines": {
155
155
  "node": ">=14"
156
156
  },
157
- "gitHead": "32897dd6a5e92368f1870bba34cbbb38da95da89",
157
+ "gitHead": "3b4b1551b181606f84799ba8b294fb36b483c9c3",
158
158
  "devDependencies": {
159
159
  "@types/fs-extra": "^11.0.4",
160
160
  "@types/jest": "^29.5.13"