@abtnode/blocklet-services 1.16.14-beta-c2843ec5 → 1.16.14-beta-5ac0c68b

package/api/cache.js

@@ -65,7 +65,7 @@ cache.getBlocklet = async ({ did, node, force, context }) => {
     }
   }
 
-  const blocklet = await node.getBlocklet({ did }, context);
+  const blocklet = await node.getBlocklet({ did, useCache: false }, context);
   if (blocklet) {
     cache.set(cacheKey, blocklet);
   }

package/api/libs/connect/shared.js

@@ -14,12 +14,12 @@ module.exports = {
       request.getBlockletInfo(),
       request.getNodeInfo(),
     ]);
-    // NOTE: 这里应该使用当前 blocklet 的 did，而不是 pid
+    // 对于 ux 来说， 要展示的始终是 pid，所以这个给 agentDid 的赋值也需要是 pid
     let agentDid;
     const provider = getProvider(request, extraParams);
     // federated 登录模式下，需要告知原有的 blocklet-did
     if (provider === LOGIN_PROVIDER.FEDERATED) {
-      agentDid = blocklet.appDid;
+      agentDid = blocklet.appPid;
     }
 
     const version = get(blocklet, 'meta.version', '');

package/api/middlewares/check-federated-cors-call.js

@@ -4,8 +4,16 @@ function checkFederatedCorsCall() {
     const { blocklet } = req;
     const federated = blocklet.settings.federated || {};
     const sites = federated?.sites || [];
-    // TODO: @zhanghan 增加 aliasAppUrl 判断
-    if (sites.find((item) => item.appUrl === caller && item.status === 'approved')) {
+    if (
+      sites.find((item) => {
+        if (item.status === 'approved') {
+          const siteHost = new URL(item.appUrl).host;
+          const callerHost = new URL(caller).host;
+          return [siteHost, ...(item.aliasDomain || [])].includes(callerHost);
+        }
+        return false;
+      })
+    ) {
       next();
       return;
     }

package/api/middlewares/ensure-blocklet.js

@@ -1,6 +1,6 @@
-function ensureBlocklet() {
+function ensureBlocklet({ useCache = false } = {}) {
   return async (req, res, next) => {
-    const blocklet = await req.getBlocklet();
+    const blocklet = await req.getBlocklet({ useCache });
     if (!blocklet) {
       res.status(404).send('blocklet not found');
       return;

package/api/routes/federated.js

@@ -14,6 +14,8 @@ const pick = require('lodash/pick');
 const defaults = require('lodash/defaults');
 const remove = require('lodash/remove');
 
+const logger = require('@abtnode/logger')('blocklet-services:federated');
+
 const { api } = require('../libs/api');
 const initJwt = require('../libs/jwt');
 const { createTokenFn, getDidConnectVersion } = require('../util');
@@ -50,6 +52,7 @@ module.exports = {
       if (federated.sites.length === 0) {
         const nodeInfo = await req.getNodeInfo();
         const blockletInfo = await req.getBlockletInfo();
+        const domainAliases = await node.getBlockletDomainAliases(blocklet);
         const masterSite = {
           appId: blocklet.appDid,
           appPid: blocklet.appPid,
@@ -57,6 +60,7 @@ module.exports = {
           appName: blockletInfo.name,
           appDescription: blockletInfo.description,
           appUrl: blockletInfo.appUrl,
+          aliasDomain: domainAliases.map((item) => item.value),
           appLogo:
             blocklet.environmentObj.BLOCKLET_APP_LOGO ||
             normalizePathPrefix(`${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo`) ||
@@ -116,11 +120,17 @@ module.exports = {
       const waitingList = federated.sites
         .filter((item) => item.appId !== federated.config.appId)
         .map((item) => {
-          return limitSync(() =>
-            pRetry(() => api.post(`${item.appUrl}/${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/sync`, postData), {
-              retries: 3,
-            })
-          );
+          return limitSync(async () => {
+            const url = `${item.appUrl}/${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/sync`;
+            // NOTICE: 即使通知其他 member 失败了，也不影响来源 member 退出统一登录
+            try {
+              await pRetry(() => api.post(url, postData), {
+                retries: 3,
+              });
+            } catch (error) {
+              logger.warn('Failed to sync federated member', { error, url, did: blocklet.appDid, action: 'quit' });
+            }
+          });
         });
       await Promise.all(waitingList);
 
@@ -251,8 +261,11 @@ module.exports = {
           const { permanentWallet } = await req.getBlockletInfo();
           const teamDid = blocklet.appPid;
           const federatedSites = blocklet.settings?.federated?.sites || [];
-          // TODO: @zhanghan 增加 aliasAppUrl 判断
-          const loginSite = federatedSites.find((item) => item.appUrl === req.headers.origin);
+          const loginSite = federatedSites.find((item) => {
+            const siteHost = new URL(item.appUrl).host;
+            const fromHost = new URL(req.headers.origin).host;
+            return [siteHost, ...(item.aliasDomain || [])].includes(fromHost);
+          });
 
           const currentUser = await node.getUser({
             teamDid,
@@ -331,7 +344,7 @@ module.exports = {
           const { dataDir } = await getApplicationInfo({ node, nodeInfo, teamDid });
           avatar = await extractUserAvatar(avatar, { dataDir });
         } catch (err) {
-          console.error(err.response.status);
+          logger.error('Failed to convert user avatar', { error: err });
         }
       }
       const doc = await node.loginUser({

package/api/services/auth/passport.js

@@ -9,7 +9,9 @@ module.exports = {
         const { vcId, userDid, locale } = req.query;
         const teamDid = req.headers['x-blocklet-did'];
 
-        if (teamDid !== req.query.teamDid) {
+        // HACK: 这里的 req.query.teamDid 可能是 blocklet 容器化之前的 teamDid(等于 blocklet.yml did)，需要根据这个 did 找到现有对应的 teamDid，否则无法使用在容器化之前颁发的通行证来登录
+        const blocklet = await node.getBlocklet({ did: req.query.teamDid, useCache: true });
+        if (teamDid !== blocklet?.meta?.did) {
           throw new Error('teamDid is invalid');
         }
 

package/api/services/studio/index.js

@@ -4,13 +4,20 @@ const express = require('express');
 const serveStatic = require('serve-static');
 const path = require('path');
 const nocache = require('nocache');
-const { BLOCKLET_PREFERENCE_FILE, BLOCKLET_UPLOADS_DIR } = require('@blocklet/constant');
+const { BLOCKLET_PREFERENCE_FILE, BLOCKLET_UPLOADS_DIR, BLOCKLET_MODES } = require('@blocklet/constant');
 
 const builderPath = path.dirname(require.resolve('@blocklet/form-builder'));
 const collectorPath = path.dirname(require.resolve('@blocklet/form-collector'));
 
 const { PREFIXES } = require('../../util/constants');
 
+const findComponent = (blocklet) => {
+  const component = blocklet.children.find((c) => c.meta.name === blocklet.meta.name);
+
+  // if blocklet is an gateway blocklet, then component will be empty and blocklet.deployedFrom will be the local folder of the blocklet
+  return component || blocklet;
+};
+
 module.exports = {
   init({ app }) {
     PREFIXES.forEach((prefix) => {
@@ -18,11 +25,11 @@ module.exports = {
 
       app.get(preferenceUrl, nocache(), async (req, res) => {
         const blocklet = await req.getBlocklet();
-        if (blocklet.mode !== 'development') {
+        if (blocklet.mode !== BLOCKLET_MODES.DEVELOPMENT) {
           return res.status(400).json({ error: 'Blocklet Studio can only be used for blocklets in development mode' });
         }
 
-        const component = blocklet.children.find((c) => c.meta.name === blocklet.meta.name);
+        const component = findComponent(blocklet);
         if (!component || !component.deployedFrom) {
           return res.status(400).json({ error: 'Can not find current component' });
         }
@@ -42,11 +49,11 @@ module.exports = {
 
       app.put(preferenceUrl, async (req, res) => {
         const blocklet = await req.getBlocklet();
-        if (blocklet.mode !== 'development') {
+        if (blocklet.mode !== BLOCKLET_MODES.DEVELOPMENT) {
           return res.status(400).json({ error: 'Blocklet Studio can only be used for blocklets in development mode' });
         }
 
-        const component = blocklet.children.find((c) => c.meta.name === blocklet.meta.name);
+        const component = findComponent(blocklet);
         if (!component || !component.deployedFrom) {
           return res.status(400).json({ error: 'Can not find current component' });
         }

package/api/util/attach-shared-utils.js

@@ -83,11 +83,11 @@ module.exports = ({ node, req, options }) => {
     return { ...config, ...componentDynamicConfig };
   };
 
-  req.getBlocklet = ({ useCache = true } = {}) => {
+  req.getBlocklet = ({ useCache = true, attachRuntimeInfo = false } = {}) => {
     const did = req.getBlockletDid();
     const context = req.getServiceContext();
 
-    return cache.getBlocklet({ did, context, node, force: !useCache });
+    return cache.getBlocklet({ did, context, node, force: !useCache, attachRuntimeInfo });
   };
 
   req.getNodeInfo = () => cache.getNodeInfo({ node });

package/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.99f79c8e.js",
+    "main.js": "/.well-known/service/static/static/js/main.a2cac121.js",
     "static/js/4716.a1240199.chunk.js": "/.well-known/service/static/static/js/4716.a1240199.chunk.js",
     "static/js/4359.5ed52fe3.chunk.js": "/.well-known/service/static/static/js/4359.5ed52fe3.chunk.js",
     "static/js/1255.0e8a8a45.chunk.js": "/.well-known/service/static/static/js/1255.0e8a8a45.chunk.js",
@@ -10,7 +10,7 @@
     "static/js/3953.e3e51520.chunk.js": "/.well-known/service/static/static/js/3953.e3e51520.chunk.js",
     "static/js/868.60de5f6d.chunk.js": "/.well-known/service/static/static/js/868.60de5f6d.chunk.js",
     "static/js/4547.b26ceabb.chunk.js": "/.well-known/service/static/static/js/4547.b26ceabb.chunk.js",
-    "static/js/652.5b3e92c7.chunk.js": "/.well-known/service/static/static/js/652.5b3e92c7.chunk.js",
+    "static/js/652.114c75d5.chunk.js": "/.well-known/service/static/static/js/652.114c75d5.chunk.js",
     "static/js/4682.81053e18.chunk.js": "/.well-known/service/static/static/js/4682.81053e18.chunk.js",
     "static/js/6711.a62d0bcd.chunk.js": "/.well-known/service/static/static/js/6711.a62d0bcd.chunk.js",
     "static/js/8437.e4b47fc3.chunk.js": "/.well-known/service/static/static/js/8437.e4b47fc3.chunk.js",
@@ -22,16 +22,16 @@
     "static/js/5176.68fd3fde.chunk.js": "/.well-known/service/static/static/js/5176.68fd3fde.chunk.js",
     "static/js/2139.341406d2.chunk.js": "/.well-known/service/static/static/js/2139.341406d2.chunk.js",
     "static/js/5052.91c69c75.chunk.js": "/.well-known/service/static/static/js/5052.91c69c75.chunk.js",
-    "static/js/8395.7df44f2d.chunk.js": "/.well-known/service/static/static/js/8395.7df44f2d.chunk.js",
+    "static/js/8395.5bd41151.chunk.js": "/.well-known/service/static/static/js/8395.5bd41151.chunk.js",
     "static/js/5233.faabaae9.chunk.js": "/.well-known/service/static/static/js/5233.faabaae9.chunk.js",
     "static/css/4603.dce369d5.chunk.css": "/.well-known/service/static/static/css/4603.dce369d5.chunk.css",
-    "static/js/4603.a370c797.chunk.js": "/.well-known/service/static/static/js/4603.a370c797.chunk.js",
+    "static/js/4603.7a55b2c4.chunk.js": "/.well-known/service/static/static/js/4603.7a55b2c4.chunk.js",
     "static/js/5050.f1d720d2.chunk.js": "/.well-known/service/static/static/js/5050.f1d720d2.chunk.js",
     "static/css/780.e3db6e49.chunk.css": "/.well-known/service/static/static/css/780.e3db6e49.chunk.css",
     "static/js/780.32bf1f5b.chunk.js": "/.well-known/service/static/static/js/780.32bf1f5b.chunk.js",
     "static/js/766.43f63b49.chunk.js": "/.well-known/service/static/static/js/766.43f63b49.chunk.js",
     "static/js/5430.6aa38ea1.chunk.js": "/.well-known/service/static/static/js/5430.6aa38ea1.chunk.js",
-    "static/js/3800.b792d5c0.chunk.js": "/.well-known/service/static/static/js/3800.b792d5c0.chunk.js",
+    "static/js/3800.6d22581f.chunk.js": "/.well-known/service/static/static/js/3800.6d22581f.chunk.js",
     "static/js/1832.3ac49edc.chunk.js": "/.well-known/service/static/static/js/1832.3ac49edc.chunk.js",
     "static/js/655.cdee65b4.chunk.js": "/.well-known/service/static/static/js/655.cdee65b4.chunk.js",
     "static/js/576.d7d4814e.chunk.js": "/.well-known/service/static/static/js/576.d7d4814e.chunk.js",
@@ -39,7 +39,7 @@
     "static/js/6315.59e078f6.chunk.js": "/.well-known/service/static/static/js/6315.59e078f6.chunk.js",
     "static/js/4651.0a58cbc3.chunk.js": "/.well-known/service/static/static/js/4651.0a58cbc3.chunk.js",
     "static/js/4319.e99b5af9.chunk.js": "/.well-known/service/static/static/js/4319.e99b5af9.chunk.js",
-    "static/js/445.aabc2c68.chunk.js": "/.well-known/service/static/static/js/445.aabc2c68.chunk.js",
+    "static/js/445.7ad42b19.chunk.js": "/.well-known/service/static/static/js/445.7ad42b19.chunk.js",
     "static/js/7518.5b02f3ba.chunk.js": "/.well-known/service/static/static/js/7518.5b02f3ba.chunk.js",
     "static/js/8669.814198b8.chunk.js": "/.well-known/service/static/static/js/8669.814198b8.chunk.js",
     "static/js/7291.5553195e.chunk.js": "/.well-known/service/static/static/js/7291.5553195e.chunk.js",
@@ -47,7 +47,7 @@
     "static/js/3242.5dea77f3.chunk.js": "/.well-known/service/static/static/js/3242.5dea77f3.chunk.js",
     "static/js/4492.97b0d4f6.chunk.js": "/.well-known/service/static/static/js/4492.97b0d4f6.chunk.js",
     "static/css/2130.b9437a64.chunk.css": "/.well-known/service/static/static/css/2130.b9437a64.chunk.css",
-    "static/js/2130.c9c0f36b.chunk.js": "/.well-known/service/static/static/js/2130.c9c0f36b.chunk.js",
+    "static/js/2130.f123740e.chunk.js": "/.well-known/service/static/static/js/2130.f123740e.chunk.js",
     "static/js/5711.aa17ef28.chunk.js": "/.well-known/service/static/static/js/5711.aa17ef28.chunk.js",
     "static/js/7345.4b4f8941.chunk.js": "/.well-known/service/static/static/js/7345.4b4f8941.chunk.js",
     "static/js/1237.a18e319d.chunk.js": "/.well-known/service/static/static/js/1237.a18e319d.chunk.js",
@@ -84,7 +84,7 @@
     "router-template-styles/styles.css": "/.well-known/service/static/router-template-styles/styles.css",
     "index.html": "/.well-known/service/static/index.html",
     "main.7ea79dc8.css.map": "/.well-known/service/static/static/css/main.7ea79dc8.css.map",
-    "main.99f79c8e.js.map": "/.well-known/service/static/static/js/main.99f79c8e.js.map",
+    "main.a2cac121.js.map": "/.well-known/service/static/static/js/main.a2cac121.js.map",
     "4716.a1240199.chunk.js.map": "/.well-known/service/static/static/js/4716.a1240199.chunk.js.map",
     "4359.5ed52fe3.chunk.js.map": "/.well-known/service/static/static/js/4359.5ed52fe3.chunk.js.map",
     "1255.0e8a8a45.chunk.js.map": "/.well-known/service/static/static/js/1255.0e8a8a45.chunk.js.map",
@@ -93,7 +93,7 @@
     "3953.e3e51520.chunk.js.map": "/.well-known/service/static/static/js/3953.e3e51520.chunk.js.map",
     "868.60de5f6d.chunk.js.map": "/.well-known/service/static/static/js/868.60de5f6d.chunk.js.map",
     "4547.b26ceabb.chunk.js.map": "/.well-known/service/static/static/js/4547.b26ceabb.chunk.js.map",
-    "652.5b3e92c7.chunk.js.map": "/.well-known/service/static/static/js/652.5b3e92c7.chunk.js.map",
+    "652.114c75d5.chunk.js.map": "/.well-known/service/static/static/js/652.114c75d5.chunk.js.map",
     "4682.81053e18.chunk.js.map": "/.well-known/service/static/static/js/4682.81053e18.chunk.js.map",
     "6711.a62d0bcd.chunk.js.map": "/.well-known/service/static/static/js/6711.a62d0bcd.chunk.js.map",
     "8437.e4b47fc3.chunk.js.map": "/.well-known/service/static/static/js/8437.e4b47fc3.chunk.js.map",
@@ -105,16 +105,16 @@
     "5176.68fd3fde.chunk.js.map": "/.well-known/service/static/static/js/5176.68fd3fde.chunk.js.map",
     "2139.341406d2.chunk.js.map": "/.well-known/service/static/static/js/2139.341406d2.chunk.js.map",
     "5052.91c69c75.chunk.js.map": "/.well-known/service/static/static/js/5052.91c69c75.chunk.js.map",
-    "8395.7df44f2d.chunk.js.map": "/.well-known/service/static/static/js/8395.7df44f2d.chunk.js.map",
+    "8395.5bd41151.chunk.js.map": "/.well-known/service/static/static/js/8395.5bd41151.chunk.js.map",
     "5233.faabaae9.chunk.js.map": "/.well-known/service/static/static/js/5233.faabaae9.chunk.js.map",
     "4603.dce369d5.chunk.css.map": "/.well-known/service/static/static/css/4603.dce369d5.chunk.css.map",
-    "4603.a370c797.chunk.js.map": "/.well-known/service/static/static/js/4603.a370c797.chunk.js.map",
+    "4603.7a55b2c4.chunk.js.map": "/.well-known/service/static/static/js/4603.7a55b2c4.chunk.js.map",
     "5050.f1d720d2.chunk.js.map": "/.well-known/service/static/static/js/5050.f1d720d2.chunk.js.map",
     "780.e3db6e49.chunk.css.map": "/.well-known/service/static/static/css/780.e3db6e49.chunk.css.map",
     "780.32bf1f5b.chunk.js.map": "/.well-known/service/static/static/js/780.32bf1f5b.chunk.js.map",
     "766.43f63b49.chunk.js.map": "/.well-known/service/static/static/js/766.43f63b49.chunk.js.map",
     "5430.6aa38ea1.chunk.js.map": "/.well-known/service/static/static/js/5430.6aa38ea1.chunk.js.map",
-    "3800.b792d5c0.chunk.js.map": "/.well-known/service/static/static/js/3800.b792d5c0.chunk.js.map",
+    "3800.6d22581f.chunk.js.map": "/.well-known/service/static/static/js/3800.6d22581f.chunk.js.map",
     "1832.3ac49edc.chunk.js.map": "/.well-known/service/static/static/js/1832.3ac49edc.chunk.js.map",
     "655.cdee65b4.chunk.js.map": "/.well-known/service/static/static/js/655.cdee65b4.chunk.js.map",
     "576.d7d4814e.chunk.js.map": "/.well-known/service/static/static/js/576.d7d4814e.chunk.js.map",
@@ -122,7 +122,7 @@
     "6315.59e078f6.chunk.js.map": "/.well-known/service/static/static/js/6315.59e078f6.chunk.js.map",
     "4651.0a58cbc3.chunk.js.map": "/.well-known/service/static/static/js/4651.0a58cbc3.chunk.js.map",
     "4319.e99b5af9.chunk.js.map": "/.well-known/service/static/static/js/4319.e99b5af9.chunk.js.map",
-    "445.aabc2c68.chunk.js.map": "/.well-known/service/static/static/js/445.aabc2c68.chunk.js.map",
+    "445.7ad42b19.chunk.js.map": "/.well-known/service/static/static/js/445.7ad42b19.chunk.js.map",
     "7518.5b02f3ba.chunk.js.map": "/.well-known/service/static/static/js/7518.5b02f3ba.chunk.js.map",
     "8669.814198b8.chunk.js.map": "/.well-known/service/static/static/js/8669.814198b8.chunk.js.map",
     "7291.5553195e.chunk.js.map": "/.well-known/service/static/static/js/7291.5553195e.chunk.js.map",
@@ -130,7 +130,7 @@
     "3242.5dea77f3.chunk.js.map": "/.well-known/service/static/static/js/3242.5dea77f3.chunk.js.map",
     "4492.97b0d4f6.chunk.js.map": "/.well-known/service/static/static/js/4492.97b0d4f6.chunk.js.map",
     "2130.b9437a64.chunk.css.map": "/.well-known/service/static/static/css/2130.b9437a64.chunk.css.map",
-    "2130.c9c0f36b.chunk.js.map": "/.well-known/service/static/static/js/2130.c9c0f36b.chunk.js.map",
+    "2130.f123740e.chunk.js.map": "/.well-known/service/static/static/js/2130.f123740e.chunk.js.map",
     "5711.aa17ef28.chunk.js.map": "/.well-known/service/static/static/js/5711.aa17ef28.chunk.js.map",
     "7345.4b4f8941.chunk.js.map": "/.well-known/service/static/static/js/7345.4b4f8941.chunk.js.map",
     "1237.a18e319d.chunk.js.map": "/.well-known/service/static/static/js/1237.a18e319d.chunk.js.map",
@@ -147,6 +147,6 @@
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.99f79c8e.js"
+    "static/js/main.a2cac121.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/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><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.99f79c8e.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/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><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.a2cac121.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>