@abtnode/blocklet-services 1.16.13-beta-d17a7de4 → 1.16.13-beta-90ded76f

package/api/index.js

@@ -8,7 +8,7 @@ const compression = require('compression');
 const cookieParser = require('cookie-parser');
 const bodyParser = require('body-parser');
 const httpProxy = require('@arcblock/http-proxy');
-const dayjs = require('dayjs');
+const dayjs = require('@abtnode/util/lib/dayjs');
 const minimatch = require('minimatch');
 
 const { getAccessLogStream } = require('@abtnode/logger');
@@ -224,7 +224,7 @@ module.exports = function createServer(node, serverOptions = {}) {
   StaticService.attachStaticResources({ app: server, proxy });
 
   // Studio service
-  StudioService.init({ app: server });
+  StudioService.init({ app: server, node });
 
   // API: notification
   notificationService.sendToUser.attach(server);
@@ -291,15 +291,19 @@ module.exports = function createServer(node, serverOptions = {}) {
   });
 
   // After all service middleware, we can now safely pass all traffic to blocklets
-  server.use(async (req, res, next) => {
-    const { target } = await ensureProxyUrl(req);
-
-    if (target) {
-      proxy.safeWeb(req, res, {
-        target,
-      });
-    } else {
-      next();
+  server.use(async (req, res) => {
+    try {
+      const { target } = await ensureProxyUrl(req);
+      if (target) {
+        proxy.safeWeb(req, res, {
+          target,
+        });
+      } else {
+        throw new Error('empty proxy target');
+      }
+    } catch (err) {
+      logger.error('Failed to get component target', { url: req.url, error: err });
+      res.status(500).send(`Blocklet Service: failed to get component target: ${err.message}`);
     }
   });
 

package/api/libs/connect/session.js

@@ -322,6 +322,7 @@ module.exports = {
         ? { provider: 'nft', did: nftState.address, owner: nftState.owner, firstLoginAt: now, lastLoginAt: now }
         : null;
 
+      let fullName = user?.fullName;
       // Update profile
       const passportForLog = passport || { name: 'Guest', role: 'guest' };
       if (user) {
@@ -349,6 +350,7 @@ module.exports = {
       } else {
         // Create user
         const profile = claims.find((x) => x.type === 'profile');
+        fullName = profile.fullName;
 
         const doc = await node.loginUser({
           teamDid,
@@ -388,7 +390,7 @@ module.exports = {
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         realDid,
-        { secret, passport, role },
+        { secret, passport, role, fullName },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(request) }
       );
       logger.info(`${action}.success`, { userDid: realDid, role });
@@ -643,7 +645,7 @@ module.exports = {
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         userDid,
-        { secret, passport, role },
+        { secret, passport, role, fullName: user.fullName },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(request) }
       );
       return { sessionToken, refreshToken };

package/api/libs/jwt.js

@@ -41,7 +41,7 @@ const initJwt = (node, options) => {
           }
         }
 
-        const { did, role, passport } = decoded;
+        const { did, role, passport, fullName } = decoded;
         let user;
         if (!did) {
           return reject(new Error('Invalid jwt token: invalid did'));
@@ -69,7 +69,7 @@ const initJwt = (node, options) => {
           user.role = role;
           user.passport = passport;
         } else {
-          user = { did, role, passport };
+          user = { did, role, passport, fullName };
         }
 
         return resolve(user);

package/api/routes/blocklet.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 const fs = require('fs');
 const cloneDeep = require('lodash/cloneDeep');
-const dayjs = require('dayjs');
+const dayjs = require('@abtnode/util/lib/dayjs');
 const JWT = require('@arcblock/jwt');
 const joinUrl = require('url-join');
 const handleInstanceInStore = require('@abtnode/core/lib/util/public-to-store');

package/api/routes/oauth.js

@@ -88,6 +88,7 @@ async function login(req, node, options) {
   });
   let doc;
   let passportForLog;
+  const fullName = currentUser?.fullName || oauthInfo?.nickname;
   // 当前账户已存在，更新账户信息
   if (currentUser) {
     const allPassports = currentUser.passports || [];
@@ -160,6 +161,7 @@ async function login(req, node, options) {
       secret,
       passport,
       role: passport.role,
+      fullName,
     },
     { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
   );
@@ -278,7 +280,7 @@ async function invite(req, node, options) {
 
   const { sessionToken, refreshToken } = createToken(
     userDid,
-    { secret, passport, role },
+    { secret, passport, role, fullName: profile.fullName },
     { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
   );
 
@@ -462,7 +464,7 @@ module.exports = {
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         userDid,
-        { secret, passport, role: passport.role },
+        { secret, passport, role: passport.role, fullName: user?.fullName },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
       );
 

package/api/routes/user.js

@@ -242,6 +242,7 @@ async function login(req, node, options) {
       secret,
       passport,
       role: passport.role,
+      fullName: doc.fullName,
     },
     { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
   );

package/api/services/auth/connect/invite.js

@@ -61,7 +61,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       const statusEndpointBaseUrl = joinUrl(baseUrl, WELLKNOWN_SERVICE_PATH_PREFIX);
       const endpoint = baseUrl;
 
-      const { passport, response, role } = await handleInvitationResponse({
+      const { passport, response, role, profile } = await handleInvitationResponse({
         req,
         node,
         nodeInfo,
@@ -80,7 +80,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         userDid,
-        { secret, passport, role },
+        { secret, passport, role, fullName: profile.fullName },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
       );
       await updateSession({ sessionToken, refreshToken }, true);

package/api/services/auth/connect/receive-transfer-app-owner.js

@@ -366,7 +366,7 @@ module.exports = function createRoutes(node, _, createSessionToken) {
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         userDid,
-        { secret, passport: vc, role },
+        { secret, passport: vc, role, fullName: profile.fullName },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
       );
       await updateSession({ sessionToken, refreshToken }, true);

package/api/services/auth/session.js

@@ -61,6 +61,7 @@ module.exports = {
                 secret,
                 passport: req.user.passport,
                 role: req.user.role,
+                fullName: user.fullName,
               },
               { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
             );
@@ -129,7 +130,7 @@ module.exports = {
             const sessionConfig = blocklet.settings?.session || {};
             const { sessionToken, refreshToken } = createToken(
               userDid,
-              { secret, passport, role },
+              { secret, passport, role, fullName: user.fullName },
               { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
             );
 

package/api/services/static.js

@@ -40,11 +40,10 @@ const attachStaticResources = ({ app, proxy }) => {
     });
   } else {
     app.use(`${WELLKNOWN_SERVICE_PATH_PREFIX}/static`, serveStatic(distDir, { maxAge: '365d', index: false }));
+    app.get(`${WELLKNOWN_SERVICE_PATH_PREFIX}/service-worker.js`, (req, res) => {
+      res.sendFile(path.join(distDir, 'service-worker.js'));
+    });
   }
-
-  app.get(`${WELLKNOWN_SERVICE_PATH_PREFIX}/service-worker.js`, (req, res) => {
-    res.sendFile(path.join(distDir, 'service-worker.js'));
-  });
 };
 
 const attachDevProxy = ({ wsRouter, proxy }) => {

package/api/services/studio/index.js

@@ -5,6 +5,7 @@ const serveStatic = require('serve-static');
 const path = require('path');
 const nocache = require('nocache');
 const { BLOCKLET_PREFERENCE_FILE, BLOCKLET_UPLOADS_DIR } = require('@blocklet/constant');
+const { getHtmlResultPath } = require('@abtnode/insights');
 
 const builderPath = path.dirname(require.resolve('@blocklet/form-builder'));
 const collectorPath = path.dirname(require.resolve('@blocklet/form-collector'));
@@ -12,7 +13,7 @@ const collectorPath = path.dirname(require.resolve('@blocklet/form-collector'));
 const { PREFIXES } = require('../../util/constants');
 
 module.exports = {
-  init({ app }) {
+  init({ app, node }) {
     PREFIXES.forEach((prefix) => {
       const preferenceUrl = `${prefix}/api/studio/preferences`;
 
@@ -78,6 +79,30 @@ module.exports = {
 
         express.static(path.join(blocklet.env.dataDir, BLOCKLET_UPLOADS_DIR), staticOptions)(req, res, next);
       });
+
+      // FIXME: @wangshijun should ensurePermission here
+      app.get(`${prefix}/api/insights/traffic`, async (req, res) => {
+        const blocklet = await req.getBlocklet();
+        if (!blocklet) {
+          return res.status(400).send('Blocklet not found');
+        }
+
+        if (blocklet.mode !== 'production') {
+          return res.status(400).send('Traffic insights are only available for production blocklets');
+        }
+
+        const { date } = req.query;
+        if (!date) {
+          return res.status(400).send('Date is required to load traffic insights');
+        }
+
+        const filePath = getHtmlResultPath(node.dataDirs.data, date, blocklet.appPid);
+        if (fs.existsSync(filePath) === false) {
+          return res.status(400).send('Traffic insight for selected date not found');
+        }
+
+        return res.sendFile(filePath);
+      });
     });
   },
 };

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

@@ -10,7 +10,6 @@ const getDynamicServiceConfig = require('./get-dynamic-service-config');
 const getStaticServiceConfig = require('./get-static-service-config');
 
 module.exports = ({ node, req, options }) => {
-  req.getBlockletUrl = () => req.headers['x-blocklet-url'] || get(options, 'blockletUrl', '');
   req.getBlockletDid = () => req.headers['x-blocklet-did'] || get(options, 'blockletDid', '');
   req.getBlockletComponentId = () => req.headers['x-blocklet-component-id'] || get(options, 'blockletComponentId', '');
   req.getRoutingRuleId = () => req.headers['x-routing-rule-id'] || get(options, 'routingRuleId', '');

package/api/util/index.js

@@ -2,7 +2,7 @@ const joinUrl = require('url-join');
 const get = require('lodash/get');
 const { ROLES, WHO_CAN_ACCESS } = require('@abtnode/constant');
 const { BlockletSource, BLOCKLET_MODES, BlockletGroup } = require('@blocklet/constant');
-const { findWebInterface } = require('@blocklet/meta/lib/util');
+const { findWebInterface, findWebInterfacePort, findComponentByIdV2 } = require('@blocklet/meta/lib/util');
 const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
 
 const getGroupPrefix = (req) => {
@@ -91,11 +91,12 @@ const findRootWebPort = (blocklet) => {
 };
 
 const ensureProxyUrl = async (req) => {
+  const blocklet = await req.getBlocklet();
   if (req.url.startsWith('/favicon')) {
     // convert all faviconXXX to favicon to ensure file exists in root blocklet
     req.url = '/favicon.ico';
 
-    const port = findRootWebPort(await req.getBlocklet());
+    const port = findRootWebPort(blocklet);
     if (port) {
       return { target: `http://127.0.0.1:${port}` };
     }
@@ -103,14 +104,20 @@ const ensureProxyUrl = async (req) => {
     return { target: null };
   }
 
-  const target = req.headers['x-blocklet-url'];
+  const componentId = req.getBlockletComponentId();
+  const component = findComponentByIdV2(blocklet, componentId) || blocklet;
+  const port = findWebInterfacePort(component);
 
-  if (target) {
-    const pathPrefix = req.headers['x-routing-rule-path-prefix'];
+  if (!port) {
+    return { target: null };
+  }
 
-    if (pathPrefix && pathPrefix !== '/') {
-      req.url = `${pathPrefix}${req.url}`;
-    }
+  const target = `http://127.0.0.1:${port}`;
+
+  // TODO: path prefix check can be removed after meta.interfaces.path|prefix need not supported
+  const pathPrefix = req.headers['x-routing-rule-path-prefix'];
+  if (pathPrefix && pathPrefix !== '/') {
+    req.url = `${pathPrefix}${req.url}`;
   }
 
   return { target };

package/build/asset-manifest.json

@@ -1,26 +1,26 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.9c09d1dd.js",
+    "main.js": "/.well-known/service/static/static/js/main.ab3b47f4.js",
     "static/js/716.1c25a58a.chunk.js": "/.well-known/service/static/static/js/716.1c25a58a.chunk.js",
     "static/js/359.0eb124b0.chunk.js": "/.well-known/service/static/static/js/359.0eb124b0.chunk.js",
     "static/js/255.279b1bca.chunk.js": "/.well-known/service/static/static/js/255.279b1bca.chunk.js",
     "static/js/371.f67a06b4.chunk.js": "/.well-known/service/static/static/js/371.f67a06b4.chunk.js",
-    "static/js/737.1f59e1c3.chunk.js": "/.well-known/service/static/static/js/737.1f59e1c3.chunk.js",
-    "static/js/158.ca656ebd.chunk.js": "/.well-known/service/static/static/js/158.ca656ebd.chunk.js",
-    "static/js/868.30686f6c.chunk.js": "/.well-known/service/static/static/js/868.30686f6c.chunk.js",
+    "static/js/737.3e7feae2.chunk.js": "/.well-known/service/static/static/js/737.3e7feae2.chunk.js",
+    "static/js/158.0f09b75c.chunk.js": "/.well-known/service/static/static/js/158.0f09b75c.chunk.js",
+    "static/js/868.cd5abe55.chunk.js": "/.well-known/service/static/static/js/868.cd5abe55.chunk.js",
     "static/js/547.ce4b87b4.chunk.js": "/.well-known/service/static/static/js/547.ce4b87b4.chunk.js",
-    "static/js/343.2a12718c.chunk.js": "/.well-known/service/static/static/js/343.2a12718c.chunk.js",
+    "static/js/387.faf23026.chunk.js": "/.well-known/service/static/static/js/387.faf23026.chunk.js",
     "static/js/682.a8bf723a.chunk.js": "/.well-known/service/static/static/js/682.a8bf723a.chunk.js",
     "static/js/711.56427a24.chunk.js": "/.well-known/service/static/static/js/711.56427a24.chunk.js",
     "static/js/437.075e8453.chunk.js": "/.well-known/service/static/static/js/437.075e8453.chunk.js",
     "static/js/690.afb99ee7.chunk.js": "/.well-known/service/static/static/js/690.afb99ee7.chunk.js",
     "static/js/42.c390a3f4.chunk.js": "/.well-known/service/static/static/js/42.c390a3f4.chunk.js",
-    "static/js/189.602863fd.chunk.js": "/.well-known/service/static/static/js/189.602863fd.chunk.js",
+    "static/js/189.971a999d.chunk.js": "/.well-known/service/static/static/js/189.971a999d.chunk.js",
     "static/js/162.8c29e450.chunk.js": "/.well-known/service/static/static/js/162.8c29e450.chunk.js",
     "static/js/610.40349d57.chunk.js": "/.well-known/service/static/static/js/610.40349d57.chunk.js",
-    "static/css/125.1bbe7d61.chunk.css": "/.well-known/service/static/static/css/125.1bbe7d61.chunk.css",
-    "static/js/125.910ae6fb.chunk.js": "/.well-known/service/static/static/js/125.910ae6fb.chunk.js",
+    "static/css/221.f0cfb042.chunk.css": "/.well-known/service/static/static/css/221.f0cfb042.chunk.css",
+    "static/js/221.c88341d7.chunk.js": "/.well-known/service/static/static/js/221.c88341d7.chunk.js",
     "static/js/199.3d76c24b.chunk.js": "/.well-known/service/static/static/js/199.3d76c24b.chunk.js",
     "static/js/573.5db9b322.chunk.js": "/.well-known/service/static/static/js/573.5db9b322.chunk.js",
     "static/media/ubuntu-mono-all-400-normal.woff": "/.well-known/service/static/static/media/ubuntu-mono-all-400-normal.c879328bc62e9c68268f.woff",
@@ -46,31 +46,31 @@
     "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.9c09d1dd.js.map": "/.well-known/service/static/static/js/main.9c09d1dd.js.map",
+    "main.ab3b47f4.js.map": "/.well-known/service/static/static/js/main.ab3b47f4.js.map",
     "716.1c25a58a.chunk.js.map": "/.well-known/service/static/static/js/716.1c25a58a.chunk.js.map",
     "359.0eb124b0.chunk.js.map": "/.well-known/service/static/static/js/359.0eb124b0.chunk.js.map",
     "255.279b1bca.chunk.js.map": "/.well-known/service/static/static/js/255.279b1bca.chunk.js.map",
     "371.f67a06b4.chunk.js.map": "/.well-known/service/static/static/js/371.f67a06b4.chunk.js.map",
-    "737.1f59e1c3.chunk.js.map": "/.well-known/service/static/static/js/737.1f59e1c3.chunk.js.map",
-    "158.ca656ebd.chunk.js.map": "/.well-known/service/static/static/js/158.ca656ebd.chunk.js.map",
-    "868.30686f6c.chunk.js.map": "/.well-known/service/static/static/js/868.30686f6c.chunk.js.map",
+    "737.3e7feae2.chunk.js.map": "/.well-known/service/static/static/js/737.3e7feae2.chunk.js.map",
+    "158.0f09b75c.chunk.js.map": "/.well-known/service/static/static/js/158.0f09b75c.chunk.js.map",
+    "868.cd5abe55.chunk.js.map": "/.well-known/service/static/static/js/868.cd5abe55.chunk.js.map",
     "547.ce4b87b4.chunk.js.map": "/.well-known/service/static/static/js/547.ce4b87b4.chunk.js.map",
-    "343.2a12718c.chunk.js.map": "/.well-known/service/static/static/js/343.2a12718c.chunk.js.map",
+    "387.faf23026.chunk.js.map": "/.well-known/service/static/static/js/387.faf23026.chunk.js.map",
     "682.a8bf723a.chunk.js.map": "/.well-known/service/static/static/js/682.a8bf723a.chunk.js.map",
     "711.56427a24.chunk.js.map": "/.well-known/service/static/static/js/711.56427a24.chunk.js.map",
     "437.075e8453.chunk.js.map": "/.well-known/service/static/static/js/437.075e8453.chunk.js.map",
     "690.afb99ee7.chunk.js.map": "/.well-known/service/static/static/js/690.afb99ee7.chunk.js.map",
     "42.c390a3f4.chunk.js.map": "/.well-known/service/static/static/js/42.c390a3f4.chunk.js.map",
-    "189.602863fd.chunk.js.map": "/.well-known/service/static/static/js/189.602863fd.chunk.js.map",
+    "189.971a999d.chunk.js.map": "/.well-known/service/static/static/js/189.971a999d.chunk.js.map",
     "162.8c29e450.chunk.js.map": "/.well-known/service/static/static/js/162.8c29e450.chunk.js.map",
     "610.40349d57.chunk.js.map": "/.well-known/service/static/static/js/610.40349d57.chunk.js.map",
-    "125.1bbe7d61.chunk.css.map": "/.well-known/service/static/static/css/125.1bbe7d61.chunk.css.map",
-    "125.910ae6fb.chunk.js.map": "/.well-known/service/static/static/js/125.910ae6fb.chunk.js.map",
+    "221.f0cfb042.chunk.css.map": "/.well-known/service/static/static/css/221.f0cfb042.chunk.css.map",
+    "221.c88341d7.chunk.js.map": "/.well-known/service/static/static/js/221.c88341d7.chunk.js.map",
     "199.3d76c24b.chunk.js.map": "/.well-known/service/static/static/js/199.3d76c24b.chunk.js.map",
     "573.5db9b322.chunk.js.map": "/.well-known/service/static/static/js/573.5db9b322.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.9c09d1dd.js"
+    "static/js/main.ab3b47f4.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.9c09d1dd.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.ab3b47f4.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>