@abtnode/blocklet-services 1.16.15-beta-d8e7b6c0 → 1.16.15-beta-9318a201

package/README.md

@@ -98,7 +98,6 @@ node.onReady(() => {
 - /api/did/switch-profile
 - /api/did/switch-passport
 - /api/did/fuel
-- /api/did/get-did-spaces-endpoint
 
 #### Websocket
 

package/api/index.js

@@ -158,7 +158,22 @@ module.exports = function createServer(node, serverOptions = {}) {
     const event = BlockletInternalEvents[key];
     eventHub.on(event, (data) => {
       const { appDid } = data;
-      notificationService.sendToApp.exec({ event, appDid, data });
+
+      // Let first worker process do something as master
+      if (process.env.NODE_ENV === 'test' || process.env.NODE_APP_INSTANCE === '0') {
+        if (event === BlockletInternalEvents.componentsUpdated) {
+          return;
+        }
+
+        notificationService.sendToAppComponents.exec({ event, appDid, data }).catch((error) => {
+          logger.error('send to component error', { error });
+        });
+      }
+
+      // backward compatibility, should be removed if BlockletSDK@1.6.14 is not supported anymore
+      notificationService.sendToApp.exec({ event, appDid, data }).catch((error) => {
+        logger.error('send to app error', { error });
+      });
     });
   });
 

package/api/libs/image.js

@@ -2,6 +2,7 @@
 // @link https://sharp.pixelplumbing.com/
 const fs = require('fs-extra');
 const path = require('path');
+const { rmSync } = require('fs');
 const sharp = require('sharp');
 const toLower = require('lodash/toLower');
 const { Joi } = require('@arcblock/validator');
@@ -193,7 +194,7 @@ const processImage = (src, extension, dest, params) => {
       dimensions.height = height;
     }
 
-    const pipeline = sharp({ animated: true }).timeout({ seconds: 8 });
+    const pipeline = sharp({ animated: true }).timeout({ seconds: 30 });
     if (rotate) {
       pipeline.rotate(rotate);
     }
@@ -238,8 +239,15 @@ const processImage = (src, extension, dest, params) => {
 
     pipeline[format || EXTENSIONS[extension]]({ quality, progressive: !!progressive, force: true });
 
+    pipeline.on('error', (error) => {
+      reject(error);
+    });
+
     // run the pipeline
     src.pipe(pipeline).pipe(out);
+  }).catch((error) => {
+    rmSync(dest, { force: true });
+    throw error;
   });
 };
 

package/api/libs/open-graph/index.js

@@ -68,16 +68,16 @@ const getOgImage = (input, info, dataDir, format) => {
   if (error) {
     throw new Error(`open graph service params invalid: ${formatError(error)}`);
   }
+  if (value.template === 'cover') {
+    value.description = value.description || value.title;
+    value.title = info.name;
+  }
   if (!value.title) {
     value.title = info.name;
   }
   if (!value.description) {
     value.description = info.description;
   }
-  if (value.template === 'cover') {
-    value.description = value.title;
-    value.title = info.name;
-  }
 
   const params = { ...value, width: 1200, height: 630, color, logoUrl, format };
   const cacheKey = md5(stringify(params));

package/api/libs/open-graph/template.js

@@ -7,6 +7,14 @@ const join = (strings, ...values) => {
   return original;
 };
 
+const getTextColor = (background) => {
+  const r = parseInt(background.slice(1, 3), 16);
+  const g = parseInt(background.slice(3, 5), 16);
+  const b = parseInt(background.slice(5, 7), 16);
+  const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
+  return luminance > 0.5 ? '#111' : '#EEE';
+};
+
 const getLogoSvg = (color) => {
   return `<svg
   xmlns="http://www.w3.org/2000/svg"
@@ -45,14 +53,13 @@ const getDefaultTemplate = ({ width, height, logoUrl, format, color, title, desc
     />
     <h2
       style="
-      font-size: 4.8rem;
+      font-size: 3rem;
       letter-spacing: -2px;
       margin: 32px 0;
       color: #ddd;
       font-weight: 400;
       font-family: Arial, sans-serif;
       text-align: left;
-      text-transform: capitalize;
       padding: 0 96px;
     "
     >
@@ -60,7 +67,7 @@ const getDefaultTemplate = ({ width, height, logoUrl, format, color, title, desc
     </h2>
     <h3
       style="
-      font-size: 2.4rem;
+      font-size: 2rem;
       margin: 0;
       color: #aaa;
       font-weight: 400;
@@ -92,16 +99,17 @@ const getSectionTemplate = ({ width, height, logoUrl, color, format, title, desc
       src="${logoUrl}"
       height="90"
       width="90"
-      style="margin-left: 96px; height: 90px; width: 90px; margin-bottom: 96px"
+      style="margin-left: 96px; height: 90px; width: 90px; margin-bottom: 64px"
     />
     <p
       style="
-      font-size: 1.8rem;
+      font-size: 1.5rem;
       margin: 0;
       color: ${color.start};
       font-weight: 400;
       font-family: Arial, sans-serif;
       text-align: left;
+      text-transform: uppercase;
       padding: 0 96px;
     "
     >
@@ -109,28 +117,29 @@ const getSectionTemplate = ({ width, height, logoUrl, color, format, title, desc
     </p>
     <h2
       style="
-      font-size: 4.8rem;
+      font-size: 3rem;
       margin: 32px 0;
       color: #eee;
       letter-spacing: -2px;
       font-weight: 400;
       font-family: Arial, sans-serif;
-      text-align: center;
-      text-transform: capitalize;
+      text-align: left;
       padding: 0 96px;
+      lineClamp: 2;
     "
     >
       ${title}
     </h2>
     <h3
       style="
-      font-size: 2.4rem;
+      font-size: 2rem;
       margin: 0;
       color: #bbb;
       font-weight: 400;
       font-family: Arial, sans-serif;
       text-align: left;
       padding: 0 96px;
+      lineClamp: 3;
     "
     >
       ${description}
@@ -140,16 +149,17 @@ const getSectionTemplate = ({ width, height, logoUrl, color, format, title, desc
 };
 
 const getCoverTemplate = ({ width, height, logoUrl, color, title, description, cover }, fn) => {
+  const textColor = getTextColor(color.start);
   return fn`<div style="width: ${width}px; height: ${height}px; display: flex; background: ${color.start};">
     <div style="display: flex; height: ${height}px; background: ${color.start}; width: 45%">
       <div style="margin-left: 32px; display: flex; flex-direction: column; align-items: flex-start; justify-content: space-around;">
         <h2
           style="
-          font-size: 3.6rem;
-          color: #ddd;
+          font-size: 3rem;
+          color: ${textColor};
           font-weight: 400;
           font-family: Arial, sans-serif;
-          margin: 32px 0 0;
+          margin: 32px 32px 0 0;
           text-align: left;
         "
         >
@@ -161,7 +171,7 @@ const getCoverTemplate = ({ width, height, logoUrl, color, title, description, c
             style="
             font-size: 2rem;
             margin: 0 0 0 16px;
-            color: #ddd;
+            color: ${textColor};
             font-weight: 400;
             font-family: Arial, sans-serif;
             text-align: left;
@@ -179,10 +189,10 @@ const getCoverTemplate = ({ width, height, logoUrl, color, title, description, c
         display: flex;
         background: ${color.start};
         height: ${height * 2}px;
-        width: 125px;
+        width: 100px;
         position: absolute;
-        transform: rotate(10deg);
-        left: -120px;
+        transform: rotate(8deg);
+        left: -90px;
         top: -25px;"></div>
     </div>
   </div>`;

package/api/libs/spaces.js

@@ -1,5 +1,4 @@
 const isUrl = require('is-url');
-const joinUrl = require('url-join');
 
 /**
  * @description
@@ -14,20 +13,6 @@ function getDIDSpacesUrlFromDisplayUrl(endpoint) {
   return endpoint.replace(/\/api\/.+/, '');
 }
 
-/**
- * @description
- * @param {string} spacesUrl
- * @return {string}
- */
-function getDIDSpacesSilentAuthorizationFromUrl(spacesUrl) {
-  if (!isUrl(spacesUrl)) {
-    throw new Error(`SpacesUrl(${spacesUrl}) is not a valid url`);
-  }
-
-  return joinUrl(spacesUrl, '/api/space/silent-authorization');
-}
-
 module.exports = {
   getDIDSpacesUrlFromDisplayUrl,
-  getDIDSpacesSilentAuthorizationFromUrl,
 };

package/api/services/auth/index.js

@@ -38,7 +38,6 @@ const createReceiveTransferAppOwnerRoutes = require('./connect/receive-transfer-
 const createSessionRoutes = require('./session');
 const createPassportRoutes = require('./passport');
 const { getRedirectUrl } = require('../../util');
-const createGetDIDSpacesEndpointRoutes = require('./connect/get-did-spaces-endpoint');
 const { sessionCacheDisabledUser } = require('../../cache');
 
 const getTokenFromWsConnect = (req, options) => {
@@ -191,7 +190,6 @@ const init = ({ node, options }) => {
       handler.attach(Object.assign({ app }, createMigrateToStructV2Routes(node, options)));
       handler.attach(Object.assign({ app }, createTransferAppOwnerRoutes(node, options)));
       handler.attach(Object.assign({ app }, createReceiveTransferAppOwnerRoutes(node, options, createSessionToken)));
-      handler.attach(Object.assign({ app }, createGetDIDSpacesEndpointRoutes(node, options, createSessionToken)));
     });
   };
 

package/api/services/notification/index.js

@@ -10,6 +10,7 @@ const states = require('../../state');
 const { PREFIXES } = require('../../util/constants');
 
 const { sendToAppChannel } = require('../../socket/channel/app');
+const { sendToAppComponents } = require('../../socket/channel/component');
 const { sendToUserDid, sendToAppDid } = require('../../socket/channel/did');
 const getHooksByChannel = require('../../socket/channel/hooks');
 const { getTokenInfo } = require('../../socket/util');
@@ -151,6 +152,10 @@ const init = ({ node }) => {
       exec: ({ event, appDid, data }) => sendToAppDid({ event, appDid, data, node, wsServer }),
     },
 
+    sendToAppComponents: {
+      exec: ({ event, appDid, data }) => sendToAppComponents({ event, appDid, data, node, wsServer }),
+    },
+
     sendToAppChannel: {
       attach: (app) => {
         PREFIXES.forEach((prefix) => {

package/api/socket/channel/component.js

@@ -0,0 +1,112 @@
+const JWT = require('@arcblock/jwt');
+const { CHANNEL_TYPE, parseChannel, getComponentChannel } = require('@blocklet/meta/lib/channel');
+const { findComponentByIdV2 } = require('@blocklet/meta/lib/util');
+const { getComponentApiKey } = require('@abtnode/util/lib/blocklet');
+const Lock = require('@abtnode/util/lib/lock');
+
+const logger = require('@abtnode/logger')('channel:component');
+const { getSenderServer, broadcast } = require('../util');
+const states = require('../../state');
+
+const lock = new Lock('');
+
+const getCacheId = (appDid, componentDid) => `${appDid}/${componentDid}`;
+
+const onAuthenticate = async ({ channel, payload, node }) => {
+  const { type, appDid, componentDid } = parseChannel(channel);
+  if (type !== CHANNEL_TYPE.COMPONENT) {
+    throw new Error(`Can not join non-component channel: ${channel}`);
+  }
+
+  const { apiKey } = payload;
+
+  const app = await node.getBlocklet({ did: appDid, useCache: true });
+
+  if (!app) {
+    throw new Error(`App not found: ${appDid}`);
+  }
+
+  const component = findComponentByIdV2(app, componentDid);
+
+  if (!component) {
+    throw new Error(`Component not found: ${appDid}/${componentDid}`);
+  }
+
+  const nodeInfo = await node.getNodeInfo({ useCache: true });
+
+  if (getComponentApiKey({ serverSk: nodeInfo.sk, app, component }) !== apiKey) {
+    throw new Error(`Invalid API key. app: ${appDid}, component: ${componentDid}`);
+  }
+};
+
+const sendCachedMessages = async (wsServer, appDid, componentDid) => {
+  await lock.acquire();
+  try {
+    const cacheId = getCacheId(appDid, componentDid);
+    const messages = await states.message.find({ did: cacheId });
+    if (messages.length) {
+      messages.forEach(({ event, data }) => {
+        wsServer.broadcast(getComponentChannel(appDid, componentDid), event, data, { noCluster: true });
+      });
+
+      await states.message.remove({ did: cacheId });
+    }
+
+    lock.release();
+  } catch (error) {
+    lock.release();
+    logger.error('Error on sending cached messages to component', { appDid, componentDid, error });
+  }
+};
+
+const onJoin = async ({ channel, wsServer }) => {
+  const { appDid, componentDid } = parseChannel(channel);
+  if (appDid && componentDid) {
+    await sendCachedMessages(wsServer, appDid, componentDid);
+  } else {
+    throw new Error(`onJoin: Invalid channel: ${channel}`);
+  }
+};
+
+const onMessage = () => {};
+
+const sendToAppComponents = async ({ event, appDid, data, node, wsServer }) => {
+  const senderInfo = await getSenderServer({ node });
+
+  const app = await node.getBlocklet({ did: appDid, useCache: true });
+
+  if (!app) {
+    throw new Error(`App not found: ${appDid}`);
+  }
+
+  const notification = {
+    data,
+    time: Date.now(),
+    sender: {
+      did: senderInfo.wallet.address,
+      pk: senderInfo.wallet.publicKey,
+      token: JWT.sign(senderInfo.wallet.address, senderInfo.wallet.secretKey),
+      name: senderInfo.name,
+    },
+  };
+
+  for (const component of app.children || []) {
+    const componentDid = component.meta.did;
+    // eslint-disable-next-line no-loop-func
+    broadcast(wsServer, getComponentChannel(appDid, componentDid), event, notification, async (count) => {
+      // FIXME @linchen 组件以 cluster 模式启动时, 是否确保所有组件实例都收到消息?
+      if (count <= 0) {
+        logger.info('Online component client was not found', { appDid, componentDid });
+        await lock.acquire();
+        try {
+          await states.message.insert({ did: getCacheId(appDid, componentDid), event, data: notification });
+          lock.release();
+        } catch (error) {
+          lock.release();
+        }
+      }
+    });
+  }
+};
+
+module.exports = { onAuthenticate, onJoin, onMessage, sendToAppComponents };

package/api/socket/channel/hooks.js

@@ -3,6 +3,7 @@ const { CHANNEL_TYPE, parseChannel } = require('@blocklet/meta/lib/channel');
 const AppChannel = require('./app');
 const DidChannel = require('./did');
 const ConnectChannel = require('./relay');
+const ComponentChannel = require('./component');
 
 const getHooksByChannel = (channel) => {
   const { type } = parseChannel(channel);
@@ -15,6 +16,9 @@ const getHooksByChannel = (channel) => {
   if (type === CHANNEL_TYPE.RELAY) {
     return ConnectChannel;
   }
+  if (type === CHANNEL_TYPE.COMPONENT) {
+    return ComponentChannel;
+  }
 
   throw new Error('Unknown channel type');
 };

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.e29a7133.js",
+    "main.js": "/.well-known/service/static/static/js/main.dad0c18f.js",
     "static/js/4716.58477c5c.chunk.js": "/.well-known/service/static/static/js/4716.58477c5c.chunk.js",
     "static/js/6856.163537c7.chunk.js": "/.well-known/service/static/static/js/6856.163537c7.chunk.js",
     "static/js/1660.e2ff5a21.chunk.js": "/.well-known/service/static/static/js/1660.e2ff5a21.chunk.js",
@@ -18,7 +18,7 @@
     "static/js/5434.523d071d.chunk.js": "/.well-known/service/static/static/js/5434.523d071d.chunk.js",
     "static/js/9409.0d5d4de2.chunk.js": "/.well-known/service/static/static/js/9409.0d5d4de2.chunk.js",
     "static/js/5859.b3338b24.chunk.js": "/.well-known/service/static/static/js/5859.b3338b24.chunk.js",
-    "static/js/3551.a3cfa6aa.chunk.js": "/.well-known/service/static/static/js/3551.a3cfa6aa.chunk.js",
+    "static/js/3551.49951db3.chunk.js": "/.well-known/service/static/static/js/3551.49951db3.chunk.js",
     "static/js/1980.79862e88.chunk.js": "/.well-known/service/static/static/js/1980.79862e88.chunk.js",
     "static/js/861.a19bf499.chunk.js": "/.well-known/service/static/static/js/861.a19bf499.chunk.js",
     "static/js/5176.9f08e927.chunk.js": "/.well-known/service/static/static/js/5176.9f08e927.chunk.js",
@@ -32,8 +32,8 @@
     "static/css/5982.ac464505.chunk.css": "/.well-known/service/static/static/css/5982.ac464505.chunk.css",
     "static/js/5982.19c5663f.chunk.js": "/.well-known/service/static/static/js/5982.19c5663f.chunk.js",
     "static/js/4023.f88d8f4b.chunk.js": "/.well-known/service/static/static/js/4023.f88d8f4b.chunk.js",
-    "static/js/6869.08bd3d6f.chunk.js": "/.well-known/service/static/static/js/6869.08bd3d6f.chunk.js",
-    "static/js/1565.f2e6e45e.chunk.js": "/.well-known/service/static/static/js/1565.f2e6e45e.chunk.js",
+    "static/js/6869.2fb2d274.chunk.js": "/.well-known/service/static/static/js/6869.2fb2d274.chunk.js",
+    "static/js/1565.74308e72.chunk.js": "/.well-known/service/static/static/js/1565.74308e72.chunk.js",
     "static/js/2393.9c045444.chunk.js": "/.well-known/service/static/static/js/2393.9c045444.chunk.js",
     "static/js/5683.46331372.chunk.js": "/.well-known/service/static/static/js/5683.46331372.chunk.js",
     "static/js/7.b3c58209.chunk.js": "/.well-known/service/static/static/js/7.b3c58209.chunk.js",
@@ -98,7 +98,7 @@
     "index.html": "/.well-known/service/static/index.html",
     "static/media/space-connected.svg": "/.well-known/service/static/static/media/space-connected.9a4e18fd2bc7d065191b0d241a131c28.svg",
     "main.7ea79dc8.css.map": "/.well-known/service/static/static/css/main.7ea79dc8.css.map",
-    "main.e29a7133.js.map": "/.well-known/service/static/static/js/main.e29a7133.js.map",
+    "main.dad0c18f.js.map": "/.well-known/service/static/static/js/main.dad0c18f.js.map",
     "4716.58477c5c.chunk.js.map": "/.well-known/service/static/static/js/4716.58477c5c.chunk.js.map",
     "6856.163537c7.chunk.js.map": "/.well-known/service/static/static/js/6856.163537c7.chunk.js.map",
     "1660.e2ff5a21.chunk.js.map": "/.well-known/service/static/static/js/1660.e2ff5a21.chunk.js.map",
@@ -115,7 +115,7 @@
     "5434.523d071d.chunk.js.map": "/.well-known/service/static/static/js/5434.523d071d.chunk.js.map",
     "9409.0d5d4de2.chunk.js.map": "/.well-known/service/static/static/js/9409.0d5d4de2.chunk.js.map",
     "5859.b3338b24.chunk.js.map": "/.well-known/service/static/static/js/5859.b3338b24.chunk.js.map",
-    "3551.a3cfa6aa.chunk.js.map": "/.well-known/service/static/static/js/3551.a3cfa6aa.chunk.js.map",
+    "3551.49951db3.chunk.js.map": "/.well-known/service/static/static/js/3551.49951db3.chunk.js.map",
     "1980.79862e88.chunk.js.map": "/.well-known/service/static/static/js/1980.79862e88.chunk.js.map",
     "861.a19bf499.chunk.js.map": "/.well-known/service/static/static/js/861.a19bf499.chunk.js.map",
     "5176.9f08e927.chunk.js.map": "/.well-known/service/static/static/js/5176.9f08e927.chunk.js.map",
@@ -129,8 +129,8 @@
     "5982.ac464505.chunk.css.map": "/.well-known/service/static/static/css/5982.ac464505.chunk.css.map",
     "5982.19c5663f.chunk.js.map": "/.well-known/service/static/static/js/5982.19c5663f.chunk.js.map",
     "4023.f88d8f4b.chunk.js.map": "/.well-known/service/static/static/js/4023.f88d8f4b.chunk.js.map",
-    "6869.08bd3d6f.chunk.js.map": "/.well-known/service/static/static/js/6869.08bd3d6f.chunk.js.map",
-    "1565.f2e6e45e.chunk.js.map": "/.well-known/service/static/static/js/1565.f2e6e45e.chunk.js.map",
+    "6869.2fb2d274.chunk.js.map": "/.well-known/service/static/static/js/6869.2fb2d274.chunk.js.map",
+    "1565.74308e72.chunk.js.map": "/.well-known/service/static/static/js/1565.74308e72.chunk.js.map",
     "2393.9c045444.chunk.js.map": "/.well-known/service/static/static/js/2393.9c045444.chunk.js.map",
     "5683.46331372.chunk.js.map": "/.well-known/service/static/static/js/5683.46331372.chunk.js.map",
     "7.b3c58209.chunk.js.map": "/.well-known/service/static/static/js/7.b3c58209.chunk.js.map",
@@ -174,6 +174,6 @@
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.e29a7133.js"
+    "static/js/main.dad0c18f.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.e29a7133.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.dad0c18f.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>