@abtnode/core 1.5.13 → 1.15.17

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 (20) hide show
  1. package/lib/blocklet/extras.js +1 -1
  2. package/lib/blocklet/hooks.js +4 -1
  3. package/lib/blocklet/manager/disk.js +30 -8
  4. package/lib/blocklet/migration.js +95 -47
  5. package/lib/blocklet/registry.js +5 -5
  6. package/lib/event.js +2 -2
  7. package/lib/migrations/1.5.15-site.js +184 -0
  8. package/lib/router/helper.js +124 -92
  9. package/lib/router/index.js +10 -2
  10. package/lib/router/manager.js +7 -7
  11. package/lib/states/site.js +1 -1
  12. package/lib/team/manager.js +1 -1
  13. package/lib/util/default-node-config.js +6 -6
  14. package/lib/util/index.js +29 -14
  15. package/lib/util/ready.js +5 -5
  16. package/lib/util/upgrade.js +4 -4
  17. package/lib/validators/router.js +13 -7
  18. package/lib/webhook/index.js +2 -2
  19. package/lib/webhook/sender/slack/index.js +1 -1
  20. package/package.json +18 -18
package/lib/validators/router.js CHANGED
@@ -83,6 +83,13 @@ const corsSchema = Joi.array()
83
83
 
84
84
  const ruleJoiSchema = Joi.object(ruleSchema);
85
85
 
86
+ const addDomainAlias = Joi.alternatives()
87
+ .try(
88
+ Joi.string().domain({ minDomainSegments: 1, tlds: false }),
89
+ Joi.string().regex(WILDCARD_DOMAIN_REGEX) // 这种其实是一种特殊的 tld
90
+ )
91
+ .required();
92
+
86
93
  const addSiteSchema = Joi.object({
87
94
  domain: Joi.alternatives()
88
95
  .try(
@@ -92,6 +99,12 @@ const addSiteSchema = Joi.object({
92
99
  )
93
100
  .required()
94
101
  .messages(domainMessages),
102
+ domainAliases: Joi.array().items(
103
+ Joi.object({
104
+ value: addDomainAlias,
105
+ isProtected: Joi.boolean(),
106
+ })
107
+ ),
95
108
  isProtected: Joi.boolean(),
96
109
  rules: Joi.array().items(ruleJoiSchema),
97
110
  corsAllowedOrigins: corsSchema,
@@ -109,13 +122,6 @@ const updateSite = Joi.object({
109
122
  .messages(domainMessages),
110
123
  });
111
124
 
112
- const addDomainAlias = Joi.alternatives()
113
- .try(
114
- Joi.string().domain({ minDomainSegments: 1, tlds: false }),
115
- Joi.string().regex(WILDCARD_DOMAIN_REGEX) // 这种其实是一种特殊的 tld
116
- )
117
- .required();
118
-
119
125
  const addRuleSchema = Joi.object({
120
126
  id: Joi.string().required(),
121
127
  rule: ruleJoiSchema,
package/lib/webhook/index.js CHANGED
@@ -15,7 +15,7 @@ const getSlackUrlInfo = (actionPath = '/notifications', urls) => {
15
15
  type: 'section',
16
16
  text: {
17
17
  type: 'mrkdwn',
18
- text: 'Use the following links to visit the blocklet detail on your ABT Node dashboard:',
18
+ text: 'Use the following links to visit the blocklet detail on your Blocklet Server dashboard:',
19
19
  },
20
20
  });
21
21
  } else {
@@ -23,7 +23,7 @@ const getSlackUrlInfo = (actionPath = '/notifications', urls) => {
23
23
  type: 'section',
24
24
  text: {
25
25
  type: 'mrkdwn',
26
- text: 'Use the following links to visit your ABT Node dashboard:',
26
+ text: 'Use the following links to visit your Blocklet Server dashboard:',
27
27
  },
28
28
  });
29
29
  }
package/lib/webhook/sender/slack/index.js CHANGED
@@ -56,7 +56,7 @@ class SlackSender extends BaseSender {
56
56
 
57
57
  await webhook.send({
58
58
  ...messageTypes[type],
59
- username: 'ABT Node',
59
+ username: 'Blocklet Server',
60
60
  icon_url: 'https://releases.arcblockio.cn/arcblock.png',
61
61
  });
62
62
  } catch (error) {
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "access": "public"
5
5
  },
6
- "version": "1.5.13",
6
+ "version": "1.15.17",
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.13",
23
- "@abtnode/cron": "1.5.13",
24
- "@abtnode/logger": "1.5.13",
25
- "@abtnode/queue": "1.5.13",
26
- "@abtnode/rbac": "1.5.13",
27
- "@abtnode/router-provider": "1.5.13",
28
- "@abtnode/static-server": "1.5.13",
29
- "@abtnode/timemachine": "1.5.13",
30
- "@abtnode/util": "1.5.13",
31
- "@arcblock/did": "^1.13.59",
32
- "@arcblock/event-hub": "1.13.59",
22
+ "@abtnode/constant": "1.15.17",
23
+ "@abtnode/cron": "1.15.17",
24
+ "@abtnode/logger": "1.15.17",
25
+ "@abtnode/queue": "1.15.17",
26
+ "@abtnode/rbac": "1.15.17",
27
+ "@abtnode/router-provider": "1.15.17",
28
+ "@abtnode/static-server": "1.15.17",
29
+ "@abtnode/timemachine": "1.15.17",
30
+ "@abtnode/util": "1.15.17",
31
+ "@arcblock/did": "^1.13.61",
32
+ "@arcblock/event-hub": "1.13.61",
33
33
  "@arcblock/pm2-events": "^0.0.5",
34
- "@arcblock/vc": "^1.13.59",
35
- "@blocklet/meta": "1.5.13",
34
+ "@arcblock/vc": "^1.13.61",
35
+ "@blocklet/meta": "1.15.17",
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.59",
40
- "@ocap/util": "^1.13.59",
41
- "@ocap/wallet": "^1.13.59",
39
+ "@ocap/mcrypto": "^1.13.61",
40
+ "@ocap/util": "^1.13.61",
41
+ "@ocap/wallet": "^1.13.61",
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": "abb145ffccdab4a9496a9e8a4dbc617306e17b84"
76
+ "gitHead": "22715c3ea74d0230f3413162a17f491614b6735a"
77
77
  }