@abtnode/core 1.6.11 → 1.6.15

package/lib/blocklet/manager/disk.js

@@ -2332,7 +2332,7 @@ class BlockletManager extends BaseBlockletManager {
   async _rollback(action, did, oldBlocklet) {
     if (action === 'install') {
       // remove blocklet
-      return this._deleteBlocklet({ did, keepData: false });
+      return this._deleteBlocklet({ did, keepData: true });
     }
 
     if (['upgrade', 'downgrade'].includes(action)) {
@@ -2374,7 +2374,18 @@ class BlockletManager extends BaseBlockletManager {
     const result = await states.blocklet.deleteBlocklet(did);
     logger.info('blocklet removed successfully', { did });
 
-    this.emit(BlockletEvents.removed, { blocklet: result, context });
+    let keepRouting = true;
+    if (keepData === false || keepConfigs === false) {
+      keepRouting = false;
+    }
+
+    this.emit(BlockletEvents.removed, {
+      blocklet: result,
+      context: {
+        ...context,
+        keepRouting,
+      },
+    });
     return blocklet;
   }
 

package/lib/index.js

@@ -400,16 +400,6 @@ function ABTNode(options) {
     } else {
       // We should only respond to pm2 events when node is alive
       events.on('node.started', async () => {
-        const info = await states.node.read();
-        certManager
-          .issue({ domain: `${info.did.toLowerCase()}.${info.didDomain}` })
-          .then(() => {
-            logger.info('add issue daemon certificate job');
-          })
-          .catch((error) => {
-            logger.error('issue daemon certificate job failed', { error });
-          });
-
         pm2Events.resume();
         initCron();
       });

package/lib/router/helper.js

@@ -5,6 +5,7 @@ const path = require('path');
 const tar = require('tar');
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
+const isEqual = require('lodash/isEqual');
 const joinUrl = require('url-join');
 const { getProvider } = require('@abtnode/router-provider');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
@@ -28,6 +29,7 @@ const {
   SLOT_FOR_IP_DNS_SITE,
   BLOCKLET_SITE_GROUP_SUFFIX,
   WELLKNOWN_ACME_CHALLENGE_PREFIX,
+  WELLKNOWN_DID_RESOLVER_PREFIX,
 } = require('@abtnode/constant');
 const {
   BLOCKLET_DYNAMIC_PATH_PREFIX,
@@ -53,6 +55,7 @@ const { getFromCache: getAccessibleExternalNodeIp } = require('../util/get-acces
 
 const Router = require('./index');
 const states = require('../states');
+const { getBlockletDomainGroupName, getDidFromDomainGroupName } = require('../util/router');
 
 /**
  * replace 888-888-888-888 with accessible ip for domain
@@ -351,6 +354,18 @@ const ensureCorsForWebWallet = async (sites) => {
   return sites;
 };
 
+const filterSitesForRemovedBlocklets = async (sites = []) => {
+  const blocklets = await states.blocklet.getBlocklets();
+  return sites.filter((site) => {
+    if (!site.domain.endsWith(BLOCKLET_SITE_GROUP_SUFFIX)) {
+      return true;
+    }
+
+    const did = getDidFromDomainGroupName(site.domain);
+    return blocklets.some((x) => x.meta.did === did);
+  });
+};
+
 const ensureLatestInfo = async (sites = [], { withDefaultCors = true } = {}) => {
   let result = await ensureLatestNodeInfo(sites, { withDefaultCors });
   result = await ensureWellknownRule(result);
@@ -499,6 +514,30 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     return { status: 'downloaded' };
   };
 
+  const upsertSiteRule = async ({ site, rule }, context) => {
+    const findExistingRule = (prefix) => site.rules.find((r) => r.from.pathPrefix === normalizePathPrefix(prefix));
+
+    const newSiteRule = {
+      id: site.id,
+      rule,
+    };
+
+    const existingRule = findExistingRule(get(rule, 'from.pathPrefix'));
+    if (!existingRule) {
+      await routerManager.addRoutingRule(newSiteRule, context);
+      return true;
+    }
+
+    if (!isEqual(existingRule.to, rule.to)) {
+      newSiteRule.rule.id = existingRule.id;
+      newSiteRule.skipProtectedRuleChecking = true;
+      await routerManager.updateRoutingRule(newSiteRule, context);
+      return true;
+    }
+
+    return false;
+  };
+
   const addWellknownSite = async (sites, context) => {
     const site = (sites || []).find((x) => x.name === NAME_FOR_WELLKNOWN_SITE);
 
@@ -511,42 +550,35 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       };
 
       const didResolverWellknownRule = {
-        from: { pathPrefix: joinUrl(WELLKNOWN_PATH_PREFIX, '/did.json') },
+        isProtected: true,
+        from: { pathPrefix: WELLKNOWN_DID_RESOLVER_PREFIX },
         to: proxyTarget,
       };
 
       const acmeChallengeWellknownRule = {
+        isProtected: true,
         from: { pathPrefix: WELLKNOWN_ACME_CHALLENGE_PREFIX },
         to: proxyTarget,
       };
 
       if (site) {
-        let changed = false;
-        const exists = (prefix) => !!site.rules.find((r) => r.from.pathPrefix === normalizePathPrefix(prefix));
-
-        if (!exists(didResolverWellknownRule.from.pathPrefix)) {
-          await routerManager.addRoutingRule(
-            {
-              id: site.id,
-              rule: didResolverWellknownRule,
-            },
-            context
-          );
-          changed = true;
-        }
+        const didResolverRuleUpdateRes = await upsertSiteRule(
+          {
+            site,
+            rule: didResolverWellknownRule,
+          },
+          context
+        );
 
-        if (!exists(acmeChallengeWellknownRule.from.pathPrefix)) {
-          await routerManager.addRoutingRule(
-            {
-              id: site.id,
-              rule: acmeChallengeWellknownRule,
-            },
-            context
-          );
-          changed = true;
-        }
+        const acmeRuleUpdateRes = await upsertSiteRule(
+          {
+            site,
+            rule: acmeChallengeWellknownRule,
+          },
+          context
+        );
 
-        return changed;
+        return didResolverRuleUpdateRes || acmeRuleUpdateRes;
       }
 
       await routerManager.addRoutingSite(
@@ -694,7 +726,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       return `/${str}`.replace(/^\/+/, '/');
     };
 
-    const domainGroup = `${blocklet.meta.did}${BLOCKLET_SITE_GROUP_SUFFIX}`;
+    const domainGroup = getBlockletDomainGroupName(blocklet.meta.did);
 
     const pathPrefix = getPrefix(webInterface.prefix);
     const rule = {
@@ -736,13 +768,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         context
       );
       logger.info('add routing site', { site: domainGroup });
-      if (
-        process.env.NODE_ENV !== 'development' &&
-        process.env.NODE_ENV !== 'test' &&
-        blocklet.mode !== 'development'
-      ) {
-        await certManager.issue({ domain: didDomain });
-      }
 
       return true;
     }
@@ -1061,7 +1086,10 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     const nodeInfo = await nodeState.read();
 
     const ruleChanged = await routerManager.deleteRoutingRulesItemByDid({ did: blocklet.meta.did }, context);
-    const siteChanged = await _removeBlockletSites(blocklet, nodeInfo, context);
+    let siteChanged;
+    if (!context.keepRouting) {
+      siteChanged = await _removeBlockletSites(blocklet, nodeInfo, context);
+    }
 
     return ruleChanged || siteChanged;
   };
@@ -1121,6 +1149,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
           try {
             const info = await nodeState.read();
             let { sites } = await readRoutingSites();
+            sites = await filterSitesForRemovedBlocklets(sites);
             sites = await ensureLatestInfo(sites);
             sites = await ensureAuthService(sites, blockletManager);
             sites = await ensureServiceRule(sites);
@@ -1354,6 +1383,8 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     getCertificates,
     checkDomain,
     ensureDashboardCertificate,
+    addWellknownSite,
+    upsertSiteRule,
 
     getRoutingCrons: () => [
       {

package/lib/router/manager.js

@@ -186,19 +186,37 @@ class RouterManager extends EventEmitter {
     return dbSite;
   }
 
-  async addDomainAlias({ id, domainAlias }, context = {}) {
+  async addDomainAlias({ id, domainAlias, force }, context = {}) {
     await validateAddDomainAlias(domainAlias, context);
     const dbSite = await states.site.findOne({ _id: id });
     if (!dbSite) {
       throw new Error(`site ${id} does not exist`);
     }
 
-    const siteCount = await states.site.count({
-      $or: [{ domain: domainAlias }, { domainAliases: domainAlias }, { 'domainAliases.value': domainAlias }],
+    // check domain exists in site domain
+    const mainDomainSiteCount = await states.site.count({
+      domain: domainAlias,
     });
 
-    if (siteCount > 0) {
-      throw new Error(`domain alias ${domainAlias} already exists`);
+    if (mainDomainSiteCount > 0) {
+      if (!force) {
+        throw new Error(`${domainAlias} already exists`);
+      } else {
+        throw new Error(`${domainAlias} cannot be forced-added`);
+      }
+    }
+
+    // check domain exists in site alias domain
+    const aliasDomainSite = await states.site.findOne({
+      $or: [{ domainAliases: domainAlias }, { 'domainAliases.value': domainAlias }],
+    });
+
+    if (aliasDomainSite) {
+      if (!force) {
+        throw new Error(`${domainAlias} already exists`);
+      } else {
+        await this.deleteDomainAlias({ id: aliasDomainSite.id, domainAlias });
+      }
     }
 
     const updateResult = await states.site.update(
@@ -302,7 +320,7 @@ class RouterManager extends EventEmitter {
 
     // update rules
     const newRules = [
-      ...dbSite.rules.filter((x) => x.groupId !== rule.id || x.id !== rule.id), // 有些路由没有 rule.groupId
+      ...dbSite.rules.filter((x) => (x.groupId && x.groupId !== rule.id) || x.id !== rule.id), // 有些路由没有 rule.groupId
       ...(await this.getRules(rule)),
     ];
 

package/lib/states/node.js

@@ -255,6 +255,7 @@ class NodeState extends BaseState {
       ABT_NODE_PK: info.pk,
       ABT_NODE_PORT: info.port,
       ABT_NODE_SERVICE_PORT: process.env.ABT_NODE_SERVICE_PORT,
+      ABT_NODE_MODE: info.mode,
     }));
   }
 

package/lib/util/blocklet.js

@@ -74,7 +74,6 @@ const PRIVATE_NODE_ENVS = [
   // 'NEDB_MULTI_PORT', // FIXME: 排查 abtnode 对外提供的 SDK(比如 @abtnode/queue), SDK 中不要自动使用 NEDB_MULTI_PORT 环境变量
   'ABT_NODE_UPDATER_PORT',
   'ABT_NODE_SESSION_TTL',
-  'ABT_NODE_MODE',
   'ABT_NODE_ROUTER_PROVIDER',
   'ABT_NODE_DATA_DIR',
   'ABT_NODE_TOKEN_SECRET',
@@ -85,6 +84,11 @@ const PRIVATE_NODE_ENVS = [
   'ABT_NODE_BASE_URL',
   'ABT_NODE_LOG_LEVEL',
   'ABT_NODE_LOG_DIR',
+  // in /core/cli/bin/blocklet.js
+  'CLI_MODE',
+  'ABT_NODE_HOME',
+  'PM2_HOME',
+  'ABT_NODE_CONFIG_FILE',
 ];
 
 /**

package/lib/util/router.js

@@ -0,0 +1,13 @@
+const { BLOCKLET_SITE_GROUP_SUFFIX } = require('@abtnode/constant');
+
+const getBlockletDomainGroupName = (did) => `${did}${BLOCKLET_SITE_GROUP_SUFFIX}`;
+
+const getDidFromDomainGroupName = (name) => {
+  const did = name.replace(BLOCKLET_SITE_GROUP_SUFFIX, '');
+  return did;
+};
+
+module.exports = {
+  getBlockletDomainGroupName,
+  getDidFromDomainGroupName,
+};

package/lib/validators/permission.js

@@ -2,7 +2,22 @@
 const JOI = require('joi');
 const { getMultipleLangParams } = require('./util');
 
-const nameSchema = JOI.string().trim().max(64);
+const nameSchema = JOI.string()
+  .trim()
+  .max(64)
+  .custom((name) => {
+    const arr = name.split('_');
+    const formatTip = 'The format of permission name should be "{action}_{resource}", e.g. query_data';
+    if (arr.length > 2) {
+      throw new Error(`Too much "_". ${formatTip}`);
+    }
+
+    if (arr.length < 2) {
+      throw new Error(formatTip);
+    }
+
+    return name;
+  });
 const descriptionSchema = JOI.string().trim().max(600);
 
 const createPermissionSchema = JOI.object({

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.11",
+  "version": "1.6.15",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,28 +19,28 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.6.11",
-    "@abtnode/constant": "1.6.11",
-    "@abtnode/cron": "1.6.11",
-    "@abtnode/db": "1.6.11",
-    "@abtnode/logger": "1.6.11",
-    "@abtnode/queue": "1.6.11",
-    "@abtnode/rbac": "1.6.11",
-    "@abtnode/router-provider": "1.6.11",
-    "@abtnode/static-server": "1.6.11",
-    "@abtnode/timemachine": "1.6.11",
-    "@abtnode/util": "1.6.11",
-    "@arcblock/did": "^1.13.79",
-    "@arcblock/event-hub": "1.13.79",
+    "@abtnode/certificate-manager": "1.6.15",
+    "@abtnode/constant": "1.6.15",
+    "@abtnode/cron": "1.6.15",
+    "@abtnode/db": "1.6.15",
+    "@abtnode/logger": "1.6.15",
+    "@abtnode/queue": "1.6.15",
+    "@abtnode/rbac": "1.6.15",
+    "@abtnode/router-provider": "1.6.15",
+    "@abtnode/static-server": "1.6.15",
+    "@abtnode/timemachine": "1.6.15",
+    "@abtnode/util": "1.6.15",
+    "@arcblock/did": "^1.13.84",
+    "@arcblock/event-hub": "1.13.84",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.13.79",
-    "@blocklet/meta": "1.6.11",
+    "@arcblock/vc": "^1.13.84",
+    "@blocklet/meta": "1.6.15",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.13.79",
-    "@ocap/util": "^1.13.79",
-    "@ocap/wallet": "^1.13.79",
+    "@ocap/mcrypto": "^1.13.84",
+    "@ocap/util": "^1.13.84",
+    "@ocap/wallet": "^1.13.84",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.21.4",
     "axon": "^2.0.3",
@@ -75,5 +75,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "3e98db6be1337968182396e6aac1b3de53b03807"
+  "gitHead": "1b7b07da04387b1daa838b251a9388355009142d"
 }