@abtnode/core 1.6.18 → 1.6.19

package/lib/api/node.js

@@ -93,7 +93,7 @@ class NodeAPI {
   async updateNodeInfo(entity = {}, context) {
     await validateNodeInfo(entity, context);
 
-    if (entity.autoUpgrade) {
+    if (entity.autoUpgrade && process.env.NODE_ENV !== 'development') {
       try {
         canPackageReadWrite(process.env.ABT_NODE_BINARY_NAME, process.env.ABT_NODE_PACKAGE_NAME);
       } catch (err) {

package/lib/blocklet/manager/disk.js

@@ -25,6 +25,7 @@ const { BLOCKLET_PURCHASE_NFT_TYPE } = require('@abtnode/constant');
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
 const {
   isFreeBlocklet,
+  isComponentBlocklet,
   isDeletableBlocklet,
   getRequiredMissingConfigs,
   hasRunnableComponent,
@@ -88,6 +89,7 @@ const {
   checkDuplicateComponents,
   getDiffFiles,
   getBundleDir,
+  needBlockletDownload,
 } = require('../../util/blocklet');
 const states = require('../../states');
 const BlockletRegistry = require('../registry');
@@ -819,21 +821,23 @@ class BlockletManager extends BaseBlockletManager {
     };
   }
 
-  async updateChildren({ updateId, did: inputDid, children: inputChildren }, context) {
+  async updateChildren({ updateId, did: inputDid, children: inputChildren, oldBlocklet: inputOldBlocklet }, context) {
     let did;
     let children;
+    let oldBlocklet;
     if (!updateId && inputDid && inputChildren) {
       did = inputDid;
       children = inputChildren;
+      oldBlocklet = inputOldBlocklet;
     } else {
       const sessionData = await states.session.end(updateId);
       did = sessionData.did;
       const { staticChildren = [], dynamicChildren = [] } = sessionData;
       children = [...staticChildren, ...dynamicChildren.map((x) => ({ ...x, dynamic: true }))];
+      oldBlocklet = await states.blocklet.getBlocklet(did);
     }
 
     // get old blocklet
-    const oldBlocklet = await states.blocklet.getBlocklet(did);
     const { meta } = oldBlocklet;
     const { name, version } = meta;
 
@@ -1179,9 +1183,6 @@ class BlockletManager extends BaseBlockletManager {
         return;
       }
 
-      const blocklet1 = await states.blocklet.setBlockletStatus(did, BlockletStatus.downloading);
-      this.emit(BlockletEvents.statusChange, blocklet1);
-
       preDownloadLock.release();
 
       const { isCancelled } = await this._downloadBlocklet(blocklet, oldBlocklet);
@@ -1434,6 +1435,10 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error('Cannot add self as a component');
     }
 
+    if (!isComponentBlocklet(meta)) {
+      throw new Error('The blocklet cannot be a component');
+    }
+
     const newChildren = await parseChildren(blocklet.meta, {
       children: [
         {
@@ -1447,10 +1452,14 @@ class BlockletManager extends BaseBlockletManager {
 
     checkDuplicateComponents(blocklet.children, newChildren);
 
+    // add component to db
+    await states.blocklet.addChildren(rootDid, newChildren);
+
     return this.updateChildren(
       {
         did: rootDid,
         children: [...blocklet.children, ...newChildren],
+        oldBlocklet: blocklet,
       },
       context
     );
@@ -2272,7 +2281,7 @@ class BlockletManager extends BaseBlockletManager {
       } else {
         const status =
           oldBlocklet.status === BlockletStatus.installed ? BlockletStatus.installed : BlockletStatus.stopped;
-        await states.blocklet.setBlockletStatus(did, status);
+        await states.blocklet.setBlockletStatus(did, status, { children: 'all' });
       }
 
       blocklet = await this.ensureBlocklet(did, context);
@@ -2496,10 +2505,7 @@ class BlockletManager extends BaseBlockletManager {
     } = blocklet;
 
     const metas = [];
-    if (
-      ![BlockletSource.upload, BlockletSource.local].includes(blocklet.source) &&
-      get(oldBlocklet, 'meta.dist.integrity') !== get(blocklet, 'meta.dist.integrity')
-    ) {
+    if (needBlockletDownload(blocklet)) {
       metas.push(blocklet.meta);
     }
 
@@ -2510,16 +2516,17 @@ class BlockletManager extends BaseBlockletManager {
 
     for (const child of blocklet.children) {
       const oldChild = oldChildren[child.meta.did];
-      if (
-        !oldChild ||
-        (![BlockletSource.upload, BlockletSource.local].includes(child.source) &&
-          child.sourceUrl &&
-          get(oldChild, 'meta.dist.integrity') !== get(child, 'meta.dist.integrity'))
-      ) {
+      if (needBlockletDownload(child, oldChild)) {
         metas.push(child.meta);
       }
     }
 
+    // update children status
+    const blocklet1 = await states.blocklet.setBlockletStatus(did, BlockletStatus.downloading, {
+      children: metas.map((x) => ({ did: x.did })),
+    });
+    this.emit(BlockletEvents.statusChange, blocklet1);
+
     try {
       logger.info('Download Blocklet', { name, did, bundles: metas.map((x) => get(x, 'dist.tarball')) });
       const tasks = [];

package/lib/router/helper.js

@@ -748,8 +748,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
     const existSite = await states.site.findOne({ domain: domainGroup });
     if (!existSite) {
-      const ipEchoDnsDomain = getIpDnsDomainForBlocklet(blocklet, webInterface, nodeInfo.did);
-      const domainAliases = [{ value: ipEchoDnsDomain, isProtected: true }];
+      const domainAliases = [];
 
       const didDomain = getDidDomainForBlocklet({
         name: blocklet.meta.name,
@@ -757,7 +756,10 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         didDomain: nodeInfo.didDomain,
       });
 
-      domainAliases.push({ value: didDomain, isProtected: true });
+      const ipEchoDnsDomain = getIpDnsDomainForBlocklet(blocklet, webInterface, nodeInfo.did);
+
+      // let didDomain in front of ipEchoDnsDomain
+      domainAliases.push({ value: didDomain, isProtected: true }, { value: ipEchoDnsDomain, isProtected: true });
 
       await routerManager.addRoutingSite(
         {

package/lib/router/manager.js

@@ -221,10 +221,10 @@ class RouterManager extends EventEmitter {
       }
     }
 
-    const updateResult = await states.site.update(
-      { _id: id },
-      { $push: { domainAliases: { value: domainAlias, isProtected: false } } }
-    );
+    // let custom domain in front of protected domain
+    const domainAliases = [{ value: domainAlias, isProtected: false }, ...dbSite.domainAliases];
+
+    const updateResult = await states.site.update({ _id: id }, { $set: { domainAliases } });
     logger.debug('add domain alias update result', { id, updateResult, domainAlias });
 
     const newSite = await states.site.findOne({ _id: id });

package/lib/states/blocklet.js

@@ -20,7 +20,7 @@ const {
 const logger = require('@abtnode/logger')('state-blocklet');
 
 const BaseState = require('./base');
-const { forEachBlocklet } = require('../util/blocklet');
+const { forEachBlocklet, checkDuplicateComponents } = require('../util/blocklet');
 const { validateBlockletMeta } = require('../util');
 
 const lock = new Lock('blocklet-port-assign-lock');
@@ -391,13 +391,20 @@ class BlockletState extends BaseState {
     return result;
   }
 
-  async setBlockletStatus(did, status) {
+  /**
+   * @param {String} did blocklet did
+   * @param {BlockletStatus} status blocklet status
+   *
+   * children status only different with parent before blocklet installation
+   * @param {Array<{did}>} children
+   */
+  async setBlockletStatus(did, status, { children } = {}) {
     if (typeof status === 'undefined') {
       throw new Error('Unsupported blocklet status');
     }
 
     const doc = await this.getBlocklet(did);
-    if (doc.status === status) {
+    if (doc.status === status && !children) {
       return formatBlocklet(doc, 'onRead', this.options.dek);
     }
 
@@ -412,6 +419,28 @@ class BlockletState extends BaseState {
       updates.stoppedAt = new Date();
     }
 
+    // update children status
+    updates.children = doc.children.map((child) => {
+      if (children === 'all') {
+        child.status = status;
+        return child;
+      }
+
+      if (!children) {
+        if (![BlockletStatus.waiting, BlockletStatus.upgrading, BlockletStatus.installing].includes(status)) {
+          child.status = status;
+        }
+
+        return child;
+      }
+
+      const inputChild = children.find((x) => x.did === child.meta.did);
+      if (inputChild) {
+        child.status = status;
+      }
+      return child;
+    });
+
     await this.update(doc._id, { $set: updates });
     return formatBlocklet({ ...doc, ...updates }, 'onRead', this.options.dek);
   }
@@ -463,6 +492,48 @@ class BlockletState extends BaseState {
 
     return children;
   }
+
+  async addChildren(did, children) {
+    const parent = await this.getBlocklet(did);
+    if (!parent) {
+      throw new Error('Blocklet does not exist');
+    }
+
+    const oldChildren = parent.children || [];
+
+    const newChildren = [...oldChildren];
+    for (const child of children) {
+      const { meta, mountPoint, sourceUrl = '', source = '', deployedFrom = '' } = child;
+
+      if (!mountPoint) {
+        throw new Error(`mountPoint is required when adding component ${meta.title || meta.name}`);
+      }
+
+      if (meta.did === parent.meta.did) {
+        throw new Error('Cannot add self as a component');
+      }
+
+      checkDuplicateComponents([child], newChildren);
+
+      newChildren.push({
+        mountPoint,
+        meta,
+        sourceUrl,
+        source,
+        deployedFrom,
+        dynamic: true,
+        status: BlockletStatus.added,
+      });
+    }
+
+    // use upgradeBlocklet to assign ports to children and write new data to db
+    return this.upgradeBlocklet({
+      meta: parent.meta,
+      source: parent.source,
+      deployedFrom: parent.deployedFrom,
+      children: newChildren,
+    });
+  }
 }
 
 BlockletState.BlockletStatus = BlockletStatus;

package/lib/util/blocklet.js

@@ -1101,6 +1101,22 @@ const getDiffFiles = async (inputFiles, sourceDir) => {
 
 const getBundleDir = (installDir, bundle) => path.join(installDir, bundle.name, bundle.version);
 
+const needBlockletDownload = (blocklet, oldBlocklet) => {
+  if ([BlockletSource.upload, BlockletSource.local, BlockletSource.custom].includes(blocklet.source)) {
+    return false;
+  }
+
+  if (!get(oldBlocklet, 'meta.dist.integrity')) {
+    return true;
+  }
+
+  if (get(oldBlocklet, 'meta.dist.integrity') === get(blocklet, 'meta.dist.integrity')) {
+    return false;
+  }
+
+  return true;
+};
+
 module.exports = {
   forEachBlocklet,
   getBlockletMetaFromUrl,
@@ -1135,4 +1151,5 @@ module.exports = {
   checkDuplicateComponents,
   getDiffFiles,
   getBundleDir,
+  needBlockletDownload,
 };

package/lib/util/upgrade.js

@@ -27,9 +27,6 @@ const waitUpdaterRpc = async (message) =>
 const checkNewVersion = async (params, context) => {
   try {
     const info = await states.node.read();
-    if (!info.autoUpgrade) {
-      return '';
-    }
 
     if (!process.env.ABT_NODE_PACKAGE_NAME) {
       logger.error('ABT_NODE_PACKAGE_NAME name was not found in environment');
@@ -176,7 +173,14 @@ const getCron = () => ({
   name: 'check-update',
   time: '0 0 8 * * *', // check every day
   // time: '0 */5 * * * *', // check every 5 minutes
-  fn: checkNewVersion,
+  fn: async () => {
+    const info = await states.node.read();
+    if (!info.autoUpgrade) {
+      return;
+    }
+
+    checkNewVersion();
+  },
   options: { runOnInit: false },
 });
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,30 +19,30 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.6.18",
-    "@abtnode/constant": "1.6.18",
-    "@abtnode/cron": "1.6.18",
-    "@abtnode/db": "1.6.18",
-    "@abtnode/logger": "1.6.18",
-    "@abtnode/queue": "1.6.18",
-    "@abtnode/rbac": "1.6.18",
-    "@abtnode/router-provider": "1.6.18",
-    "@abtnode/static-server": "1.6.18",
-    "@abtnode/timemachine": "1.6.18",
-    "@abtnode/util": "1.6.18",
-    "@arcblock/did": "^1.14.8",
-    "@arcblock/event-hub": "1.14.8",
+    "@abtnode/certificate-manager": "1.6.19",
+    "@abtnode/constant": "1.6.19",
+    "@abtnode/cron": "1.6.19",
+    "@abtnode/db": "1.6.19",
+    "@abtnode/logger": "1.6.19",
+    "@abtnode/queue": "1.6.19",
+    "@abtnode/rbac": "1.6.19",
+    "@abtnode/router-provider": "1.6.19",
+    "@abtnode/static-server": "1.6.19",
+    "@abtnode/timemachine": "1.6.19",
+    "@abtnode/util": "1.6.19",
+    "@arcblock/did": "^1.14.11",
+    "@arcblock/event-hub": "1.14.11",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.14.8",
-    "@blocklet/meta": "1.6.18",
+    "@arcblock/vc": "^1.14.11",
+    "@blocklet/meta": "1.6.19",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.14.8",
-    "@ocap/util": "^1.14.8",
-    "@ocap/wallet": "^1.14.8",
+    "@ocap/mcrypto": "^1.14.11",
+    "@ocap/util": "^1.14.11",
+    "@ocap/wallet": "^1.14.11",
     "@slack/webhook": "^5.0.3",
-    "axios": "^0.21.4",
+    "axios": "^0.25.0",
     "axon": "^2.0.3",
     "chalk": "^4.0.0",
     "deep-diff": "^1.0.2",
@@ -53,7 +53,7 @@
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
     "is-url": "^1.2.4",
-    "joi": "^17.5.0",
+    "joi": "^17.6.0",
     "js-yaml": "^3.14.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
@@ -75,5 +75,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "2f02f166869d8ebedc0466068f6ed90ab3e07b87"
+  "gitHead": "42a1290f14fca261eccafb05561eecf8683ed66a"
 }