@abtnode/blocklet-services 1.16.39-beta-20250215-130252-43410928 → 1.16.39-beta-20250218-110004-a308c501

package/api/index.js

@@ -50,7 +50,8 @@ const states = require('./state/index');
 const { init: initNotification } = require('./services/notification');
 const { init: initKyc } = require('./services/kyc');
 const { init: initRelay } = require('./services/relay');
-const BlockletEventsNotifier = require('./services/notification/blocklet-events-notifier');
+// const BlockletEventsNotifier = require('./services/notification/blocklet-events-notifier');
+const notificationQueue = require('./services/notification/notification-queue');
 const { init: initAuth } = require('./services/auth');
 const { init: initDashboard } = require('./services/dashboard');
 const StaticService = require('./services/static');
@@ -764,7 +765,10 @@ self.blocklet = {
     });
   });
 
-  BlockletEventsNotifier.init({ node, notificationService });
+  // BlockletEventsNotifier.init({ node, notificationService });
+  if (process.env.NODE_ENV !== 'test') {
+    notificationQueue.init({ node, notificationService });
+  }
 
   server.sendToAppComponents = ({ event, appDid, data }) =>
     notificationService.sendToAppComponents.exec({ event, appDid, data });

package/api/libs/email.js

@@ -28,13 +28,13 @@ async function sendEmail(
   const blocklet = await node.getBlocklet({ did: teamDid, useCache: true });
   if (!blocklet) {
     logger.warn(`Failed to get blocklet: ${teamDid}`);
-    return null;
+    throw new Error(`Failed to get blocklet: ${teamDid}`);
   }
   const config = blocklet.settings?.notification?.email || {};
 
   if (!config.enabled) {
     // skip send email
-    return null;
+    throw new Error('Email Service is not Enabled.');
   }
 
   const { error, value } = emailConfigSchema.validate(omit(config, 'enabled'));

package/api/services/notification/index.js

@@ -196,20 +196,22 @@ const init = ({ node }) => {
       attach: (app) => {
         app.post(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/send-to-push-kit`, onSendToPush);
       },
-      exec: (data) => sendToMail({ ...data, node, wsServer }),
+      exec: (data) => sendToPush({ ...data, node, wsServer }),
     },
 
     sendToWebhook: {
       attach: (app) => {
         app.post(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/send-to-webhook`, onSendToWebhook);
       },
+      exec: (data) => sendToWebhook({ ...data, node, wsServer }),
     },
 
     sendToApp: {
       attach: (app) => {
         app.post(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/send-to-wallet`, onSendToWallet);
       },
-      exec: ({ event, appDid, data }) => sendToAppDid({ event, appDid, data, node, wsServer }),
+      exec: ({ event, appDid, data, sender, notification, receiver, ...rest }) =>
+        sendToAppDid({ event, sender, appDid, data, node, wsServer, notification, receiver, ...rest }),
     },
 
     sendToAppComponents: {