@abtnode/blocklet-services 1.16.54-beta-20251029-055649-a9143beb → 1.16.54-beta-20251029-230008-54c9843b

package/api/index.js

@@ -62,7 +62,6 @@ 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 notificationQueue = require('./services/notification/queue');
 const { init: initAuth } = require('./services/auth');
 const { init: initDashboard } = require('./services/dashboard');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251029-055649-a9143beb",
+  "version": "1.16.54-beta-20251029-230008-54c9843b",
   "description": "Provide unified services for every blocklet",
   "main": "api/index.js",
   "files": [
@@ -34,17 +34,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/auth": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/connect-storage": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/constant": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/core": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/cron": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/db-cache": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/logger": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/models": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/router-templates": "1.16.54-beta-20251029-055649-a9143beb",
-    "@abtnode/util": "1.16.54-beta-20251029-055649-a9143beb",
+    "@abtnode/analytics": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/auth": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/connect-storage": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/constant": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/core": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/cron": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/db-cache": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/logger": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/models": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/router-templates": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/util": "1.16.54-beta-20251029-230008-54c9843b",
     "@arcblock/did": "^1.26.3",
     "@arcblock/did-connect-js": "^1.26.3",
     "@arcblock/did-ext": "^1.26.3",
@@ -54,18 +54,18 @@
     "@arcblock/jwt": "^1.26.3",
     "@arcblock/validator": "^1.26.3",
     "@arcblock/ws": "^1.26.3",
-    "@blocklet/constant": "1.16.54-beta-20251029-055649-a9143beb",
+    "@blocklet/constant": "1.16.54-beta-20251029-230008-54c9843b",
     "@blocklet/dbhub": "^0.2.9",
-    "@blocklet/env": "1.16.54-beta-20251029-055649-a9143beb",
+    "@blocklet/env": "1.16.54-beta-20251029-230008-54c9843b",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-builder": "^0.1.12",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.54-beta-20251029-055649-a9143beb",
-    "@blocklet/js-sdk": "1.16.54-beta-20251029-055649-a9143beb",
-    "@blocklet/meta": "1.16.54-beta-20251029-055649-a9143beb",
-    "@blocklet/rate-limit": "1.16.54-beta-20251029-055649-a9143beb",
-    "@blocklet/sdk": "1.16.54-beta-20251029-055649-a9143beb",
-    "@blocklet/server-js": "1.16.54-beta-20251029-055649-a9143beb",
+    "@blocklet/images": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/js-sdk": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/meta": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/rate-limit": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/sdk": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/server-js": "1.16.54-beta-20251029-230008-54c9843b",
     "@blocklet/theme": "^3.1.53",
     "@blocklet/theme-builder": "0.4.7",
     "@blocklet/uploader-server": "^0.3.1",
@@ -125,7 +125,7 @@
     "whatwg-url": "14.0.0"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.16.54-beta-20251029-055649-a9143beb",
+    "@abtnode/ux": "1.16.54-beta-20251029-230008-54c9843b",
     "@arcblock/bridge": "^3.1.53",
     "@arcblock/did-connect-react": "^3.1.53",
     "@arcblock/icons": "^3.1.53",
@@ -135,7 +135,7 @@
     "@blocklet/did-space-react": "^1.1.35",
     "@blocklet/launcher-layout": "^3.1.53",
     "@blocklet/payment-react": "^1.22.0",
-    "@blocklet/tracker": "1.16.54-beta-20251029-055649-a9143beb",
+    "@blocklet/tracker": "1.16.54-beta-20251029-230008-54c9843b",
     "@blocklet/ui-react": "^3.1.53",
     "@blocklet/uploader": "^0.3.1",
     "@emotion/react": "^11.14.0",
@@ -215,5 +215,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "4ac4eebb4ade000c0fca21b1d542054a9dafd776"
+  "gitHead": "21cf7881f5759a9b82e1a852286f048af112bafa"
 }

package/api/services/notification/blocklet-events-notifier.js

@@ -1,215 +0,0 @@
-const get = require('lodash/get');
-const uniqBy = require('lodash/uniqBy');
-const uniq = require('lodash/uniq');
-const { isInstanceWorker } = require('@abtnode/util/lib/pm2/is-instence-worker');
-const JWT = require('@arcblock/jwt');
-
-const { ROLES } = require('@abtnode/constant');
-const { BlockletEvents, TeamEvents } = require('@blocklet/constant');
-
-const eventHub =
-  process.env.NODE_ENV === 'test' ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
-
-const logger = require('../../libs/logger')('notification');
-const cache = require('../../cache');
-
-const getComponentNamesWithVersion = (app) => {
-  const { componentDids = [], children = [] } = app;
-
-  const componentNames = uniq(componentDids).map((x) => {
-    const component = children.find((y) => y.meta.did === x);
-    return `${component.meta.title}@${component.meta.version}`;
-  });
-
-  return `${componentNames}`;
-};
-
-const messages = {
-  [BlockletEvents.componentInstalled]: ({ data }) => ({
-    title: {
-      en: 'Component Installed Success',
-      zh: '组件安装成功',
-    },
-    body: {
-      en: `Component ${getComponentNamesWithVersion(data)} is installed successfully for ${data.meta.title}.`,
-      zh: `${data.meta.title} 中的组件 ${getComponentNamesWithVersion(data)} 安装成功`,
-    },
-  }),
-  [BlockletEvents.componentInstallFailed]: ({ data }) => ({
-    title: {
-      en: 'Component Install Failed',
-      zh: '组件安装失败',
-    },
-    body: {
-      en: `${getComponentNamesWithVersion(data)} installed failed for ${data.meta.title}: ${data?.error?.message}`,
-      zh: `${data.meta.title} 中的组件 ${getComponentNamesWithVersion(data)} 安装失败: ${data?.error?.message}`,
-    },
-  }),
-  [BlockletEvents.componentUpgraded]: ({ data }) => ({
-    title: {
-      en: 'Component Upgrade Success',
-      zh: '组件升级成功',
-    },
-    body: {
-      en: `${getComponentNamesWithVersion(data)} is upgraded successfully for ${data.meta.title}.`,
-      zh: `${data.meta.title} 中的组件 ${getComponentNamesWithVersion(data)} 升级成功`,
-    },
-  }),
-  [BlockletEvents.componentUpgradeFailed]: ({ data }) => ({
-    title: {
-      en: 'Component Upgrade Failed',
-      zh: '组件升级失败',
-    },
-    body: {
-      en: `${getComponentNamesWithVersion(data)} upgraded failed for ${data.meta.title}: ${data?.error?.message}`,
-      zh: `${data.meta.title} 中的组件 ${getComponentNamesWithVersion(data)} 升级失败: ${data?.error?.message}`,
-    },
-  }),
-  [BlockletEvents.componentRemoved]: ({ data }) => ({
-    title: {
-      en: 'Component Removed Success',
-      zh: '组件删除成功',
-    },
-    body: {
-      en: `${getComponentNamesWithVersion(data)} is removed successfully for ${data.meta.title}.`,
-      zh: `${data.meta.title} 中的组件 ${getComponentNamesWithVersion(data)} 删除成功`,
-    },
-  }),
-  [BlockletEvents.started]: ({ data = {} }) => {
-    return {
-      title: {
-        en: 'Component Start Success',
-        zh: '组件启动成功',
-      },
-      body: {
-        en: `${getComponentNamesWithVersion(data)} started successfully for ${data.meta.title}.`,
-        zh: `${data.meta.title} 中的组件 ${getComponentNamesWithVersion(data)}  启动成功`,
-      },
-    };
-  },
-
-  [BlockletEvents.startFailed]: ({ data }) => ({
-    title: {
-      en: 'Component Start Failed',
-      zh: 'Component 启动失败',
-    },
-    body: {
-      en: `${getComponentNamesWithVersion(data)} started failed: ${data.error?.message}`,
-      zh: `${data.meta.title} 中的组件 ${getComponentNamesWithVersion(data)} 启动失败: ${data.error?.message}`,
-    },
-  }),
-  [BlockletEvents.stopped]: ({ data = {} }) => {
-    return {
-      title: {
-        en: 'Component Stop Success',
-        zh: '组件已停止运行',
-      },
-      body: {
-        en: `${
-          data?.componentDids?.length ? getComponentNamesWithVersion(data) : 'All components'
-        } stopped successfully for ${data.meta.title}.`,
-        zh: `${data.meta.title}${
-          data?.componentDids?.length ? `中的组件 ${getComponentNamesWithVersion(data)}` : ''
-        } 已停止运行`,
-      },
-    };
-  },
-  [TeamEvents.userAdded]: ({ data }) => ({
-    title: {
-      en: 'New member join',
-      zh: '新成员加入',
-    },
-    body: {
-      en: `Member with Name (${data.user?.fullName}) and DID (${data.user?.did}) has joined this Blocklet`,
-      zh: `成员 ${data.user?.fullName} (DID: ${data.user?.did}) 已加入此 Blocklet`,
-    },
-  }),
-};
-
-const DEFAULT_LOCALE = 'en';
-
-// eslint-disable-next-line no-unused-vars
-const init = ({ node, notificationService }) => {
-  [
-    BlockletEvents.componentInstalled,
-    BlockletEvents.componentInstallFailed,
-    BlockletEvents.componentUpgraded,
-    BlockletEvents.componentUpgradeFailed,
-    BlockletEvents.componentRemoved,
-    BlockletEvents.started,
-    BlockletEvents.startFailed,
-    BlockletEvents.stopped,
-
-    TeamEvents.userAdded,
-
-    // The blocklet owner does not need to receive removed events
-    // BlockletEvents.removed,
-  ].forEach((eventName) => {
-    eventHub.on(eventName, async (data) => {
-      // Only first worker process handle blocklet event
-      if (isInstanceWorker()) {
-        return;
-      }
-
-      try {
-        const did = get(data, 'meta.did') || get(data, 'teamDid');
-
-        const error = get(data, 'error');
-
-        const blockletInfo = await cache.getBlockletInfo({ did, node });
-        const { wallet } = blockletInfo;
-
-        // FIXME: BLOCKLET ADMIN is more than 50
-        const { users: adminUsers } = await node.getUsers({
-          teamDid: did,
-          query: { approved: true, role: ROLES.ADMIN },
-          paging: { pageSize: 50 },
-        });
-
-        const { users: ownerUsers } = await node.getUsers({
-          teamDid: did,
-          query: { approved: true, role: ROLES.OWNER },
-        });
-
-        const users = uniqBy((adminUsers || []).concat(ownerUsers).filter(Boolean), 'did');
-
-        if (!users.length) {
-          return;
-        }
-
-        const token = await JWT.sign(wallet.address, wallet.secretKey);
-        const sender = { token, appDid: wallet.address };
-
-        const message = messages[eventName]({ data, blockletInfo, error });
-
-        // send message to each user
-        users.forEach(({ did: userDid, locale = 'en' }) => {
-          // eslint-disable-next-line no-unused-vars
-          const input = {
-            sender,
-            receiver: userDid,
-            notification: {
-              title: message.title[locale] || message.title[DEFAULT_LOCALE],
-              body: message.body[locale] || message.body[DEFAULT_LOCALE],
-              source: 'app',
-            },
-          };
-          // 注释原因：
-          // 1. 重复逻辑，
-          //   a. 这里的消息监听是通过 this.emit() 推送的。然后通过 sendToUser 发送给用户。
-          //      调用 this.emit() 的地方都有 _createNotification() 方法，在 _createNotification 方法中又 重新调用 this.emit() 方法将消息发送给用户；
-          //      在 _createNotification() 方法中推送的事件不同，但是结果都会向用户推送相同的消息
-          // 2. 存在的问题
-          //   a. 缺少用户信息，基于 L163~L174 代码可以看出这里获取的用户信息只有 teamDid 对应的 service 用户，没有 server 用户
-          // notificationService.sendToUser.exec(input).catch((notificationError) => {
-          //   logger.error('sendToUser error', { error: notificationError, input });
-          // });
-        });
-      } catch (error) {
-        logger.error('Handle event failed', { eventName, error });
-      }
-    });
-  });
-};
-
-module.exports = { init };