@abtnode/core 1.16.17-beta-e8ba7813 → 1.16.18-beta-adeeb0b3
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/router/helper.js +4 -1
- package/lib/router/manager.js +10 -1
- package/package.json +20 -20
package/lib/router/helper.js
CHANGED
|
@@ -1026,7 +1026,10 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
|
|
|
1026
1026
|
}
|
|
1027
1027
|
|
|
1028
1028
|
const existRule = (existSite.rules || []).find((y) => get(y, 'from.pathPrefix') === pathPrefix);
|
|
1029
|
-
if (
|
|
1029
|
+
if (
|
|
1030
|
+
existRule &&
|
|
1031
|
+
(rule.to?.type !== ROUTING_RULE_TYPES.BLOCKLET || existRule.to?.type === ROUTING_RULE_TYPES.BLOCKLET)
|
|
1032
|
+
) {
|
|
1030
1033
|
await routerManager.updateRoutingRule({
|
|
1031
1034
|
id: existSite.id,
|
|
1032
1035
|
rule: {
|
package/lib/router/manager.js
CHANGED
|
@@ -307,7 +307,16 @@ class RouterManager extends EventEmitter {
|
|
|
307
307
|
const existedRule = dbSite.rules.find((x) => x.from.pathPrefix === rule.from.pathPrefix);
|
|
308
308
|
|
|
309
309
|
if (existedRule) {
|
|
310
|
-
|
|
310
|
+
if (
|
|
311
|
+
rule.from.pathPrefix === '/' &&
|
|
312
|
+
rule.to.type === ROUTING_RULE_TYPES.BLOCKLET &&
|
|
313
|
+
existedRule.to.type !== ROUTING_RULE_TYPES.BLOCKLET
|
|
314
|
+
) {
|
|
315
|
+
// Do nothing
|
|
316
|
+
// This is a special case that we allow a non-blocklet rule already exists in '/'
|
|
317
|
+
} else {
|
|
318
|
+
throw new Error(`addRoutingRule: path prefix '${originalPathPrefix}' already exists`);
|
|
319
|
+
}
|
|
311
320
|
}
|
|
312
321
|
}
|
|
313
322
|
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "1.16.
|
|
6
|
+
"version": "1.16.18-beta-adeeb0b3",
|
|
7
7
|
"description": "",
|
|
8
8
|
"main": "lib/index.js",
|
|
9
9
|
"files": [
|
|
@@ -19,19 +19,19 @@
|
|
|
19
19
|
"author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
|
|
20
20
|
"license": "Apache-2.0",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@abtnode/analytics": "1.16.
|
|
23
|
-
"@abtnode/auth": "1.16.
|
|
24
|
-
"@abtnode/certificate-manager": "1.16.
|
|
25
|
-
"@abtnode/constant": "1.16.
|
|
26
|
-
"@abtnode/cron": "1.16.
|
|
27
|
-
"@abtnode/logger": "1.16.
|
|
28
|
-
"@abtnode/models": "1.16.
|
|
29
|
-
"@abtnode/queue": "1.16.
|
|
30
|
-
"@abtnode/rbac": "1.16.
|
|
31
|
-
"@abtnode/router-provider": "1.16.
|
|
32
|
-
"@abtnode/static-server": "1.16.
|
|
33
|
-
"@abtnode/timemachine": "1.16.
|
|
34
|
-
"@abtnode/util": "1.16.
|
|
22
|
+
"@abtnode/analytics": "1.16.18-beta-adeeb0b3",
|
|
23
|
+
"@abtnode/auth": "1.16.18-beta-adeeb0b3",
|
|
24
|
+
"@abtnode/certificate-manager": "1.16.18-beta-adeeb0b3",
|
|
25
|
+
"@abtnode/constant": "1.16.18-beta-adeeb0b3",
|
|
26
|
+
"@abtnode/cron": "1.16.18-beta-adeeb0b3",
|
|
27
|
+
"@abtnode/logger": "1.16.18-beta-adeeb0b3",
|
|
28
|
+
"@abtnode/models": "1.16.18-beta-adeeb0b3",
|
|
29
|
+
"@abtnode/queue": "1.16.18-beta-adeeb0b3",
|
|
30
|
+
"@abtnode/rbac": "1.16.18-beta-adeeb0b3",
|
|
31
|
+
"@abtnode/router-provider": "1.16.18-beta-adeeb0b3",
|
|
32
|
+
"@abtnode/static-server": "1.16.18-beta-adeeb0b3",
|
|
33
|
+
"@abtnode/timemachine": "1.16.18-beta-adeeb0b3",
|
|
34
|
+
"@abtnode/util": "1.16.18-beta-adeeb0b3",
|
|
35
35
|
"@arcblock/did": "1.18.93",
|
|
36
36
|
"@arcblock/did-auth": "1.18.93",
|
|
37
37
|
"@arcblock/did-ext": "^1.18.93",
|
|
@@ -42,11 +42,11 @@
|
|
|
42
42
|
"@arcblock/pm2-events": "^0.0.5",
|
|
43
43
|
"@arcblock/validator": "^1.18.93",
|
|
44
44
|
"@arcblock/vc": "1.18.93",
|
|
45
|
-
"@blocklet/constant": "1.16.
|
|
46
|
-
"@blocklet/env": "1.16.
|
|
47
|
-
"@blocklet/meta": "1.16.
|
|
48
|
-
"@blocklet/resolver": "1.16.
|
|
49
|
-
"@blocklet/sdk": "1.16.
|
|
45
|
+
"@blocklet/constant": "1.16.18-beta-adeeb0b3",
|
|
46
|
+
"@blocklet/env": "1.16.18-beta-adeeb0b3",
|
|
47
|
+
"@blocklet/meta": "1.16.18-beta-adeeb0b3",
|
|
48
|
+
"@blocklet/resolver": "1.16.18-beta-adeeb0b3",
|
|
49
|
+
"@blocklet/sdk": "1.16.18-beta-adeeb0b3",
|
|
50
50
|
"@did-space/client": "^0.3.12",
|
|
51
51
|
"@fidm/x509": "^1.2.1",
|
|
52
52
|
"@ocap/mcrypto": "1.18.93",
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
"jest": "^27.5.1",
|
|
102
102
|
"unzipper": "^0.10.11"
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "1bef55d8f6ec840d5336e5a8c113771535a1416f"
|
|
105
105
|
}
|