@abtnode/core 1.17.7-beta-20260103-230139-51fc594d → 1.17.7-beta-20260104-034806-6a4e6fba

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 (2) hide show
  1. package/lib/router/helper.js +13 -3
  2. package/package.json +22 -22
package/lib/router/helper.js CHANGED
@@ -496,6 +496,14 @@ const ensureBlockletWellknownRules = (sites, blocklets) => {
496
496
  .filter(Boolean);
497
497
  };
498
498
 
499
+ const isNotComponentRule = (x) =>
500
+ [
501
+ ROUTING_RULE_TYPES.GENERAL_PROXY,
502
+ ROUTING_RULE_TYPES.DIRECT_RESPONSE,
503
+ ROUTING_RULE_TYPES.GENERAL_REWRITE,
504
+ ROUTING_RULE_TYPES.REDIRECT,
505
+ ROUTING_RULE_TYPES.NONE,
506
+ ].includes(x.to.type);
499
507
  const expandComponentRules = (sites = [], blocklets) => {
500
508
  return sites
501
509
  .map((site) => {
@@ -527,15 +535,17 @@ const expandComponentRules = (sites = [], blocklets) => {
527
535
  },
528
536
  }));
529
537
 
530
- // logger.info('expandComponentRules.before.rules', { siteId: site.id, rules: site.rules, expandedRules });
531
- site.rules = site.rules.filter((x) => x.isProtected).concat(expandedRules);
538
+ // console.info('expandComponentRules.before.rules', JSON.stringify(site.rules, null, 2));
539
+ site.rules = site.rules
540
+ .filter((x) => x.isProtected || x.to.pageGroup || isNotComponentRule(x))
541
+ .concat(expandedRules);
532
542
  site.rules.forEach((x) => {
533
543
  if (x.to.type === ROUTING_RULE_TYPES.COMPONENT) {
534
544
  x.to.type = ROUTING_RULE_TYPES.BLOCKLET;
535
545
  x.to.componentId = [blocklet.meta.did, x.to.componentId].join('/');
536
546
  }
537
547
  });
538
- // logger.info('expandComponentRules.after.rules', { siteId: site.id, rules: site.rules });
548
+ // console.info('expandComponentRules.after.rules', JSON.stringify(site.rules, null, 2));
539
549
 
540
550
  site.componentExpanded = true;
541
551
  return site;
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "access": "public"
5
5
  },
6
- "version": "1.17.7-beta-20260103-230139-51fc594d",
6
+ "version": "1.17.7-beta-20260104-034806-6a4e6fba",
7
7
  "description": "",
8
8
  "main": "lib/index.js",
9
9
  "files": [
@@ -17,19 +17,19 @@
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.7-beta-20260103-230139-51fc594d",
21
- "@abtnode/auth": "1.17.7-beta-20260103-230139-51fc594d",
22
- "@abtnode/certificate-manager": "1.17.7-beta-20260103-230139-51fc594d",
23
- "@abtnode/constant": "1.17.7-beta-20260103-230139-51fc594d",
24
- "@abtnode/cron": "1.17.7-beta-20260103-230139-51fc594d",
25
- "@abtnode/db-cache": "1.17.7-beta-20260103-230139-51fc594d",
26
- "@abtnode/docker-utils": "1.17.7-beta-20260103-230139-51fc594d",
27
- "@abtnode/logger": "1.17.7-beta-20260103-230139-51fc594d",
28
- "@abtnode/models": "1.17.7-beta-20260103-230139-51fc594d",
29
- "@abtnode/queue": "1.17.7-beta-20260103-230139-51fc594d",
30
- "@abtnode/rbac": "1.17.7-beta-20260103-230139-51fc594d",
31
- "@abtnode/router-provider": "1.17.7-beta-20260103-230139-51fc594d",
32
- "@abtnode/util": "1.17.7-beta-20260103-230139-51fc594d",
20
+ "@abtnode/analytics": "1.17.7-beta-20260104-034806-6a4e6fba",
21
+ "@abtnode/auth": "1.17.7-beta-20260104-034806-6a4e6fba",
22
+ "@abtnode/certificate-manager": "1.17.7-beta-20260104-034806-6a4e6fba",
23
+ "@abtnode/constant": "1.17.7-beta-20260104-034806-6a4e6fba",
24
+ "@abtnode/cron": "1.17.7-beta-20260104-034806-6a4e6fba",
25
+ "@abtnode/db-cache": "1.17.7-beta-20260104-034806-6a4e6fba",
26
+ "@abtnode/docker-utils": "1.17.7-beta-20260104-034806-6a4e6fba",
27
+ "@abtnode/logger": "1.17.7-beta-20260104-034806-6a4e6fba",
28
+ "@abtnode/models": "1.17.7-beta-20260104-034806-6a4e6fba",
29
+ "@abtnode/queue": "1.17.7-beta-20260104-034806-6a4e6fba",
30
+ "@abtnode/rbac": "1.17.7-beta-20260104-034806-6a4e6fba",
31
+ "@abtnode/router-provider": "1.17.7-beta-20260104-034806-6a4e6fba",
32
+ "@abtnode/util": "1.17.7-beta-20260104-034806-6a4e6fba",
33
33
  "@aigne/aigne-hub": "^0.10.15",
34
34
  "@arcblock/did": "^1.27.16",
35
35
  "@arcblock/did-connect-js": "^1.27.16",
@@ -41,15 +41,15 @@
41
41
  "@arcblock/pm2-events": "^0.0.5",
42
42
  "@arcblock/validator": "^1.27.16",
43
43
  "@arcblock/vc": "^1.27.16",
44
- "@blocklet/constant": "1.17.7-beta-20260103-230139-51fc594d",
44
+ "@blocklet/constant": "1.17.7-beta-20260104-034806-6a4e6fba",
45
45
  "@blocklet/did-space-js": "^1.2.12",
46
- "@blocklet/env": "1.17.7-beta-20260103-230139-51fc594d",
46
+ "@blocklet/env": "1.17.7-beta-20260104-034806-6a4e6fba",
47
47
  "@blocklet/error": "^0.3.5",
48
- "@blocklet/meta": "1.17.7-beta-20260103-230139-51fc594d",
49
- "@blocklet/resolver": "1.17.7-beta-20260103-230139-51fc594d",
50
- "@blocklet/sdk": "1.17.7-beta-20260103-230139-51fc594d",
51
- "@blocklet/server-js": "1.17.7-beta-20260103-230139-51fc594d",
52
- "@blocklet/store": "1.17.7-beta-20260103-230139-51fc594d",
48
+ "@blocklet/meta": "1.17.7-beta-20260104-034806-6a4e6fba",
49
+ "@blocklet/resolver": "1.17.7-beta-20260104-034806-6a4e6fba",
50
+ "@blocklet/sdk": "1.17.7-beta-20260104-034806-6a4e6fba",
51
+ "@blocklet/server-js": "1.17.7-beta-20260104-034806-6a4e6fba",
52
+ "@blocklet/store": "1.17.7-beta-20260104-034806-6a4e6fba",
53
53
  "@blocklet/theme": "^3.3.7",
54
54
  "@fidm/x509": "^1.2.1",
55
55
  "@ocap/mcrypto": "^1.27.16",
@@ -114,5 +114,5 @@
114
114
  "express": "^4.18.2",
115
115
  "unzipper": "^0.10.11"
116
116
  },
117
- "gitHead": "fb908bd3cd022e1061fbf20328dbad8edd22409b"
117
+ "gitHead": "9cebb3f3a88e8fd66e70e5a080c037322685460b"
118
118
  }