@abtnode/blocklet-services 1.16.41-beta-20250318-123609-b48bb2d7 → 1.16.41-beta-20250319-131732-1224cca5

package/api/libs/email.js

@@ -1,8 +1,8 @@
 const { Joi } = require('@arcblock/validator');
 const { render } = require('@react-email/components');
-const { emailConfigSchema } = require('@blocklet/sdk/lib/validators/email');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
-const omit = require('lodash/omit');
+const { getEmailServiceProvider } = require('@abtnode/auth/lib/email');
+const { sendEmailWithLauncher } = require('@abtnode/auth/lib/launcher');
 
 const logger = require('./logger')('blocklet-services:notification');
 const { NotificationEmail } = require('../emails/pages/notification');
@@ -15,7 +15,7 @@ const validateEmail = schemaEmail.validateAsync.bind(schemaEmail);
 async function sendEmail(
   receiver,
   notification,
-  { teamDid, node, locale, unsubscribeToken = '', userInfo = {}, raw = false }
+  { teamDid, node, locale, unsubscribeToken = '', userInfo = {}, raw = false, launcher = false }
 ) {
   if (!receiver) {
     throw new Error('receiver is required');
@@ -30,68 +30,88 @@ async function sendEmail(
     logger.warn(`Failed to get blocklet: ${teamDid}`);
     throw new Error(`Failed to get blocklet: ${teamDid}`);
   }
-  const config = blocklet.settings?.notification?.email || {};
 
-  if (!config.enabled) {
-    // skip send email
-    throw new Error('Email Service is not Enabled.');
+  const provider = getEmailServiceProvider(blocklet);
+  logger.debug('service.sendEmail', { teamDid, provider, raw, launcher });
+  if (!provider || (provider === 'launcher' && !launcher)) {
+    throw new Error('Email Service is not available.');
   }
 
-  const { error, value } = emailConfigSchema.validate(omit(config, 'enabled'));
-  if (error) {
-    throw new Error(error.message);
-  }
+  if (provider === 'service') {
+    const config = blocklet.settings?.notification?.email;
+    const info = getBlockletInfo(blocklet);
+    const logo = `${info.appUrl}/.well-known/service/blocklet/logo-rect?imageFilter=convert&f=png`;
+
+    const appInfo = notification.appInfo || {
+      logo,
+      description: info.description,
+      title: info.name,
+      version: info.version,
+      url: info.appUrl,
+    };
 
-  const info = getBlockletInfo(blocklet);
-  const logo = `${info.appUrl}/.well-known/service/blocklet/logo-rect?imageFilter=convert&f=png`;
-
-  const appInfo = notification.appInfo || {
-    logo,
-    description: info.description,
-    title: info.name,
-    version: info.version,
-    url: info.appUrl,
-  };
-
-  const subject = `${
-    notification.title ||
-    { zh: '您收到了一个通知', en: 'You have received a notification' }[locale] ||
-    'You have received a notification'
-  }`;
-
-  const html = render(
-    NotificationEmail({
+    const subject = `${
+      notification.title ||
+      { zh: '您收到了一个通知', en: 'You have received a notification' }[locale] ||
+      'You have received a notification'
+    }`;
+
+    const html = render(
+      NotificationEmail({
+        subject,
+        appInfo,
+        ...notification,
+        locale,
+        raw,
+        unsubscribeToken,
+        userInfo: {
+          ...userInfo,
+          email: receiver,
+        },
+      })
+    );
+
+    const emailData = {
+      from: `"${appInfo.title}" <${config.from}>`,
+      to: receiver,
+      title: notification.title,
       subject,
-      appInfo,
-      ...notification,
-      locale,
-      raw,
-      unsubscribeToken,
-      userInfo: {
-        ...userInfo,
-        email: receiver,
-      },
-    })
-  );
-  const emailData = {
-    from: `"${appInfo.title}" <${value.from}>`,
-    to: receiver,
-    title: notification.title,
-    subject,
-    html,
-    replyTo: value.from,
-  };
-  if (process.env.NODE_ENV === 'test') {
-    return {
-      messageId: 'test-message-id',
-      accepted: [emailData.to],
-      rejected: [],
-      response: 'Test environment - Email skipped',
+      html,
+      replyTo: config.from,
     };
+
+    if (process.env.NODE_ENV === 'test') {
+      return {
+        messageId: 'test-message-id',
+        accepted: [emailData.to],
+        rejected: [],
+        response: 'Test environment - Email skipped',
+      };
+    }
+    const transporter = cache.getTransport({ did: teamDid, config });
+    const result = await transporter.sendMail(emailData);
+    return result;
   }
-  const transporter = cache.getTransport({ did: teamDid, config: value });
-  const result = await transporter.sendMail(emailData);
-  return result;
+
+  if (provider === 'launcher') {
+    if (!blocklet.controller) {
+      throw new Error('Launcher info not available.');
+    }
+
+    const info = await node.getNodeInfo({ useCache: true });
+    const result = await sendEmailWithLauncher(info.sk, blocklet.controller, {
+      receiver,
+      notification,
+      options: { locale, raw },
+    });
+    if (result.error) {
+      throw new Error(result.error);
+    }
+
+    return result;
+  }
+
+  throw new Error('Unknown email provider.');
 }
 
 module.exports = {

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

@@ -18,7 +18,7 @@ const { getTemplate } = require('./template');
 const { getCacheFilePath } = require('../image');
 const emoji = require('./emoji');
 
-const TEMPLATES = ['default', 'section', 'cover'];
+const TEMPLATES = ['default', 'section', 'cover', 'banner'];
 const MAX_TITLE_LENGTH = 128;
 const MAX_DESCRIPTION_LENGTH = 512;
 const MAX_IMAGE_SIZE = 5 * 1024 * 1024;
@@ -69,7 +69,11 @@ const schema = Joi.object({
   // customize logo
   logo: Joi.string()
     .uri({ scheme: ['https'] })
-    .optional(),
+    .when('template', {
+      is: 'banner',
+      then: Joi.required(),
+      otherwise: Joi.optional().default(''),
+    }),
   logoRounded: Joi.string().allow('0', '1').optional(),
 
   // custom emoji
@@ -110,13 +114,19 @@ const getOgImage = ({ input, info, cacheDir, format, tmpDir }) => {
   }
 
   value.logoRounded = value.logoRounded === '1';
-  value.background = joinURL(
-    info.appUrl,
-    WELLKNOWN_SERVICE_PATH_PREFIX,
-    `/blocklet/og-image?imageFilter=resize&w=1200&h=630&hash=${info.ogImageHash || ''}`
-  );
+  if (value.template === 'banner') {
+    value.background = joinURL(info.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, '/static/images/banner.png');
+  } else {
+    value.background = joinURL(
+      info.appUrl,
+      WELLKNOWN_SERVICE_PATH_PREFIX,
+      `/blocklet/og-image?imageFilter=resize&w=1200&h=630&hash=${info.ogImageHash || ''}`
+    );
+  }
 
-  const params = { ...value, width: 1200, height: 630, color, format };
+  const width = value.template === 'banner' ? 1280 : 1200;
+  const height = value.template === 'banner' ? 441 : 630;
+  const params = { ...value, width, height, color, format };
   const cacheKey = md5(stringify(params));
   const nocache = input.nocache === '1';
   const destPath = getCacheFilePath(cacheDir, `${cacheKey}.${format}`);
@@ -166,7 +176,7 @@ const convertExternalImage = (url, dest, height) => {
         },
         (res) => {
           if (res.statusCode && res.statusCode >= 400) {
-            reject(new CustomError(400, `unexpected external image status: ${res.statusCode}`));
+            reject(new CustomError(400, `unexpected external image status: ${res.statusCode} ${url}`));
             return;
           }
 
@@ -207,8 +217,8 @@ const convertExternalImage = (url, dest, height) => {
   });
 };
 
-const getCachedExternalImage = (cacheKey, port = process.env.ABT_NODE_SERVICE_PORT) => {
-  return `http://127.0.0.1:${port}/open-graph/${cacheKey.slice(0, 2)}/${cacheKey.slice(2)}.png`;
+const getCachedExternalImage = (cacheKey) => {
+  return `http://127.0.0.1:${process.env.ABT_NODE_SERVICE_PORT}/open-graph/${cacheKey.slice(0, 2)}/${cacheKey.slice(2)}.png`;
 };
 
 const cacheTasks = {};

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

@@ -83,9 +83,9 @@ const getSectionTemplate = (
   { width, height, logo, logoRounded, background, color, title, description, section },
   fn
 ) => {
-  return fn` <div
+  return fn`<div
     style="
-    width: ${width};
+    width: ${width}px;
     height: ${height}px;
     background-image: url(${background});
     background-size: cover;
@@ -200,6 +200,42 @@ const getCoverTemplate = ({ width, height, logo, logoRounded, color, title, desc
   </div>`;
 };
 
+const getBannerTemplate = ({ width, height, logo, logoRounded, background, title }, fn) => {
+  return fn`<div
+    style="
+    width: ${width}px;
+    height: ${height}px;
+    background-image: url(${background});
+    background-size: cover;
+    background-position: center;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+  "
+  >
+    <img
+      src="${logo}"
+      height="150"
+      width="150"
+      style="height: 150px; width: 150px; ${logoRounded ? 'border-radius: 50%;' : ''} margin-right: 48px"
+    />
+    <h2
+      style="
+      font-size: 72px;
+      color: #eee;
+      font-weight: 500;
+      font-family: Arial, sans-serif;
+      text-align: left;
+      line-clamp: 1;
+    "
+    >
+      ${title}
+    </h2>
+  </div>`;
+};
+
 const getTemplate = async (params) => {
   // eslint-disable-next-line import/no-unresolved
   const { html } = await import('satori-html');
@@ -214,6 +250,9 @@ const getTemplate = async (params) => {
   if (params.template === 'cover') {
     return getCoverTemplate(params, fn);
   }
+  if (params.template === 'banner') {
+    return getBannerTemplate(params, fn);
+  }
 
   throw new Error('Invalid open graph template');
 };

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

@@ -362,12 +362,24 @@ module.exports = function createRoutes(node, _, createSessionToken) {
 
       // restart blocklet (not use queue)
       node
-        .stopBlocklet({ did: appPid })
+        .stopBlocklet({ did: appPid, updateStatus: false })
         .then(() => {
-          return node.startBlocklet({ did: appPid });
+          return node.startBlocklet({ did: appPid, checkHealthImmediately: true, throwOnError: true, atomic: true });
+        })
+        .then((doc) => {
+          logger.info('restart blocklet success after transfer ownership', { appPid });
+          return node.createAuditLog(
+            {
+              action: 'restartBlocklet',
+              args: { did: appPid },
+              context: formatContext(req),
+              result: doc,
+            },
+            node
+          );
         })
         .catch((error) => {
-          logger.error('restart blocklet failed', { appPid, error });
+          logger.error('restart blocklet failed after transfer ownership', { appPid, error });
         });
 
       await sleep(3000);

package/api/services/kyc/index.js

@@ -113,6 +113,7 @@ const init = ({ node }) => {
           node,
           locale: req.query.locale,
           raw: true,
+          launcher: true,
         }
       );
       logger.info('send verify code', { teamDid, result });

package/api/socket/channel/did.js

@@ -458,13 +458,14 @@ const sendToMail = async ({ sender, receiver, notification, options, node, pushO
 
   const notifications = parseNotification({ id, ...rest }, senderInfo);
 
-  const { locale = 'en' } = options || {};
+  const { locale = 'en', raw = false } = options || {};
   const results = await Promise.allSettled(
     receivers.map((email) => {
       return sendEmail(email, notifications[0], {
         teamDid: sender.appDid,
         node,
         locale,
+        raw,
         ...(unsubscribeToken ? { unsubscribeToken } : {}),
         ...(userInfo ? { userInfo } : {}),
       });

package/dist/assets/{ArrowDropDown-Do4OWmCn.js → ArrowDropDown-ydRfHJ2x.js}

@@ -1 +1 @@
-import{a1 as e,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-BUS40ceY.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),p=t;u=r.default=(0,i.default)((0,p.jsx)("path",{d:"m7 10 5 5 5-5z"}),"ArrowDropDown");export{u as d};
+import{a1 as e,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),p=t;u=r.default=(0,i.default)((0,p.jsx)("path",{d:"m7 10 5 5 5-5z"}),"ArrowDropDown");export{u as d};

package/dist/assets/{CheckCircle-DDHElFhm.js → CheckCircle-DgSwRUf8.js}

@@ -1 +1 @@
-import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-BUS40ceY.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m-2 15-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8z"}),"CheckCircle");export{u as d};
+import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m-2 15-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8z"}),"CheckCircle");export{u as d};

package/dist/assets/{ChevronLeft-CLfrYODg.js → ChevronLeft-CqDoHwdJ.js}

@@ -1 +1 @@
-import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-BUS40ceY.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,f=o(a()),i=t;u=e.default=(0,f.default)((0,i.jsx)("path",{d:"M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z"}),"ChevronLeft");export{u as d};
+import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,f=o(a()),i=t;u=e.default=(0,f.default)((0,i.jsx)("path",{d:"M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z"}),"ChevronLeft");export{u as d};

package/dist/assets/{ChevronRight-OJJ2SUEU.js → ChevronRight-Bpkf9aqI.js}

@@ -1 +1 @@
-import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-BUS40ceY.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),v=t;u=e.default=(0,i.default)((0,v.jsx)("path",{d:"M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"}),"ChevronRight");export{u as d};
+import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),v=t;u=e.default=(0,i.default)((0,v.jsx)("path",{d:"M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"}),"ChevronRight");export{u as d};

package/dist/assets/{DeleteOutline-C954mj84.js → DeleteOutline-D4DYIaUj.js}

@@ -1 +1 @@
-import{a1 as t,j as r}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-BUS40ceY.js";var e={},u=t;Object.defineProperty(e,"__esModule",{value:!0});var o=e.default=void 0,i=u(a()),l=r;o=e.default=(0,i.default)((0,l.jsx)("path",{d:"M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6zM8 9h8v10H8zm7.5-5-1-1h-5l-1 1H5v2h14V4z"}),"DeleteOutline");export{o as d};
+import{a1 as t,j as r}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},u=t;Object.defineProperty(e,"__esModule",{value:!0});var o=e.default=void 0,i=u(a()),l=r;o=e.default=(0,i.default)((0,l.jsx)("path",{d:"M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6zM8 9h8v10H8zm7.5-5-1-1h-5l-1 1H5v2h14V4z"}),"DeleteOutline");export{o as d};

package/dist/assets/{Done-BXwXbLQs.js → Done-B8c93MpP.js}

@@ -1 +1 @@
-import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-BUS40ceY.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M9 16.2 4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4z"}),"Done");export{u as d};
+import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M9 16.2 4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4z"}),"Done");export{u as d};

package/dist/assets/{Download-OmIe8_8C.js → Download-DANYdeZR.js}

@@ -1 +1 @@
-import{a1 as r,j as a}from"./vendor-mui-core-O22FPGM4.js";import{r as t}from"./vendor-ux-did-connect-BUS40ceY.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,d=o(t()),i=a;u=e.default=(0,d.default)((0,i.jsx)("path",{d:"M5 20h14v-2H5zM19 9h-4V3H9v6H5l7 7z"}),"Download");export{u as d};
+import{a1 as r,j as a}from"./vendor-mui-core-O22FPGM4.js";import{r as t}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,d=o(t()),i=a;u=e.default=(0,d.default)((0,i.jsx)("path",{d:"M5 20h14v-2H5zM19 9h-4V3H9v6H5l7 7z"}),"Download");export{u as d};

package/dist/assets/{Error-CXMTbOyQ.js → Error-wKO1hXtU.js}

@@ -1 +1 @@
-import{a1 as e,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-BUS40ceY.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),s=t;u=r.default=(0,i.default)((0,s.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-2h2zm0-4h-2V7h2z"}),"Error");export{u as d};
+import{a1 as e,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),s=t;u=r.default=(0,i.default)((0,s.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-2h2zm0-4h-2V7h2z"}),"Error");export{u as d};

package/dist/assets/{ExpandLess-xJAJmJam.js → ExpandLess-BqrBuxL9.js}

@@ -1 +1 @@
-import{a1 as r,j as a}from"./vendor-mui-core-O22FPGM4.js";import{r as t}from"./vendor-ux-did-connect-BUS40ceY.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var s=e.default=void 0,u=o(t()),d=a;s=e.default=(0,u.default)((0,d.jsx)("path",{d:"m12 8-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"}),"ExpandLess");export{s as d};
+import{a1 as r,j as a}from"./vendor-mui-core-O22FPGM4.js";import{r as t}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var s=e.default=void 0,u=o(t()),d=a;s=e.default=(0,u.default)((0,d.jsx)("path",{d:"m12 8-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"}),"ExpandLess");export{s as d};