@abtnode/core 1.17.3-beta-20251117-230305-4637416e → 1.17.3-beta-20251119-034511-f26047c0

package/lib/index.js

@@ -669,6 +669,7 @@ function ABTNode(options) {
     getNotificationComponents: teamAPI.getNotificationComponents.bind(teamAPI),
     resendNotification: blockletManager.resendNotification.bind(blockletManager),
     getReceivers: teamAPI.getReceivers.bind(teamAPI),
+    getNotificationStats: teamAPI.getNotificationStats.bind(teamAPI),
 
     // AuditLog
     createAuditLog: async (params) => {

package/lib/states/notification.js

@@ -4,6 +4,7 @@ const { Sequelize, Op } = require('sequelize');
 const { isValid } = require('@arcblock/did');
 const { Joi } = require('@arcblock/validator');
 const { ROLES, SERVER_ROLES, NOTIFICATION_SEND_CHANNEL, NOTIFICATION_SEND_STATUS } = require('@abtnode/constant');
+const dayjs = require('@abtnode/util/lib/dayjs');
 const BaseState = require('./base');
 const { getReceiversStatistics } = require('../util/notification');
 
@@ -954,6 +955,52 @@ class NotificationState extends BaseState {
     });
     return Number(countResult.total);
   }
+
+  async getNotificationsBySince({ since = '1h' }) {
+    // 解析 since 参数，格式为 "数字h"，例如 "1h", "24h"
+    const sinceMatch = since.match(/^(\d+)h$/);
+    if (!sinceMatch) {
+      throw new Error('Invalid since format. Expected format: "1h", "2h", "24h", etc.');
+    }
+
+    const hours = parseInt(sinceMatch[1], 10);
+
+    // 验证范围：最小 1h，最大 24h
+    if (hours < 1 || hours > 24) {
+      throw new Error('The since parameter must be between 1h and 24h.');
+    }
+
+    // 计算时间范围
+    const startTime = dayjs().subtract(hours, 'hours').toDate();
+
+    // 第一步：在 notifications 表中查询符合时间范围的通知 ID
+    const notifications = await this.model.findAll({
+      where: {
+        createdAt: {
+          [Op.gte]: startTime,
+        },
+      },
+      attributes: ['id'],
+    });
+
+    // 如果没有找到符合条件的通知，直接返回空数组
+    if (notifications.length === 0) {
+      return [];
+    }
+
+    // 提取通知 ID 列表
+    const notificationIds = notifications.map((n) => n.id);
+
+    // 第二步：根据通知 ID 在 notification_receivers 表中查询数据
+    return this.notificationReceivers.model.findAll({
+      where: {
+        notificationId: {
+          [Op.in]: notificationIds,
+        },
+      },
+      order: [['createdAt', 'DESC']],
+    });
+  }
 }
 
 module.exports = NotificationState;

package/lib/util/blocklet.js

@@ -2,9 +2,9 @@
 /* eslint-disable no-await-in-loop */
 
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const shelljs = require('shelljs');
-const os = require('os');
+const os = require('node:os');
 const tar = require('tar');
 const get = require('lodash/get');
 const isNil = require('lodash/isNil');
@@ -338,7 +338,7 @@ const fillBlockletConfigs = (blocklet, configs) => {
   }, {});
 };
 
-const ensureBlockletExpanded = async (meta, appDir) => {
+const ensureBlockletExpanded = async (_meta, appDir) => {
   const bundlePath = path.join(appDir, BLOCKLET_BUNDLE_FILE);
   if (fs.existsSync(bundlePath)) {
     try {
@@ -773,7 +773,6 @@ const startBlockletProcess = async (
 
     // start process
     const maxMemoryRestart = get(nodeInfo, 'runtimeConfig.blockletMaxMemoryLimit', BLOCKLET_MAX_MEM_LIMIT_IN_MB);
-
     const processIdName = isGreen ? `${processId}-green` : processId;
     /**
      * @type {pm2.StartOptions}
@@ -800,8 +799,8 @@ const startBlockletProcess = async (
           BLOCKLET_START_AT: now,
           NODE_OPTIONS: await getSecurityNodeOptions(b, nodeInfo.enableFileSystemIsolation),
         },
-        // should not inject appSk and appPsk to the blocklet environment
-        process.env.WITH_SK ? [] : ['BLOCKLET_APP_SK', 'BLOCKLET_APP_PSK']
+        // should only inject appSk and appPsk to the blocklet environment when unsafe mode enabled
+        ['1', 1].includes(env.UNSAFE_MODE) ? [] : ['BLOCKLET_APP_SK', 'BLOCKLET_APP_PSK']
       ),
       script,
       args,
@@ -1158,11 +1157,11 @@ const checkBlockletProcessHealthy = async (
   blocklet,
   { minConsecutiveTime, timeout, componentDids, setBlockletRunning, isGreen = false, appDid } = {}
 ) => {
-  if (process.env.NODE_ENV === 'test' && process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME) {
-    // need bigger than minConsecutiveTime in test env
-    // eslint-disable-next-line no-param-reassign
-    timeout = Math.max(+process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME * 10, minConsecutiveTime + 1000);
-  }
+  // if (process.env.NODE_ENV === 'test' && process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME) {
+  //   // need bigger than minConsecutiveTime in test env
+  //   // eslint-disable-next-line no-param-reassign
+  //   timeout = Math.max(+process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME * 10, minConsecutiveTime + 3000);
+  // }
   await forEachBlocklet(
     blocklet,
     async (b) => {
@@ -1457,7 +1456,7 @@ const getRuntimeInfo = async (processId) => {
     return {
       ...dockerInfo,
       pid: proc.pid,
-      uptime: proc.pm2_env ? +new Date() - Number(proc.pm2_env.pm_uptime) : 0,
+      uptime: proc.pm2_env ? Date.now() - Number(proc.pm2_env.pm_uptime) : 0,
       port: proc.pm2_env ? proc.pm2_env.BLOCKLET_PORT : null,
       status: proc.pm2_env ? proc.pm2_env.status : null,
       runningDocker: !!dockerName,
@@ -1465,7 +1464,7 @@ const getRuntimeInfo = async (processId) => {
   }
   return {
     pid: proc.pid,
-    uptime: proc.pm2_env ? +new Date() - Number(proc.pm2_env.pm_uptime) : 0,
+    uptime: proc.pm2_env ? Date.now() - Number(proc.pm2_env.pm_uptime) : 0,
     memoryUsage: proc.monit.memory,
     cpuUsage: proc.monit.cpu,
     status: proc.pm2_env ? proc.pm2_env.status : null,
@@ -2385,7 +2384,7 @@ const shouldSkipComponent = (componentDid, whiteList) => {
   return !arr.includes(componentDid);
 };
 
-const ensurePortsShape = (states, portsA, portsB) => {
+const ensurePortsShape = (_states, portsA, portsB) => {
   if (!portsA || Object.keys(portsA).length === 0) {
     return;
   }

package/lib/util/notification.js

@@ -2,7 +2,11 @@ const { joinURL } = require('ufo');
 const isUrl = require('is-url');
 const omit = require('lodash/omit');
 const groupBy = require('lodash/groupBy');
-const { NOTIFICATION_SEND_STATUS } = require('@abtnode/constant');
+const {
+  NOTIFICATION_SEND_STATUS,
+  NOTIFICATION_SEND_CHANNEL,
+  NOTIFICATION_SEND_FAILED_REASON,
+} = require('@abtnode/constant');
 
 const REMOVE_FIELDS = [
   'description',
@@ -131,9 +135,189 @@ function getReceiversStatistics(receivers) {
   };
 }
 
+/**
+ * 检测消息推送渠道是否开启
+ */
+function checkPushChannelAvailable(blocklet = {}, isServer = false) {
+  const config = blocklet.settings?.notification || {};
+
+  const pushKitEnabled = config.pushKit?.enabled && config.pushKit?.endpoint;
+  const emailEnabled = config.email?.enabled;
+
+  return {
+    [NOTIFICATION_SEND_CHANNEL.WALLET]: {
+      enabled: true,
+    },
+    ...(isServer
+      ? {}
+      : {
+          [NOTIFICATION_SEND_CHANNEL.PUSH]: {
+            enabled: !!pushKitEnabled,
+          },
+          [NOTIFICATION_SEND_CHANNEL.EMAIL]: {
+            enabled: emailEnabled || false,
+          },
+        }),
+    [NOTIFICATION_SEND_CHANNEL.WEBHOOK]: {
+      enabled: true,
+    },
+  };
+}
+
+function getColumnField(channel, suffix) {
+  switch (channel) {
+    case NOTIFICATION_SEND_CHANNEL.WALLET:
+      return `wallet${suffix}`;
+    case NOTIFICATION_SEND_CHANNEL.PUSH:
+      return `pushKit${suffix}`;
+    case NOTIFICATION_SEND_CHANNEL.EMAIL:
+      return `email${suffix}`;
+    default:
+      return '';
+  }
+}
+
+const SEND_STATUS_MAP = {
+  [NOTIFICATION_SEND_STATUS.PENDING]: 'pending',
+  [NOTIFICATION_SEND_STATUS.SENT]: 'success',
+  [NOTIFICATION_SEND_STATUS.FAILED]: 'failed',
+};
+
+function getFailedReasonMessage(reason, channel) {
+  if (!reason || !channel) {
+    return reason;
+  }
+  switch (reason) {
+    case NOTIFICATION_SEND_FAILED_REASON.USER_DISABLED:
+      return `The user has disabled the notification for the "${channel}" channel.`;
+    case NOTIFICATION_SEND_FAILED_REASON.CHANNEL_UNAVAILABLE:
+      return `The "${channel}" channel is not available.`;
+    case NOTIFICATION_SEND_FAILED_REASON.CHANNEL_DISABLED:
+      return `The "${channel}" channel was not selected for this notification.`;
+    case NOTIFICATION_SEND_FAILED_REASON.NOT_ONLINE:
+      return 'The user is not online.';
+    default:
+      return reason;
+  }
+}
+
+function getStatisticsState(results, channel = NOTIFICATION_SEND_CHANNEL.WALLET) {
+  const last = results[0];
+
+  const getIgnoredAndFailedCount = (data) => {
+    const notSuccessCount = data.filter(
+      (item) => item[getColumnField(channel, 'SendStatus')] !== NOTIFICATION_SEND_STATUS.SENT
+    ).length;
+    const ignoredCount = data.filter(
+      (item) =>
+        item[getColumnField(channel, 'SendStatus')] !== NOTIFICATION_SEND_STATUS.SENT &&
+        (item[getColumnField(channel, 'SendStatus')] === NOTIFICATION_SEND_STATUS.PENDING ||
+          [
+            ...Object.values(NOTIFICATION_SEND_FAILED_REASON),
+            'Email Service is not available.',
+            'Push Kit Service is not Enabled.',
+          ].includes(item[getColumnField(channel, 'SendFailedReason')]))
+    ).length;
+
+    return {
+      ignored: ignoredCount,
+      failed: notSuccessCount - ignoredCount,
+    };
+  };
+
+  return {
+    last: {
+      sendAt: last[getColumnField(channel, 'SendAt')],
+      sendStatus: SEND_STATUS_MAP[last[getColumnField(channel, 'SendStatus')]],
+      reason: getFailedReasonMessage(last[getColumnField(channel, 'SendFailedReason')], channel),
+    },
+    state: {
+      total: results.length,
+      success: results.filter((item) => item[getColumnField(channel, 'SendStatus')] === NOTIFICATION_SEND_STATUS.SENT)
+        .length,
+      ...getIgnoredAndFailedCount(results),
+    },
+  };
+}
+
+function getWebhookStatisticsState(results) {
+  // 收集所有 URL 的最新记录
+  const latestRecords = [];
+
+  const state = results.reduce(
+    (acc, item) => {
+      const webhook = item.webhook ?? {};
+      Object.values(webhook).forEach((records) => {
+        // 对每个 URL 的记录数组按 sendAt 倒序排列，取最新的
+        const latestRecord = records.sort((a, b) => new Date(b.sendAt) - new Date(a.sendAt))[0];
+        if (latestRecord) {
+          latestRecords.push(latestRecord);
+          acc.total++;
+          if (latestRecord.status === NOTIFICATION_SEND_STATUS.SENT) {
+            acc.success++;
+          } else if (latestRecord.status === NOTIFICATION_SEND_STATUS.FAILED) {
+            acc.failed++;
+          } else if (latestRecord.status === NOTIFICATION_SEND_STATUS.PENDING) {
+            acc.ignored++;
+          }
+        }
+      });
+      return acc;
+    },
+    {
+      total: 0,
+      success: 0,
+      failed: 0,
+      ignored: 0,
+    }
+  );
+
+  // 从所有 URL 的最新记录中，找到最新的那个
+  const lastWebhook = latestRecords.sort((a, b) => new Date(b.sendAt) - new Date(a.sendAt))[0];
+
+  return {
+    last: lastWebhook
+      ? {
+          sendAt: lastWebhook.sendAt,
+          type: lastWebhook.type,
+          sendStatus: SEND_STATUS_MAP[lastWebhook.status],
+          reason: lastWebhook.failedReason,
+        }
+      : null,
+    state,
+  };
+}
+
+function getNotificationPushState(results, channelsAvailable, isServer = false) {
+  return {
+    wallet: {
+      ...channelsAvailable[NOTIFICATION_SEND_CHANNEL.WALLET],
+      ...getStatisticsState(results, NOTIFICATION_SEND_CHANNEL.WALLET),
+    },
+    ...(isServer
+      ? {}
+      : {
+          pushKit: {
+            ...channelsAvailable[NOTIFICATION_SEND_CHANNEL.PUSH],
+            ...getStatisticsState(results, NOTIFICATION_SEND_CHANNEL.PUSH),
+          },
+          email: {
+            ...channelsAvailable[NOTIFICATION_SEND_CHANNEL.EMAIL],
+            ...getStatisticsState(results, NOTIFICATION_SEND_CHANNEL.EMAIL),
+          },
+        }),
+    webhook: {
+      ...channelsAvailable[NOTIFICATION_SEND_CHANNEL.WEBHOOK],
+      ...getWebhookStatisticsState(results),
+    },
+  };
+}
+
 module.exports = {
   transformNotification,
   getStatusCounts,
   getWebhookStatusCounts,
   getReceiversStatistics,
+  checkPushChannelAvailable,
+  getNotificationPushState,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.3-beta-20251117-230305-4637416e",
+  "version": "1.17.3-beta-20251119-034511-f26047c0",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,21 +17,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/auth": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/certificate-manager": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/constant": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/cron": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/db-cache": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/docker-utils": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/logger": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/models": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/queue": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/rbac": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/router-provider": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/static-server": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/timemachine": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/util": "1.17.3-beta-20251117-230305-4637416e",
+    "@abtnode/analytics": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/auth": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/certificate-manager": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/constant": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/cron": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/db-cache": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/docker-utils": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/logger": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/models": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/queue": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/rbac": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/router-provider": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/static-server": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/timemachine": "1.17.3-beta-20251119-034511-f26047c0",
+    "@abtnode/util": "1.17.3-beta-20251119-034511-f26047c0",
     "@aigne/aigne-hub": "^0.10.9",
     "@arcblock/did": "^1.27.7",
     "@arcblock/did-connect-js": "^1.27.7",
@@ -43,15 +43,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.7",
     "@arcblock/vc": "^1.27.7",
-    "@blocklet/constant": "1.17.3-beta-20251117-230305-4637416e",
+    "@blocklet/constant": "1.17.3-beta-20251119-034511-f26047c0",
     "@blocklet/did-space-js": "^1.2.4",
-    "@blocklet/env": "1.17.3-beta-20251117-230305-4637416e",
+    "@blocklet/env": "1.17.3-beta-20251119-034511-f26047c0",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.3-beta-20251117-230305-4637416e",
-    "@blocklet/resolver": "1.17.3-beta-20251117-230305-4637416e",
-    "@blocklet/sdk": "1.17.3-beta-20251117-230305-4637416e",
-    "@blocklet/server-js": "1.17.3-beta-20251117-230305-4637416e",
-    "@blocklet/store": "1.17.3-beta-20251117-230305-4637416e",
+    "@blocklet/meta": "1.17.3-beta-20251119-034511-f26047c0",
+    "@blocklet/resolver": "1.17.3-beta-20251119-034511-f26047c0",
+    "@blocklet/sdk": "1.17.3-beta-20251119-034511-f26047c0",
+    "@blocklet/server-js": "1.17.3-beta-20251119-034511-f26047c0",
+    "@blocklet/store": "1.17.3-beta-20251119-034511-f26047c0",
     "@blocklet/theme": "^3.2.6",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.7",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "91bbcd8cfe4db52306f6ce83b90295c296350a7f"
+  "gitHead": "7ab331f3b29e171a1e02aca80e73f35b6a161b86"
 }