@abtnode/core 1.8.5 → 1.8.8

package/lib/api/node.js

@@ -30,12 +30,11 @@ class NodeAPI {
    *
    * @param {object} state Node StateDB
    */
-  constructor(state, blockletRegistry) {
+  constructor(state) {
     assert.notStrictEqual(state, undefined, 'argument state can not be undefined');
     assert.notStrictEqual(state, null, 'argument state can not be null');
 
     this.state = state;
-    this.blockletRegistry = blockletRegistry;
   }
 
   // eslint-disable-next-line no-unused-vars
@@ -66,7 +65,6 @@ class NodeAPI {
     const newBlockletRegistryList = info.blockletRegistryList.map((x) => ({ ...x, selected: false }));
     newBlockletRegistryList.push({ ...newBlockletRegistry, url: sanitized, selected: true, protected: false });
 
-    this.blockletRegistry.clearCache();
     return this.state.updateNodeInfo({ blockletRegistryList: newBlockletRegistryList });
   }
 
@@ -80,8 +78,6 @@ class NodeAPI {
       throw new Error(`Blocklet registry does not exist: ${sanitized}`);
     }
 
-    this.blockletRegistry.clearCache();
-
     const blockletRegistryList = info.blockletRegistryList.filter((x) => x.url !== sanitized);
     if (!blockletRegistryList.find((x) => x.selected)) {
       blockletRegistryList[0].selected = true;
@@ -99,7 +95,6 @@ class NodeAPI {
       throw new Error(`Blocklet registry does not exist: ${sanitized}`);
     }
 
-    this.blockletRegistry.clearCache();
     return this.state.updateNodeInfo({
       blockletRegistryList: info.blockletRegistryList.map((x) => ({ ...x, selected: x.url === sanitized })),
     });

package/lib/blocklet/extras.js

@@ -21,6 +21,7 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
       secure: x.secure || false,
       validation: x.validation || '',
       custom: x.custom,
+      shared: x.shared,
     };
     return acc;
   }, {});
@@ -55,7 +56,7 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
   });
 
   newConfig.forEach((config) => {
-    const { name, key, value, default: defaultVal, required, description, secure, validation, custom } = config;
+    const { name, key, value, default: defaultVal, required, description, secure, validation, custom, shared } = config;
     // 新增、更新或者删除
     if (key) {
       const originalVal = oldConfig[key] || {};
@@ -67,6 +68,7 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
         validation: validation || '',
         secure: secure === undefined ? false : secure,
         custom: custom === undefined ? false : custom,
+        shared,
       };
       return;
     }
@@ -81,6 +83,7 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
           validation: validation || '',
           secure: secure === undefined ? false : secure,
           custom: custom === undefined ? false : custom,
+          shared,
         };
 
         return;
@@ -94,6 +97,7 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
         validation: validation || '',
         secure: secure === undefined ? false : secure,
         custom: custom === undefined ? false : custom,
+        shared,
       };
     }
   });
@@ -109,6 +113,7 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
       secure: mergedObj[key].secure,
       validation: mergedObj[key].validation,
       custom: mergedObj[key].custom,
+      shared: mergedObj[key].shared,
     }));
 
   return mergedConfig;

package/lib/blocklet/manager/disk.js

@@ -2211,6 +2211,9 @@ class BlockletManager extends BaseBlockletManager {
     } else {
       newBlocklet.children.push(newChild);
     }
+
+    checkDuplicateComponents(newBlocklet.children);
+
     await this._upsertDynamicNavigation(newBlocklet.meta.did, newChild);
 
     await this._downloadBlocklet(newBlocklet, oldBlocklet);
@@ -2771,7 +2774,6 @@ class BlockletManager extends BaseBlockletManager {
     // ids
     context.skippedProcessIds = getSkippedProcessIds({ newBlocklet, oldBlocklet, context });
 
-    const oldVersion = oldBlocklet.meta.version;
     const action = semver.gt(oldBlocklet.meta.version, version) ? 'downgrade' : 'upgrade';
     try {
       // delete old process
@@ -2817,26 +2819,21 @@ class BlockletManager extends BaseBlockletManager {
         });
       await forEachBlocklet(blocklet, postInstall, { parallel: true });
 
-      // run migrations
-      const runMigration = (b, { ancestors }) => {
-        // BUG: 本身的定义是在执行 upgrade 操作时进行 migration，但是父 blocklet upgrade 时，子 blocklet 可能不需要 upgrade，就会导致子 blocklet 多走了一遍 migration 流程
-        if (b.meta.did === did) {
+      logger.info('start migration');
+      try {
+        const oldVersions = {};
+        forEachBlockletSync(oldBlocklet, (b, { id }) => {
+          oldVersions[id] = b.meta.version;
+        });
+        const runMigration = (b, { id, ancestors }) => {
           return runMigrationScripts({
             blocklet: b,
             appDir: b.env.appDir,
             env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
-            oldVersion,
-            newVersion: version,
-            did: b.meta.did,
-            notification: states.notification,
-            context,
+            oldVersion: oldVersions[id],
+            newVersion: b.meta.version,
           });
-        }
-        return Promise.resolve();
-      };
-      logger.info('start migration');
-
-      try {
+        };
         await forEachBlocklet(blocklet, runMigration, { parallel: true });
       } catch (error) {
         logger.error('Failed to migrate blocklet', { did, error });

package/lib/blocklet/migration.js

@@ -102,6 +102,10 @@ module.exports = async ({
   printSuccess = logger.info,
   printError = logger.error,
 }) => {
+  if (!oldVersion) {
+    return;
+  }
+
   const baseDir = env.BLOCKLET_DATA_DIR;
 
   const scriptsDir = path.join(appDir, 'migration');
@@ -125,4 +129,6 @@ module.exports = async ({
     printInfo,
     printSuccess,
   });
+
+  fs.removeSync(backupDir);
 };

package/lib/blocklet/registry.js

@@ -1,6 +1,4 @@
-const { BlockletGroup } = require('@blocklet/meta/lib/constants');
 const joinURL = require('url-join');
-const get = require('lodash/get');
 const { BLOCKLET_STORE_API_PREFIX } = require('@abtnode/constant');
 
 const { name } = require('../../package.json');
@@ -10,48 +8,15 @@ const logger = require('@abtnode/logger')(`${name}:blocklet:registry`); // eslin
 const request = require('../util/request');
 
 const states = require('../states');
-const isRequirementsSatisfied = require('../util/requirement');
 const { fixAndVerifyMetaFromStore } = require('../util/blocklet');
-const { translate } = require('../locales');
 const { validateRegistryURL, getRegistryMeta } = require('../util/registry');
 
-const DEFAULT_REFRESH_INTERVAL = 1 * 60 * 1000;
-const MAX_REFRESH_INTERVAL = 1 * 60 * 1000;
-
 class BlockletRegistry {
   constructor() {
     this.blocklets = [];
     this.cacheId = '';
   }
 
-  getCron(refreshInterval = DEFAULT_REFRESH_INTERVAL) {
-    const interval = Math.min(Math.max(Number(refreshInterval), DEFAULT_REFRESH_INTERVAL), MAX_REFRESH_INTERVAL); // Should between 20 ~ 60 seconds
-    return {
-      name: 'refetch-blocklet-registry',
-      time: `*/${Math.round(interval / 1000)} * * * * *`,
-      fn: this._init.bind(this),
-    };
-  }
-
-  async listBlocklets(input, context) {
-    const registryUrl = await states.node.getBlockletRegistry();
-
-    if (input && input.registryUrl && registryUrl !== input.registryUrl) {
-      this.blocklets = [];
-      this.cacheId = '';
-    }
-
-    if (this.blocklets.length > 0) {
-      return this.blocklets.filter((x) => isRequirementsSatisfied(x.requirements, false));
-    }
-    return this.refreshBlocklets(context);
-  }
-
-  async hasBlocklet(id) {
-    const list = await this.listBlocklets();
-    return list.some((x) => x.did === id || x.name === id);
-  }
-
   getBlocklet(id, registryUrl) {
     return this.getBlockletMeta({ did: id, registryUrl });
   }
@@ -100,59 +65,6 @@ class BlockletRegistry {
     this.cacheId = '';
     this.blocklets = [];
   }
-
-  async _init() {
-    states.node.onReady(async () => {
-      this.refreshBlocklets().catch(
-        (error) => logger.error('refresh blocklets failed on initialize the registry', { error })
-        // eslint-disable-next-line function-paren-newline
-      );
-    });
-  }
-
-  async refreshBlocklets(context) {
-    const registryUrl = await states.node.getBlockletRegistry();
-    const url = joinURL(registryUrl, BLOCKLET_STORE_API_PREFIX, '/blocklets.json');
-    try {
-      let res = await request.get(url, {
-        validateStatus: (status) => (status >= 200 && status < 300) || status === 304,
-        headers: {
-          'If-None-Match': this.cacheId,
-        },
-      });
-
-      if (res.status === 304 && this.blocklets.length > 0) {
-        logger.debug('use cached data', { etag: res.headers.etag, registryUrl });
-        return this.blocklets.filter((x) => isRequirementsSatisfied(x.requirements, false));
-      }
-
-      if (res.status === 304) {
-        res = await request.get(url, {
-          headers: {
-            'Cache-Control': 'no-store',
-          },
-        });
-
-        logger.debug('re-fetch from registry', { status: res.status });
-      }
-
-      if (!Array.isArray(res.data)) {
-        logger.error('Blocklet list fetch failed, response data is not a list', { url, data: res.data });
-        throw new Error('Blocklet list fetch failed');
-      }
-
-      const blocklets = res.data.filter((x) => BlockletGroup[x.group]);
-      logger.debug('blocklets loaded', { url, blocklets: blocklets.map((x) => ({ did: x.did, name: x.name })) });
-      this.cacheId = res.headers.etag;
-      this.blocklets = blocklets.filter((x) => isRequirementsSatisfied(x.requirements, false));
-    } catch (error) {
-      logger.error('refresh blocklet registry failed', { error, registryUrl });
-      this.cacheId = '';
-      throw new Error(translate(get(context, 'query.locale', 'en'), 'registry.getListError', { registryUrl }));
-    }
-
-    return this.blocklets;
-  }
 }
 
 BlockletRegistry.validateRegistryURL = validateRegistryURL;

package/lib/event.js

@@ -18,7 +18,6 @@ const routingSnapshotPrefix = (blocklet) => (blocklet.mode === BLOCKLET_MODES.DE
 // Initialize the event queue: this will make events across process
 module.exports = ({
   blockletManager,
-  blockletRegistry,
   ensureBlockletRouting,
   ensureBlockletRoutingForUpgrade,
   removeBlockletRouting,
@@ -252,9 +251,6 @@ module.exports = ({
   nodeState.once(EVENTS.NODE_ADDED_OWNER, () => downloadAddedBlocklet());
   nodeState.on(EVENTS.NODE_UPDATED, (nodeInfo, oldInfo) => {
     onEvent(EVENTS.NODE_UPDATED, { did: nodeInfo.did });
-    blockletRegistry
-      .refreshBlocklets()
-      .catch((error) => logger.error('refresh blocklets failed on initialize the registry', { error }));
 
     // We need update router on some fields change
     const fields = ['enableWelcomePage', 'webWalletUrl', 'registerUrl'];

package/lib/index.js

@@ -162,7 +162,7 @@ function ABTNode(options) {
     getRouterProvider,
   } = getRouterHelpers({ dataDirs, routingSnapshot, routerManager, blockletManager, certManager });
 
-  const nodeAPI = new NodeAPI(states.node, blockletRegistry);
+  const nodeAPI = new NodeAPI(states.node);
   const teamAPI = new TeamAPI({ states, teamManager });
 
   blockletManager.getRoutingRulesByDid = getRoutingRulesByDid;
@@ -230,7 +230,6 @@ function ABTNode(options) {
     setBlockletInitialized: blockletManager.setInitialized.bind(blockletManager),
 
     // Registry
-    listBlocklets: blockletRegistry.listBlocklets.bind(blockletRegistry),
     getBlockletMeta: blockletRegistry.getBlockletMeta.bind(blockletRegistry),
     getRegistryMeta: BlockletRegistry.getRegistryMeta,
 
@@ -412,7 +411,6 @@ function ABTNode(options) {
       context: { states, events, webhook },
       jobs: [
         IP.cron,
-        blockletRegistry.getCron(),
         Upgrade.getCron(),
         ...getRoutingCrons(),
         ...blockletManager.getCrons(),

package/lib/states/audit-log.js

@@ -145,7 +145,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'login':
       return `${user} logged in to ${team} with passport ${args.passport.name}`;
     case 'updateWhoCanAccess':
-      return `updated access control policy to **${args.value}** for ${team} when ${args.reason}`;
+      return `updated access control policy to **${args.whoCanAccess}**`;
     case 'configPassportIssuance':
       return `${args.enabled ? 'enabled' : 'disabled'} passport issuance for ${team}`;
     case 'createPassportIssuance':

package/lib/states/node.js

@@ -163,7 +163,6 @@ class NodeState extends BaseState {
   // FIXME: 这个接口比较危险，可能会修改一些本不应该修改的字段，后续需要考虑改进
   async updateNodeInfo(entity = {}) {
     const record = await this.read();
-
     const updateResult = await this.update(record._id, { $set: omit(entity, ['ownerNft', 'sk']) });
     this.emit(EVENTS.NODE_UPDATED, updateResult, record);
     return updateResult;

package/lib/util/blocklet.js

@@ -21,6 +21,7 @@ const CustomError = require('@abtnode/util/lib/custom-error');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const hashFiles = require('@abtnode/util/lib/hash-files');
+const isPathPrefixEqual = require('@abtnode/util/lib/is-path-prefix-equal');
 const { BLOCKLET_MAX_MEM_LIMIT_IN_MB, BLOCKLET_STORE_API_BLOCKLET_PREFIX } = require('@abtnode/constant');
 
 const {
@@ -339,6 +340,7 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
       : {};
 
   const root = (ancestors || [])[0] || blocklet;
+
   const ports = {};
   forEachBlockletSync(root, (x) => {
     const webInterface = findWebInterface(x);
@@ -347,12 +349,23 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     }
   });
 
+  const mountPoints = [];
+  for (const x of root.children || []) {
+    mountPoints.push({
+      title: x.meta.title,
+      did: x.meta.did,
+      name: x.meta.name,
+      mountPoint: x.mountPoint || '',
+    });
+  }
+
   return {
     ...blocklet.configObj,
     ...getSharedConfigObj(blocklet, ancestors),
     ...blocklet.environmentObj,
     ...devEnvironments,
     BLOCKLET_WEB_PORTS: JSON.stringify(ports),
+    BLOCKLET_MOUNT_POINTS: JSON.stringify(mountPoints),
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };
@@ -1179,7 +1192,7 @@ const checkDuplicateComponents = (components = []) => {
   }
 
   const duplicateMountPoints = components.filter(
-    (item, index) => components.findIndex((x) => x.mountPoint === item.mountPoint) !== index
+    (item, index) => components.findIndex((x) => isPathPrefixEqual(x.mountPoint, item.mountPoint)) !== index
   );
   if (duplicateMountPoints.length) {
     throw new Error(`mount point must be unique: ${duplicateMountPoints.map((x) => x.mountPoint).join(', ')}`);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.5",
+  "version": "1.8.8",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,40 +19,40 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.8.5",
-    "@abtnode/constant": "1.8.5",
-    "@abtnode/cron": "1.8.5",
-    "@abtnode/db": "1.8.5",
-    "@abtnode/logger": "1.8.5",
-    "@abtnode/queue": "1.8.5",
-    "@abtnode/rbac": "1.8.5",
-    "@abtnode/router-provider": "1.8.5",
-    "@abtnode/static-server": "1.8.5",
-    "@abtnode/timemachine": "1.8.5",
-    "@abtnode/util": "1.8.5",
-    "@arcblock/did": "1.17.6",
+    "@abtnode/certificate-manager": "1.8.8",
+    "@abtnode/constant": "1.8.8",
+    "@abtnode/cron": "1.8.8",
+    "@abtnode/db": "1.8.8",
+    "@abtnode/logger": "1.8.8",
+    "@abtnode/queue": "1.8.8",
+    "@abtnode/rbac": "1.8.8",
+    "@abtnode/router-provider": "1.8.8",
+    "@abtnode/static-server": "1.8.8",
+    "@abtnode/timemachine": "1.8.8",
+    "@abtnode/util": "1.8.8",
+    "@arcblock/did": "1.17.11",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.6",
-    "@arcblock/event-hub": "1.17.6",
-    "@arcblock/jwt": "^1.17.6",
+    "@arcblock/did-util": "1.17.11",
+    "@arcblock/event-hub": "1.17.11",
+    "@arcblock/jwt": "^1.17.11",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.17.6",
-    "@blocklet/meta": "1.8.5",
-    "@blocklet/sdk": "1.8.5",
+    "@arcblock/vc": "1.17.11",
+    "@blocklet/meta": "1.8.8",
+    "@blocklet/sdk": "1.8.8",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.3.2",
     "@nedb/multi": "^1.3.2",
-    "@ocap/mcrypto": "1.17.6",
-    "@ocap/util": "1.17.6",
-    "@ocap/wallet": "1.17.6",
-    "@slack/webhook": "^5.0.3",
+    "@ocap/mcrypto": "1.17.11",
+    "@ocap/util": "1.17.11",
+    "@ocap/wallet": "1.17.11",
+    "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
-    "chalk": "^4.0.0",
+    "chalk": "^4.1.2",
     "deep-diff": "^1.0.2",
     "detect-port": "^1.3.0",
     "flat": "^5.0.2",
-    "fs-extra": "^10.0.1",
+    "fs-extra": "^10.1.0",
     "get-port": "^5.1.1",
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
@@ -61,16 +61,16 @@
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
-    "pm2": "^5.1.2",
+    "pm2": "^5.2.0",
     "promise.any": "^2.0.4",
-    "semver": "^7.3.2",
-    "shelljs": "^0.8.4",
-    "slugify": "^1.4.6",
-    "ssri": "^8.0.0",
+    "semver": "^7.3.7",
+    "shelljs": "^0.8.5",
+    "slugify": "^1.6.5",
+    "ssri": "^8.0.1",
     "stream-throttle": "^0.1.3",
     "stream-to-promise": "^3.0.0",
-    "systeminformation": "^5.11.5",
-    "tar": "^6.1.0",
+    "systeminformation": "^5.12.4",
+    "tar": "^6.1.11",
     "ua-parser-js": "^1.0.2",
     "unzipper": "^0.10.11",
     "url-join": "^4.0.1",
@@ -79,8 +79,8 @@
   "devDependencies": {
     "compression": "^1.7.4",
     "expand-tilde": "^2.0.2",
-    "express": "^4.17.1",
-    "jest": "^27.4.5"
+    "express": "^4.18.1",
+    "jest": "^27.5.1"
   },
-  "gitHead": "58da88581cdf1dd45fd50e56db08a055be82626e"
+  "gitHead": "8da61db2342d7c53f2b803e5193c03d82bce8f77"
 }