@abtnode/core 1.7.15 → 1.7.18

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.
@@ -326,7 +326,12 @@ const ensureWellknownRule = async (sites) => {
326
326
  }
327
327
 
328
328
  // add /.well-known/service for blocklet
329
- const blockletRules = site.rules.filter((x) => x.to.type === ROUTING_RULE_TYPES.BLOCKLET);
329
+ const blockletRules = site.rules
330
+ .filter((x) => x.to.type === ROUTING_RULE_TYPES.BLOCKLET)
331
+ // 可能存在挂载的 blocklet 不是自己, 是其他 blocklet
332
+ // 这里默认 pathPrefix 最短的是自己 ( 通常自己在 /, 其他 blocklet 在 /xxxx )
333
+ // 挂载其他 blocklet 的使用方式不推荐, 将来可能会被废弃
334
+ .sort((a, b) => (a.from.pathPrefix.length > b.from.pathPrefix.length ? 1 : -1));
330
335
  if (blockletRules.length) {
331
336
  // get pathPrefix for blocklet-service
332
337
  const rootBlockletRule = blockletRules.find((x) => x.to.did === x.to.realDid);
@@ -135,7 +135,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
135
135
  case 'switchProfile':
136
136
  return `switched profile to ${args.profile.fullName} for ${team}`;
137
137
  case 'switchPassport':
138
- return `switched passport to ${args.passport.role} for ${team}`;
138
+ return `switched passport to ${args.passport.name} for ${team}`;
139
139
  case 'login':
140
140
  return `${user} logged in to ${team} with passport ${args.passport.name}`;
141
141
  case 'configWhoCanAccess':
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "access": "public"
5
5
  },
6
- "version": "1.7.15",
6
+ "version": "1.7.18",
7
7
  "description": "",
8
8
  "main": "lib/index.js",
9
9
  "files": [
@@ -19,29 +19,29 @@
19
19
  "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
20
20
  "license": "MIT",
21
21
  "dependencies": {
22
- "@abtnode/certificate-manager": "1.7.15",
23
- "@abtnode/constant": "1.7.15",
24
- "@abtnode/cron": "1.7.15",
25
- "@abtnode/db": "1.7.15",
26
- "@abtnode/logger": "1.7.15",
27
- "@abtnode/queue": "1.7.15",
28
- "@abtnode/rbac": "1.7.15",
29
- "@abtnode/router-provider": "1.7.15",
30
- "@abtnode/static-server": "1.7.15",
31
- "@abtnode/timemachine": "1.7.15",
32
- "@abtnode/util": "1.7.15",
33
- "@arcblock/did": "^1.16.8",
22
+ "@abtnode/certificate-manager": "1.7.18",
23
+ "@abtnode/constant": "1.7.18",
24
+ "@abtnode/cron": "1.7.18",
25
+ "@abtnode/db": "1.7.18",
26
+ "@abtnode/logger": "1.7.18",
27
+ "@abtnode/queue": "1.7.18",
28
+ "@abtnode/rbac": "1.7.18",
29
+ "@abtnode/router-provider": "1.7.18",
30
+ "@abtnode/static-server": "1.7.18",
31
+ "@abtnode/timemachine": "1.7.18",
32
+ "@abtnode/util": "1.7.18",
33
+ "@arcblock/did": "^1.16.9",
34
34
  "@arcblock/did-motif": "^1.1.5",
35
- "@arcblock/event-hub": "1.16.8",
35
+ "@arcblock/event-hub": "1.16.9",
36
36
  "@arcblock/pm2-events": "^0.0.5",
37
- "@arcblock/vc": "^1.16.8",
38
- "@blocklet/meta": "1.7.15",
37
+ "@arcblock/vc": "^1.16.9",
38
+ "@blocklet/meta": "1.7.18",
39
39
  "@fidm/x509": "^1.2.1",
40
40
  "@nedb/core": "^1.2.2",
41
41
  "@nedb/multi": "^1.2.2",
42
- "@ocap/mcrypto": "^1.16.8",
43
- "@ocap/util": "^1.16.8",
44
- "@ocap/wallet": "^1.16.8",
42
+ "@ocap/mcrypto": "^1.16.9",
43
+ "@ocap/util": "^1.16.9",
44
+ "@ocap/wallet": "^1.16.9",
45
45
  "@slack/webhook": "^5.0.3",
46
46
  "axios": "^0.26.1",
47
47
  "axon": "^2.0.3",
@@ -79,5 +79,5 @@
79
79
  "express": "^4.17.1",
80
80
  "jest": "^27.4.5"
81
81
  },
82
- "gitHead": "d95421b38c281ed41fa7490a707f149aa737f3d3"
82
+ "gitHead": "062bf3d0df5acd1f2207b70597f49745089033df"
83
83
  }