@abtnode/blocklet-services 1.16.8-beta-b3039c78 → 1.16.8-beta-186fd5aa

package/api/emails/components/footer.js

@@ -15,6 +15,7 @@ const footer = {
     fontFamily: "-apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
     fontSize: '12px',
     lineHeight: '22px',
+    margin: 0,
 };
 const link = {
     color: '#2754C5',

package/api/emails/components/header.js

@@ -15,6 +15,6 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const components_1 = require("@react-email/components");
 function Header(_a) {
     var { appInfo } = _a, props = __rest(_a, ["appInfo"]);
-    return ((0, jsx_runtime_1.jsx)(components_1.Section, Object.assign({}, props, { children: (0, jsx_runtime_1.jsx)(components_1.Img, { src: appInfo.logo, height: "80", alt: appInfo.title }) })));
+    return ((0, jsx_runtime_1.jsx)(components_1.Section, Object.assign({}, props, { children: (0, jsx_runtime_1.jsx)(components_1.Img, { src: appInfo.logo, height: "50", alt: appInfo.title }) })));
 }
 exports.default = Header;

package/api/emails/components/layout.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const components_1 = require("@react-email/components");
-function Layout({ children, mainStyle = {}, containerStyle = {}, }) {
-    return ((0, jsx_runtime_1.jsxs)(components_1.Html, { children: [(0, jsx_runtime_1.jsx)(components_1.Head, { children: (0, jsx_runtime_1.jsx)("title", { children: "My email title" }) }), (0, jsx_runtime_1.jsx)(components_1.Body, Object.assign({ style: Object.assign(Object.assign({}, main), mainStyle) }, { children: (0, jsx_runtime_1.jsx)("div", Object.assign({ style: Object.assign(Object.assign({}, main), mainStyle) }, { children: (0, jsx_runtime_1.jsx)("div", Object.assign({ style: { padding: '20px' } }, { children: (0, jsx_runtime_1.jsx)(components_1.Container, Object.assign({ style: Object.assign(Object.assign({}, container), containerStyle) }, { children: (0, jsx_runtime_1.jsx)("div", { children: children }) })) })) })) }))] }));
+function Layout({ children, mainStyle = {}, containerStyle = {}, subject, }) {
+    return ((0, jsx_runtime_1.jsxs)(components_1.Html, { children: [(0, jsx_runtime_1.jsx)(components_1.Head, { children: subject && (0, jsx_runtime_1.jsx)("title", { children: subject }) }), (0, jsx_runtime_1.jsx)(components_1.Body, Object.assign({ style: Object.assign(Object.assign({}, main), mainStyle) }, { children: (0, jsx_runtime_1.jsx)("div", Object.assign({ style: Object.assign(Object.assign({}, main), mainStyle) }, { children: (0, jsx_runtime_1.jsx)("div", Object.assign({ style: { padding: '30px 20px' } }, { children: (0, jsx_runtime_1.jsx)(components_1.Container, Object.assign({ style: Object.assign(Object.assign({}, container), containerStyle) }, { children: (0, jsx_runtime_1.jsx)("div", { children: children }) })) })) })) }))] }));
 }
 exports.default = Layout;
 const main = {

package/api/emails/libs/highlight.js

@@ -42,13 +42,13 @@ const toClickableSpan = (str, isHighLight = true) => {
                 }
                 // HACK: 邮件中无法支持 dapp 的展示，缺少 dapp 链接，只能作为加粗展示
                 if ((0, func_1.isSameAddr)(type, 'dapp')) {
-                    return `<em data-type="${type}" data-chain-id="${chainId}" data-did="${did}">${item.text}</em>`;
+                    return `<em style="font-weight:bold;" data-type="${type}" data-chain-id="${chainId}" data-did="${did}">${item.text}</em>`;
                 }
                 if (url) {
-                    return `<a target="_blank" href="${url}">${item.text}</a>`;
+                    return `<a target="_blank" style="color:#4598fa;font-weight:bold;" href="${url}">${item.text}</a>`;
                 }
                 // 默认展示为加粗
-                return `<em data-type="${type}" data-chain-id="${chainId}" data-did="${did}">${item.text}</em>`;
+                return `<em style="font-weight:bold;" data-type="${type}" data-chain-id="${chainId}" data-did="${did}">${item.text}</em>`;
             }
             return item.text;
         }

package/api/emails/pages/notification.js

@@ -10,8 +10,8 @@ const footer_1 = __importDefault(require("../components/footer"));
 const content_1 = __importDefault(require("../components/content"));
 const layout_1 = __importDefault(require("../components/layout"));
 const header_1 = __importDefault(require("../components/header"));
-const NotificationEmail = ({ title, body = '', attachments = [], actions = [], appInfo, locale = 'en', }) => {
-    return ((0, jsx_runtime_1.jsxs)(layout_1.default, Object.assign({ mainStyle: main }, { children: [(0, jsx_runtime_1.jsx)(components_1.Preview, { children: title }), (0, jsx_runtime_1.jsx)(header_1.default, { appInfo: appInfo }), (0, jsx_runtime_1.jsx)(content_1.default, { style: container, title: title, content: body, attachments: attachments, actions: actions, locale: locale }), (0, jsx_runtime_1.jsx)(footer_1.default, { showCopyright: false, showBlocklet: true, appInfo: appInfo })] })));
+const NotificationEmail = ({ title, body = '', subject, attachments = [], actions = [], appInfo, locale = 'en', }) => {
+    return ((0, jsx_runtime_1.jsxs)(layout_1.default, Object.assign({ mainStyle: main, subject: subject }, { children: [(0, jsx_runtime_1.jsx)(components_1.Preview, { children: subject }), (0, jsx_runtime_1.jsx)(header_1.default, { appInfo: appInfo }), (0, jsx_runtime_1.jsx)(content_1.default, { style: container, title: title, content: body, attachments: attachments, actions: actions, locale: locale }), (0, jsx_runtime_1.jsx)(footer_1.default, { showCopyright: false, showBlocklet: true, appInfo: appInfo })] })));
 };
 exports.NotificationEmail = NotificationEmail;
 exports.default = exports.NotificationEmail;
@@ -20,7 +20,7 @@ const main = {
     fontFamily,
 };
 const container = {
-    margin: '30px auto',
+    margin: '20px auto',
     backgroundColor: '#ffffff',
-    padding: '5px 50px 10px 60px',
+    padding: '5px 50px 30px 60px',
 };

package/api/emails/test.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const notification_1 = __importDefault(require("./pages/notification"));
 function Test() {
-    const title = 'Blocklet Server is about to expire';
+    const title = 'Head for blocklet email demo';
     const body = 'User <DAMINGZHAO(did:abt:z1Y313EXfBK9FePjDh5cZy6sNY97TneEemB)> has a <Transaction(tx:beta:D20C566BB46A7B6B4DDEA0B42EB3996F0213C1C27C54533F3D40D7B5C6DA59FD)> and it will give your a <Badge (nft:beta:zjdivheWGgy6ucvsYYqP34hVeUgx6743GEfx)> on the DApp <OCAP Playground(dapp:beta:zNKeLKixvCM32TkVM1zmRDdAU3bvm3dTtAcM)>';
     const attachments = [
         {
             type: 'token',
             data: {
-                address: 'abcdefghjikl',
+                address: 'zjdivheWGgy6ucvsYYqP34hVeUgx6743GEfx',
                 decimal: 18,
                 amount: 10000,
                 chianHost: 'beta',
@@ -23,7 +23,7 @@ function Test() {
             type: 'nft',
             data: {
                 chianHost: 'beta',
-                did: 'abcdefghijkl',
+                did: 'zjdivheWGgy6ucvsYYqP34hVeUgx6743GEfx',
             },
         },
         // {
@@ -155,12 +155,12 @@ function Test() {
         },
     ];
     const appInfo = {
-        title: 'Blocklet Email Test',
+        title: 'Blocklet Email Demo',
         logo: 'https://picsum.photos/200/100',
         url: 'https://www.arcblock.io',
-        description: 'This is a test blocklet for email test only',
+        description: 'This is a demo blocklet for email test only',
         version: '1.0.0',
     };
-    return (0, jsx_runtime_1.jsx)(notification_1.default, { title: title, body: body, attachments: attachments, actions: actions, appInfo: appInfo });
+    return ((0, jsx_runtime_1.jsx)(notification_1.default, { title: title, body: body, attachments: attachments, actions: actions, appInfo: appInfo, subject: `[${appInfo.title}] ${title}` }));
 }
 exports.default = Test;

package/api/libs/email.js

@@ -3,6 +3,8 @@ const { render } = require('@react-email/components');
 const { getSafeEnv } = require('@abtnode/core/lib/util');
 const { getRuntimeEnvironments } = require('@abtnode/core/lib/util/blocklet');
 const { emailConfigSchema } = require('@blocklet/sdk/lib/validators/email');
+const logger = require('@abtnode/logger')('blocklet-services:notification');
+const omit = require('lodash/omit');
 
 const { NotificationEmail } = require('../emails/pages/notification');
 const cache = require('../cache');
@@ -20,16 +22,18 @@ async function sendEmail(receiver, notification, { teamDid, node }) {
     throw new Error('notification is required');
   }
 
-  const blocklet = await node.getBlocklet({ did: teamDid, attachRuntimeInfo: false });
-  const config = blocklet.settings?.notification?.email || {};
+  const blocklet = await node.getBlocklet({ did: teamDid, useCache: true });
+  if (!blocklet) {
+    logger.warn(`Failed to get blocklet: ${teamDid}`);
+  }
+  const config = blocklet?.settings?.notification?.email || {};
 
   if (!config.enabled) {
     // skip send email
     return;
   }
-  delete config.enabled;
 
-  const { error, value: emailConfig } = emailConfigSchema.validate(config);
+  const { error, value: emailConfig } = emailConfigSchema.validate(omit(config, 'enabled'));
   if (error) {
     throw new Error(error.message);
   }
@@ -50,12 +54,21 @@ async function sendEmail(receiver, notification, { teamDid, node }) {
     url,
   };
 
-  const html = render(NotificationEmail({ ...notification, appInfo }));
+  // TODO: @zhanghan notification 目前并没有 locale 信息，无法实现多 locale 提示
+  const subject = `[${appInfo.title}] ${notification.title || 'You have received a notification'}`;
+
+  const html = render(
+    NotificationEmail({
+      subject,
+      ...notification,
+      appInfo,
+    })
+  );
   const emailData = {
     from: emailConfig.from,
     to: receiver,
     title: notification.title,
-    subject: notification.title,
+    subject,
     html,
   };
   const transporter = cache.getTransport({ did: teamDid, config: emailConfig });

package/api/services/studio/index.js

@@ -22,7 +22,12 @@ module.exports = {
           return res.status(400).json({ error: 'Blocklet Studio can only be used for blocklets in development mode' });
         }
 
-        const schemaFile = path.join(blocklet.env.appDir, BLOCKLET_PREFERENCE_FILE);
+        const component = blocklet.children.find((c) => c.meta.name === blocklet.meta.name);
+        if (!component || !component.deployedFrom) {
+          return res.status(400).json({ error: 'Can not find current component' });
+        }
+
+        const schemaFile = path.join(component.deployedFrom, BLOCKLET_PREFERENCE_FILE);
         if (fs.existsSync(schemaFile)) {
           try {
             const schema = JSON.parse(fs.readFileSync(schemaFile, 'utf8'));
@@ -41,7 +46,12 @@ module.exports = {
           return res.status(400).json({ error: 'Blocklet Studio can only be used for blocklets in development mode' });
         }
 
-        const schemaFile = path.join(blocklet.env.appDir, BLOCKLET_PREFERENCE_FILE);
+        const component = blocklet.children.find((c) => c.meta.name === blocklet.meta.name);
+        if (!component || !component.deployedFrom) {
+          return res.status(400).json({ error: 'Can not find current component' });
+        }
+
+        const schemaFile = path.join(component.deployedFrom, BLOCKLET_PREFERENCE_FILE);
         fs.writeFileSync(schemaFile, JSON.stringify(req.body, null, 2));
         return res.json(req.body);
       });

package/api/socket/channel/did.js

@@ -2,6 +2,7 @@ const {
   validateReceiver,
   validateNotification,
   validateMessage,
+  NOTIFICATION_TYPES,
 } = require('@blocklet/sdk/lib/validators/notification');
 const { NODE_MODES } = require('@abtnode/constant');
 const { getWalletDid } = require('@blocklet/sdk/lib/did');
@@ -90,10 +91,13 @@ const sendToDid = async ({ sender, receiver: rawDid, notification, options, node
         }
       });
     }
-    for (const receiverEmail of receiverEmailList) {
-      sendEmail(receiverEmail, data, { teamDid: sender.appDid, node }).catch((error) => {
-        logger.error('Failed to send email', { error });
-      });
+    // NOTICE: 目前只有 notification 的通知能够发送邮件，并且 type 可能为 undefined
+    if ([undefined, NOTIFICATION_TYPES.NOTIFICATION].includes(data.type)) {
+      for (const receiverEmail of receiverEmailList) {
+        sendEmail(receiverEmail, data, { teamDid: sender.appDid, node }).catch((error) => {
+          logger.error('Failed to send email', { error });
+        });
+      }
     }
   });
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.8-beta-b3039c78",
+  "version": "1.16.8-beta-186fd5aa",
   "description": "Provide unified services for every blocklet",
   "main": "api/index.js",
   "files": [
@@ -33,16 +33,16 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.8-beta-b3039c78",
-    "@abtnode/client": "1.16.8-beta-b3039c78",
-    "@abtnode/constant": "1.16.8-beta-b3039c78",
-    "@abtnode/core": "1.16.8-beta-b3039c78",
-    "@abtnode/cron": "1.16.8-beta-b3039c78",
-    "@abtnode/db": "1.16.8-beta-b3039c78",
-    "@abtnode/logger": "1.16.8-beta-b3039c78",
-    "@abtnode/router-adapter": "1.16.8-beta-b3039c78",
-    "@abtnode/router-templates": "1.16.8-beta-b3039c78",
-    "@abtnode/util": "1.16.8-beta-b3039c78",
+    "@abtnode/auth": "1.16.8-beta-186fd5aa",
+    "@abtnode/client": "1.16.8-beta-186fd5aa",
+    "@abtnode/constant": "1.16.8-beta-186fd5aa",
+    "@abtnode/core": "1.16.8-beta-186fd5aa",
+    "@abtnode/cron": "1.16.8-beta-186fd5aa",
+    "@abtnode/db": "1.16.8-beta-186fd5aa",
+    "@abtnode/logger": "1.16.8-beta-186fd5aa",
+    "@abtnode/router-adapter": "1.16.8-beta-186fd5aa",
+    "@abtnode/router-templates": "1.16.8-beta-186fd5aa",
+    "@abtnode/util": "1.16.8-beta-186fd5aa",
     "@arcblock/did": "^1.18.78",
     "@arcblock/did-auth": "1.18.78",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
@@ -51,11 +51,11 @@
     "@arcblock/jwt": "1.18.78",
     "@arcblock/validator": "^1.18.78",
     "@arcblock/ws": "1.18.78",
-    "@blocklet/constant": "1.16.8-beta-b3039c78",
+    "@blocklet/constant": "1.16.8-beta-186fd5aa",
     "@blocklet/form-builder": "^0.1.11",
     "@blocklet/form-collector": "^0.1.6",
-    "@blocklet/meta": "1.16.8-beta-b3039c78",
-    "@blocklet/sdk": "1.16.8-beta-b3039c78",
+    "@blocklet/meta": "1.16.8-beta-186fd5aa",
+    "@blocklet/sdk": "1.16.8-beta-186fd5aa",
     "@did-connect/authenticator": "^2.1.54",
     "@did-connect/relay-adapter-express": "^2.1.54",
     "@did-connect/storage-nedb": "^2.1.54",
@@ -96,7 +96,7 @@
     "@nedb/multi": "^2.0.5"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.16.8-beta-b3039c78",
+    "@abtnode/ux": "1.16.8-beta-186fd5aa",
     "@arcblock/did-connect": "^2.5.39",
     "@arcblock/icons": "^2.5.39",
     "@arcblock/ux": "^2.5.39",
@@ -163,5 +163,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "3f27acff94c144a1cf3dcf14bc1972c79a330641"
+  "gitHead": "3150c3a5c3e041fe7f5a3902418d9d62adee3173"
 }