@abtnode/core 1.8.8 → 1.8.11

package/lib/blocklet/manager/disk.js

@@ -2716,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/router/helper.js

@@ -1284,12 +1284,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     });
   };
 
-  const checkDomain = async (domain) => {
-    const matchedCert = await routerManager.getMatchedCert(domain);
-
-    return { domain, isHttps: !!matchedCert, matchedCert };
-  };
-
   return {
     ensureDashboardRouting,
     ensureBlockletRouting,
@@ -1305,7 +1299,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     getSnapshotSites,
     getSitesFromSnapshot,
     getCertificates,
-    checkDomain,
     ensureWildcardCerts,
     addWellknownSite,
     upsertSiteRule,

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/domain-status.js

@@ -1,6 +1,7 @@
+const https = require('https');
 const { EventEmitter } = require('events');
 const logger = require('@abtnode/logger')('@abtnode/domain-status');
-const { EVENTS } = require('@abtnode/constant');
+const { EVENTS, WELLKNOWN_PING_PREFIX } = require('@abtnode/constant');
 const { checkDomainDNS } = require('./index');
 
 const dnsStatusStore = Object.create(null);
@@ -31,9 +32,51 @@ class DomainStatus extends EventEmitter {
     this.routerManager = routerManager;
   }
 
+  async getHttpsCert(domain) {
+    const matchedCert = await this.routerManager.getMatchedCert(domain);
+
+    if (matchedCert) {
+      return matchedCert;
+    }
+
+    return new Promise((resolve) => {
+      const req = https.request(
+        {
+          host: domain,
+          path: WELLKNOWN_PING_PREFIX,
+          method: 'GET',
+          timeout: 1000 * 10,
+        },
+        (res) => {
+          try {
+            const data = res.socket.getPeerCertificate();
+            const cert = {
+              issuer: {
+                countryName: data.issuer.C,
+                organizationName: data.issuer.O,
+                commonName: data.issuer.CN,
+              },
+              validFrom: data.valid_from,
+              validTo: data.valid_to,
+            };
+            resolve(cert);
+          } catch {
+            resolve(null);
+          }
+        }
+      );
+
+      req.on('error', () => {
+        resolve(null);
+      });
+
+      req.end();
+    });
+  }
+
   checkDomainsStatus({ domains } = {}) {
     (domains || []).forEach((domain) => {
-      Promise.all([this.routerManager.getMatchedCert(domain), checkDomainDnsWrapper(domain)])
+      Promise.all([this.getHttpsCert(domain), checkDomainDnsWrapper(domain)])
         .then((data) => {
           const [matchedCert, dns] = data;
           this.emit(EVENTS.DOMAIN_STATUS, { domain, matchedCert, isHttps: !!matchedCert, dns });

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.8",
+  "version": "1.8.11",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,17 +19,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@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",
+    "@abtnode/certificate-manager": "1.8.11",
+    "@abtnode/constant": "1.8.11",
+    "@abtnode/cron": "1.8.11",
+    "@abtnode/db": "1.8.11",
+    "@abtnode/logger": "1.8.11",
+    "@abtnode/queue": "1.8.11",
+    "@abtnode/rbac": "1.8.11",
+    "@abtnode/router-provider": "1.8.11",
+    "@abtnode/static-server": "1.8.11",
+    "@abtnode/timemachine": "1.8.11",
+    "@abtnode/util": "1.8.11",
     "@arcblock/did": "1.17.11",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.17.11",
@@ -37,11 +37,11 @@
     "@arcblock/jwt": "^1.17.11",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.17.11",
-    "@blocklet/meta": "1.8.8",
-    "@blocklet/sdk": "1.8.8",
+    "@blocklet/meta": "1.8.11",
+    "@blocklet/sdk": "1.8.11",
     "@fidm/x509": "^1.2.1",
-    "@nedb/core": "^1.3.2",
-    "@nedb/multi": "^1.3.2",
+    "@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",
@@ -82,5 +82,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "8da61db2342d7c53f2b803e5193c03d82bce8f77"
+  "gitHead": "389148562de1ce5b45097e764bc9d1718009e527"
 }