@abtnode/core 1.7.10 → 1.7.13

package/lib/api/node.js

@@ -10,7 +10,7 @@ const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
 const IP = require('../util/ip');
-const { validateNodeInfo } = require('../validators/node');
+const { validateNodeInfo, validateUpdateGateway } = require('../validators/node');
 const BlockletRegistry = require('../blocklet/registry');
 const { getAll } = require('../blocklet/manager/engine');
 
@@ -154,6 +154,12 @@ class NodeAPI {
 
     return res;
   }
+
+  async updateGateway(entity, context) {
+    const data = await validateUpdateGateway(entity, context);
+
+    return this.state.updateGateway(data);
+  }
 }
 
 module.exports = NodeAPI;

package/lib/api/team.js

@@ -54,9 +54,9 @@ class TeamAPI extends EventEmitter {
     if (teamDid === nodeInfo.did && nodeInfo.nodeOwner && user.did !== nodeInfo.nodeOwner.did) {
       await this.notification.create({
         title: 'New member join',
-        description: `User with Name (${user.fullName}) and DID (${user.did}) has joined this Node`,
+        description: `User with Name (${user.fullName}) and DID (${user.did}) has joined this server`,
         entityType: 'node',
-        action: '/settings/team',
+        action: '/team/members',
         entityId: user.did,
         severity: 'success',
       });

package/lib/blocklet/manager/disk.js

@@ -31,6 +31,7 @@ const {
   isDeletableBlocklet,
   getRequiredMissingConfigs,
   hasRunnableComponent,
+  forEachBlocklet,
 } = require('@blocklet/meta/lib/util');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const toBlockletDid = require('@blocklet/meta/lib/did');
@@ -63,7 +64,6 @@ const {
   getFromCache: getAccessibleExternalNodeIp,
 } = require('../../util/get-accessible-external-node-ip');
 const {
-  forEachBlocklet,
   getBlockletDirs,
   getBlockletMetaFromUrl,
   fillBlockletConfigs,
@@ -88,12 +88,15 @@ const {
   getUpdateMetaList,
   getRuntimeEnvironments,
   getSourceFromInstallParams,
+  parseChildrenFromMeta,
   parseChildren,
   checkDuplicateComponents,
   getDiffFiles,
   getBundleDir,
   needBlockletDownload,
   verifyPurchase,
+  findAvailableDid,
+  ensureMeta,
 } = require('../../util/blocklet');
 const { parseSourceUrl } = require('../../util/registry');
 const states = require('../../states');
@@ -217,11 +220,15 @@ class BlockletManager extends BaseBlockletManager {
    *
    * InstallFromUpload
    * @param {Object} file
-   * @param {String} did for diff upload
+   * @param {String} did for diff upload or custom component did
    * @param {String} diffVersion for diff upload
    * @param {Array} deleteSet for diff upload
+   *
+   * Custom info
+   * @param {String} title custom component title
+   * @param {String} name custom component name
    */
-  async installComponent({ rootDid, mountPoint, url, file, did, diffVersion, deleteSet }, context = {}) {
+  async installComponent({ rootDid, mountPoint, url, file, did, diffVersion, deleteSet, title, name }, context = {}) {
     logger.debug('start install component', { rootDid, mountPoint, url });
 
     if (file) {
@@ -229,7 +236,7 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     if (url) {
-      return this._installComponentFromUrl({ rootDid, mountPoint, url, context });
+      return this._installComponentFromUrl({ rootDid, mountPoint, url, context, title, did, name });
     }
 
     // should not be here
@@ -283,7 +290,7 @@ class BlockletManager extends BaseBlockletManager {
 
   async start({ did, throwOnError, checkHealthImmediately = false, e2eMode = false }, context) {
     logger.info('start blocklet', { did });
-    const blocklet = await this.ensureBlocklet(did, e2eMode);
+    const blocklet = await this.ensureBlocklet(did, { e2eMode });
 
     try {
       if (!hasRunnableComponent(blocklet)) {
@@ -452,7 +459,7 @@ class BlockletManager extends BaseBlockletManager {
     logger.info('delete blocklet', { did, keepData });
 
     try {
-      const blocklet = await this.ensureBlocklet(did);
+      const blocklet = await this.ensureBlocklet(did, { validateEnv: false });
       if (isDeletableBlocklet(blocklet) === false) {
         throw new Error('Blocklet is protected from accidental deletion');
       }
@@ -521,14 +528,33 @@ class BlockletManager extends BaseBlockletManager {
   async deleteComponent({ did, rootDid }, context) {
     logger.info('delete blocklet component', { did, rootDid });
 
+    const blocklet = await this.ensureBlocklet(rootDid);
     const doc = await states.blocklet.getBlocklet(rootDid);
 
+    const child = doc.children.find((x) => x.meta.did === did);
+
+    if (!child) {
+      throw new Error('Component does not exist');
+    }
+
     doc.children = doc.children.filter((x) => x.meta.did !== did);
     const children = (await this._getDynamicChildrenFromSettings(rootDid)).filter((x) => x.meta.did !== did);
+    children.push({
+      meta: pick(child.meta, ['did', 'name', 'bundleDid', 'bundleName', 'version', 'title', 'description']),
+      mountPoint: child.mountPoint,
+      status: BlockletStatus.deleted,
+      deletedAt: new Date(),
+    });
 
     await states.blocklet.updateBlocklet(rootDid, doc);
     states.blockletExtras.setSettings(rootDid, { children });
 
+    // delete storage
+    const childBlocklet = blocklet.children.find((x) => x.meta.did === did);
+    const { cacheDir, logsDir } = childBlocklet.env;
+    fs.removeSync(cacheDir);
+    fs.removeSync(logsDir);
+
     const newBlocklet = await this.ensureBlocklet(rootDid);
     this.emit(BlockletEvents.upgraded, { blocklet: newBlocklet, context }); // trigger router refresh
     return newBlocklet;
@@ -738,9 +764,9 @@ class BlockletManager extends BaseBlockletManager {
 
     const upgradeFromRegistry = registryUrl || blocklet.deployedFrom;
 
-    const newVersionBlocklet = await this.registry.getBlockletMeta(
+    const newVersionMeta = await this.registry.getBlockletMeta(
       {
-        did,
+        did: blocklet.meta.bundleDid,
         registryUrl: upgradeFromRegistry,
       },
       context
@@ -767,7 +793,7 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const currentDeveloperSignature = getSignature(blocklet.meta.signatures);
-    const newVersionDeveloperSignature = getSignature(newVersionBlocklet.signatures, blocklet.meta.signatures);
+    const newVersionDeveloperSignature = getSignature(newVersionMeta.signatures, blocklet.meta.signatures);
 
     if (!newVersionDeveloperSignature) {
       throw new Error('Invalid upgrade blocklet signature');
@@ -783,15 +809,15 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error('Invalid developer signature');
     }
 
-    if (blocklet.meta.version === newVersionBlocklet.version) {
+    if (blocklet.meta.version === newVersionMeta.version) {
       throw new Error('Upgrade/downgrade blocklet to same version is noop');
     }
 
-    const action = semver.gt(blocklet.meta.version, newVersionBlocklet.version) ? 'downgrade' : 'upgrade';
+    const action = semver.gt(blocklet.meta.version, newVersionMeta.version) ? 'downgrade' : 'upgrade';
     logger.info(`${action} blocklet`, { did });
 
     return this._upgrade({
-      meta: newVersionBlocklet,
+      meta: newVersionMeta,
       source: BlockletSource.registry,
       deployedFrom: upgradeFromRegistry,
       context,
@@ -859,16 +885,19 @@ class BlockletManager extends BaseBlockletManager {
 
   async checkChildrenForUpdates({ did }) {
     const blocklet = await states.blocklet.getBlocklet(did);
-    const newStaticChildren = await parseChildren(blocklet.meta);
+    const newStaticChildren = await parseChildrenFromMeta(blocklet.meta);
 
-    const oldDynamicChildren = await this._getDynamicChildrenFromSettings(did);
+    const oldDynamicChildren = await this._getDynamicChildrenFromSettings(did, { skipDeleted: true });
     const noneSourceUrlChildren = oldDynamicChildren.filter((x) => !x.sourceUrl);
     const dynamicConfig = oldDynamicChildren
       .filter((x) => x.sourceUrl)
       .map((x) => ({ resolved: x.sourceUrl, name: x.meta.name, mountPoint: x.mountPoint }));
-    const newDynamicChildren = [...noneSourceUrlChildren, ...(await parseChildren(dynamicConfig, { dynamic: true }))];
+    const newDynamicChildren = [
+      ...noneSourceUrlChildren,
+      ...(await parseChildrenFromMeta(dynamicConfig, { dynamic: true })),
+    ];
 
-    checkDuplicateComponents(newDynamicChildren, newStaticChildren);
+    checkDuplicateComponents([...newDynamicChildren, ...newStaticChildren]);
 
     const updateList = getUpdateMetaList(
       [...blocklet.children.map((x) => x.meta), ...oldDynamicChildren.map((x) => x.meta)],
@@ -1013,7 +1042,6 @@ class BlockletManager extends BaseBlockletManager {
 
     const children = await this._getChildren(meta);
     const added = await states.blocklet.addBlocklet({
-      did,
       meta,
       source: BlockletSource.local,
       deployedFrom: folder,
@@ -1062,19 +1090,17 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const defaultPath = formatName(meta.name);
-    const children = await parseChildren(existRoot.meta, {
-      children: [
-        {
-          meta,
-          mountPoint: mountPoint || `/${defaultPath}`,
-          source: BlockletSource.local,
-          deployedFrom: folder,
-          status: BlockletStatus.installed,
-          mode: BLOCKLET_MODES.DEVELOPMENT,
-        },
-      ],
-      dynamic: true,
-    });
+    const children = await parseChildren([
+      {
+        meta: ensureMeta(meta),
+        mountPoint: mountPoint || `/${defaultPath}`,
+        source: BlockletSource.local,
+        deployedFrom: folder,
+        status: BlockletStatus.installed,
+        mode: BLOCKLET_MODES.DEVELOPMENT,
+        dynamic: true,
+      },
+    ]);
     await states.blocklet.addChildren(rootDid, children);
 
     logger.info('add blocklet component for dev', { did, version, meta });
@@ -1088,7 +1114,7 @@ class BlockletManager extends BaseBlockletManager {
     return rootBlocklet;
   }
 
-  async ensureBlocklet(did, e2eMode = false) {
+  async ensureBlocklet(did, { e2eMode = false, validateEnv = true } = {}) {
     if (!isValidDid(did)) {
       throw new Error(`Blocklet did is invalid: ${did}`);
     }
@@ -1098,6 +1124,7 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error(`Can not find blocklet in database by did ${did}`);
     }
 
+    // env
     blocklet.env = {
       appId: blocklet.meta.name,
       // dataDir is /dataDir.data/blocklet.meta.name
@@ -1107,18 +1134,23 @@ class BlockletManager extends BaseBlockletManager {
         dataDirs: this.dataDirs,
         ensure: true,
         e2eMode,
+        validate: validateEnv,
       }),
     };
 
+    // configs
     const configs = await states.blockletExtras.getConfigs(blocklet.meta.did);
     fillBlockletConfigs(blocklet, configs);
 
-    // merge settings to blocklet
+    // settings
     const settings = await states.blockletExtras.getSettings(blocklet.meta.did);
     blocklet.trustedPassports = get(settings, 'trustedPassports') || [];
     blocklet.enablePassportIssuance = get(settings, 'enablePassportIssuance', true);
     blocklet.settings = settings || {};
 
+    // site
+    blocklet.site = await this.getSiteByDid(blocklet.meta.did);
+
     // handle child env
     for (const child of blocklet.children) {
       const {
@@ -1128,11 +1160,9 @@ class BlockletManager extends BaseBlockletManager {
         meta: { name },
       } = blocklet;
 
+      // child env
       child.env = {
         appId: `${encodeURIComponent(name)}/${encodeURIComponent(childName)}`,
-        // dataDir is /dataDir.data/blocklet.meta.name/child.meta.name
-        // cacheDir is /dataDirs.cache/blocklet.meta.name/child.meta.name
-        // logDir is /dataDirs.log/blocklet.meta.name
         ...getBlockletDirs(child, {
           dataDirs: this.dataDirs,
           ensure: true,
@@ -1140,13 +1170,11 @@ class BlockletManager extends BaseBlockletManager {
         }),
       };
 
+      // child configs
       const childConfigs = await states.blockletExtras.getChildConfigs(blocklet.meta.did, childDid);
       fillBlockletConfigs(child, childConfigs, blocklet);
     }
 
-    // site
-    blocklet.site = await this.getSiteByDid(blocklet.meta.did);
-
     return blocklet;
   }
 
@@ -1583,7 +1611,7 @@ class BlockletManager extends BaseBlockletManager {
     });
   }
 
-  async _installComponentFromUrl({ rootDid, mountPoint, url, context }) {
+  async _installComponentFromUrl({ rootDid, mountPoint, url, context, title, name: inputName, did: inputDid }) {
     const blocklet = await states.blocklet.getBlocklet(rootDid);
     if (!blocklet) {
       throw new Error('Root blocklet does not exist');
@@ -1601,18 +1629,31 @@ class BlockletManager extends BaseBlockletManager {
 
     verifyPurchase(meta, context);
 
-    const newChildren = await parseChildren(blocklet.meta, {
-      children: [
-        {
-          meta,
-          mountPoint,
-          sourceUrl: url,
-        },
-      ],
-      dynamic: true,
-    });
+    if (title) {
+      meta.title = await titleSchema.validateAsync(title);
+    }
+
+    let name = inputName;
+    let did = inputDid;
+    if (!inputName && !inputDid) {
+      const found = findAvailableDid(meta, [
+        ...blocklet.children.map((x) => x.meta),
+        ...(await states.blockletExtras.getSettings(rootDid, 'children', [])).map((x) => x.meta),
+      ]);
+      name = found.name;
+      did = found.did;
+    }
+
+    const newChildren = await parseChildren([
+      {
+        meta: ensureMeta(meta, { did, name }),
+        mountPoint,
+        sourceUrl: url,
+        dynamic: true,
+      },
+    ]);
 
-    checkDuplicateComponents(blocklet.children, newChildren);
+    checkDuplicateComponents([...blocklet.children, ...newChildren]);
 
     // add component to db
     await states.blocklet.addChildren(rootDid, newChildren);
@@ -1656,7 +1697,6 @@ class BlockletManager extends BaseBlockletManager {
     const meta = validateMeta(rawMeta);
 
     await states.blocklet.addBlocklet({
-      did: meta.did,
       meta,
       source: BlockletSource.custom,
     });
@@ -1723,7 +1763,7 @@ class BlockletManager extends BaseBlockletManager {
 
       const { meta } = await this._resolveDiffDownload(cwd, tarFile, deleteSet, oldBlocklet.meta);
       const newBlocklet = await states.blocklet.getBlocklet(did);
-      newBlocklet.meta = meta;
+      newBlocklet.meta = ensureMeta(meta);
       newBlocklet.source = BlockletSource.upload;
       newBlocklet.deployedFrom = `Upload by ${context.user.fullName}`;
       newBlocklet.children = await this._getChildren(meta);
@@ -1749,7 +1789,7 @@ class BlockletManager extends BaseBlockletManager {
       }
 
       const newBlocklet = await states.blocklet.getBlocklet(meta.did);
-      newBlocklet.meta = meta;
+      newBlocklet.meta = ensureMeta(meta);
       newBlocklet.source = BlockletSource.upload;
       newBlocklet.deployedFrom = `Upload by ${context.user.fullName}`;
       newBlocklet.children = await this._getChildren(meta);
@@ -1767,7 +1807,6 @@ class BlockletManager extends BaseBlockletManager {
     // full deploy - install
     const children = await this._getChildren(meta);
     const blocklet = await states.blocklet.addBlocklet({
-      did: meta.did,
       meta,
       source: BlockletSource.upload,
       deployedFrom: `Upload by ${context.user.fullName}`,
@@ -1834,28 +1873,26 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const newBlocklet = await states.blocklet.getBlocklet(rootDid);
-    const dynamicChildren = await this._getDynamicChildrenFromSettings(rootDid);
+
+    if (newBlocklet.children.some((x) => !x.dynamic && x.meta.did === meta.did)) {
+      throw new Error('Cannot add duplicate component defined in app meta');
+    }
 
     const newChild = {
-      meta,
+      meta: ensureMeta(meta),
       mountPoint,
       source: BlockletSource.upload,
       deployedFrom: `Upload by ${context.user.fullName}`,
       sourceUrl: '',
       dynamic: true,
     };
-    const index = dynamicChildren.findIndex((child) => child.meta.did === meta.did);
+    const index = newBlocklet.children.findIndex((child) => child.meta.did === meta.did);
     if (index >= 0) {
-      dynamicChildren.splice(index, 1, newChild);
+      newBlocklet.children.splice(index, 1, newChild);
     } else {
-      dynamicChildren.push(newChild);
+      newBlocklet.children.push(newChild);
     }
 
-    const staticChildren = newBlocklet.children.filter((x) => !x.dynamic);
-    checkDuplicateComponents(dynamicChildren, staticChildren);
-
-    newBlocklet.children = [...staticChildren, ...dynamicChildren.map((x) => ({ ...x, dynamic: true }))];
-
     await validateBlocklet(newBlocklet);
 
     return this._upgradeBlocklet({
@@ -1902,13 +1939,15 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error('the blocklet is not installed');
     }
 
+    const { bundleDid } = blocklet.meta;
+
     let versions = this.cachedBlockletVersions.get(did);
 
     if (!versions) {
       const { blockletRegistryList } = await states.node.read();
       const tasks = blockletRegistryList.map((registry) =>
         this.registry
-          .getBlockletMeta({ did, registryUrl: registry.url })
+          .getBlockletMeta({ did: bundleDid, registryUrl: registry.url })
           .then((item) => ({ did, version: item.version, registryUrl: registry.url }))
           .catch((error) => {
             if (error.response && error.response.status === 404) {
@@ -1982,19 +2021,24 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async _getChildren(meta) {
-    const staticChildren = await parseChildren(meta);
-    const dynamicChildren = await parseChildren(meta, {
-      children: await states.blockletExtras.getSettings(meta.did, 'children', []),
-      dynamic: true,
-    });
-    checkDuplicateComponents(dynamicChildren, staticChildren);
+    const staticChildren = await parseChildrenFromMeta(meta);
+    const dynamicChildren = await parseChildren(
+      await this._getDynamicChildrenFromSettings(meta.did, { skipDeleted: true }),
+      meta,
+      {
+        dynamic: true,
+      }
+    );
+    checkDuplicateComponents([...dynamicChildren, ...staticChildren]);
 
     return [...staticChildren, ...dynamicChildren];
   }
 
-  async _getDynamicChildrenFromSettings(did) {
+  async _getDynamicChildrenFromSettings(did, { skipDeleted } = {}) {
     const children = await states.blockletExtras.getSettings(did, 'children', []);
-    return children.map((x) => ({ ...x, dynamic: true }));
+    return children
+      .map((x) => ({ ...x, dynamic: true }))
+      .filter((x) => (skipDeleted ? x.status !== BlockletStatus.deleted : true));
   }
 
   async _install({ meta, source, deployedFrom, context, sync }) {
@@ -2005,7 +2049,6 @@ class BlockletManager extends BaseBlockletManager {
     const children = await this._getChildren(meta);
     try {
       const blocklet = await states.blocklet.addBlocklet({
-        did: meta.did,
         meta,
         source,
         deployedFrom,
@@ -2091,11 +2134,11 @@ class BlockletManager extends BaseBlockletManager {
 
     // NOTE: 目前的版本移除了降级通道，所以不需要考虑降级通道的情况
     const action = semver.gt(oldBlocklet.meta.version, version) ? 'downgrade' : 'upgrade';
-    logger.info(`${action} blocklet`, { did, version });
+    logger.info(`${action} blocklet`, { did, name, version });
 
     const newBlocklet = await states.blocklet.setBlockletStatus(did, BlockletStatus.waiting);
 
-    newBlocklet.meta = meta;
+    newBlocklet.meta = ensureMeta(meta);
     newBlocklet.source = source;
     newBlocklet.deployedFrom = deployedFrom;
     newBlocklet.children = await this._getChildren(meta);
@@ -2326,6 +2369,9 @@ class BlockletManager extends BaseBlockletManager {
 
       this.emit(BlockletEvents.installed, { blocklet, context });
 
+      // Update dynamic component meta in blocklet settings
+      await this._ensureDynamicChildrenInSettings(blocklet);
+
       states.notification.create({
         title: 'Blocklet Installed',
         description: `Blocklet ${meta.name}@${meta.version} is installed successfully. (Source: ${
@@ -2475,10 +2521,7 @@ class BlockletManager extends BaseBlockletManager {
       }
 
       // Update dynamic component meta in blocklet settings
-      const dynamicChildren = blocklet.children
-        .filter((x) => x.dynamic)
-        .map((x) => pick(x, ['meta', 'mountPoint', 'sourceUrl', 'source']));
-      await states.blockletExtras.setSettings(did, { children: dynamicChildren });
+      await this._ensureDynamicChildrenInSettings(blocklet);
 
       return blocklet;
     } catch (err) {
@@ -2496,6 +2539,23 @@ class BlockletManager extends BaseBlockletManager {
     }
   }
 
+  // Update dynamic component meta in blocklet settings
+  async _ensureDynamicChildrenInSettings(blocklet) {
+    const { did } = blocklet.meta;
+    const dynamicChildren = blocklet.children
+      .filter((x) => x.dynamic)
+      .map((x) => pick(x, ['meta', 'mountPoint', 'sourceUrl', 'source']));
+
+    // deleted blocklet
+    let deletes = await states.blockletExtras.getSettings(did, 'children', []);
+    deletes = deletes.filter(
+      (x) => x.status === BlockletStatus.deleted && !blocklet.children.some((y) => y.meta.did === x.meta.did)
+    );
+    dynamicChildren.push(...deletes);
+
+    await states.blockletExtras.setSettings(did, { children: dynamicChildren });
+  }
+
   /**
    * for download: cwd, tarball, did
    * for verify: verify, integrity
@@ -2619,7 +2679,7 @@ class BlockletManager extends BaseBlockletManager {
    * @return {object} { isCancelled: Boolean }
    */
   async _downloadBundle(meta, rootDid, url) {
-    const { name, did, version, dist = {} } = meta;
+    const { bundleName: name, bundleDid: did, version, dist = {} } = meta;
     const { tarball, integrity } = dist;
 
     const lockName = `download-${did}-${version}`;

package/lib/blocklet/registry.js

@@ -11,7 +11,7 @@ const request = require('../util/request');
 
 const states = require('../states');
 const isRequirementsSatisfied = require('../util/requirement');
-const { fixAndVerifyBlockletMeta } = require('../util/blocklet');
+const { fixAndVerifyMetaFromStore } = require('../util/blocklet');
 const { translate } = require('../locales');
 const { validateRegistryURL, getRegistryMeta } = require('../util/registry');
 
@@ -68,7 +68,11 @@ class BlockletRegistry {
 
     const { data } = await request.get(url);
     try {
-      return fixAndVerifyBlockletMeta(data, did);
+      if (data.did !== did) {
+        throw new Error('Invalid blocklet meta: did does not match');
+      }
+
+      return fixAndVerifyMetaFromStore(data);
     } catch (err) {
       logger.error('failed to get blocklet meta', { did, data, error: err });
       throw err;

package/lib/event.js

@@ -210,6 +210,11 @@ module.exports = ({
     }
   });
   nodeState.on(EVENTS.NODE_UPGRADE_PROGRESS, (session) => onEvent(EVENTS.NODE_UPGRADE_PROGRESS, session));
+  nodeState.on(EVENTS.RELOAD_GATEWAY, (nodeInfo) => {
+    handleRouting(nodeInfo).catch((err) => {
+      logger.error('Handle routing failed on node.updated', { error: err });
+    });
+  });
 
   domainStatus.on(EVENTS.DOMAIN_STATUS, (data) => {
     if (data) {