@abtnode/core 1.8.7 → 1.8.10

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);
@@ -2713,6 +2716,9 @@ class BlockletManager extends BaseBlockletManager {
 
       await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createDidLogo(blocklet.meta.did));
 
+      // Init db
+      await this.teamManager.initTeam(blocklet.meta.did);
+
       this.emit(BlockletEvents.installed, { blocklet, context });
 
       // Update dynamic component meta in blocklet settings

package/lib/event.js

@@ -25,6 +25,7 @@ module.exports = ({
   handleRouting,
   domainStatus,
   teamAPI,
+  teamManager,
   certManager,
   node,
 }) => {
@@ -50,6 +51,11 @@ module.exports = ({
   // Subscribe events from eventHub and proxy to eventHandler
   [...Object.values(BlockletEvents), ...Object.values(EVENTS)].forEach((name) => {
     eventHub.on(name, (data) => {
+      if (name === BlockletEvents.removed) {
+        // Cleanup cache in teamManager for every node instance
+        teamManager.deleteTeam(data?.meta?.did, { closeDatabase: false });
+      }
+
       if (typeof eventHandler === 'function') {
         eventHandler({ name, data });
       }

package/lib/index.js

@@ -400,6 +400,7 @@ function ABTNode(options) {
     handleRouting,
     domainStatus,
     teamAPI,
+    teamManager,
     certManager,
     node: instance,
   });

package/lib/team/manager.js

@@ -104,7 +104,7 @@ class TeamManager extends EventEmitter {
 
   async getUserState(did) {
     // validate exist
-    if (!this.isNodeTeam(did) && !(await this.states.blocklet.getBlocklet(did))) {
+    if (!this.isNodeTeam(did) && !(await this.states.blocklet.hasBlocklet(did))) {
       logger.error('Did does not exist', { action: 'getUserState', did });
       throw new Error(`Did does not exist: ${did}`);
     }
@@ -143,7 +143,7 @@ class TeamManager extends EventEmitter {
 
   async getSessionState(did) {
     // validate exist
-    if (!this.isNodeTeam(did) && !(await this.states.blocklet.getBlocklet(did))) {
+    if (!this.isNodeTeam(did) && !(await this.states.blocklet.hasBlocklet(did))) {
       logger.error('Did does not exist', { action: 'getSessionState', did });
       throw new Error(`Did does not exist: ${did}`);
     }
@@ -182,7 +182,7 @@ class TeamManager extends EventEmitter {
     logger.info('get rbac', { did });
 
     // validate exist
-    if (!this.isNodeTeam(did) && !(await this.states.blocklet.getBlocklet(did))) {
+    if (!this.isNodeTeam(did) && !(await this.states.blocklet.hasBlocklet(did))) {
       logger.error('Did does not exist', { action: 'getRBAC', did });
       throw new Error(`Did does not exist: ${did}`);
     }
@@ -288,8 +288,34 @@ class TeamManager extends EventEmitter {
     return owner;
   }
 
-  async deleteTeam(did) {
-    if (this.cache[did]) {
+  async initTeam(did) {
+    if (!did) {
+      logger.error('initTeam: did does not exist');
+      return;
+    }
+
+    logger.info('initTeam', { did });
+
+    const rbac = await this.getRBAC(did);
+    const user = await this.getUserState(did);
+    const session = await this.getSessionState(did);
+
+    this.cache[did] = {
+      rbac,
+      user,
+      session,
+    };
+  }
+
+  async deleteTeam(did, { closeDatabase: closeDB = true } = {}) {
+    if (!did) {
+      logger.error('deleteTeam: did does not exist');
+      return;
+    }
+
+    logger.info('deleteTeam', { did, closeDB });
+
+    if (closeDB && this.cache[did]) {
       try {
         if (this.cache[did].rbac) {
           await closeDatabase(this.cache[did].rbac.storage.db);

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 {
@@ -1191,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/lib/util/upgrade.js

@@ -128,7 +128,7 @@ const doUpgrade = async (session) => {
   if (session.stage === NODE_UPGRADE_PROGRESS.CLEANUP) {
     logger.info('cleanup for upgrading', { from, to, sessionId });
     await goNextState(NODE_UPGRADE_PROGRESS.COMPLETE);
-    await sleep(5000);
+    await sleep(8000);
     await states.node.updateNodeInfo({ nextVersion: '', version: to, upgradeSessionId: '' });
     try {
       await states.node.exitMode(NODE_MODES.MAINTENANCE);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.7",
+  "version": "1.8.10",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,32 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.8.7",
-    "@abtnode/constant": "1.8.7",
-    "@abtnode/cron": "1.8.7",
-    "@abtnode/db": "1.8.7",
-    "@abtnode/logger": "1.8.7",
-    "@abtnode/queue": "1.8.7",
-    "@abtnode/rbac": "1.8.7",
-    "@abtnode/router-provider": "1.8.7",
-    "@abtnode/static-server": "1.8.7",
-    "@abtnode/timemachine": "1.8.7",
-    "@abtnode/util": "1.8.7",
-    "@arcblock/did": "1.17.10",
+    "@abtnode/certificate-manager": "1.8.10",
+    "@abtnode/constant": "1.8.10",
+    "@abtnode/cron": "1.8.10",
+    "@abtnode/db": "1.8.10",
+    "@abtnode/logger": "1.8.10",
+    "@abtnode/queue": "1.8.10",
+    "@abtnode/rbac": "1.8.10",
+    "@abtnode/router-provider": "1.8.10",
+    "@abtnode/static-server": "1.8.10",
+    "@abtnode/timemachine": "1.8.10",
+    "@abtnode/util": "1.8.10",
+    "@arcblock/did": "1.17.11",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.10",
-    "@arcblock/event-hub": "1.17.10",
-    "@arcblock/jwt": "^1.17.10",
+    "@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.10",
-    "@blocklet/meta": "1.8.7",
-    "@blocklet/sdk": "1.8.7",
+    "@arcblock/vc": "1.17.11",
+    "@blocklet/meta": "1.8.10",
+    "@blocklet/sdk": "1.8.10",
     "@fidm/x509": "^1.2.1",
-    "@nedb/core": "^1.3.2",
-    "@nedb/multi": "^1.3.2",
-    "@ocap/mcrypto": "1.17.10",
-    "@ocap/util": "1.17.10",
-    "@ocap/wallet": "1.17.10",
+    "@nedb/core": "^1.3.4",
+    "@nedb/multi": "^1.3.4",
+    "@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",
@@ -82,5 +82,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "9807ea28b3ae634f5806c875774ac3b7e38502a1"
+  "gitHead": "84f655bd7b8d55fde2656fac8671faad3c3bde28"
 }