@abtnode/core 1.17.6-beta-20251218-120326-5b44dadf → 1.17.6-beta-20251219-114550-06c96cf5
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.
|
@@ -41,7 +41,7 @@ const { isDockerOnlySingleInstance } = require('../../../util/docker/is-docker-o
|
|
|
41
41
|
* @returns {Promise<Object>} 返回启动后的 blocklet 对象
|
|
42
42
|
*/
|
|
43
43
|
const blueGreenStartBlocklet = async (
|
|
44
|
-
{ did, componentDids, operator: _operator, ignoreErrorNotification, onError },
|
|
44
|
+
{ did, componentDids, operator: _operator, ignoreErrorNotification, onError, ignoreBlockletStartedEvent },
|
|
45
45
|
context,
|
|
46
46
|
manager,
|
|
47
47
|
states
|
|
@@ -445,7 +445,8 @@ const blueGreenStartBlocklet = async (
|
|
|
445
445
|
}
|
|
446
446
|
|
|
447
447
|
// 根据情况更新 route table， 会判断只有包含多 interfaces 的 DID 才会更新 route table
|
|
448
|
-
|
|
448
|
+
// 如果是蓝绿更新发起的，则不更新 route table，因为蓝绿更新会自动更新 route table
|
|
449
|
+
if (!['true', '1'].includes(process.env.ABT_NODE_DISABLE_BLUE_GREEN) && !ignoreBlockletStartedEvent) {
|
|
449
450
|
const latestBlocklet = await manager.getBlocklet(did, { e2eMode });
|
|
450
451
|
manager.emit(BlockletEvents.blurOrGreenStarted, {
|
|
451
452
|
blocklet: latestBlocklet,
|
|
@@ -39044,7 +39044,7 @@ module.exports = require("zlib");
|
|
|
39044
39044
|
/***/ ((module) => {
|
|
39045
39045
|
|
|
39046
39046
|
"use strict";
|
|
39047
|
-
module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.17.5","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.17.5","@abtnode/auth":"1.17.5","@abtnode/certificate-manager":"1.17.5","@abtnode/constant":"1.17.5","@abtnode/cron":"1.17.5","@abtnode/db-cache":"1.17.5","@abtnode/docker-utils":"1.17.5","@abtnode/logger":"1.17.5","@abtnode/models":"1.17.5","@abtnode/queue":"1.17.5","@abtnode/rbac":"1.17.5","@abtnode/router-provider":"1.17.5","@abtnode/static-server":"1.17.5","@abtnode/timemachine":"1.17.5","@abtnode/util":"1.17.5","@aigne/aigne-hub":"^0.10.15","@arcblock/did":"^1.27.15","@arcblock/did-connect-js":"^1.27.15","@arcblock/did-ext":"^1.27.15","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.15","@arcblock/event-hub":"^1.27.15","@arcblock/jwt":"^1.27.15","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.15","@arcblock/vc":"^1.27.15","@blocklet/constant":"1.17.5","@blocklet/did-space-js":"^1.2.
|
|
39047
|
+
module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.17.5","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.17.5","@abtnode/auth":"1.17.5","@abtnode/certificate-manager":"1.17.5","@abtnode/constant":"1.17.5","@abtnode/cron":"1.17.5","@abtnode/db-cache":"1.17.5","@abtnode/docker-utils":"1.17.5","@abtnode/logger":"1.17.5","@abtnode/models":"1.17.5","@abtnode/queue":"1.17.5","@abtnode/rbac":"1.17.5","@abtnode/router-provider":"1.17.5","@abtnode/static-server":"1.17.5","@abtnode/timemachine":"1.17.5","@abtnode/util":"1.17.5","@aigne/aigne-hub":"^0.10.15","@arcblock/did":"^1.27.15","@arcblock/did-connect-js":"^1.27.15","@arcblock/did-ext":"^1.27.15","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.15","@arcblock/event-hub":"^1.27.15","@arcblock/jwt":"^1.27.15","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.15","@arcblock/vc":"^1.27.15","@blocklet/constant":"1.17.5","@blocklet/did-space-js":"^1.2.11","@blocklet/env":"1.17.5","@blocklet/error":"^0.3.5","@blocklet/meta":"1.17.5","@blocklet/resolver":"1.17.5","@blocklet/sdk":"1.17.5","@blocklet/server-js":"1.17.5","@blocklet/store":"1.17.5","@blocklet/theme":"^3.2.19","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.15","@ocap/util":"^1.27.15","@ocap/wallet":"^1.27.15","@slack/webhook":"^7.0.6","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
|
|
39048
39048
|
|
|
39049
39049
|
/***/ }),
|
|
39050
39050
|
|
package/lib/util/blocklet.js
CHANGED
|
@@ -65,6 +65,7 @@ const { toSvg: createDidLogo } = require('@arcblock/did-motif');
|
|
|
65
65
|
const { createBlockiesSvg } = require('@blocklet/meta/lib/blockies');
|
|
66
66
|
const formatName = require('@abtnode/util/lib/format-name');
|
|
67
67
|
const { hasMountPoint } = require('@blocklet/meta/lib/engine');
|
|
68
|
+
const { fixAvatar } = require('@blocklet/sdk/lib/util/user');
|
|
68
69
|
|
|
69
70
|
const SCRIPT_ENGINES_WHITE_LIST = ['npm', 'npx', 'pnpm', 'yarn'];
|
|
70
71
|
|
|
@@ -2775,7 +2776,7 @@ const publishDidDocument = async ({ blocklet, ownerInfo, nodeInfo }) => {
|
|
|
2775
2776
|
});
|
|
2776
2777
|
|
|
2777
2778
|
const name = blocklet.meta?.title || blocklet.meta?.name;
|
|
2778
|
-
const state = fromBlockletStatus(blocklet.status
|
|
2779
|
+
const state = fromBlockletStatus(blocklet.status);
|
|
2779
2780
|
|
|
2780
2781
|
let launcher = null;
|
|
2781
2782
|
if (!isEmpty(blocklet.controller)) {
|
|
@@ -2823,7 +2824,7 @@ const publishDidDocument = async ({ blocklet, ownerInfo, nodeInfo }) => {
|
|
|
2823
2824
|
const owner = {
|
|
2824
2825
|
did: toDid(ownerInfo.did),
|
|
2825
2826
|
name: ownerInfo.fullName,
|
|
2826
|
-
avatar: ownerInfo.avatar,
|
|
2827
|
+
avatar: fixAvatar(ownerInfo.avatar),
|
|
2827
2828
|
};
|
|
2828
2829
|
|
|
2829
2830
|
return didDocument.updateBlockletDocument({
|
|
@@ -2845,7 +2846,7 @@ const publishDidDocument = async ({ blocklet, ownerInfo, nodeInfo }) => {
|
|
|
2845
2846
|
});
|
|
2846
2847
|
};
|
|
2847
2848
|
|
|
2848
|
-
const updateDidDocument = async ({ did,
|
|
2849
|
+
const updateDidDocument = async ({ did, nodeInfo, teamManager, states }) => {
|
|
2849
2850
|
const blocklet = await states.blocklet.getBlocklet(did);
|
|
2850
2851
|
const blockletExtra = await states.blockletExtras.findOne({ did });
|
|
2851
2852
|
|
|
@@ -2855,10 +2856,6 @@ const updateDidDocument = async ({ did, status, nodeInfo, teamManager, states })
|
|
|
2855
2856
|
|
|
2856
2857
|
logger.debug('update did document', { blocklet });
|
|
2857
2858
|
|
|
2858
|
-
if (isEmpty(blocklet.status)) {
|
|
2859
|
-
blocklet.status = status;
|
|
2860
|
-
}
|
|
2861
|
-
|
|
2862
2859
|
const ownerDid = blocklet.settings.owner.did;
|
|
2863
2860
|
logger.info('get owner info', { ownerDid, teamDid: blocklet.appPid });
|
|
2864
2861
|
const userState = await teamManager.getUserState(blocklet.appPid);
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "1.17.6-beta-
|
|
6
|
+
"version": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
7
7
|
"description": "",
|
|
8
8
|
"main": "lib/index.js",
|
|
9
9
|
"files": [
|
|
@@ -17,21 +17,21 @@
|
|
|
17
17
|
"author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
|
|
18
18
|
"license": "Apache-2.0",
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@abtnode/analytics": "1.17.6-beta-
|
|
21
|
-
"@abtnode/auth": "1.17.6-beta-
|
|
22
|
-
"@abtnode/certificate-manager": "1.17.6-beta-
|
|
23
|
-
"@abtnode/constant": "1.17.6-beta-
|
|
24
|
-
"@abtnode/cron": "1.17.6-beta-
|
|
25
|
-
"@abtnode/db-cache": "1.17.6-beta-
|
|
26
|
-
"@abtnode/docker-utils": "1.17.6-beta-
|
|
27
|
-
"@abtnode/logger": "1.17.6-beta-
|
|
28
|
-
"@abtnode/models": "1.17.6-beta-
|
|
29
|
-
"@abtnode/queue": "1.17.6-beta-
|
|
30
|
-
"@abtnode/rbac": "1.17.6-beta-
|
|
31
|
-
"@abtnode/router-provider": "1.17.6-beta-
|
|
32
|
-
"@abtnode/static-server": "1.17.6-beta-
|
|
33
|
-
"@abtnode/timemachine": "1.17.6-beta-
|
|
34
|
-
"@abtnode/util": "1.17.6-beta-
|
|
20
|
+
"@abtnode/analytics": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
21
|
+
"@abtnode/auth": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
22
|
+
"@abtnode/certificate-manager": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
23
|
+
"@abtnode/constant": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
24
|
+
"@abtnode/cron": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
25
|
+
"@abtnode/db-cache": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
26
|
+
"@abtnode/docker-utils": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
27
|
+
"@abtnode/logger": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
28
|
+
"@abtnode/models": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
29
|
+
"@abtnode/queue": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
30
|
+
"@abtnode/rbac": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
31
|
+
"@abtnode/router-provider": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
32
|
+
"@abtnode/static-server": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
33
|
+
"@abtnode/timemachine": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
34
|
+
"@abtnode/util": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
35
35
|
"@aigne/aigne-hub": "^0.10.15",
|
|
36
36
|
"@arcblock/did": "^1.27.15",
|
|
37
37
|
"@arcblock/did-connect-js": "^1.27.15",
|
|
@@ -43,16 +43,16 @@
|
|
|
43
43
|
"@arcblock/pm2-events": "^0.0.5",
|
|
44
44
|
"@arcblock/validator": "^1.27.15",
|
|
45
45
|
"@arcblock/vc": "^1.27.15",
|
|
46
|
-
"@blocklet/constant": "1.17.6-beta-
|
|
47
|
-
"@blocklet/did-space-js": "^1.2.
|
|
48
|
-
"@blocklet/env": "1.17.6-beta-
|
|
46
|
+
"@blocklet/constant": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
47
|
+
"@blocklet/did-space-js": "^1.2.11",
|
|
48
|
+
"@blocklet/env": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
49
49
|
"@blocklet/error": "^0.3.5",
|
|
50
|
-
"@blocklet/meta": "1.17.6-beta-
|
|
51
|
-
"@blocklet/resolver": "1.17.6-beta-
|
|
52
|
-
"@blocklet/sdk": "1.17.6-beta-
|
|
53
|
-
"@blocklet/server-js": "1.17.6-beta-
|
|
54
|
-
"@blocklet/store": "1.17.6-beta-
|
|
55
|
-
"@blocklet/theme": "^3.2.
|
|
50
|
+
"@blocklet/meta": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
51
|
+
"@blocklet/resolver": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
52
|
+
"@blocklet/sdk": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
53
|
+
"@blocklet/server-js": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
54
|
+
"@blocklet/store": "1.17.6-beta-20251219-114550-06c96cf5",
|
|
55
|
+
"@blocklet/theme": "^3.2.19",
|
|
56
56
|
"@fidm/x509": "^1.2.1",
|
|
57
57
|
"@ocap/mcrypto": "^1.27.15",
|
|
58
58
|
"@ocap/util": "^1.27.15",
|
|
@@ -116,5 +116,5 @@
|
|
|
116
116
|
"express": "^4.18.2",
|
|
117
117
|
"unzipper": "^0.10.11"
|
|
118
118
|
},
|
|
119
|
-
"gitHead": "
|
|
119
|
+
"gitHead": "73291571be14b70486dfe2e6996b9a38a5313802"
|
|
120
120
|
}
|