@abtnode/core 1.16.10-beta-cceee857 → 1.16.10-beta-90abf54e

package/lib/blocklet/manager/disk.js

@@ -1803,19 +1803,19 @@ class BlockletManager extends BaseBlockletManager {
         oldBlocklet,
       });
 
-      if (context.startImmediately) {
-        const missingProps = getAppMissingConfigs(installedBlocklet);
-        if (!missingProps.length) {
-          try {
-            logger.info('start blocklet after installed', { did });
-            await this.start({ did, checkHealthImmediately: true });
-          } catch (error) {
-            logger.warn('attempt to start immediately failed', { did, error });
-          }
+      if (context.startImmediately && installedBlocklet?.settings.initialized) {
+        try {
+          logger.info('start blocklet after installed', { did });
+          await this.start({ did, checkHealthImmediately: true });
+        } catch (error) {
+          logger.warn('attempt to start immediately failed', { did, error });
         }
       }
+
+      return installedBlocklet;
     } catch (err) {
       logger.error('blocklet onInstall error', { err });
+      return null;
     }
   }
 

package/lib/blocklet/manager/helper/install-application-from-backup.js

@@ -44,6 +44,8 @@ const installApplicationFromBackup = async ({
     throw new Error(`dir(${dir}) does not exist`);
   }
 
+  context.startImmediately = true;
+
   // parse data from source dir
   const srcBundleDirs = await getAppDirs(path.join(dir, 'blocklets'));
 
@@ -128,6 +130,8 @@ const installApplicationFromBackup = async ({
 
   logger.info('installFromBackup', { srcBundleDirs, srcDataDir });
 
+  let blocklet = null;
+
   try {
     // copy extra
     const existExtra = await states.blockletExtras.find({ did });
@@ -144,7 +148,7 @@ const installApplicationFromBackup = async ({
     logger.info('blocklet extra is copied successfully');
 
     // add blocklet
-    await states.blocklet.addBlocklet(blockletState);
+    blocklet = await states.blocklet.addBlocklet(blockletState);
     logger.info('blocklet state is added successfully');
 
     // copy bundle
@@ -214,7 +218,7 @@ const installApplicationFromBackup = async ({
     const state = await states.blocklet.setBlockletStatus(did, BlockletStatus.installing);
     manager.emit(BlockletEvents.statusChange, state);
 
-    return manager._installBlocklet({ did, context });
+    return manager._onInstall({ blocklet, did, context });
   }
 
   try {

package/lib/event.js

@@ -52,7 +52,7 @@ module.exports = ({
     eventHub.on(name, (data) => {
       if (name === BlockletEvents.removed) {
         // Cleanup cache in teamManager for every node instance
-        teamManager.deleteTeam(data?.meta?.did, { closeDatabase: false });
+        teamManager.deleteTeam(data?.meta?.did);
       }
 
       // clear cache

package/lib/team/manager.js

@@ -13,8 +13,14 @@ const logger = require('@abtnode/logger')('@abtnode/core:team:manager');
 const { ROLES, RBAC_CONFIG } = require('@abtnode/constant');
 const { BlockletEvents } = require('@blocklet/constant');
 const Lock = require('@abtnode/util/lib/lock');
-const sleep = require('@abtnode/util/lib/sleep');
-const { BaseState, doSchemaMigration, createSequelize, getBlockletModels, setupModels } = require('@abtnode/models');
+const {
+  BaseState,
+  doSchemaMigration,
+  createSequelize,
+  destroySequelize,
+  getBlockletModels,
+  setupModels,
+} = require('@abtnode/models');
 
 const { isCLI, getDbFilePath } = require('../util');
 
@@ -35,23 +41,6 @@ const getDefaultTeamState = () => ({
   session: null,
 });
 
-const closeDatabase = async (db) =>
-  new Promise((resolve, reject) => {
-    if (!db || process.env.NODE_ENV === 'test') {
-      resolve(true);
-      return;
-    }
-
-    db.closeDatabase((err) => {
-      if (err) {
-        reject(err);
-        return;
-      }
-
-      resolve(true);
-    });
-  });
-
 class TeamManager extends EventEmitter {
   constructor({ nodeDid, dataDirs, states }) {
     super();
@@ -69,6 +58,7 @@ class TeamManager extends EventEmitter {
     this.cache = {};
 
     this.models = new Map();
+    this.connections = new Map();
 
     this.init();
   }
@@ -340,38 +330,20 @@ class TeamManager extends EventEmitter {
     };
   }
 
-  // FIXME: @wangshijun should we clear models cache here
-  async deleteTeam(did, { closeDatabase: closeDB = false } = {}) {
+  async deleteTeam(did, { closeDatabase = true } = {}) {
     if (!did) {
       logger.error('deleteTeam: did does not exist');
       return;
     }
 
-    logger.info('deleteTeam', { did, closeDB });
+    logger.info('deleteTeam', { did, closeDatabase });
 
     const pid = await this.getPid(did);
-    if (closeDB && this.cache[pid]) {
+    const connection = this.connections.get(did) || this.connections.get(pid);
+    if (closeDatabase && connection) {
       logger.info('deleteTeam.closeDatabase', { did });
       try {
-        if (this.cache[pid].rbac) {
-          await closeDatabase(this.cache[pid].rbac.storage.db);
-        }
-        if (this.cache[pid].user) {
-          await closeDatabase(this.cache[pid].user.db);
-        }
-        if (this.cache[pid].passport) {
-          await closeDatabase(this.cache[pid].passport.db);
-        }
-        if (this.cache[pid].connectedAccount) {
-          await closeDatabase(this.cache[pid].connectedAccount.db);
-        }
-        if (this.cache[pid].session) {
-          await closeDatabase(this.cache[pid].session.db);
-        }
-
-        // NOTICE: wait for nedb to finish closeDatabase
-        const timeout = process.env.NODE_ENV !== 'test' ? 2000 : 200;
-        await sleep(timeout);
+        await destroySequelize(connection);
       } catch (error) {
         logger.error('Failed to close database', { did, error });
       }
@@ -379,6 +351,10 @@ class TeamManager extends EventEmitter {
 
     this.cache[did] = null;
     this.cache[pid] = null;
+    this.models.delete(did);
+    this.models.delete(pid);
+    this.connections.delete(did);
+    this.connections.delete(pid);
   }
 
   // =======
@@ -411,6 +387,7 @@ class TeamManager extends EventEmitter {
       setupModels(models, sequelize);
       await this.initDatabase(did);
       this.models.set(did, models);
+      this.connections.set(did, file);
     }
 
     return this.models.get(did);

package/lib/util/blocklet.js

@@ -1552,7 +1552,7 @@ const consumeServerlessNFT = async ({ nftId, nodeInfo, blocklet }) => {
       },
     });
 
-    logger.error('consume serverless nft success', { nftId, hash: result.hash });
+    logger.info('consume serverless nft success', { nftId, hash: result.hash });
   } catch (error) {
     logger.error('consume serverless nft failed', { nftId, error });
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.10-beta-cceee857",
+  "version": "1.16.10-beta-90abf54e",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.10-beta-cceee857",
-    "@abtnode/certificate-manager": "1.16.10-beta-cceee857",
-    "@abtnode/constant": "1.16.10-beta-cceee857",
-    "@abtnode/cron": "1.16.10-beta-cceee857",
-    "@abtnode/logger": "1.16.10-beta-cceee857",
-    "@abtnode/models": "1.16.10-beta-cceee857",
-    "@abtnode/queue": "1.16.10-beta-cceee857",
-    "@abtnode/rbac": "1.16.10-beta-cceee857",
-    "@abtnode/router-provider": "1.16.10-beta-cceee857",
-    "@abtnode/static-server": "1.16.10-beta-cceee857",
-    "@abtnode/timemachine": "1.16.10-beta-cceee857",
-    "@abtnode/util": "1.16.10-beta-cceee857",
+    "@abtnode/auth": "1.16.10-beta-90abf54e",
+    "@abtnode/certificate-manager": "1.16.10-beta-90abf54e",
+    "@abtnode/constant": "1.16.10-beta-90abf54e",
+    "@abtnode/cron": "1.16.10-beta-90abf54e",
+    "@abtnode/logger": "1.16.10-beta-90abf54e",
+    "@abtnode/models": "1.16.10-beta-90abf54e",
+    "@abtnode/queue": "1.16.10-beta-90abf54e",
+    "@abtnode/rbac": "1.16.10-beta-90abf54e",
+    "@abtnode/router-provider": "1.16.10-beta-90abf54e",
+    "@abtnode/static-server": "1.16.10-beta-90abf54e",
+    "@abtnode/timemachine": "1.16.10-beta-90abf54e",
+    "@abtnode/util": "1.16.10-beta-90abf54e",
     "@arcblock/did": "1.18.80",
     "@arcblock/did-auth": "1.18.80",
     "@arcblock/did-ext": "^1.18.80",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.80",
     "@arcblock/vc": "1.18.80",
-    "@blocklet/constant": "1.16.10-beta-cceee857",
-    "@blocklet/meta": "1.16.10-beta-cceee857",
-    "@blocklet/sdk": "1.16.10-beta-cceee857",
+    "@blocklet/constant": "1.16.10-beta-90abf54e",
+    "@blocklet/meta": "1.16.10-beta-90abf54e",
+    "@blocklet/sdk": "1.16.10-beta-90abf54e",
     "@did-space/client": "^0.2.99",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.80",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "821e24df918ee50a05c64e0da6757926d42a948d"
+  "gitHead": "724462068e8b20d662f0461b03799da7b11b7b60"
 }