@abtnode/core 1.16.8-beta-0c0c5eb2 → 1.16.8-beta-b3039c78

package/lib/api/node.js

@@ -2,11 +2,13 @@
 /* eslint-disable no-underscore-dangle */
 const assert = require('assert');
 const os = require('os');
+const LRU = require('lru-cache');
 const isDocker = require('@abtnode/util/lib/is-docker');
 const isGitpod = require('@abtnode/util/lib/is-gitpod');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 const { toDelegateAddress } = require('@arcblock/did-util');
+const { SERVER_CACHE_TTL } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
@@ -36,6 +38,11 @@ class NodeAPI {
       historyLength: MONITOR_HISTORY_LENGTH,
     });
 
+    this.cache = new LRU({
+      max: 1,
+      maxAge: SERVER_CACHE_TTL,
+    });
+
     this.state = state;
   }
 
@@ -59,15 +66,26 @@ class NodeAPI {
     }
   }
 
-  async getInfo() {
-    const info = await this.state.read();
-    const env = await this.state.getEnvironments();
-    info.environments = Object.keys(env).map((x) => ({ key: x, value: env[x] }));
+  async getInfo({ useCache } = {}) {
+    let info;
+    if (useCache && this.cache.has('info')) {
+      info = this.cache.get('info');
+    } else {
+      info = await this.state.read();
+      const env = await this.state.getEnvironments();
+      info.environments = Object.keys(env).map((x) => ({ key: x, value: env[x] }));
+      this.cache.set('info', info);
+    }
+
     info.uptime = process.uptime() * 1000;
 
     return info;
   }
 
+  deleteCache() {
+    this.cache.del('del');
+  }
+
   async getDiskInfo() {
     let diskInfo = { app: 0, cache: 0, log: 0, data: 0, blocklets: 0 };
     try {

package/lib/blocklet/manager/disk.js

@@ -3,12 +3,12 @@
 const fs = require('fs-extra');
 const path = require('path');
 const flat = require('flat');
+const LRU = require('lru-cache');
 const get = require('lodash/get');
 const omit = require('lodash/omit');
 const merge = require('lodash/merge');
 const pick = require('lodash/pick');
 const isEmpty = require('lodash/isEmpty');
-const cloneDeep = require('lodash/cloneDeep');
 const { isNFTExpired, getNftExpirationDate } = require('@abtnode/util/lib/nft');
 const didDocument = require('@abtnode/util/lib/did-document');
 const { sign } = require('@arcblock/jwt');
@@ -22,6 +22,7 @@ const {
   BLOCKLET_INSTALL_TYPE,
   NODE_MODES,
   APP_STRUCT_VERSION,
+  BLOCKLET_CACHE_TTL,
 } = require('@abtnode/constant');
 
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
@@ -41,6 +42,7 @@ const {
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
 const { titleSchema, updateMountPointSchema, environmentNameSchema } = require('@blocklet/meta/lib/schema');
+const { emailConfigSchema } = require('@blocklet/sdk/lib/validators/email');
 const Lock = require('@abtnode/util/lib/lock');
 
 const {
@@ -82,7 +84,6 @@ const {
   checkBlockletProcessHealthy,
   validateBlocklet,
   validateBlockletChainInfo,
-  statusMap,
   pruneBlockletBundle,
   getDiskInfo,
   getRuntimeEnvironments,
@@ -128,7 +129,7 @@ const UpgradeComponents = require('./helper/upgrade-components');
 const BlockletDownloader = require('../downloader/blocklet-downloader');
 const RollbackCache = require('./helper/rollback-cache');
 const { migrateApplicationToStructV2 } = require('./helper/migrate-application-to-struct-v2');
-const { getBackupFilesUrlFromEndpoint, getDIDSpaceBackupEndpoint } = require('../../util/spaces');
+const { getBackupFilesUrlFromEndpoint, getBackupEndpoint } = require('../../util/spaces');
 const { validateAddSpaceGateway, validateUpdateSpaceGateway } = require('../../validators/space-gateway');
 
 const { formatEnvironments, shouldUpdateBlockletStatus, getBlockletMeta, validateOwner } = util;
@@ -221,7 +222,10 @@ class BlockletManager extends BaseBlockletManager {
     this.teamManager = teamManager;
 
     // cached installed blocklets for performance
-    this.cachedBlocklets = null;
+    this.cachedBlocklets = new LRU({
+      max: 100,
+      maxAge: BLOCKLET_CACHE_TTL,
+    });
 
     this.runtimeMonitor = new BlockletRuntimeMonitor({ historyLength: MONITOR_HISTORY_LENGTH, states });
 
@@ -944,7 +948,7 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   // Get blocklet by blockletDid or appDid
-  async detail({ did, attachConfig = true, attachRuntimeInfo = true }, context) {
+  async detail({ did, attachConfig = true, attachRuntimeInfo, useCache }, context) {
     if (!did) {
       throw new Error('did should not be empty');
     }
@@ -953,49 +957,36 @@ class BlockletManager extends BaseBlockletManager {
       return states.blocklet.getBlocklet(did);
     }
 
-    if (!attachRuntimeInfo) {
-      try {
-        const blocklet = await this.getBlocklet(did, { throwOnNotExist: false });
-        return blocklet;
-      } catch (e) {
-        logger.error('get blocklet detail error', { error: e });
-        return states.blocklet.getBlocklet(did);
-      }
-    }
-
-    const nodeInfo = await states.node.read();
+    if (attachRuntimeInfo) {
+      const nodeInfo = await states.node.read();
 
-    return this._attachRuntimeInfo({ did, nodeInfo, diskInfo: true, context });
-  }
+      return this._attachRuntimeInfo({ did, nodeInfo, diskInfo: true, context });
+    }
 
-  async attachBlockletListRuntimeInfo({ blocklets, useCache }, context) {
-    const nodeInfo = await states.node.read();
-    const updated = (
-      await Promise.all(
-        blocklets.map((x) => {
-          if (isBeforeInstalled(x.status)) {
-            return x;
-          }
+    if (useCache && this.cachedBlocklets.has(did)) {
+      return this.cachedBlocklets.get(did);
+    }
 
-          const cachedBlocklet =
-            useCache && this.cachedBlocklets ? this.cachedBlocklets.find((y) => y.meta.did === x.meta.did) : null;
+    try {
+      const blocklet = await this.getBlocklet(did, { throwOnNotExist: false });
 
-          return this._attachRuntimeInfo({
-            did: x.meta.did,
-            nodeInfo,
-            diskInfo: false,
-            context,
-            cachedBlocklet,
-          });
-        })
-      )
-    ).filter(Boolean);
+      if (blocklet) {
+        if (blocklet.appDid) {
+          this.cachedBlocklets.set(blocklet.appDid, blocklet);
+        }
+        if (blocklet.appPid) {
+          this.cachedBlocklets.set(blocklet.appPid, blocklet);
+        }
+      }
 
-    this.cachedBlocklets = cloneDeep(updated);
-    return updated;
+      return blocklet;
+    } catch (e) {
+      logger.error('get blocklet detail error', { error: e });
+      return states.blocklet.getBlocklet(did);
+    }
   }
 
-  async list({ includeRuntimeInfo = true, useCache = true, query, filter } = {}, context) {
+  async list({ includeRuntimeInfo = true, query, filter } = {}, context) {
     const condition = { ...flat(query || {}) };
     if (filter === 'external-only') {
       condition.controller = {
@@ -1012,7 +1003,7 @@ class BlockletManager extends BaseBlockletManager {
     const blocklets = await states.blocklet.getBlocklets(condition);
 
     if (includeRuntimeInfo) {
-      return this.attachBlockletListRuntimeInfo({ blocklets, useCache }, context);
+      return this._attachBlockletListRuntimeInfo({ blocklets }, context);
     }
 
     return blocklets;
@@ -1235,6 +1226,33 @@ class BlockletManager extends BaseBlockletManager {
     return newState;
   }
 
+  async configNotification({ did, notification = {} }) {
+    let newConfig = {};
+    try {
+      newConfig = JSON.parse(notification);
+    } catch (error) {
+      logger.error('parse configNotification error', { error });
+      throw new Error('parse configNotification error');
+    }
+    const enabled = newConfig?.email?.enabled;
+    if (enabled) {
+      const { error } = emailConfigSchema.validate(
+        pick(newConfig?.email || {}, ['from', 'host', 'port', 'user', 'password'])
+      );
+      if (error) {
+        logger.error('configNotification validate error', { error });
+        throw new Error(error.message);
+      }
+    }
+    const oldConfig = await states.blockletExtras.getSettings(did, 'notification', {});
+    // NOTICE：validate 本身没有做任何字段规范化处理，所以处理后的结果跟处理前是一样的，最终结果的合并先使用原始值
+    const mergeConfig = { ...oldConfig, ...newConfig };
+    await states.blockletExtras.setSettings(did, { notification: mergeConfig });
+    const newState = await this.getBlocklet(did);
+    this.emit(BlockletEvents.updated, newState);
+    return newState;
+  }
+
   // TODO: this method can be removed if title is not changed anymore
   async updateComponentTitle({ did, rootDid: inputRootDid, title }) {
     await titleSchema.validateAsync(title);
@@ -1596,6 +1614,14 @@ class BlockletManager extends BaseBlockletManager {
     return states.backup.getBlockletBackups({ did });
   }
 
+  deleteCache(did) {
+    const cache = this.cachedBlocklets.get(did);
+    if (cache) {
+      this.cachedBlocklets.del(cache.appDid);
+      this.cachedBlocklets.del(cache.appPid);
+    }
+  }
+
   // ============================================================================================
   // Private API that are used by self of helper function
   // ============================================================================================
@@ -1891,11 +1917,18 @@ class BlockletManager extends BaseBlockletManager {
       await spacesBackup.backup();
 
       await states.backup.success(backup._id, {
-        targetUrl: getBackupFilesUrlFromEndpoint(getDIDSpaceBackupEndpoint(blocklet?.environments)),
+        targetUrl: getBackupFilesUrlFromEndpoint(getBackupEndpoint(blocklet?.environments)),
       });
 
       // 备份成功了
-      this.emit(BlockletEvents.backupProgress, { appDid, meta: { did: appPid }, completed: true, progress: 100 });
+      this.emit(BlockletEvents.backupProgress, {
+        appDid,
+        meta: { did: appPid },
+        completed: true,
+        progress: 100,
+        context,
+        blocklet,
+      });
     } catch (error) {
       await states.backup.fail(backup._id, {
         message: error?.message,
@@ -1906,6 +1939,8 @@ class BlockletManager extends BaseBlockletManager {
         completed: true,
         progress: -1,
         message: error?.message,
+        context,
+        blocklet,
       });
       throw error;
     }
@@ -1922,59 +1957,69 @@ class BlockletManager extends BaseBlockletManager {
    */
   // eslint-disable-next-line no-unused-vars
   async _onRestoreFromSpaces({ input, context }) {
-    if (input.delay) {
-      await sleep(input.delay);
-    }
-
     const appPid = input.appDid;
 
-    this.emit(BlockletEvents.restoreProgress, {
-      appDid: input.appDid,
-      meta: { did: appPid },
-      status: RESTORE_PROGRESS_STATUS.start,
-    });
+    try {
+      if (input.delay) {
+        await sleep(input.delay);
+      }
+
+      this.emit(BlockletEvents.restoreProgress, {
+        appDid: input.appDid,
+        meta: { did: appPid },
+        status: RESTORE_PROGRESS_STATUS.start,
+      });
 
-    const userDid = context.user.did;
+      const userDid = context.user.did;
+      const spacesRestore = new SpacesRestore({ ...input, appPid, event: this, userDid, referrer: context.referrer });
+      const params = await spacesRestore.restore();
 
-    const spacesRestore = new SpacesRestore({ ...input, appPid, event: this, userDid, referrer: context.referrer });
-    const params = await spacesRestore.restore();
+      const removeRestoreDir = () => {
+        if (fs.existsSync(spacesRestore.restoreDir)) {
+          fs.remove(spacesRestore.restoreDir).catch((err) => {
+            logger.error('failed to remove restore dir', { error: err, dir: spacesRestore.restoreDir });
+          });
+        }
+      };
 
-    const removeRestoreDir = () => {
-      if (fs.existsSync(spacesRestore.restoreDir)) {
-        fs.remove(spacesRestore.restoreDir).catch((err) => {
-          logger.error('failed to remove restore dir', { error: err, dir: spacesRestore.restoreDir });
+      this.emit(BlockletEvents.restoreProgress, {
+        appDid: input.appDid,
+        meta: { did: appPid },
+        status: RESTORE_PROGRESS_STATUS.installing,
+      });
+
+      try {
+        await installApplicationFromBackup({
+          url: `file://${spacesRestore.restoreDir}`,
+          moveDir: true,
+          ...merge(...params),
+          manager: this,
+          states,
+          controller: input.controller,
+          context: { ...context, startImmediately: true },
         });
-      }
-    };
 
-    this.emit(BlockletEvents.restoreProgress, {
-      appDid: input.appDid,
-      meta: { did: appPid },
-      status: RESTORE_PROGRESS_STATUS.installing,
-    });
+        removeRestoreDir();
+      } catch (error) {
+        removeRestoreDir();
+        throw error;
+      }
 
-    try {
-      await installApplicationFromBackup({
-        url: `file://${spacesRestore.restoreDir}`,
-        moveDir: true,
-        ...merge(...params),
-        manager: this,
-        states,
-        controller: input.controller,
-        context: { ...context, startImmediately: true },
+      this.emit(BlockletEvents.restoreProgress, {
+        appDid: input.appDid,
+        meta: { did: appPid },
+        status: RESTORE_PROGRESS_STATUS.completed,
       });
-
-      removeRestoreDir();
     } catch (error) {
-      removeRestoreDir();
+      this.emit(BlockletEvents.restoreProgress, {
+        appDid: input.appDid,
+        meta: { did: appPid },
+        status: RESTORE_PROGRESS_STATUS.error,
+        message: error.message,
+      });
+
       throw error;
     }
-
-    this.emit(BlockletEvents.restoreProgress, {
-      appDid: input.appDid,
-      meta: { did: appPid },
-      status: RESTORE_PROGRESS_STATUS.completed,
-    });
   }
 
   async _updateBlockletEnvironment(did) {
@@ -2027,7 +2072,27 @@ class BlockletManager extends BaseBlockletManager {
     return states.blocklet.updateBlocklet(did, blocklet);
   }
 
-  async _attachRuntimeInfo({ did, nodeInfo, diskInfo = true, context, cachedBlocklet }) {
+  async _attachBlockletListRuntimeInfo({ blocklets }, context) {
+    const nodeInfo = await states.node.read();
+    return (
+      await Promise.all(
+        blocklets.map((x) => {
+          if (isBeforeInstalled(x.status)) {
+            return x;
+          }
+
+          return this._attachRuntimeInfo({
+            did: x.meta.did,
+            nodeInfo,
+            diskInfo: false,
+            context,
+          });
+        })
+      )
+    ).filter(Boolean);
+  }
+
+  async _attachRuntimeInfo({ did, nodeInfo, diskInfo = true, context }) {
     if (!did) {
       throw new Error('did should not be empty');
     }
@@ -2039,24 +2104,6 @@ class BlockletManager extends BaseBlockletManager {
         return null;
       }
 
-      const fromCache = !!cachedBlocklet;
-
-      // if from cached data, only use cache data of runtime info (engine, diskInfo, runtimeInfo...)
-      if (fromCache) {
-        const cached = {};
-        forEachBlockletSync(cachedBlocklet, (component, { id }) => {
-          cached[id] = component;
-        });
-
-        Object.assign(blocklet, pick(cachedBlocklet, ['appRuntimeInfo', 'diskInfo']));
-
-        forEachBlockletSync(blocklet, (component, { id }) => {
-          if (cached[id]) {
-            Object.assign(component, pick(cached[id], ['runtimeInfo']));
-          }
-        });
-      }
-
       // 处理 domainAliases#value SLOT_FOR_IP_DNS_SITE
       if (blocklet?.site?.domainAliases?.length) {
         const nodeIp = await getAccessibleExternalNodeIp(nodeInfo);
@@ -2069,24 +2116,18 @@ class BlockletManager extends BaseBlockletManager {
       // app runtime info, app status
       blocklet.appRuntimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did);
 
-      if (!fromCache) {
-        // app disk info, component runtime info, component status, component engine
-        await forEachBlocklet(blocklet, async (component, { level }) => {
-          component.engine = getEngine(getBlockletEngineNameByPlatform(component.meta)).describe();
-
-          if (level === 0) {
-            component.diskInfo = await getDiskInfo(component, {
-              useFakeDiskInfo: !diskInfo,
-            });
-          }
+      // app disk info, component runtime info, component engine
+      await forEachBlocklet(blocklet, async (component, { level }) => {
+        component.engine = getEngine(getBlockletEngineNameByPlatform(component.meta)).describe();
 
-          component.runtimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did, component.env.id);
+        if (level === 0) {
+          component.diskInfo = await getDiskInfo(component, {
+            useFakeDiskInfo: !diskInfo,
+          });
+        }
 
-          if (component.runtimeInfo?.status && shouldUpdateBlockletStatus(component.status)) {
-            component.status = statusMap[component.runtimeInfo.status];
-          }
-        });
-      }
+        component.runtimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did, component.env.id);
+      });
 
       return blocklet;
     } catch (err) {

package/lib/blocklet/storage/backup/spaces.js

@@ -218,11 +218,9 @@ class SpacesBackup extends BaseBackup {
       const { locale } = this.input;
       // @FIXME: get locale @jianchao
       if (statusCode === 403) {
-        throw new Error(
-          `${translate(locale, 'backup.space.error.title')}: ${translate(locale, 'backup.space.error.forbidden')}`
-        );
+        throw new Error(translate(locale, 'backup.space.error.forbidden'));
       }
-      throw new Error(`${translate(locale, 'backup.space.error.title')}: ${message}`);
+      throw new Error(message);
     }
   }
 

package/lib/blocklet/storage/restore/spaces.js

@@ -135,7 +135,7 @@ class SpacesRestore extends BaseRestore {
     );
 
     if (errorCount !== 0) {
-      throw new Error(`Sync from spaces encountered error: ${message}`);
+      throw new Error(message);
     }
   }
 

package/lib/event.js

@@ -12,6 +12,7 @@ const eventHub =
   process.env.NODE_ENV === 'test' ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
 
 const states = require('./states');
+const { getBackupEndpoint, getBackupFilesUrlFromEndpoint, getDIDSpacesUrlFromEndpoint } = require('./util/spaces');
 
 const routingSnapshotPrefix = (blocklet) => (blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '[DEV] ' : '');
 
@@ -25,6 +26,7 @@ module.exports = ({
   handleRouting,
   domainStatus,
   teamAPI,
+  nodeAPI,
   teamManager,
   certManager,
   routerManager,
@@ -53,12 +55,34 @@ module.exports = ({
         teamManager.deleteTeam(data?.meta?.did, { closeDatabase: false });
       }
 
+      // clear cache
+      if (
+        [
+          BlockletEvents.updated,
+          BlockletEvents.started,
+          BlockletEvents.removed,
+          BlockletEvents.statusChange,
+          BlockletEvents.installed,
+        ].includes(name)
+      ) {
+        const did = get(data, 'meta.did');
+        if (did) {
+          logger.info('delete blocklet cache on update', { did });
+          blockletManager.deleteCache(did);
+        }
+      }
+
       if (typeof eventHandler === 'function') {
         eventHandler({ name, data });
       }
     });
   });
 
+  eventHub.on(EVENTS.NODE_UPDATED, () => {
+    logger.info('node update');
+    nodeAPI.deleteCache();
+  });
+
   // Wipe sensitive data
   // Emit events to event hub
   // Emit events to node listener
@@ -259,6 +283,25 @@ module.exports = ({
           logger.error('Reload gateway failed on blocklet.connectedSpace', { error: err });
         });
       logger.info('Reload gateway after blocklet connected to space', { event: eventName, did: blocklet.appDid });
+    } else if (BlockletEvents.backupProgress === eventName && payload?.completed) {
+      try {
+        const backupEndpoint = getBackupEndpoint(blocklet?.environments);
+
+        await node.createAuditLog({
+          action: 'backupToSpaces',
+          args: {
+            did: blocklet.meta.did,
+            url: getDIDSpacesUrlFromEndpoint(backupEndpoint),
+            backupUrl: getBackupFilesUrlFromEndpoint(backupEndpoint),
+            success: payload?.progress === 100,
+            errorMessage: payload?.message,
+          },
+          context: payload?.context ?? {},
+          result: cloneDeep(blocklet),
+        });
+      } catch (error) {
+        logger.error('Failed to createAuditLog for backupToSpaces failed', { error });
+      }
     }
 
     if (

package/lib/index.js

@@ -254,6 +254,7 @@ function ABTNode(options) {
     configPublicToStore: blockletManager.configPublicToStore.bind(blockletManager),
     configNavigations: blockletManager.configNavigations.bind(blockletManager),
     configOAuth: blockletManager.configOAuth.bind(blockletManager),
+    configNotification: blockletManager.configNotification.bind(blockletManager),
     updateWhoCanAccess: blockletManager.updateWhoCanAccess.bind(blockletManager),
     updateComponentTitle: blockletManager.updateComponentTitle.bind(blockletManager),
     updateComponentMountPoint: blockletManager.updateComponentMountPoint.bind(blockletManager),
@@ -471,6 +472,7 @@ function ABTNode(options) {
     handleRouting,
     domainStatus,
     teamAPI,
+    nodeAPI,
     teamManager,
     certManager,
     routerManager,

package/lib/states/audit-log.js

@@ -12,6 +12,14 @@ const BaseState = require('./base');
 const { parse } = require('../util/ua');
 
 const getServerInfo = (info) => `[${info.name}](${joinUrl(info.routing.adminPath, '/settings/about')})`;
+/**
+ * @description
+ * @param {import('@abtnode/client').BlockletState} blocklet
+ * @param {{
+ *  routing: { adminPath: string }
+ * }} info
+ * @returns {string}
+ */
 const getBlockletInfo = (blocklet, info) => `[${getDisplayName(blocklet)} v${blocklet.meta.version}](${joinUrl(info.routing.adminPath, '/blocklets/', blocklet.meta.did, '/overview')})`; // prettier-ignore
 const expandTeam = async (teamDid, info, node) => {
   if (!teamDid) {
@@ -81,7 +89,7 @@ const expandUser = async (teamDid, userDid, passportId, info, node) => {
  * Create log content in markdown format
  *
  * @param {string} action - GraphQL query/mutation name
- * @param {object} args - GraphQL arguments
+ * @param {Record<string, string>} args - GraphQL arguments
  * @param {object} context - request context: user, ip, user-agent, etc.
  * @param {object} result - GraphQL resolve result
  * @param {object} info - server info
@@ -116,12 +124,22 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'deleteComponent':
       return `removed component ${args.did} from blocklet ${getBlockletInfo(result, info)}`;
     case 'configBlocklet':
-      return `updated following config for blocklet ${getBlockletInfo(result, info)}:\n${args.configs.map(x => `- ${x.key}: ${x.value}\n`)}`; // prettier-ignore
+      return `updated following config for blocklet ${getBlockletInfo(result, info)}:\n${args.configs.map(x => `* ${x.key}: ${x.value}`).join('\n')}`; // prettier-ignore
     case 'upgradeBlocklet':
       if (result.resultStatus === 'failed') {
         return `upgrade blocklet failed: ${getBlockletInfo(result, info)}`;
       }
       return `upgraded blocklet ${getBlockletInfo(result, info)} to v${result.meta.version}`;
+    case 'backupToSpaces':
+      if (args?.success) {
+        return `Backup ${getBlockletInfo(result, info)} to ${
+          args.url
+        } successfully:\n- Backup files have been stored [here](${args.backupUrl})`;
+      }
+      return `Backup ${getBlockletInfo(result, info)} to ${
+        args.url
+      } failed:\n- The reason for the error is: <span style='color:red'>${args.errorMessage}</span>`;
+
     case 'upgradeComponents':
       return `upgraded components for blocklet ${getBlockletInfo(result, info)}`;
     case 'configPublicToStore':
@@ -136,6 +154,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       )}`;
     case 'configOAuth':
       return `updated following OAuth for blocklet ${getBlockletInfo(result, info)}:\n${args.oauth}`;
+    case 'configNotification':
+      return `updated following notification setting for blocklet ${getBlockletInfo(result, info)}`;
     case 'updateComponentTitle':
       return `update component title to **${args.title}** for blocklet ${getBlockletInfo(result, info)}`;
     case 'updateComponentMountPoint':
@@ -295,8 +315,10 @@ const getLogCategory = (action) => {
     case 'configPublicToStore':
     case 'configNavigations':
     case 'configOAuth':
+    case 'configNotification':
     case 'updateComponentTitle':
     case 'updateComponentMountPoint':
+    case 'backupToSpaces':
       return 'blocklet';
 
     // store，此处应该返回 server

package/lib/util/spaces.js

@@ -1,4 +1,6 @@
 const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
+const isUrl = require('is-url');
+const isArray = require('lodash/isArray');
 const isEmpty = require('lodash/isEmpty');
 const joinUrl = require('url-join');
 
@@ -7,10 +9,12 @@ const joinUrl = require('url-join');
  * @param {import('@abtnode/client').ConfigEntry[]} configs
  * @return {string | null}
  */
-const getDIDSpaceBackupEndpoint = (configs) => {
-  return (
-    configs?.find((config) => config.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_BACKUP_ENDPOINT)?.value || null
-  );
+const getBackupEndpoint = (configs) => {
+  if (!isArray(configs) || isEmpty(configs)) {
+    return '';
+  }
+
+  return configs.find((config) => config.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_BACKUP_ENDPOINT)?.value || null;
 };
 
 /**
@@ -33,7 +37,16 @@ function getBackupFilesUrlFromEndpoint(endpoint) {
   return joinUrl(prefix, 'space', spaceDid, 'apps', appDid, 'explorer', `?key=/apps/${appDid}/.did-objects/${appDid}/`);
 }
 
+function getDIDSpacesUrlFromEndpoint(endpoint) {
+  if (!isUrl(endpoint)) {
+    throw new Error(`Endpoint(${endpoint}) is not a valid url`);
+  }
+
+  return endpoint.replace(/\/api\/space\/.+/, '');
+}
+
 module.exports = {
-  getDIDSpaceBackupEndpoint,
+  getBackupEndpoint,
   getBackupFilesUrlFromEndpoint,
+  getDIDSpacesUrlFromEndpoint,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.8-beta-0c0c5eb2",
+  "version": "1.16.8-beta-b3039c78",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/certificate-manager": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/constant": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/cron": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/db": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/logger": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/queue": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/rbac": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/router-provider": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/static-server": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/timemachine": "1.16.8-beta-0c0c5eb2",
-    "@abtnode/util": "1.16.8-beta-0c0c5eb2",
+    "@abtnode/auth": "1.16.8-beta-b3039c78",
+    "@abtnode/certificate-manager": "1.16.8-beta-b3039c78",
+    "@abtnode/constant": "1.16.8-beta-b3039c78",
+    "@abtnode/cron": "1.16.8-beta-b3039c78",
+    "@abtnode/db": "1.16.8-beta-b3039c78",
+    "@abtnode/logger": "1.16.8-beta-b3039c78",
+    "@abtnode/queue": "1.16.8-beta-b3039c78",
+    "@abtnode/rbac": "1.16.8-beta-b3039c78",
+    "@abtnode/router-provider": "1.16.8-beta-b3039c78",
+    "@abtnode/static-server": "1.16.8-beta-b3039c78",
+    "@abtnode/timemachine": "1.16.8-beta-b3039c78",
+    "@abtnode/util": "1.16.8-beta-b3039c78",
     "@arcblock/did": "1.18.78",
     "@arcblock/did-auth": "1.18.78",
     "@arcblock/did-ext": "^1.18.78",
@@ -39,12 +39,12 @@
     "@arcblock/event-hub": "1.18.78",
     "@arcblock/jwt": "^1.18.78",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.77",
+    "@arcblock/validator": "^1.18.78",
     "@arcblock/vc": "1.18.78",
-    "@blocklet/constant": "1.16.8-beta-0c0c5eb2",
-    "@blocklet/meta": "1.16.8-beta-0c0c5eb2",
-    "@blocklet/sdk": "1.16.8-beta-0c0c5eb2",
-    "@did-space/client": "^0.2.90",
+    "@blocklet/constant": "1.16.8-beta-b3039c78",
+    "@blocklet/meta": "1.16.8-beta-b3039c78",
+    "@blocklet/sdk": "1.16.8-beta-b3039c78",
+    "@did-space/client": "^0.2.91",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.78",
     "@ocap/util": "1.18.78",
@@ -71,6 +71,7 @@
     "js-yaml": "^4.1.0",
     "kill-port": "^2.0.1",
     "lodash": "^4.17.21",
+    "lru-cache": "^6.0.0",
     "moment-timezone": "^0.5.37",
     "node-stream-zip": "^1.15.0",
     "p-limit": "^3.1.0",
@@ -94,5 +95,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "0d8ec3154caf670770284dbdabc61a5f4e8b205f"
+  "gitHead": "3f27acff94c144a1cf3dcf14bc1972c79a330641"
 }