@abtnode/core 1.5.20 → 1.5.21
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/api/node.js +1 -2
- package/lib/util/default-node-config.js +2 -9
- package/lib/util/upgrade.js +7 -2
- package/package.json +18 -18
package/lib/api/node.js
CHANGED
|
@@ -6,7 +6,6 @@ const isDocker = require('@abtnode/util/lib/is-docker');
|
|
|
6
6
|
const isGitpod = require('@abtnode/util/lib/is-gitpod');
|
|
7
7
|
const getFolderSize = require('@abtnode/util/lib/get-folder-size');
|
|
8
8
|
const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
|
|
9
|
-
const { NODE_PACKAGE_NAME, NODE_COMMAND_NAME } = require('@abtnode/constant');
|
|
10
9
|
|
|
11
10
|
const logger = require('@abtnode/logger')('@abtnode/core:api:node');
|
|
12
11
|
|
|
@@ -96,7 +95,7 @@ class NodeAPI {
|
|
|
96
95
|
|
|
97
96
|
if (entity.autoUpgrade) {
|
|
98
97
|
try {
|
|
99
|
-
canPackageReadWrite(
|
|
98
|
+
canPackageReadWrite(process.env.ABT_NODE_BINARY_NAME, process.env.ABT_NODE_PACKAGE_NAME);
|
|
100
99
|
} catch (err) {
|
|
101
100
|
throw new Error(`Auto upgrade is not supported for this node due to: ${err.message}`);
|
|
102
101
|
}
|
|
@@ -1,16 +1,9 @@
|
|
|
1
|
-
const {
|
|
2
|
-
NODE_REGISTER_URL,
|
|
3
|
-
BLOCKLET_STORE_URL,
|
|
4
|
-
BLOCKLET_STORE_URL_DEV,
|
|
5
|
-
WEB_WALLET_URL,
|
|
6
|
-
NODE_PACKAGE_NAME,
|
|
7
|
-
NODE_COMMAND_NAME,
|
|
8
|
-
} = require('@abtnode/constant');
|
|
1
|
+
const { NODE_REGISTER_URL, BLOCKLET_STORE_URL, BLOCKLET_STORE_URL_DEV, WEB_WALLET_URL } = require('@abtnode/constant');
|
|
9
2
|
const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
|
|
10
3
|
|
|
11
4
|
const getDefaultAutoUpgrade = () => {
|
|
12
5
|
try {
|
|
13
|
-
return canPackageReadWrite(
|
|
6
|
+
return canPackageReadWrite(process.env.ABT_NODE_BINARY_NAME, process.env.ABT_NODE_PACKAGE_NAME);
|
|
14
7
|
} catch (err) {
|
|
15
8
|
return false;
|
|
16
9
|
}
|
package/lib/util/upgrade.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
const axon = require('axon');
|
|
3
3
|
const semver = require('semver');
|
|
4
4
|
const sleep = require('@abtnode/util/lib/sleep');
|
|
5
|
-
const {
|
|
5
|
+
const { NODE_MODES, NODE_UPGRADE_PROGRESS } = require('@abtnode/constant');
|
|
6
6
|
const listNpmPackageVersion = require('@abtnode/util/lib/list-npm-package-version');
|
|
7
7
|
const Lock = require('@abtnode/util/lib/lock');
|
|
8
8
|
const logger = require('@abtnode/logger')('@abtnode/core:upgrade');
|
|
@@ -31,7 +31,12 @@ const checkNewVersion = async (params, context) => {
|
|
|
31
31
|
return '';
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
|
|
34
|
+
if (!process.env.ABT_NODE_PACKAGE_NAME) {
|
|
35
|
+
logger.error('ABT_NODE_PACKAGE_NAME name was not found in environment');
|
|
36
|
+
return '';
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
const versions = await listNpmPackageVersion(process.env.ABT_NODE_PACKAGE_NAME);
|
|
35
40
|
if (Array.isArray(versions) && versions.length) {
|
|
36
41
|
const latestVersion = versions[0].version;
|
|
37
42
|
if (semver.gt(latestVersion, info.version)) {
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "1.5.
|
|
6
|
+
"version": "1.5.21",
|
|
7
7
|
"description": "",
|
|
8
8
|
"main": "lib/index.js",
|
|
9
9
|
"files": [
|
|
@@ -19,26 +19,26 @@
|
|
|
19
19
|
"author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
|
|
20
20
|
"license": "MIT",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@abtnode/constant": "1.5.
|
|
23
|
-
"@abtnode/cron": "1.5.
|
|
24
|
-
"@abtnode/logger": "1.5.
|
|
25
|
-
"@abtnode/queue": "1.5.
|
|
26
|
-
"@abtnode/rbac": "1.5.
|
|
27
|
-
"@abtnode/router-provider": "1.5.
|
|
28
|
-
"@abtnode/static-server": "1.5.
|
|
29
|
-
"@abtnode/timemachine": "1.5.
|
|
30
|
-
"@abtnode/util": "1.5.
|
|
31
|
-
"@arcblock/did": "^1.13.
|
|
32
|
-
"@arcblock/event-hub": "1.13.
|
|
22
|
+
"@abtnode/constant": "1.5.21",
|
|
23
|
+
"@abtnode/cron": "1.5.21",
|
|
24
|
+
"@abtnode/logger": "1.5.21",
|
|
25
|
+
"@abtnode/queue": "1.5.21",
|
|
26
|
+
"@abtnode/rbac": "1.5.21",
|
|
27
|
+
"@abtnode/router-provider": "1.5.21",
|
|
28
|
+
"@abtnode/static-server": "1.5.21",
|
|
29
|
+
"@abtnode/timemachine": "1.5.21",
|
|
30
|
+
"@abtnode/util": "1.5.21",
|
|
31
|
+
"@arcblock/did": "^1.13.65",
|
|
32
|
+
"@arcblock/event-hub": "1.13.65",
|
|
33
33
|
"@arcblock/pm2-events": "^0.0.5",
|
|
34
|
-
"@arcblock/vc": "^1.13.
|
|
35
|
-
"@blocklet/meta": "1.5.
|
|
34
|
+
"@arcblock/vc": "^1.13.65",
|
|
35
|
+
"@blocklet/meta": "1.5.21",
|
|
36
36
|
"@fidm/x509": "^1.2.1",
|
|
37
37
|
"@nedb/core": "^1.2.2",
|
|
38
38
|
"@nedb/multi": "^1.2.2",
|
|
39
|
-
"@ocap/mcrypto": "^1.13.
|
|
40
|
-
"@ocap/util": "^1.13.
|
|
41
|
-
"@ocap/wallet": "^1.13.
|
|
39
|
+
"@ocap/mcrypto": "^1.13.65",
|
|
40
|
+
"@ocap/util": "^1.13.65",
|
|
41
|
+
"@ocap/wallet": "^1.13.65",
|
|
42
42
|
"@slack/webhook": "^5.0.3",
|
|
43
43
|
"axios": "^0.21.4",
|
|
44
44
|
"axon": "^2.0.3",
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"express": "^4.17.1",
|
|
74
74
|
"jest": "^27.3.1"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "db219f519704e8c7ebe60f8448ec6c447ac4e059"
|
|
77
77
|
}
|