@abtnode/core 1.6.9 → 1.6.13

package/lib/blocklet/manager/disk.js

@@ -24,7 +24,7 @@ const { updateBlocklet: updateDidDocument } = require('@abtnode/util/lib/did-doc
 const { BLOCKLET_PURCHASE_NFT_TYPE } = require('@abtnode/constant');
 
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
-const { isFreeBlocklet, getRequiredMissingConfigs } = require('@blocklet/meta/lib/util');
+const { isFreeBlocklet, isDeletableBlocklet, getRequiredMissingConfigs } = require('@blocklet/meta/lib/util');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const { getBlockletInfo } = require('@blocklet/meta/lib');
 
@@ -381,6 +381,9 @@ class BlockletManager extends BaseBlockletManager {
 
     try {
       const blocklet = await this.ensureBlocklet(did);
+      if (isDeletableBlocklet(blocklet) === false) {
+        throw new Error('Blocklet is protected from accidental deletion');
+      }
 
       const nodeEnvironments = await states.node.getEnvironments();
 
@@ -540,6 +543,12 @@ class BlockletManager extends BaseBlockletManager {
         }
       }
 
+      if (x.key === 'BLOCKLET_DELETABLE') {
+        if (['yes', 'no'].includes(x.value) === false) {
+          throw new Error('BLOCKLET_DELETABLE must be either "yes" or "no"');
+        }
+      }
+
       blocklet.configObj[x.key] = x.value;
     }
 
@@ -1506,6 +1515,15 @@ class BlockletManager extends BaseBlockletManager {
       return null;
     }
 
+    // When new version found from the store where the blocklet was installed from, we should use that store first
+    if (blocklet.source === BlockletSource.registry && blocklet.deployedFrom) {
+      const latestFromSameRegistry = versions.find((x) => x.registryUrl === blocklet.deployedFrom);
+      if (latestFromSameRegistry) {
+        return latestFromSameRegistry;
+      }
+    }
+
+    // Otherwise try upgrading from other store
     let latestBlockletVersion = versions[0];
     versions.forEach((item) => {
       if (semver.lt(latestBlockletVersion.version, item.version)) {

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,
@@ -499,6 +501,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 +537,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(
@@ -1354,6 +1373,8 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     getCertificates,
     checkDomain,
     ensureDashboardCertificate,
+    addWellknownSite,
+    upsertSiteRule,
 
     getRoutingCrons: () => [
       {

package/lib/router/manager.js

@@ -302,7 +302,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/util/ready.js

@@ -33,7 +33,7 @@ const createStateReadyHandler =
             console.error('Sharing data dir between Blocklet Server instances may break things!');
             console.error('======================================================\x1b[0m');
             console.log('\nIf you intend to use this dir:');
-            console.log(`  1. Stop Blocklet Server by ${chalk.cyan('abtnode stop --force')}`);
+            console.log(`  1. Stop Blocklet Server by ${chalk.cyan('blocklet server stop --force')}`);
             console.log(`  2. Clear data dir by ${chalk.cyan(`rm -r ${options.dataDir}`)}`);
             console.log('  3. Reinitialize and start Blocklet Server');
             process.exit(1);

package/lib/webhook/index.js

@@ -76,8 +76,8 @@ module.exports = ({ events, dataDirs, instance }) => {
             const senderInstance = WebHookSender.getMessageSender(item.type);
             senderFns[item.type] = senderInstance.send.bind(senderInstance);
           }
-          const { description } = nodeInfo;
-          const options = { ...message, nodeInfo: `*${description}*` };
+          const { name } = nodeInfo;
+          const options = { ...message, nodeInfo: `*${name}*` };
           if (item.type === 'slack') {
             options.urlInfo = getSlackUrlInfo(message.action, baseUrls);
           }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.9",
+  "version": "1.6.13",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,22 +19,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.6.9",
-    "@abtnode/constant": "1.6.9",
-    "@abtnode/cron": "1.6.9",
-    "@abtnode/db": "1.6.9",
-    "@abtnode/logger": "1.6.9",
-    "@abtnode/queue": "1.6.9",
-    "@abtnode/rbac": "1.6.9",
-    "@abtnode/router-provider": "1.6.9",
-    "@abtnode/static-server": "1.6.9",
-    "@abtnode/timemachine": "1.6.9",
-    "@abtnode/util": "1.6.9",
+    "@abtnode/certificate-manager": "1.6.13",
+    "@abtnode/constant": "1.6.13",
+    "@abtnode/cron": "1.6.13",
+    "@abtnode/db": "1.6.13",
+    "@abtnode/logger": "1.6.13",
+    "@abtnode/queue": "1.6.13",
+    "@abtnode/rbac": "1.6.13",
+    "@abtnode/router-provider": "1.6.13",
+    "@abtnode/static-server": "1.6.13",
+    "@abtnode/timemachine": "1.6.13",
+    "@abtnode/util": "1.6.13",
     "@arcblock/did": "^1.13.79",
     "@arcblock/event-hub": "1.13.79",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "^1.13.79",
-    "@blocklet/meta": "1.6.9",
+    "@blocklet/meta": "1.6.13",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
@@ -75,5 +75,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "372e95513bd9a510702d93650c0c004589579cb3"
+  "gitHead": "4fff3e4867db54e55b11bb0188bbbf703505dea9"
 }