@abtnode/blocklet-services 1.16.15-beta-89b542d3 → 1.16.15-beta-e143b1cf

package/api/libs/email.js

@@ -1,8 +1,7 @@
 const { Joi } = require('@arcblock/validator');
 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 getBlockletInfo = require('@blocklet/meta/lib/info');
 const logger = require('@abtnode/logger')('blocklet-services:notification');
 const omit = require('lodash/omit');
 
@@ -26,35 +25,33 @@ async function sendEmail(receiver, notification, { teamDid, node, locale }) {
   if (!blocklet) {
     logger.warn(`Failed to get blocklet: ${teamDid}`);
   }
-  const config = blocklet?.settings?.notification?.email || {};
+  const config = blocklet.settings?.notification?.email || {};
 
   if (!config.enabled) {
     // skip send email
     return;
   }
 
-  const { error, value: emailConfig } = emailConfigSchema.validate(omit(config, 'enabled'));
+  const { error, value } = emailConfigSchema.validate(omit(config, 'enabled'));
   if (error) {
     throw new Error(error.message);
   }
 
-  const nodeEnvironments = await node.states.node.getEnvironments();
-  const env = getSafeEnv(getRuntimeEnvironments(blocklet, nodeEnvironments));
-
-  const url = env?.BLOCKLET_APP_URL;
-  // logo 采用顺序：横板 logo -> 正方形 logo -> blocklet.yml 指定的 logo
+  const info = getBlockletInfo(blocklet);
+  // logo 采用顺序：横板 logo -> 正方形 logo
   const logo =
-    env?.BLOCKLET_APP_LOGO_RECT || env?.BLOCKLET_APP_LOGO_SQUARE || `${url}/.well-known/service/blocklet/logo/`;
+    blocklet.environmentObj?.BLOCKLET_APP_LOGO_RECT ||
+    `${info.appUrl}/.well-known/service/blocklet/logo?imageFilter=resize&h=80`;
 
   const appInfo = {
     logo,
-    description: blocklet?.meta?.description,
-    title: blocklet?.meta?.title || blocklet?.meta?.name,
-    version: blocklet?.meta?.version,
-    url,
+    description: info.description,
+    title: info.name,
+    version: info.version,
+    url: info.appUrl,
   };
 
-  const subject = `[${appInfo.title}] ${
+  const subject = `${
     notification.title ||
     { zh: '您收到了一个通知', en: 'You have received a notification' }[locale] ||
     'You have received a notification'
@@ -69,14 +66,14 @@ async function sendEmail(receiver, notification, { teamDid, node, locale }) {
     })
   );
   const emailData = {
-    from: emailConfig.user,
+    from: `"${info.name}" <${value.user}>`,
     to: receiver,
     title: notification.title,
     subject,
     html,
-    replyTo: emailConfig.from,
+    replyTo: value.from,
   };
-  const transporter = cache.getTransport({ did: teamDid, config: emailConfig });
+  const transporter = cache.getTransport({ did: teamDid, config: value });
   await transporter.sendMail(emailData);
 }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-89b542d3",
+  "version": "1.16.15-beta-e143b1cf",
   "description": "Provide unified services for every blocklet",
   "main": "api/index.js",
   "files": [
@@ -33,17 +33,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.15-beta-89b542d3",
-    "@abtnode/auth": "1.16.15-beta-89b542d3",
-    "@abtnode/client": "1.16.15-beta-89b542d3",
-    "@abtnode/connect-storage": "1.16.15-beta-89b542d3",
-    "@abtnode/constant": "1.16.15-beta-89b542d3",
-    "@abtnode/core": "1.16.15-beta-89b542d3",
-    "@abtnode/cron": "1.16.15-beta-89b542d3",
-    "@abtnode/logger": "1.16.15-beta-89b542d3",
-    "@abtnode/models": "1.16.15-beta-89b542d3",
-    "@abtnode/router-templates": "1.16.15-beta-89b542d3",
-    "@abtnode/util": "1.16.15-beta-89b542d3",
+    "@abtnode/analytics": "1.16.15-beta-e143b1cf",
+    "@abtnode/auth": "1.16.15-beta-e143b1cf",
+    "@abtnode/client": "1.16.15-beta-e143b1cf",
+    "@abtnode/connect-storage": "1.16.15-beta-e143b1cf",
+    "@abtnode/constant": "1.16.15-beta-e143b1cf",
+    "@abtnode/core": "1.16.15-beta-e143b1cf",
+    "@abtnode/cron": "1.16.15-beta-e143b1cf",
+    "@abtnode/logger": "1.16.15-beta-e143b1cf",
+    "@abtnode/models": "1.16.15-beta-e143b1cf",
+    "@abtnode/router-templates": "1.16.15-beta-e143b1cf",
+    "@abtnode/util": "1.16.15-beta-e143b1cf",
     "@arcblock/did": "^1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -52,11 +52,11 @@
     "@arcblock/jwt": "1.18.89",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/ws": "1.18.89",
-    "@blocklet/constant": "1.16.15-beta-89b542d3",
+    "@blocklet/constant": "1.16.15-beta-e143b1cf",
     "@blocklet/form-builder": "^0.1.11",
     "@blocklet/form-collector": "^0.1.6",
-    "@blocklet/meta": "1.16.15-beta-89b542d3",
-    "@blocklet/sdk": "1.16.15-beta-89b542d3",
+    "@blocklet/meta": "1.16.15-beta-e143b1cf",
+    "@blocklet/sdk": "1.16.15-beta-e143b1cf",
     "@did-connect/authenticator": "^2.2.0",
     "@did-connect/relay-adapter-express": "^2.2.0",
     "@did-connect/storage-nedb": "^2.2.0",
@@ -97,12 +97,12 @@
     "@nedb/core": "^2.1.2"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.16.15-beta-89b542d3",
+    "@abtnode/ux": "1.16.15-beta-e143b1cf",
     "@arcblock/did-connect": "^2.7.9",
     "@arcblock/icons": "^2.7.9",
     "@arcblock/ux": "^2.7.9",
     "@blocklet/launcher-layout": "2.1.101",
-    "@blocklet/tracker": "1.16.15-beta-89b542d3",
+    "@blocklet/tracker": "1.16.15-beta-e143b1cf",
     "@blocklet/ui-react": "^2.7.9",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -173,5 +173,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "a5302e43c87e7f33a35b1293d7b55579cc36fcc8"
+  "gitHead": "86dcc908f3cb7259d1ca92b9ae75160a6e43509a"
 }