@abtnode/blocklet-services 1.16.11-next-a232f5fb → 1.16.11-next-3d2b39f7

package/api/index.js

@@ -13,7 +13,7 @@ const minimatch = require('minimatch');
 
 const { getAccessLogStream } = require('@abtnode/logger');
 const { WELLKNOWN_SERVICE_PATH_PREFIX, NODE_SERVICES_PREFIX, EVENTS } = require('@abtnode/constant');
-const { BlockletEvents } = require('@blocklet/constant');
+const { BlockletEvents, BlockletInternalEvents } = require('@blocklet/constant');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const createInvite = require('@abtnode/auth/lib/invitation');
 const eventHub =
@@ -145,6 +145,13 @@ module.exports = function createServer(node, serverOptions = {}) {
     cache.del(cache.keyFns.node());
   });
 
+  [BlockletInternalEvents.componentsUpdated, BlockletInternalEvents.appConfigChanged].forEach((name) => {
+    eventHub.on(name, (data) => {
+      const { appDid } = data;
+      notificationService.sendToApp.exec({ event: name, appDid, data });
+    });
+  });
+
   // Http server
   const server = express();
 

package/api/middlewares/check-running.js

@@ -1,24 +1,31 @@
 const { BlockletStatus } = require('@blocklet/constant');
 const getBlockletMaintenanceTemplate = require('@abtnode/router-templates/lib/blocklet-maintenance');
+const { findComponentByIdV2 } = require('@blocklet/meta/lib/util');
 
 const { shouldGotoStartPage, getRedirectUrl } = require('../util');
 
 const checkRunning = async (req, res, next) => {
-  const blocklet = await req.getBlocklet();
+  const app = await req.getBlocklet();
+  const componentId = req.getBlockletComponentId();
+  let component = findComponentByIdV2(app, componentId);
+
+  // for backward compatibility
+  component = component || app;
+
   if (
     ![
       BlockletStatus.running,
       // Waiting, Downloading should be allowed because blocklet is currently being upgrading
       BlockletStatus.waiting,
       BlockletStatus.downloading,
-    ].includes(blocklet.status)
+    ].includes(component.status)
   ) {
-    if (shouldGotoStartPage(req, blocklet)) {
+    if (shouldGotoStartPage(req, component)) {
       // FIXME: @wangshijun how to validate this token or generate token here?
       if (req.query.setupToken) {
         res.cookie('login_token', req.query.setupToken, { maxAge: 24 * 60 * 60 * 1000 });
       }
-      if (blocklet.settings.initialized) {
+      if (app.settings.initialized) {
         res.redirect(getRedirectUrl({ req, pagePath: '/start' }));
       } else {
         res.redirect(getRedirectUrl({ req, pagePath: '/setup' }));
@@ -32,11 +39,18 @@ const checkRunning = async (req, res, next) => {
     if (req.accepts(['html', 'json']) === 'json') {
       res.json({ code: 'error', error: 'blocklet is under maintenance' });
     } else {
-      res.send(getBlockletMaintenanceTemplate(blocklet, nodeInfo));
+      res.send(getBlockletMaintenanceTemplate(app, nodeInfo, component));
     }
     return;
   }
 
+  const url = new URL(`http://localhost${req.url}`);
+  if (url.searchParams.get('__start__')) {
+    url.searchParams.delete('__start__');
+    res.redirect(`${url.pathname}${url.search}`);
+    return;
+  }
+
   next();
 };
 

package/api/routes/blocklet.js

@@ -21,7 +21,12 @@ const {
   cacheError,
 } = require('@abtnode/util/lib/logo-middleware');
 const formatName = require('@abtnode/util/lib/format-name');
-const { fixBlockletStatus, wipeSensitiveData, findComponentById } = require('@blocklet/meta/lib/util');
+const {
+  fixBlockletStatus,
+  wipeSensitiveData,
+  findComponentByIdV2,
+  forEachComponentV2Sync,
+} = require('@blocklet/meta/lib/util');
 const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX, ROLES } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')(require('../../package.json').name);
 
@@ -88,7 +93,7 @@ module.exports = {
         onGetBlocklet: async ({ req }) => {
           const blocklet = await req.getBlocklet();
           const dids = req.url.split('?')[0].replace(`${prefix}/blocklet/logo-bundle`, '').split('/').filter(Boolean);
-          const component = findComponentById(blocklet, [blocklet.meta.did].concat(dids));
+          const component = findComponentByIdV2(blocklet, [blocklet.meta.did].concat(dids));
           return component;
         },
       }),
@@ -318,10 +323,43 @@ module.exports = {
     server.get(`${prefix}/health`, async (req, res) => {
       const blocklet = await req.getBlocklet();
 
+      if (!blocklet) {
+        return res.status(404).json({ message: 'blocklet not found' });
+      }
+
       if (blocklet.status !== BlockletStatus.running) {
         return res.status(503).json({ message: 'not running' });
       }
 
+      const components = {};
+      forEachComponentV2Sync(blocklet, (component) => {
+        components[component.meta.did] = {
+          running: component.status === BlockletStatus.running,
+        };
+      });
+
+      return res.json({ message: 'ok', components });
+    });
+
+    server.get(`${prefix}/health/:componentId`, async (req, res) => {
+      const { componentId } = req.params;
+
+      const blocklet = await req.getBlocklet();
+
+      if (!blocklet) {
+        return res.status(404).json({ message: 'blocklet not found' });
+      }
+
+      const component = findComponentByIdV2(blocklet, componentId);
+
+      if (!component) {
+        return res.status(404).json({ message: 'component not found' });
+      }
+
+      if (component.status !== BlockletStatus.running) {
+        return res.status(503).json({ message: 'not running' });
+      }
+
       return res.json({ message: 'ok' });
     });
 

package/api/services/notification/index.js

@@ -10,7 +10,7 @@ const states = require('../../state');
 const { PREFIXES } = require('../../util/constants');
 
 const { sendToAppChannel } = require('../../socket/channel/app');
-const { sendToDid } = require('../../socket/channel/did');
+const { sendToUserDid, sendToAppDid } = require('../../socket/channel/did');
 const getHooksByChannel = require('../../socket/channel/hooks');
 const { getTokenInfo } = require('../../socket/util');
 
@@ -113,7 +113,7 @@ const init = ({ node }) => {
 
   const onSendToUser = async (req, res) => {
     try {
-      await sendToDid({ ...req.body.data, node, wsServer });
+      await sendToUserDid({ ...req.body.data, node, wsServer });
       res.status(200).send('');
     } catch (error) {
       logger.error('Send message to user channel failed', { error });
@@ -144,7 +144,11 @@ const init = ({ node }) => {
           app.post(`${prefix}/api/sendToUser`, onSendToUser);
         });
       },
-      exec: (data) => sendToDid({ ...data, node, wsServer }),
+      exec: (data) => sendToUserDid({ ...data, node, wsServer }),
+    },
+
+    sendToApp: {
+      exec: ({ event, appDid, data }) => sendToAppDid({ event, appDid, data, node, wsServer }),
     },
 
     sendToAppChannel: {

package/api/socket/channel/did.js

@@ -6,16 +6,17 @@ const {
 } = require('@blocklet/sdk/lib/validators/notification');
 const { NODE_MODES } = require('@abtnode/constant');
 const { getWalletDid } = require('@blocklet/sdk/lib/did');
+const JWT = require('@arcblock/jwt');
 const pMap = require('p-map');
 
 // eslint-disable-next-line global-require
 const logger = require('@abtnode/logger')(`${require('../../../package.json').name}:notification`);
-const { ensureSenderApp, parseNotification, broadcast, EVENTS } = require('../util');
+const { ensureSenderApp, getSenderServer, parseNotification, broadcast, EVENTS } = require('../util');
 const states = require('../../state');
 const { validateEmail, sendEmail } = require('../../libs/email');
 
 /**
- *
+ * app send notification to user
  * @param {{
  *   {{
  *     did: String
@@ -29,7 +30,7 @@ const { validateEmail, sendEmail } = require('../../libs/email');
  * }}
  * @returns
  */
-const sendToDid = async ({ sender, receiver: rawDid, notification, options, node, wsServer }) => {
+const sendToUserDid = async ({ sender, receiver: rawDid, notification, options, node, wsServer }) => {
   const { keepForOfflineUser = true } = options || {};
   const receiver = Array.isArray(rawDid) ? rawDid : [rawDid];
 
@@ -72,7 +73,7 @@ const sendToDid = async ({ sender, receiver: rawDid, notification, options, node
     throw new Error('Invalid receiver');
   }
 
-  const nodeInfo = await node.getNodeInfo();
+  const nodeInfo = await node.getNodeInfo({ useCache: true });
 
   if (nodeInfo.mode !== NODE_MODES.DEBUG) {
     await validateNotification(notification);
@@ -107,6 +108,24 @@ const sendToDid = async ({ sender, receiver: rawDid, notification, options, node
   });
 };
 
+// server send notification to app
+const sendToAppDid = async ({ event, appDid, data, node, wsServer }) => {
+  const senderInfo = await getSenderServer({ node });
+
+  const notification = {
+    data,
+  };
+
+  notification.sender = {
+    did: senderInfo.wallet.address,
+    pk: senderInfo.wallet.publicKey,
+    token: JWT.sign(senderInfo.wallet.address, senderInfo.wallet.secretKey),
+    name: senderInfo.name,
+  };
+
+  wsServer.broadcast(appDid, event, notification, { noCluster: true });
+};
+
 const sendCachedMessages = async (wsServer, did) => {
   try {
     const messages = await states.message.find({ did });
@@ -145,9 +164,9 @@ const onMessage = async ({ channel: from, event = EVENTS.MESSAGE, payload: messa
   // validate receiver
   const { receiver, ...data } = message;
 
-  const blocklet = await node.getBlocklet({ did: receiver.did, attachConfig: false });
+  const blocklet = await node.getBlocklet({ did: receiver.did, attachConfig: false, useCache: true });
   if (!blocklet) {
-    const nodeInfo = await node.getNodeInfo();
+    const nodeInfo = await node.getNodeInfo({ useCache: true });
 
     // only throw error if receiver is a blocklet (not server)
     if (nodeInfo.did !== receiver.did) {
@@ -187,4 +206,4 @@ const onAuthenticate = async ({ channel, did, payload }) => {
   }
 };
 
-module.exports = { onAuthenticate, onJoin, onMessage, sendToDid };
+module.exports = { onAuthenticate, onJoin, onMessage, sendToUserDid, sendToAppDid };

package/api/socket/util.js

@@ -66,6 +66,12 @@ const ensureSenderApp = async ({ sender, node, nodeInfo }) => {
   return appInfo;
 };
 
+const getSenderServer = async ({ node }) => {
+  const nodeInfo = await node.getNodeInfo({ useCache: true });
+  const senderInfo = await getApplicationInfo({ node, nodeInfo, teamDid: nodeInfo.did });
+  return senderInfo;
+};
+
 const getTokenInfo = (decoded) => ({
   did: decoded.iss.replace(/^did:abt:/, ''),
 });
@@ -78,6 +84,7 @@ module.exports = {
   parseNotification,
   broadcast,
   ensureSenderApp,
+  getSenderServer,
   getTokenInfo,
   EVENTS,
 };

package/build/asset-manifest.json

@@ -1,16 +1,16 @@
 {
   "files": {
     "main.css": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css",
-    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.941e7207.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.748b0f19.js",
     "static/js/716.b48e64d9.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/716.b48e64d9.chunk.js",
     "static/js/359.d6450ee2.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/359.d6450ee2.chunk.js",
     "static/js/255.279b1bca.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js",
     "static/js/371.f67a06b4.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/371.f67a06b4.chunk.js",
-    "static/js/737.5fbeda50.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.5fbeda50.chunk.js",
+    "static/js/737.ef64812c.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.ef64812c.chunk.js",
     "static/js/158.ca656ebd.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/158.ca656ebd.chunk.js",
     "static/js/868.ac8df3a0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/868.ac8df3a0.chunk.js",
     "static/js/547.03d5d719.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/547.03d5d719.chunk.js",
-    "static/js/343.7deaa08f.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.7deaa08f.chunk.js",
+    "static/js/343.da2b2075.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.da2b2075.chunk.js",
     "static/js/682.a8bf723a.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/682.a8bf723a.chunk.js",
     "static/js/711.56427a24.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/711.56427a24.chunk.js",
     "static/js/437.075e8453.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/437.075e8453.chunk.js",
@@ -45,16 +45,16 @@
     "router-template-styles/styles.css": "/.blocklet/proxy/blocklet-service/router-template-styles/styles.css",
     "index.html": "/.blocklet/proxy/blocklet-service/index.html",
     "main.632501d5.css.map": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css.map",
-    "main.941e7207.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.941e7207.js.map",
+    "main.748b0f19.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.748b0f19.js.map",
     "716.b48e64d9.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/716.b48e64d9.chunk.js.map",
     "359.d6450ee2.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/359.d6450ee2.chunk.js.map",
     "255.279b1bca.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js.map",
     "371.f67a06b4.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/371.f67a06b4.chunk.js.map",
-    "737.5fbeda50.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.5fbeda50.chunk.js.map",
+    "737.ef64812c.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.ef64812c.chunk.js.map",
     "158.ca656ebd.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/158.ca656ebd.chunk.js.map",
     "868.ac8df3a0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/868.ac8df3a0.chunk.js.map",
     "547.03d5d719.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/547.03d5d719.chunk.js.map",
-    "343.7deaa08f.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.7deaa08f.chunk.js.map",
+    "343.da2b2075.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.da2b2075.chunk.js.map",
     "682.a8bf723a.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/682.a8bf723a.chunk.js.map",
     "711.56427a24.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/711.56427a24.chunk.js.map",
     "437.075e8453.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/437.075e8453.chunk.js.map",
@@ -70,6 +70,6 @@
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.941e7207.js"
+    "static/js/main.748b0f19.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><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.941e7207.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.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><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.748b0f19.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>