@abtnode/core 1.16.14-beta-d802cd3c → 1.16.14-beta-dc99d0a2

package/lib/blocklet/manager/disk.js

@@ -77,7 +77,7 @@ const {
   SUSPENDED_REASON,
 } = require('@blocklet/constant');
 const isUndefined = require('lodash/isUndefined');
-const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
+const { WELLKNOWN_SERVICE_PATH_PREFIX, WELLKNOWN_BLOCKLET_ADMIN_PATH } = require('@abtnode/constant');
 const { signV2 } = require('@arcblock/jwt');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const pLimit = require('p-limit');
@@ -610,6 +610,16 @@ class DiskBlockletManager extends BaseBlockletManager {
         components: getComponentsInternalInfo(res),
       });
 
+      this._createNotification(did, {
+        title: '',
+        description: `${
+          componentDids?.length ? getComponentNamesWithVersion(blocklet, componentDids) : 'All components'
+        } is successfully stopped for ${blocklet.meta.title}.`,
+        entityType: 'blocklet',
+        entityId: did,
+        severity: 'success',
+      });
+
       return res;
     }
 
@@ -1299,7 +1309,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     const enabled = newConfig?.email?.enabled;
     if (enabled) {
       const { error } = emailConfigSchema.validate(
-        pick(newConfig?.email || {}, ['from', 'host', 'port', 'user', 'password'])
+        pick(newConfig?.email || {}, ['from', 'host', 'port', 'user', 'password', 'secure'])
       );
       if (error) {
         logger.error('configNotification validate error', { error });
@@ -1395,6 +1405,9 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     if (validateConfig.cacheTtl) {
       sessionConfig.cacheTtl = validateConfig.cacheTtl;
+    } else {
+      // NOTE: 将 cacheTtl 默认值设置为 3600s
+      sessionConfig.cacheTtl = 60 * 60; // seconds
     }
     if (validateConfig.ttl) {
       sessionConfig.ttl = validateConfig.ttl;
@@ -2011,6 +2024,16 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       this.emit(BlockletEvents.statusChange, res);
       this.emit(BlockletEvents.started, { ...res, componentDids });
+      this._createNotification(did, {
+        title: '',
+        description: `${getComponentNamesWithVersion(blocklet, componentDids)} is successfully started for ${
+          blocklet.meta.title
+        }.`,
+        entityType: 'blocklet',
+        entityId: did,
+        severity: 'success',
+      });
+
       logger.info('blocklet healthy', { did, name, time: Date.now() - startedAt });
     } catch (error) {
       const status = await states.blocklet.getBlockletStatus(did);
@@ -2963,7 +2986,9 @@ class DiskBlockletManager extends BaseBlockletManager {
         if (blocklet) {
           const urls = blocklet.site?.domainAliases || [];
           const customUrl = urls.find((x) => !x.isProtected)?.value;
-          blockletUrl = `http://${customUrl || getDidDomainForBlocklet({ appPid: blocklet.appPid })}`;
+          blockletUrl = `http://${
+            customUrl || getDidDomainForBlocklet({ appPid: blocklet.appPid })
+          }${WELLKNOWN_BLOCKLET_ADMIN_PATH}`;
         }
       } catch (error) {
         logger.error('[_createNotification] get blocklet url failed', { error });
@@ -3498,8 +3523,8 @@ class FederatedBlockletManager extends DiskBlockletManager {
               'agreement',
               'verifiableCredential',
               'asset',
-              // 'keyPair',
-              // 'encryptionKey',
+              'keyPair',
+              // 'encryptionKey',  // 备份还原应用时使用
             ],
           },
         ],

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14-beta-d802cd3c",
+  "version": "1.16.14-beta-dc99d0a2",
   "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.14-beta-d802cd3c",
-    "@abtnode/auth": "1.16.14-beta-d802cd3c",
-    "@abtnode/certificate-manager": "1.16.14-beta-d802cd3c",
-    "@abtnode/constant": "1.16.14-beta-d802cd3c",
-    "@abtnode/cron": "1.16.14-beta-d802cd3c",
-    "@abtnode/logger": "1.16.14-beta-d802cd3c",
-    "@abtnode/models": "1.16.14-beta-d802cd3c",
-    "@abtnode/queue": "1.16.14-beta-d802cd3c",
-    "@abtnode/rbac": "1.16.14-beta-d802cd3c",
-    "@abtnode/router-provider": "1.16.14-beta-d802cd3c",
-    "@abtnode/static-server": "1.16.14-beta-d802cd3c",
-    "@abtnode/timemachine": "1.16.14-beta-d802cd3c",
-    "@abtnode/util": "1.16.14-beta-d802cd3c",
+    "@abtnode/analytics": "1.16.14-beta-dc99d0a2",
+    "@abtnode/auth": "1.16.14-beta-dc99d0a2",
+    "@abtnode/certificate-manager": "1.16.14-beta-dc99d0a2",
+    "@abtnode/constant": "1.16.14-beta-dc99d0a2",
+    "@abtnode/cron": "1.16.14-beta-dc99d0a2",
+    "@abtnode/logger": "1.16.14-beta-dc99d0a2",
+    "@abtnode/models": "1.16.14-beta-dc99d0a2",
+    "@abtnode/queue": "1.16.14-beta-dc99d0a2",
+    "@abtnode/rbac": "1.16.14-beta-dc99d0a2",
+    "@abtnode/router-provider": "1.16.14-beta-dc99d0a2",
+    "@abtnode/static-server": "1.16.14-beta-dc99d0a2",
+    "@abtnode/timemachine": "1.16.14-beta-dc99d0a2",
+    "@abtnode/util": "1.16.14-beta-dc99d0a2",
     "@arcblock/did": "1.18.87",
     "@arcblock/did-auth": "1.18.87",
     "@arcblock/did-ext": "^1.18.87",
@@ -42,10 +42,10 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.87",
     "@arcblock/vc": "1.18.87",
-    "@blocklet/constant": "1.16.14-beta-d802cd3c",
-    "@blocklet/meta": "1.16.14-beta-d802cd3c",
-    "@blocklet/resolver": "1.16.14-beta-d802cd3c",
-    "@blocklet/sdk": "1.16.14-beta-d802cd3c",
+    "@blocklet/constant": "1.16.14-beta-dc99d0a2",
+    "@blocklet/meta": "1.16.14-beta-dc99d0a2",
+    "@blocklet/resolver": "1.16.14-beta-dc99d0a2",
+    "@blocklet/sdk": "1.16.14-beta-dc99d0a2",
     "@did-space/client": "^0.2.129",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.87",
@@ -99,5 +99,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "f8e2dcefd8d6876e5dedee833ac976b4a0496b20"
+  "gitHead": "a00766d660ede97e2036f3a785f4f5cfb2e6d870"
 }