@abtnode/core 1.17.3-beta-20251121-135300-8e451e6e → 1.17.3-beta-20251123-232619-53258789

package/lib/blocklet/manager/disk.js

@@ -1514,13 +1514,19 @@ class DiskBlockletManager extends BaseBlockletManager {
       });
 
       const doc = await this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
-      this._createNotification(doc.meta.did, {
-        title: 'Blocklet Deleted',
-        description: `Blocklet ${getDisplayName(blocklet)} is deleted.`,
-        entityType: 'blocklet',
-        entityId: doc.meta.did,
-        severity: 'success',
-      });
+      this._createNotification(
+        doc.meta.did,
+        {
+          title: 'Blocklet Deleted',
+          description: `Blocklet ${getDisplayName(blocklet)} is deleted.`,
+          entityType: 'blocklet',
+          entityId: doc.meta.did,
+          severity: 'success',
+        },
+        {
+          skipGetBlocklet: true,
+        }
+      );
       await removeDockerNetwork(parseDockerName(did, 'docker-network'));
       return doc;
     } catch (error) {
@@ -1529,13 +1535,19 @@ class DiskBlockletManager extends BaseBlockletManager {
       const doc = await this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
       await removeDockerNetwork(parseDockerName(did, 'docker-network'));
 
-      this._createNotification(doc.meta.did, {
-        title: 'Blocklet Deleted',
-        description: `Blocklet ${getDisplayName(blocklet)} is deleted.`,
-        entityType: 'blocklet',
-        entityId: doc.meta.did,
-        severity: 'success',
-      });
+      this._createNotification(
+        doc.meta.did,
+        {
+          title: 'Blocklet Deleted',
+          description: `Blocklet ${getDisplayName(blocklet)} is deleted.`,
+          entityType: 'blocklet',
+          entityId: doc.meta.did,
+          severity: 'success',
+        },
+        {
+          skipGetBlocklet: true,
+        }
+      );
 
       return doc;
     }
@@ -5111,7 +5123,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   // 目前：Blocklet 的安装消息都会聚合在这里。
-  async _createNotification(did, notification) {
+  async _createNotification(did, notification, { skipGetBlocklet = false } = {}) {
     if (isCLI()) {
       return undefined;
     }
@@ -5120,7 +5132,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       let blockletUrl;
       let blocklet;
       try {
-        blocklet = await this.getBlocklet(did);
+        blocklet = skipGetBlocklet ? null : await this.getBlocklet(did);
         if (blocklet) {
           const urls = blocklet.site?.domainAliases || [];
           const customUrl = urls.find((x) => !x.isProtected)?.value;

package/lib/blocklet/manager/helper/blue-green-start-blocklet.js

@@ -41,7 +41,7 @@ const { isDockerOnlySingleInstance } = require('../../../util/docker/is-docker-o
  * @returns {Promise<Object>} 返回启动后的 blocklet 对象
  */
 const blueGreenStartBlocklet = async (
-  { did, componentDids, operator: _operator, ignoreErrorNotification },
+  { did, componentDids, operator: _operator, ignoreErrorNotification, onError },
   context,
   manager,
   states
@@ -418,6 +418,10 @@ const blueGreenStartBlocklet = async (
     });
   }
 
+  if (errorBlockletDids.length && onError) {
+    onError(errorBlockletDids);
+  }
+
   if (throwOnError && errorDescription) {
     throw new Error(errorDescription);
   }

package/lib/blocklet/manager/helper/blue-green-upgrade-blocklet.js

@@ -28,6 +28,8 @@ const blueGreenUpgradeBlocklet = async (
     }
   }
 
+  let errorBlockletDids = [];
+
   try {
     await states.blocklet.upgradeBlocklet({ meta, source, deployedFrom, children });
     logger.info('updated blocklet for upgrading', { did, componentDids, source, name });
@@ -81,7 +83,15 @@ const blueGreenUpgradeBlocklet = async (
     if (runningDids.length) {
       if (initialized) {
         await blueGreenStartBlocklet(
-          { did, componentDids: runningDids, operator: context?.user?.did, ignoreErrorNotification: true },
+          {
+            did,
+            componentDids: runningDids,
+            operator: context?.user?.did,
+            ignoreErrorNotification: true,
+            onError: (dids) => {
+              errorBlockletDids = dids;
+            },
+          },
           context,
           manager,
           states
@@ -159,18 +169,44 @@ const blueGreenUpgradeBlocklet = async (
   } catch (err) {
     logger.error('failed to upgrade blocklet', { did, version, name, error: err });
     const nextBlocklet = await manager.ensureBlocklet(did);
+
+    // 提取出错的 blocklet did 列表
+    let errorDids = [];
+    if (Array.isArray(errorBlockletDids) && errorBlockletDids.length > 0) {
+      if (typeof errorBlockletDids[0] === 'string') {
+        errorDids = errorBlockletDids;
+      } else {
+        errorDids = errorBlockletDids.map((x) => x.did);
+      }
+    }
+
+    const rollbackBlocklet = { ...oldBlocklet };
     for (const child of nextBlocklet.children) {
-      for (const oldChild of oldBlocklet.children) {
-        if (child && oldChild && child.meta.did === oldChild.meta.did) {
-          oldChild.status = child.status;
-          oldChild.greenStatus = child.greenStatus;
+      const isErrorBlocklet = errorDids.includes(child.meta.did);
+      if (isErrorBlocklet) {
+        for (const oldChild of oldBlocklet.children) {
+          if (child && oldChild && child.meta.did === oldChild.meta.did) {
+            const rollbackChild = rollbackBlocklet.children.find((c) => c.meta.did === child.meta.did);
+            if (rollbackChild) {
+              rollbackChild.status = oldChild.status;
+              rollbackChild.greenStatus = oldChild.greenStatus;
+              rollbackChild.ports = oldChild.ports;
+              rollbackChild.greenPorts = oldChild.greenPorts;
+            }
+          }
+        }
+      } else {
+        const rollbackChildIndex = rollbackBlocklet.children.findIndex((c) => c.meta.did === child.meta.did);
+        if (rollbackChildIndex !== -1) {
+          rollbackBlocklet.children[rollbackChildIndex] = child;
         }
       }
     }
-    await states.blocklet.upgradeBlocklet({ ...oldBlocklet });
-    manager.configSynchronizer.throttledSyncAppConfig(oldBlocklet);
+
+    await states.blocklet.upgradeBlocklet({ ...rollbackBlocklet });
+    manager.configSynchronizer.throttledSyncAppConfig(rollbackBlocklet);
     await manager._updateDependents(did);
-    manager.emit(BlockletEvents.statusChange, { ...oldBlocklet, error: { message: err.message } });
+    manager.emit(BlockletEvents.statusChange, { ...rollbackBlocklet, error: { message: err.message } });
 
     const actionName = action === INSTALL_ACTIONS.INSTALL_COMPONENT ? 'install' : 'upgrade';
     const notificationEvent =

package/lib/event/index.js

@@ -318,6 +318,7 @@ module.exports = ({
       description: `Blocklet Server is ${status} successfully`,
       entityType: 'node',
       status: 'success',
+      source: 'system',
     });
   };
 

package/lib/index.js

@@ -684,6 +684,7 @@ function ABTNode(options) {
       if (['deleteBlocklet', 'installBlocklet'].includes(params.action) || teamDid === options.nodeDid) {
         const result = await states.auditLog.create(params, instance);
         // 如果是 installBlocklet, 不需要提前返回， 要将 log 记录在 service 中
+        // 如果是 deleteBlocklet, 需要提前返回，因为 deleteBlocklet 会触发 blocklet 的删除，不需要再往 service 的auditLog 表中插入记录了
         if (params.action !== 'installBlocklet') {
           return result;
         }

package/lib/states/notification.js

@@ -223,7 +223,7 @@ class NotificationState extends BaseState {
       });
       return result.length > 0 ? result.map((item) => item.did) : [did];
     } catch (error) {
-      logger.error('getUserDids error: ', error);
+      logger.warn('getUserDids error: ', error);
       return [did];
     }
   }
@@ -798,16 +798,18 @@ class NotificationState extends BaseState {
       },
     };
 
-    const receiverDids = await this.getUserDids(receiver);
+    const includeWhere = {};
+    if (receiver) {
+      const receiverDids = await this.getUserDids(receiver);
+      includeWhere.receiver = { [Op.in]: receiverDids };
+    }
 
     const include = [
       {
         model: this.notificationReceivers.model,
         as: 'receivers',
         attributes: [],
-        where: {
-          receiver: { [Op.in]: receiverDids },
-        },
+        where: includeWhere,
         required: false,
       },
     ];

package/lib/team/manager.js

@@ -243,9 +243,23 @@ class TeamManager extends EventEmitter {
         users = users.concat(roleUsers);
       }
       if (userDids.length > 0) {
-        const queryUsers = await Promise.all(
-          userDids.map((did) => userState.getUser(did, { includePassports: true, enableConnectedAccount: true }))
-        );
+        let queryUsers = [];
+        if (userDids.includes('*')) {
+          queryUsers = await userState.getUsersByDids({
+            dids: userDids,
+            query: {
+              approved: true,
+              selection,
+              includeConnectedAccounts,
+              includePassports: true,
+            },
+          });
+        } else {
+          // 使用 getUser 查询的目的是为了避免传入的 receiver 不在user表中而存在于 connected_account 表中
+          queryUsers = await Promise.all(
+            userDids.map((did) => userState.getUser(did, { includePassports: true, enableConnectedAccount: true }))
+          );
+        }
 
         const validUsers = queryUsers.filter((user, index) => {
           if (!user) {

package/lib/webhook/sender/slack/index.js

@@ -167,7 +167,6 @@ class SlackSender extends BaseSender {
       });
       return res;
     } catch (err) {
-      console.error(err);
       logger.error('failed to push notification to slack', { api: url, error: err });
       throw err;
     }

package/lib/webhook/sender/wallet/index.js

@@ -1,19 +1,27 @@
 const logger = require('@abtnode/logger')('@abtnode/core:sender:api');
-const { sendToUser } = require('@blocklet/sdk/lib/util/send-notification');
-const { ROLES, PASSPORT_STATUS } = require('@abtnode/constant');
+const { ROLES, PASSPORT_STATUS, NOTIFICATION_SEND_CHANNEL } = require('@abtnode/constant');
 const BaseSender = require('../base');
 
 class WalletSender extends BaseSender {
   async send(params, data = {}) {
-    const { id, title, description, nodeInfo, node, receiver, actions, attachments, message, appInfo } = data;
+    const {
+      id,
+      title,
+      description,
+      nodeInfo,
+      node,
+      receiver,
+      actions,
+      attachments,
+      message,
+      appInfo,
+      entityType,
+      entityId,
+      source,
+      teamDid,
+    } = data;
 
     try {
-      const sender = {
-        appDid: nodeInfo.did,
-        appSk: nodeInfo.sk,
-        type: 'server',
-      };
-
       const _message = message ?? {
         id,
         title,
@@ -21,6 +29,9 @@ class WalletSender extends BaseSender {
         actions,
         attachments,
         appInfo,
+        ...(entityType ? { entityType } : {}),
+        ...(entityId ? { entityId } : {}),
+        ...(source ? { source } : {}),
       };
 
       let to = [];
@@ -48,7 +59,14 @@ class WalletSender extends BaseSender {
       if (!to.length) {
         return;
       }
-      await sendToUser(to, _message, sender, process.env.ABT_NODE_SERVICE_PORT);
+
+      // @FIXME: liushuang 感觉这里不需要创建 notification，只需要发送消息到 wallet 即可
+      await node.createNotification({
+        teamDid: teamDid || nodeInfo.did,
+        ..._message,
+        receiver: to,
+        channels: [NOTIFICATION_SEND_CHANNEL.WALLET],
+      });
     } catch (error) {
       delete error.request;
       delete error.response;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.3-beta-20251121-135300-8e451e6e",
+  "version": "1.17.3-beta-20251123-232619-53258789",
   "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-20251121-135300-8e451e6e",
-    "@abtnode/auth": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/certificate-manager": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/constant": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/cron": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/db-cache": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/docker-utils": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/logger": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/models": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/queue": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/rbac": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/router-provider": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/static-server": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/timemachine": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/util": "1.17.3-beta-20251121-135300-8e451e6e",
+    "@abtnode/analytics": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/auth": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/certificate-manager": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/constant": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/cron": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/db-cache": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/docker-utils": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/logger": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/models": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/queue": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/rbac": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/router-provider": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/static-server": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/timemachine": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/util": "1.17.3-beta-20251123-232619-53258789",
     "@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-20251121-135300-8e451e6e",
+    "@blocklet/constant": "1.17.3-beta-20251123-232619-53258789",
     "@blocklet/did-space-js": "^1.2.4",
-    "@blocklet/env": "1.17.3-beta-20251121-135300-8e451e6e",
+    "@blocklet/env": "1.17.3-beta-20251123-232619-53258789",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@blocklet/resolver": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@blocklet/sdk": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@blocklet/server-js": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@blocklet/store": "1.17.3-beta-20251121-135300-8e451e6e",
+    "@blocklet/meta": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/resolver": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/sdk": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/server-js": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/store": "1.17.3-beta-20251123-232619-53258789",
     "@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": "e34d7abbe02a8b6eb754b7e2590a9e3d9d663c7d"
+  "gitHead": "d37497a49c982e82ba60249ed06c1b73f340b893"
 }