@abtnode/blocklet-services 1.7.7 → 1.7.10

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 (84) hide show
  1. package/api/index.js +41 -1
  2. package/api/routes/blocklet.js +4 -4
  3. package/api/services/auth/connect/login.js +9 -5
  4. package/api/services/auth/connect/switch-passport.js +107 -0
  5. package/api/services/auth/connect/switch-profile.js +60 -0
  6. package/api/services/auth/index.js +5 -1
  7. package/api/services/notification/index.js +1 -8
  8. package/api/services/static.js +4 -1
  9. package/api/util/attach-shared-utils.js +1 -1
  10. package/api/util/index.js +30 -8
  11. package/build/asset-manifest.json +32 -34
  12. package/build/favicon.ico +0 -0
  13. package/build/index.html +1 -1
  14. package/build/precache-manifest.6bba5a0937fec8cc0577975770db10ff.js +114 -0
  15. package/build/service-worker.js +1 -1
  16. package/build/static/css/4.6e1172e8.chunk.css +2 -0
  17. package/build/static/css/4.6e1172e8.chunk.css.map +1 -0
  18. package/build/static/js/0.8641a485.chunk.js +3 -0
  19. package/build/static/js/{0.369fac6d.chunk.js.LICENSE.txt → 0.8641a485.chunk.js.LICENSE.txt} +0 -0
  20. package/build/static/js/0.8641a485.chunk.js.map +1 -0
  21. package/build/static/js/1.d6f10e20.chunk.js +2 -0
  22. package/build/static/js/1.d6f10e20.chunk.js.map +1 -0
  23. package/build/static/js/10.eae356ec.chunk.js +2 -0
  24. package/build/static/js/10.eae356ec.chunk.js.map +1 -0
  25. package/build/static/js/4.973ae192.chunk.js +3 -0
  26. package/build/static/js/{4.da598ff9.chunk.js.LICENSE.txt → 4.973ae192.chunk.js.LICENSE.txt} +0 -0
  27. package/build/static/js/4.973ae192.chunk.js.map +1 -0
  28. package/build/static/js/5.a97b78a4.chunk.js +2 -0
  29. package/build/static/js/5.a97b78a4.chunk.js.map +1 -0
  30. package/build/static/js/6.60aaf58a.chunk.js +2 -0
  31. package/build/static/js/6.60aaf58a.chunk.js.map +1 -0
  32. package/build/static/js/7.6ffbad13.chunk.js +2 -0
  33. package/build/static/js/7.6ffbad13.chunk.js.map +1 -0
  34. package/build/static/js/8.7e2dd683.chunk.js +2 -0
  35. package/build/static/js/8.7e2dd683.chunk.js.map +1 -0
  36. package/build/static/js/9.9561f820.chunk.js +2 -0
  37. package/build/static/js/9.9561f820.chunk.js.map +1 -0
  38. package/build/static/js/main.73e47d11.chunk.js +2 -0
  39. package/build/static/js/main.73e47d11.chunk.js.map +1 -0
  40. package/build/static/js/{runtime-main.c2e2dfd3.js → runtime-main.d47db38c.js} +2 -2
  41. package/build/static/js/{runtime-main.c2e2dfd3.js.map → runtime-main.d47db38c.js.map} +1 -1
  42. package/configs/auth.json +9 -4
  43. package/package.json +27 -27
  44. package/build/precache-manifest.6ec624c9ac86fef39f147e6fbb8caf56.js +0 -186
  45. package/build/static/css/4.634341e0.chunk.css +0 -2
  46. package/build/static/css/4.634341e0.chunk.css.map +0 -1
  47. package/build/static/js/0.369fac6d.chunk.js +0 -3
  48. package/build/static/js/0.369fac6d.chunk.js.map +0 -1
  49. package/build/static/js/1.c0e3e4df.chunk.js +0 -2
  50. package/build/static/js/1.c0e3e4df.chunk.js.map +0 -1
  51. package/build/static/js/10.1d68b28c.chunk.js +0 -2
  52. package/build/static/js/10.1d68b28c.chunk.js.map +0 -1
  53. package/build/static/js/4.da598ff9.chunk.js +0 -3
  54. package/build/static/js/4.da598ff9.chunk.js.map +0 -1
  55. package/build/static/js/5.e8b7573e.chunk.js +0 -2
  56. package/build/static/js/5.e8b7573e.chunk.js.map +0 -1
  57. package/build/static/js/6.fd72b935.chunk.js +0 -2
  58. package/build/static/js/6.fd72b935.chunk.js.map +0 -1
  59. package/build/static/js/7.5710df9a.chunk.js +0 -2
  60. package/build/static/js/7.5710df9a.chunk.js.map +0 -1
  61. package/build/static/js/8.6d6d04ee.chunk.js +0 -2
  62. package/build/static/js/8.6d6d04ee.chunk.js.map +0 -1
  63. package/build/static/js/9.35b1a21d.chunk.js +0 -2
  64. package/build/static/js/9.35b1a21d.chunk.js.map +0 -1
  65. package/build/static/js/main.7467feb3.chunk.js +0 -2
  66. package/build/static/js/main.7467feb3.chunk.js.map +0 -1
  67. package/build/static/media/rubik-all-400-normal.c2324103.woff +0 -0
  68. package/build/static/media/rubik-all-500-normal.000c3408.woff +0 -0
  69. package/build/static/media/rubik-all-600-normal.30df2fd0.woff +0 -0
  70. package/build/static/media/rubik-cyrillic-400-normal.49f3ce37.woff2 +0 -0
  71. package/build/static/media/rubik-cyrillic-500-normal.0c1bd2ab.woff2 +0 -0
  72. package/build/static/media/rubik-cyrillic-600-normal.b76031ea.woff2 +0 -0
  73. package/build/static/media/rubik-cyrillic-ext-400-normal.d3902986.woff2 +0 -0
  74. package/build/static/media/rubik-cyrillic-ext-500-normal.7e493ee0.woff2 +0 -0
  75. package/build/static/media/rubik-cyrillic-ext-600-normal.f4b6c519.woff2 +0 -0
  76. package/build/static/media/rubik-hebrew-400-normal.0ebef856.woff2 +0 -0
  77. package/build/static/media/rubik-hebrew-500-normal.3664f2b5.woff2 +0 -0
  78. package/build/static/media/rubik-hebrew-600-normal.6207349a.woff2 +0 -0
  79. package/build/static/media/rubik-latin-400-normal.b836d2ed.woff2 +0 -0
  80. package/build/static/media/rubik-latin-500-normal.18984747.woff2 +0 -0
  81. package/build/static/media/rubik-latin-600-normal.b1216018.woff2 +0 -0
  82. package/build/static/media/rubik-latin-ext-400-normal.69a88832.woff2 +0 -0
  83. package/build/static/media/rubik-latin-ext-500-normal.21b63491.woff2 +0 -0
  84. package/build/static/media/rubik-latin-ext-600-normal.d0d90e83.woff2 +0 -0
package/api/index.js CHANGED
@@ -76,7 +76,11 @@ module.exports = function createServer(node, serverOptions = {}) {
76
76
  const notificationService = initNotification({ node, options });
77
77
 
78
78
  // Proxy engine
79
- const proxy = httpProxy.createProxyServer({});
79
+ const proxy = httpProxy.createProxyServer({
80
+ timeout: 3600 * 1000,
81
+ proxyTimeout: 3600 * 1000,
82
+ });
83
+
80
84
  proxy.safeWeb = (req, res, opts = {}) => {
81
85
  proxy.web(req, res, opts, (error) => {
82
86
  if (error) {
@@ -285,9 +289,45 @@ module.exports = function createServer(node, serverOptions = {}) {
285
289
  wsRouter.use('**', async (req, socket, head) => {
286
290
  const { target } = ensureProxyUrl(req);
287
291
  if (target) {
292
+ let isOpen = false;
293
+ let timer;
294
+ let proxyReq;
295
+
296
+ const setProxyReq = (x) => {
297
+ proxyReq = x;
298
+ };
299
+
300
+ const setIsOpen = () => {
301
+ isOpen = true;
302
+ clearTimeout(timer);
303
+ };
304
+
305
+ proxy.once('open', setIsOpen);
306
+ proxy.once('proxyReqWs', setProxyReq);
307
+
308
+ timer = setTimeout(() => {
309
+ if (!isOpen) {
310
+ proxy.off('open', setIsOpen);
311
+ proxy.off('proxyReqWs', setProxyReq);
312
+
313
+ socket.write('HTTP/1.1 502 Proxy Timeout\r\n\r\n');
314
+ socket.destroy();
315
+
316
+ proxyReq?.destroy();
317
+ proxyReq = null;
318
+ }
319
+ }, 120 * 1000);
320
+
288
321
  proxy.ws(req, socket, head, { target }, (error) => {
322
+ proxy.off('open', setIsOpen);
323
+ proxy.off('proxyReqWs', setProxyReq);
324
+ clearTimeout(timer);
325
+ proxyReq = null;
326
+
289
327
  if (error) {
290
328
  logger.error('socket proxy error', { from: req.url, to: target, error });
329
+ socket.write('HTTP/1.1 502 Proxy Error\r\n\r\n');
330
+ socket.destroy();
291
331
  }
292
332
  });
293
333
  } else {
@@ -33,7 +33,7 @@ const prefix = WELLKNOWN_SERVICE_PATH_PREFIX;
33
33
  module.exports = {
34
34
  init(server, node) {
35
35
  server.get(`${prefix}/blocklet/logo`, async (req, res) => {
36
- const sendOptions = { maxAge: '1d' };
36
+ const sendOptions = { maxAge: '1y' };
37
37
 
38
38
  try {
39
39
  const blocklet = await req.getBlocklet();
@@ -98,8 +98,6 @@ module.exports = {
98
98
  });
99
99
 
100
100
  if (fromSetup) {
101
- await node.setBlockletInitialized({ did: blocklet.meta.did });
102
-
103
101
  const { did: userDid, role } = req.user;
104
102
  const { wallet, name, passportColor } = await req.getBlockletInfo();
105
103
  const teamDid = blocklet.meta.did;
@@ -107,6 +105,8 @@ module.exports = {
107
105
  const { pk, locale = 'en', extra = {} } = user;
108
106
  const { baseUrl } = extra;
109
107
 
108
+ await node.setBlockletInitialized({ did: blocklet.meta.did, owner: { did: userDid, pk } });
109
+
110
110
  // create vc
111
111
  const vc = createPassportVC({
112
112
  issuerName: name,
@@ -191,7 +191,7 @@ module.exports = {
191
191
  PREFIXES.forEach((p) => {
192
192
  // backward compatible
193
193
  server.get(`${p}/blocklet/logo/:did`, async (req, res) => {
194
- const sendOptions = { maxAge: '1d' };
194
+ const sendOptions = { maxAge: '1y' };
195
195
 
196
196
  let blocklet = null;
197
197
  try {
@@ -53,10 +53,6 @@ const isInvitedUserOnly = async (config, node, teamDid) => {
53
53
  return [false, ROLES.GUEST];
54
54
  }
55
55
 
56
- if ([true, 'yes', 'not-first'].includes(config.invitedUserOnly)) {
57
- return [true];
58
- }
59
-
60
56
  return [false, ROLES.GUEST];
61
57
  };
62
58
 
@@ -124,7 +120,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
124
120
  // Get passport
125
121
  const trustedPassports = (blocklet.trustedPassports || []).map((x) => x.issuerDid);
126
122
  const trustedIssuers = [teamAppDid, ...trustedPassports].filter(Boolean);
127
- let { vc } = await getVCFromClaims({
123
+ const { vc: inputVC } = await getVCFromClaims({
128
124
  claims,
129
125
  challenge,
130
126
  trustedIssuers,
@@ -132,6 +128,8 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
132
128
  locale,
133
129
  });
134
130
 
131
+ let vc = inputVC;
132
+
135
133
  const config = (await req.getServiceConfig(NODE_SERVICES.AUTH)) || {};
136
134
  const [invitedUserOnly, defaultRole, issuePassport] = await isInvitedUserOnly(config, node, teamDid);
137
135
 
@@ -244,6 +242,12 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
244
242
  await updateSession({ sessionToken }, true);
245
243
  logger.info('login.success', { userDid, role });
246
244
 
245
+ // if user provides owner passport AND app does not have owner, set this user to owner
246
+ if (inputVC && role === ROLES.OWNER && !blocklet.settings?.owner) {
247
+ logger.info('Bind owner for blocklet', { teamDid, userDid });
248
+ await node.setBlockletInitialized({ did: teamDid, owner: { did: userDid, pk: userPk } });
249
+ }
250
+
247
251
  // issue passport for the first login user in a invite-only team
248
252
  if (issuePassport) {
249
253
  return {
@@ -0,0 +1,107 @@
1
+ const get = require('lodash/get');
2
+ const { messages, getVCFromClaims, getUser, validatePassportStatus } = require('@abtnode/auth/lib/auth');
3
+ const { ROLES, VC_TYPE_GENERAL_PASSPORT, VC_TYPE_NODE_PASSPORT } = require('@abtnode/constant');
4
+ const {
5
+ validatePassport,
6
+ isUserPassportRevoked,
7
+ getRoleFromLocalPassport,
8
+ getRoleFromExternalPassport,
9
+ createUserPassport,
10
+ } = require('@abtnode/auth/lib/passport');
11
+
12
+ const vcTypes = [VC_TYPE_GENERAL_PASSPORT, VC_TYPE_NODE_PASSPORT];
13
+
14
+ module.exports = function createRoutes(node, authenticator, createSessionToken) {
15
+ return {
16
+ action: 'switch-passport',
17
+ onConnect: async ({ req, userDid, extraParams: { locale, connectedDid } }) => {
18
+ if (userDid && connectedDid && userDid !== connectedDid) {
19
+ throw new Error(messages.userMismatch[locale]);
20
+ }
21
+
22
+ const { wallet, did: teamDid } = await req.getBlockletInfo();
23
+ const user = await getUser(node, teamDid, userDid);
24
+
25
+ if (!user) {
26
+ throw new Error(messages.userNotFound[locale]);
27
+ }
28
+ if (!user.approved) {
29
+ throw new Error(messages.notAuthorized[locale]);
30
+ }
31
+
32
+ return {
33
+ verifiableCredential: async ({ context }) => {
34
+ const { request } = context;
35
+ const blocklet = await request.getBlocklet();
36
+
37
+ const trustedPassports = (blocklet.trustedPassports || []).map((x) => x.issuerDid);
38
+ const trustedIssuers = [wallet.address, ...trustedPassports].filter(Boolean);
39
+
40
+ return {
41
+ description: messages.requestPassport[locale],
42
+ item: vcTypes,
43
+ trustedIssuers,
44
+ optional: false,
45
+ };
46
+ },
47
+ };
48
+ },
49
+
50
+ onAuth: async ({ claims, challenge, userDid, updateSession, extraParams, req }) => {
51
+ const { locale } = extraParams;
52
+ const blocklet = await req.getBlocklet();
53
+ const { wallet, name, did: teamDid } = await req.getBlockletInfo();
54
+
55
+ // Validate user
56
+ const user = await getUser(node, teamDid, userDid);
57
+ if (!user) {
58
+ throw new Error(messages.userNotFound[locale]);
59
+ }
60
+ if (!user.approved) {
61
+ throw new Error(messages.notAuthorized[locale]);
62
+ }
63
+
64
+ // Get passport
65
+ const trustedPassports = (blocklet.trustedPassports || []).map((x) => x.issuerDid);
66
+ const trustedIssuers = [wallet.address, ...trustedPassports].filter(Boolean);
67
+ const { vc } = await getVCFromClaims({ claims, challenge, trustedIssuers, vcTypes, locale });
68
+
69
+ // Get user passport from vc
70
+ let passport = createUserPassport(vc);
71
+ if (passport && isUserPassportRevoked(user, passport)) {
72
+ throw new Error(messages.passportRevoked[locale](name));
73
+ }
74
+
75
+ // Get role
76
+ let role = ROLES.GUEST;
77
+ await validatePassport(get(vc, 'credentialSubject.passport'));
78
+ const issuerId = get(vc, 'issuer.id');
79
+ if (issuerId === wallet.address) {
80
+ role = getRoleFromLocalPassport(get(vc, 'credentialSubject.passport'));
81
+ } else {
82
+ // map external passport to local role
83
+ const { mappings = [] } = (blocklet.trustedPassports || []).find((x) => x.issuerDid === issuerId) || {};
84
+ role = await getRoleFromExternalPassport({
85
+ passport: get(vc, 'credentialSubject.passport'),
86
+ node,
87
+ teamDid,
88
+ locale,
89
+ mappings,
90
+ });
91
+
92
+ // check status of external passport if passport has an endpoint
93
+ const endpoint = get(vc, 'credentialStatus.id');
94
+ if (endpoint) {
95
+ await validatePassportStatus({ vcId: vc.id, endpoint, locale });
96
+ }
97
+ }
98
+
99
+ // Recreate passport with correct role
100
+ passport = createUserPassport(vc, { role });
101
+
102
+ // Generate new session token that client can save to localStorage
103
+ const sessionToken = await createSessionToken(userDid, { passport, role });
104
+ await updateSession({ sessionToken }, true);
105
+ },
106
+ };
107
+ };
@@ -0,0 +1,60 @@
1
+ const get = require('lodash/get');
2
+ const { messages, getUser } = require('@abtnode/auth/lib/auth');
3
+ const { NODE_SERVICES } = require('@abtnode/constant');
4
+
5
+ module.exports = function createRoutes(node) {
6
+ return {
7
+ action: 'switch-profile',
8
+ onConnect: async ({ req, userDid, extraParams: { locale, connectedDid } }) => {
9
+ if (userDid && connectedDid && userDid !== connectedDid) {
10
+ throw new Error(messages.userMismatch[locale]);
11
+ }
12
+
13
+ const config = await req.getServiceConfig(NODE_SERVICES.AUTH);
14
+ if (get(config, 'allowSwitchProfile', true) === false) {
15
+ throw new Error(messages.actionForbidden[locale]);
16
+ }
17
+
18
+ const { did: teamDid } = await req.getBlockletInfo();
19
+ const user = await getUser(node, teamDid, userDid);
20
+
21
+ if (!user) {
22
+ throw new Error(messages.userNotFound[locale]);
23
+ }
24
+ if (!user.approved) {
25
+ throw new Error(messages.notAuthorized[locale]);
26
+ }
27
+
28
+ return {
29
+ profile: {
30
+ fields: get(config, 'profileFields') || ['fullName', 'avatar'],
31
+ description: messages.description[locale],
32
+ },
33
+ };
34
+ },
35
+
36
+ onAuth: async ({ req, claims, userDid, extraParams: { locale } }) => {
37
+ const { did: teamDid } = await req.getBlockletInfo();
38
+
39
+ // check user approved
40
+ const user = await getUser(node, teamDid, userDid);
41
+ if (!user) {
42
+ throw new Error(messages.userNotFound[locale]);
43
+ }
44
+ if (!user.approved) {
45
+ throw new Error(messages.notAuthorized[locale]);
46
+ }
47
+
48
+ // Update user
49
+ const profile = claims.find((x) => x.type === 'profile');
50
+ await node.updateUser({
51
+ teamDid,
52
+ user: {
53
+ ...user,
54
+ ...profile,
55
+ locale,
56
+ },
57
+ });
58
+ },
59
+ };
60
+ };
@@ -17,6 +17,8 @@ const createIssuePassportAuth = require('./connect/issue-passport');
17
17
  const createLostPassportListAuth = require('./connect/lost-passport-list');
18
18
  const createLostPassportIssueAuth = require('./connect/lost-passport-issue');
19
19
  const createSetupAuth = require('./connect/setup');
20
+ const createSwitchProfileAuth = require('./connect/switch-profile');
21
+ const createSwitchPassportAuth = require('./connect/switch-passport');
20
22
  const createSessionRoutes = require('./session');
21
23
  const createPassportRoutes = require('./passport');
22
24
  const { getRedirectUrl } = require('../../util');
@@ -126,6 +128,8 @@ const init = ({ node, options }) => {
126
128
  handler.attach(Object.assign({ app }, createLostPassportListAuth(node, authenticator, createSessionToken)));
127
129
  handler.attach(Object.assign({ app }, createLostPassportIssueAuth(node, authenticator, createSessionToken)));
128
130
  handler.attach(Object.assign({ app }, createSetupAuth(node, authenticator, createSessionToken)));
131
+ handler.attach(Object.assign({ app }, createSwitchProfileAuth(node, authenticator, createSessionToken)));
132
+ handler.attach(Object.assign({ app }, createSwitchPassportAuth(node, authenticator, createSessionToken)));
129
133
  });
130
134
  };
131
135
 
@@ -140,7 +144,7 @@ const init = ({ node, options }) => {
140
144
 
141
145
  // ignore some dev path in dev mode
142
146
  const blocklet = await req.getBlocklet();
143
- const devUrls = ['/sockjs-node'];
147
+ const devUrls = ['/sockjs-node', '/ws'];
144
148
  const mode = get(blocklet, 'mode');
145
149
  if (mode === BLOCKLET_MODES.DEVELOPMENT && devUrls.includes(req.url)) {
146
150
  next();
@@ -14,7 +14,6 @@ const { getTeamInfo } = require('@abtnode/auth/lib/auth');
14
14
  const { NODE_MODES } = require('@abtnode/constant');
15
15
 
16
16
  const states = require('../../state');
17
- const { getBlockletLogo } = require('../../util');
18
17
  const { PREFIXES } = require('../../util/constants');
19
18
 
20
19
  const getDid = (jwt) => jwt.iss.replace(/^did:abt:/, '');
@@ -72,7 +71,7 @@ const onSendToUser = async (node, payload, wsServer) => {
72
71
  throw err;
73
72
  }
74
73
 
75
- const { wallet, name, type: senderType } = senderInfo;
74
+ const { wallet, name } = senderInfo;
76
75
  if (!JWT.verify(sender.token, wallet.publicKey)) {
77
76
  throw new Error(`Invalid authentication token for sender blocklet: ${sender.did}`);
78
77
  }
@@ -81,11 +80,6 @@ const onSendToUser = async (node, payload, wsServer) => {
81
80
  throw new Error(`Invalid app did, expected: ${wallet.address}, actual: ${sender.appDid}`);
82
81
  }
83
82
 
84
- let blocklet;
85
- if (senderType === 'blocklet') {
86
- blocklet = await node.getBlocklet({ did: sender.did, attachRuntimeInfo: false });
87
- }
88
-
89
83
  // parse notifications
90
84
 
91
85
  const notifications = [].concat(notification);
@@ -95,7 +89,6 @@ const onSendToUser = async (node, payload, wsServer) => {
95
89
  x.sender = {
96
90
  did: sender.appDid,
97
91
  name,
98
- icon: senderType === 'blocklet' ? getBlockletLogo({ blocklet }) : null, // deprecated: did wallet will find icon locally by sender appDid
99
92
  };
100
93
  x.createdAt = new Date();
101
94
  });
@@ -15,7 +15,10 @@ const attachUtils = ({ req, res, proxy }) => {
15
15
  target: `http://127.0.0.1:${process.env.ABT_NODE_SERVICE_FE_PORT}`,
16
16
  });
17
17
  } else {
18
- res.sendFile(path.join(distDir, 'index.html'));
18
+ res.sendFile(path.join(distDir, 'index.html'), {
19
+ lastModified: false,
20
+ etag: false,
21
+ });
19
22
  }
20
23
  };
21
24
 
@@ -1,7 +1,7 @@
1
1
  const get = require('lodash/get');
2
2
 
3
3
  const getBlockletInfo = require('@blocklet/meta/lib/info');
4
- const { getDefaultServiceConfig, findService } = require('@abtnode/core/lib/util/service');
4
+ const { getDefaultServiceConfig, findService } = require('@blocklet/meta/lib/service');
5
5
  const logger = require('@abtnode/logger')(require('../../package.json').name);
6
6
  const cache = require('../cache');
7
7
 
package/api/util/index.js CHANGED
@@ -3,29 +3,45 @@ const get = require('lodash/get');
3
3
  const { ROLES } = require('@abtnode/constant');
4
4
  const { BlockletSource, BLOCKLET_MODES } = require('@blocklet/meta/lib/constants');
5
5
  const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
6
- const { getBaseUrl } = require('@abtnode/router-adapter');
7
6
 
8
- const getLogoFromLogoUrl = (blocklet) => {
7
+ const getBaseUrl = (req) => {
8
+ if (req.headers['x-group-path-prefix']) {
9
+ return `/${req.headers['x-group-path-prefix']}/`.replace(/\/+/g, '/');
10
+ }
11
+
12
+ return '/';
13
+ };
14
+
15
+ const getLogoFromLogoUrl = (blocklet, version) => {
9
16
  try {
17
+ if (!blocklet.meta.logoUrl) {
18
+ return null;
19
+ }
20
+
21
+ const url = `${blocklet.meta.logoUrl}?version=${version || ''}`;
22
+
10
23
  if (blocklet.source === BlockletSource.registry) {
11
- return new URL(blocklet.meta.logoUrl, blocklet.deployedFrom).href;
24
+ return new URL(url, blocklet.deployedFrom).href;
12
25
  }
13
- return blocklet.meta.logoUrl || null;
26
+
27
+ return url;
14
28
  } catch (error) {
15
29
  return null;
16
30
  }
17
31
  };
18
32
 
19
33
  const getBlockletLogo = ({ baseUrl, blocklet }) => {
34
+ const version = get(blocklet, 'meta.version', '');
35
+
20
36
  if (!baseUrl) {
21
- return getLogoFromLogoUrl(blocklet);
37
+ return getLogoFromLogoUrl(blocklet, version);
22
38
  }
23
39
 
24
40
  if (get(blocklet, 'meta.logoUrl')) {
25
- return getLogoFromLogoUrl(blocklet);
41
+ return getLogoFromLogoUrl(blocklet, version);
26
42
  }
27
43
 
28
- return `${baseUrl}/blocklet/logo`;
44
+ return `${baseUrl}/blocklet/logo?version=${version}`;
29
45
  };
30
46
 
31
47
  const shouldGotoStartPage = (req, blocklet) => {
@@ -61,9 +77,11 @@ const ensureProxyUrl = (req) => {
61
77
 
62
78
  const getRedirectUrl = ({ req, pagePath }) => {
63
79
  const baseUrl = getBaseUrl(req);
64
-
65
80
  const redirectUrlObj = new URL(`http://localhost${req.url}`);
81
+ // 重定向时考虑 serverUrl 查询参数的处理
82
+ const serverUrl = redirectUrlObj.searchParams.get('serverUrl');
66
83
  redirectUrlObj.searchParams.delete('__start__');
84
+ redirectUrlObj.searchParams.delete('serverUrl');
67
85
  const redirectUrl = `${baseUrl.replace(/\/+$/, '')}${redirectUrlObj.pathname}${redirectUrlObj.search}`;
68
86
 
69
87
  const url = new URL(`http://localhost${joinUrl(baseUrl, WELLKNOWN_SERVICE_PATH_PREFIX, pagePath || '/')}`);
@@ -74,6 +92,10 @@ const getRedirectUrl = ({ req, pagePath }) => {
74
92
  url.searchParams.set('locale', locale);
75
93
  }
76
94
 
95
+ if (serverUrl) {
96
+ url.searchParams.set('serverUrl', serverUrl);
97
+ }
98
+
77
99
  return `${url.pathname}${url.search}`;
78
100
  };
79
101
 
@@ -1,43 +1,41 @@
1
1
  {
2
2
  "files": {
3
- "static/js/0.369fac6d.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/0.369fac6d.chunk.js",
4
- "static/js/0.369fac6d.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/0.369fac6d.chunk.js.map",
5
- "static/js/1.c0e3e4df.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/1.c0e3e4df.chunk.js",
6
- "static/js/1.c0e3e4df.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/1.c0e3e4df.chunk.js.map",
7
- "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.7467feb3.chunk.js",
8
- "main.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.7467feb3.chunk.js.map",
9
- "runtime-main.js": "/.blocklet/proxy/blocklet-service/static/js/runtime-main.c2e2dfd3.js",
10
- "runtime-main.js.map": "/.blocklet/proxy/blocklet-service/static/js/runtime-main.c2e2dfd3.js.map",
11
- "static/css/4.634341e0.chunk.css": "/.blocklet/proxy/blocklet-service/static/css/4.634341e0.chunk.css",
12
- "static/js/4.da598ff9.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/4.da598ff9.chunk.js",
13
- "static/js/4.da598ff9.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/4.da598ff9.chunk.js.map",
14
- "static/js/5.e8b7573e.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/5.e8b7573e.chunk.js",
15
- "static/js/5.e8b7573e.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/5.e8b7573e.chunk.js.map",
16
- "static/js/6.fd72b935.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/6.fd72b935.chunk.js",
17
- "static/js/6.fd72b935.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/6.fd72b935.chunk.js.map",
18
- "static/js/7.5710df9a.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/7.5710df9a.chunk.js",
19
- "static/js/7.5710df9a.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/7.5710df9a.chunk.js.map",
20
- "static/js/8.6d6d04ee.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/8.6d6d04ee.chunk.js",
21
- "static/js/8.6d6d04ee.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/8.6d6d04ee.chunk.js.map",
22
- "static/js/9.35b1a21d.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/9.35b1a21d.chunk.js",
23
- "static/js/9.35b1a21d.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/9.35b1a21d.chunk.js.map",
24
- "static/js/10.1d68b28c.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/10.1d68b28c.chunk.js",
25
- "static/js/10.1d68b28c.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/10.1d68b28c.chunk.js.map",
3
+ "static/js/0.8641a485.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/0.8641a485.chunk.js",
4
+ "static/js/0.8641a485.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/0.8641a485.chunk.js.map",
5
+ "static/js/1.d6f10e20.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/1.d6f10e20.chunk.js",
6
+ "static/js/1.d6f10e20.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/1.d6f10e20.chunk.js.map",
7
+ "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.73e47d11.chunk.js",
8
+ "main.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.73e47d11.chunk.js.map",
9
+ "runtime-main.js": "/.blocklet/proxy/blocklet-service/static/js/runtime-main.d47db38c.js",
10
+ "runtime-main.js.map": "/.blocklet/proxy/blocklet-service/static/js/runtime-main.d47db38c.js.map",
11
+ "static/css/4.6e1172e8.chunk.css": "/.blocklet/proxy/blocklet-service/static/css/4.6e1172e8.chunk.css",
12
+ "static/js/4.973ae192.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/4.973ae192.chunk.js",
13
+ "static/js/4.973ae192.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/4.973ae192.chunk.js.map",
14
+ "static/js/5.a97b78a4.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/5.a97b78a4.chunk.js",
15
+ "static/js/5.a97b78a4.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/5.a97b78a4.chunk.js.map",
16
+ "static/js/6.60aaf58a.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/6.60aaf58a.chunk.js",
17
+ "static/js/6.60aaf58a.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/6.60aaf58a.chunk.js.map",
18
+ "static/js/7.6ffbad13.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/7.6ffbad13.chunk.js",
19
+ "static/js/7.6ffbad13.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/7.6ffbad13.chunk.js.map",
20
+ "static/js/8.7e2dd683.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/8.7e2dd683.chunk.js",
21
+ "static/js/8.7e2dd683.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/8.7e2dd683.chunk.js.map",
22
+ "static/js/9.9561f820.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/9.9561f820.chunk.js",
23
+ "static/js/9.9561f820.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/9.9561f820.chunk.js.map",
24
+ "static/js/10.eae356ec.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/10.eae356ec.chunk.js",
25
+ "static/js/10.eae356ec.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/10.eae356ec.chunk.js.map",
26
26
  "index.html": "/.blocklet/proxy/blocklet-service/index.html",
27
- "precache-manifest.6ec624c9ac86fef39f147e6fbb8caf56.js": "/.blocklet/proxy/blocklet-service/precache-manifest.6ec624c9ac86fef39f147e6fbb8caf56.js",
27
+ "precache-manifest.6bba5a0937fec8cc0577975770db10ff.js": "/.blocklet/proxy/blocklet-service/precache-manifest.6bba5a0937fec8cc0577975770db10ff.js",
28
28
  "service-worker.js": "/.blocklet/proxy/blocklet-service/service-worker.js",
29
- "static/css/4.634341e0.chunk.css.map": "/.blocklet/proxy/blocklet-service/static/css/4.634341e0.chunk.css.map",
30
- "static/js/0.369fac6d.chunk.js.LICENSE.txt": "/.blocklet/proxy/blocklet-service/static/js/0.369fac6d.chunk.js.LICENSE.txt",
31
- "static/js/4.da598ff9.chunk.js.LICENSE.txt": "/.blocklet/proxy/blocklet-service/static/js/4.da598ff9.chunk.js.LICENSE.txt",
29
+ "static/css/4.6e1172e8.chunk.css.map": "/.blocklet/proxy/blocklet-service/static/css/4.6e1172e8.chunk.css.map",
30
+ "static/js/0.8641a485.chunk.js.LICENSE.txt": "/.blocklet/proxy/blocklet-service/static/js/0.8641a485.chunk.js.LICENSE.txt",
31
+ "static/js/4.973ae192.chunk.js.LICENSE.txt": "/.blocklet/proxy/blocklet-service/static/js/4.973ae192.chunk.js.LICENSE.txt",
32
32
  "static/media/400.css": "/.blocklet/proxy/blocklet-service/static/media/ubuntu-mono-latin-ext-400-normal.84fa8bc1.woff2",
33
- "static/media/700.css": "/.blocklet/proxy/blocklet-service/static/media/lato-latin-ext-700-normal.a48b0f04.woff2",
34
- "static/media/500.css": "/.blocklet/proxy/blocklet-service/static/media/rubik-latin-ext-500-normal.21b63491.woff2",
35
- "static/media/600.css": "/.blocklet/proxy/blocklet-service/static/media/rubik-latin-ext-600-normal.d0d90e83.woff2"
33
+ "static/media/700.css": "/.blocklet/proxy/blocklet-service/static/media/lato-latin-ext-700-normal.a48b0f04.woff2"
36
34
  },
37
35
  "entrypoints": [
38
- "static/js/runtime-main.c2e2dfd3.js",
39
- "static/css/4.634341e0.chunk.css",
40
- "static/js/4.da598ff9.chunk.js",
41
- "static/js/main.7467feb3.chunk.js"
36
+ "static/js/runtime-main.d47db38c.js",
37
+ "static/css/4.6e1172e8.chunk.css",
38
+ "static/js/4.973ae192.chunk.js",
39
+ "static/js/main.73e47d11.chunk.js"
42
40
  ]
43
41
  }
package/build/favicon.ico CHANGED
Binary file
package/build/index.html CHANGED
@@ -1 +1 @@
1
- <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/.well-known/service/static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src="/.well-known/service/api/env"></script><link href="/.blocklet/proxy/blocklet-service/static/css/4.634341e0.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,a,i=t[0],l=t[1],f=t[2],s=t[3]||[],d=0,h=[];d<i.length;d++)a=i[d],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&h.push(o[a][0]),o[a]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(p&&p(t),u.push.apply(u,s);h.length;)h.shift()();return c.push.apply(c,f||[]),r()}function r(){for(var e,t=0;t<c.length;t++){for(var r=c[t],n=!0,l=1;l<r.length;l++){var f=r[l];0!==o[f]&&(n=!1)}n&&(c.splice(t--,1),e=i(i.s=r[0]))}return 0===c.length&&(u.forEach((function(e){if(void 0===o[e]){o[e]=null;var t=document.createElement("link");i.nc&&t.setAttribute("nonce",i.nc),t.rel="prefetch",t.as="script",t.href=a(e),document.head.appendChild(t)}})),u.length=0),e}var n={},o={3:0},c=[],u=[];function a(e){return i.p+"static/js/"+({}[e]||e)+"."+{0:"369fac6d",1:"c0e3e4df",5:"e8b7573e",6:"fd72b935",7:"5710df9a",8:"6d6d04ee",9:"35b1a21d",10:"1d68b28c"}[e]+".chunk.js"}function i(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.e=function(e){var t=[],r=o[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=o[e]=[t,n]}));t.push(r[2]=n);var c,u=document.createElement("script");u.charset="utf-8",u.timeout=120,i.nc&&u.setAttribute("nonce",i.nc),u.src=a(e);var l=new Error;c=function(t){u.onerror=u.onload=null,clearTimeout(f);var r=o[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),c=t&&t.target&&t.target.src;l.message="Loading chunk "+e+" failed.\n("+n+": "+c+")",l.name="ChunkLoadError",l.type=n,l.request=c,r[1](l)}o[e]=void 0}};var f=setTimeout((function(){c({type:"timeout",target:u})}),12e4);u.onerror=u.onload=c,document.head.appendChild(u)}return Promise.all(t)},i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/.blocklet/proxy/blocklet-service/",i.oe=function(e){throw console.error(e),e};var l=this["webpackJsonp@abtnode/blocklet-services"]=this["webpackJsonp@abtnode/blocklet-services"]||[],f=l.push.bind(l);l.push=t,l=l.slice();for(var s=0;s<l.length;s++)t(l[s]);var p=f;r()}([])</script><script src="/.blocklet/proxy/blocklet-service/static/js/4.da598ff9.chunk.js"></script><script src="/.blocklet/proxy/blocklet-service/static/js/main.7467feb3.chunk.js"></script></body></html>
1
+ <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/.well-known/service/static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src="/.well-known/service/api/env"></script><link href="/.blocklet/proxy/blocklet-service/static/css/4.6e1172e8.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,c,i=t[0],l=t[1],f=t[2],s=t[3]||[],d=0,h=[];d<i.length;d++)c=i[d],Object.prototype.hasOwnProperty.call(o,c)&&o[c]&&h.push(o[c][0]),o[c]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(p&&p(t),u.push.apply(u,s);h.length;)h.shift()();return a.push.apply(a,f||[]),r()}function r(){for(var e,t=0;t<a.length;t++){for(var r=a[t],n=!0,l=1;l<r.length;l++){var f=r[l];0!==o[f]&&(n=!1)}n&&(a.splice(t--,1),e=i(i.s=r[0]))}return 0===a.length&&(u.forEach((function(e){if(void 0===o[e]){o[e]=null;var t=document.createElement("link");i.nc&&t.setAttribute("nonce",i.nc),t.rel="prefetch",t.as="script",t.href=c(e),document.head.appendChild(t)}})),u.length=0),e}var n={},o={3:0},a=[],u=[];function c(e){return i.p+"static/js/"+({}[e]||e)+"."+{0:"8641a485",1:"d6f10e20",5:"a97b78a4",6:"60aaf58a",7:"6ffbad13",8:"7e2dd683",9:"9561f820",10:"eae356ec"}[e]+".chunk.js"}function i(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.e=function(e){var t=[],r=o[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=o[e]=[t,n]}));t.push(r[2]=n);var a,u=document.createElement("script");u.charset="utf-8",u.timeout=120,i.nc&&u.setAttribute("nonce",i.nc),u.src=c(e);var l=new Error;a=function(t){u.onerror=u.onload=null,clearTimeout(f);var r=o[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),a=t&&t.target&&t.target.src;l.message="Loading chunk "+e+" failed.\n("+n+": "+a+")",l.name="ChunkLoadError",l.type=n,l.request=a,r[1](l)}o[e]=void 0}};var f=setTimeout((function(){a({type:"timeout",target:u})}),12e4);u.onerror=u.onload=a,document.head.appendChild(u)}return Promise.all(t)},i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/.blocklet/proxy/blocklet-service/",i.oe=function(e){throw console.error(e),e};var l=this["webpackJsonp@abtnode/blocklet-services"]=this["webpackJsonp@abtnode/blocklet-services"]||[],f=l.push.bind(l);l.push=t,l=l.slice();for(var s=0;s<l.length;s++)t(l[s]);var p=f;r()}([])</script><script src="/.blocklet/proxy/blocklet-service/static/js/4.973ae192.chunk.js"></script><script src="/.blocklet/proxy/blocklet-service/static/js/main.73e47d11.chunk.js"></script></body></html>