@abtnode/core 1.16.27-beta-e0e33468 → 1.16.27-beta-91ff0d1b

package/lib/blocklet/manager/disk.js

@@ -832,7 +832,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
-  async stop({ did, updateStatus = true, silent = false, componentDids }, context) {
+  async stop({ did, updateStatus = true, silent = false, componentDids, reason }, context) {
     logger.info('stop blocklet', { did, componentDids, updateStatus, silent });
 
     const blocklet = await this.getBlocklet(did);
@@ -895,11 +895,17 @@ class DiskBlockletManager extends BaseBlockletManager {
       });
       this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
 
+      let description = `${
+        componentDids?.length ? getComponentNamesWithVersion(blocklet, componentDids) : 'All components'
+      } is successfully stopped for ${blocklet.meta.title}.`;
+
+      if (reason === SUSPENDED_REASON.expired) {
+        description = `${description} Reason: The subscription has expired.`;
+      }
+
       this._createNotification(did, {
         title: 'Component stop succeed',
-        description: `${
-          componentDids?.length ? getComponentNamesWithVersion(blocklet, componentDids) : 'All components'
-        } is successfully stopped for ${blocklet.meta.title}.`,
+        description,
         entityType: 'blocklet',
         entityId: did,
         severity: 'success',
@@ -3609,7 +3615,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             : BlockletEvents.componentUpgraded;
         const actionName = action === INSTALL_ACTIONS.INSTALL_COMPONENT ? 'installed' : 'upgraded';
 
-        this.emit(notificationEvent, { ...blocklet, componentDids, context });
+        this.emit(notificationEvent, { ...blocklet, componentDids, oldBlocklet, context });
 
         this._createNotification(did, {
           title: `Component ${actionName} succeed`,
@@ -4055,7 +4061,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             // 如果 Blocklet 没停止, 先停止
             const blocklet = await states.blocklet.getBlocklet(did);
             if (blocklet.status !== BlockletStatus.stopped) {
-              await this.stop({ did });
+              await this.stop({ did, reason: SUSPENDED_REASON.expired });
               logger.info('the expired blocklet is stopped', { did, blockletDid: did });
             }
 

package/lib/event/index.js

@@ -12,7 +12,7 @@ const {
   TeamEvents,
   BLOCKLET_CONFIGURABLE_KEY,
 } = require('@blocklet/constant');
-const { EVENTS, BACKUPS } = require('@abtnode/constant');
+const { EVENTS, BACKUPS, NODE_MODES } = require('@abtnode/constant');
 
 const { NodeMonitSender } = require('../monitor/node-monit-sender');
 const handleInstanceInStore = require('../util/public-to-store');
@@ -123,13 +123,19 @@ module.exports = ({
   // Emit events to node listener
   // Call eventHandler
   // NOT emit events to event hub
-  const onInternalEvent = (name, data) => {
+  const onInternalEvent = async (name, data) => {
     events.emit(name, data);
     if (typeof eventHandler === 'function') {
       eventHandler({ name, data });
     }
 
     if (name === EVENTS.NODE_RUNTIME_INFO) {
+      const info = await node.getNodeInfo();
+
+      if (info.mode === NODE_MODES.SERVERLESS) {
+        return;
+      }
+
       nodeMonitSender.sendToWallet(data);
     }
   };

package/lib/states/audit-log.js

@@ -132,7 +132,12 @@ const getLogContent = async (action, args, context, result, info, node) => {
           result.componentDids
         )}**${errMsg}`;
       }
-      return `${actionName} component: **${getComponentNamesWithVersion(result, result.componentDids)}**`;
+      const newVersions = getComponentNamesWithVersion(result, result.componentDids);
+      if (result.oldBlocklet) {
+        const oldVersions = getComponentNamesWithVersion(result.oldBlocklet, result.componentDids);
+        return `${actionName} component: **${newVersions}** from **${oldVersions}**`;
+      }
+      return `${actionName} component: **${newVersions}**`;
     case 'deleteComponent':
       return `removed ${result.deletedComponent.meta.title}@${result.deletedComponent.meta.version} ${args.keepData !== false ? 'but kept its data and config' : 'and its data and config'}`; // prettier-ignore
     case 'configBlocklet':

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.27-beta-e0e33468",
+  "version": "1.16.27-beta-91ff0d1b",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.27-beta-e0e33468",
-    "@abtnode/auth": "1.16.27-beta-e0e33468",
-    "@abtnode/certificate-manager": "1.16.27-beta-e0e33468",
-    "@abtnode/constant": "1.16.27-beta-e0e33468",
-    "@abtnode/cron": "1.16.27-beta-e0e33468",
-    "@abtnode/logger": "1.16.27-beta-e0e33468",
-    "@abtnode/models": "1.16.27-beta-e0e33468",
-    "@abtnode/queue": "1.16.27-beta-e0e33468",
-    "@abtnode/rbac": "1.16.27-beta-e0e33468",
-    "@abtnode/router-provider": "1.16.27-beta-e0e33468",
-    "@abtnode/static-server": "1.16.27-beta-e0e33468",
-    "@abtnode/timemachine": "1.16.27-beta-e0e33468",
-    "@abtnode/util": "1.16.27-beta-e0e33468",
+    "@abtnode/analytics": "1.16.27-beta-91ff0d1b",
+    "@abtnode/auth": "1.16.27-beta-91ff0d1b",
+    "@abtnode/certificate-manager": "1.16.27-beta-91ff0d1b",
+    "@abtnode/constant": "1.16.27-beta-91ff0d1b",
+    "@abtnode/cron": "1.16.27-beta-91ff0d1b",
+    "@abtnode/logger": "1.16.27-beta-91ff0d1b",
+    "@abtnode/models": "1.16.27-beta-91ff0d1b",
+    "@abtnode/queue": "1.16.27-beta-91ff0d1b",
+    "@abtnode/rbac": "1.16.27-beta-91ff0d1b",
+    "@abtnode/router-provider": "1.16.27-beta-91ff0d1b",
+    "@abtnode/static-server": "1.16.27-beta-91ff0d1b",
+    "@abtnode/timemachine": "1.16.27-beta-91ff0d1b",
+    "@abtnode/util": "1.16.27-beta-91ff0d1b",
     "@arcblock/did": "1.18.115",
     "@arcblock/did-auth": "1.18.115",
     "@arcblock/did-ext": "^1.18.115",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.115",
     "@arcblock/vc": "1.18.115",
-    "@blocklet/constant": "1.16.27-beta-e0e33468",
-    "@blocklet/env": "1.16.27-beta-e0e33468",
-    "@blocklet/meta": "1.16.27-beta-e0e33468",
-    "@blocklet/resolver": "1.16.27-beta-e0e33468",
-    "@blocklet/sdk": "1.16.27-beta-e0e33468",
-    "@blocklet/store": "1.16.27-beta-e0e33468",
+    "@blocklet/constant": "1.16.27-beta-91ff0d1b",
+    "@blocklet/env": "1.16.27-beta-91ff0d1b",
+    "@blocklet/meta": "1.16.27-beta-91ff0d1b",
+    "@blocklet/resolver": "1.16.27-beta-91ff0d1b",
+    "@blocklet/sdk": "1.16.27-beta-91ff0d1b",
+    "@blocklet/store": "1.16.27-beta-91ff0d1b",
     "@did-space/client": "^0.4.3",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.115",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "2f507521d1523329bc0bbb5d64fb0ebe39a5177b"
+  "gitHead": "5c8d1719acb88ae62298293030860c79b0124692"
 }