@abtnode/core 1.6.6 → 1.6.10

package/lib/states/index.js

@@ -1,4 +1,4 @@
-const BaseState = require('./base');
+const stateFactory = require('@abtnode/db/lib/factory');
 const NodeState = require('./node');
 const ChallengeState = require('./challenge');
 const BlockletState = require('./blocklet');
@@ -12,8 +12,6 @@ const SessionState = require('./session');
 const ExtrasState = require('./blocklet-extras');
 const CacheState = require('./cache');
 
-const states = {};
-
 const init = (dataDirs, options) => {
   const notificationState = new NotificationState(dataDirs.core, options);
   const nodeState = new NodeState(dataDirs.core, options, dataDirs, notificationState);
@@ -28,7 +26,7 @@ const init = (dataDirs, options) => {
   const extrasState = new ExtrasState(dataDirs.core, options);
   const cacheState = new CacheState(dataDirs.core, options);
 
-  Object.assign(states, {
+  return {
     node: nodeState,
     blocklet: blockletState,
     notification: notificationState,
@@ -41,22 +39,7 @@ const init = (dataDirs, options) => {
     session: sessionState,
     blockletExtras: extrasState,
     cache: cacheState,
-  });
+  };
 };
 
-module.exports = new Proxy(
-  {},
-  {
-    get(target, prop) {
-      if (prop === 'init') {
-        return init;
-      }
-
-      if (states[prop] instanceof BaseState) {
-        return states[prop];
-      }
-
-      throw new Error(`State ${String(prop)} may not be initialized`);
-    },
-  }
-);
+module.exports = stateFactory(init);

package/lib/states/node.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-underscore-dangle */
+const semver = require('semver');
 const omit = require('lodash/omit');
 const isEqual = require('lodash/isEqual');
 const isEmpty = require('lodash/isEmpty');
@@ -89,6 +90,8 @@ class NodeState extends BaseState {
           runtimeConfig,
           ownerNft,
           launcherInfo,
+          didRegistry,
+          didDomain,
         } = this.options;
 
         if (nodeOwner && !validateOwner(nodeOwner)) {
@@ -121,6 +124,8 @@ class NodeState extends BaseState {
                 ownerNft,
                 diskAlertThreshold: DISK_ALERT_THRESHOLD_PERCENT,
                 launcherInfo: launcherInfo || undefined,
+                didRegistry,
+                didDomain,
               },
               async (e, data) => {
                 if (e) {
@@ -133,6 +138,10 @@ class NodeState extends BaseState {
                 }
 
                 logger.info('create', { data });
+                if (dek) {
+                  data.sk = security.decrypt(data.sk, data.did, dek);
+                }
+
                 return resolve(data);
               }
             )
@@ -163,7 +172,7 @@ class NodeState extends BaseState {
 
   cleanupDirtyUpgradeState() {
     return this.read().then((doc) => {
-      if (doc.nextVersion === doc.version) {
+      if (doc.nextVersion && semver.lte(doc.nextVersion, doc.version)) {
         const updates = { nextVersion: '', upgradeSessionId: '' };
 
         // FIXME: this may cause the node exit some mode unexpectedly if it is not being upgraded

package/lib/util/blocklet.js

@@ -5,6 +5,7 @@ const path = require('path');
 const os = require('os');
 const tar = require('tar');
 const get = require('lodash/get');
+const intersection = require('lodash/intersection');
 const streamToPromise = require('stream-to-promise');
 const { Throttle } = require('stream-throttle');
 const ssri = require('ssri');
@@ -69,7 +70,7 @@ const statusMap = {
   stopped: BlockletStatus.stopped,
 };
 
-const nodePrivateEnvs = [
+const PRIVATE_NODE_ENVS = [
   // 'NEDB_MULTI_PORT', // FIXME: 排查 abtnode 对外提供的 SDK(比如 @abtnode/queue), SDK 中不要自动使用 NEDB_MULTI_PORT 环境变量
   'ABT_NODE_UPDATER_PORT',
   'ABT_NODE_SESSION_TTL',
@@ -186,7 +187,7 @@ const getBlockletDirs = (blocklet, { rootBlocklet, dataDirs, ensure = false } =
  * @param {*} blocklet
  * @param {*} configs
  */
-const fillBlockletConfigs = (blocklet, configs) => {
+const fillBlockletConfigs = (blocklet, configs, parent) => {
   blocklet.configs = configs || [];
   blocklet.configObj = blocklet.configs.reduce((acc, x) => {
     acc[x.key] = x.value;
@@ -196,6 +197,13 @@ const fillBlockletConfigs = (blocklet, configs) => {
     acc[x.key] = x.value;
     return acc;
   }, {});
+
+  const sharedConfigs = getSharedConfigs(blocklet, parent);
+  Object.keys(sharedConfigs).forEach((key) => {
+    blocklet.configObj[key] = sharedConfigs[key];
+    const item = blocklet.configs.find((x) => x.key === key);
+    item.value = sharedConfigs[key];
+  });
 };
 
 const ensureBlockletExpanded = async (meta, appDir) => {
@@ -297,10 +305,10 @@ const getSystemEnvironments = (blocklet) => {
   };
 };
 
-const getRuntimeEnvironments = (blocklet, nodeEnvironments) => {
+const getRuntimeEnvironments = (blocklet, nodeEnvironments, parent) => {
   // pm2 will force inject env variables of daemon process to blocklet process
   // we can only rewrite these private env variables to empty
-  const safeNodeEnvironments = nodePrivateEnvs.reduce((o, x) => {
+  const safeNodeEnvironments = PRIVATE_NODE_ENVS.reduce((o, x) => {
     o[x] = '';
     return o;
   }, {});
@@ -308,11 +316,28 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments) => {
   return {
     ...blocklet.environmentObj,
     ...blocklet.configObj,
+    ...getSharedConfigs(blocklet, parent),
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };
 };
 
+// we support share insecure same configs between parent and child blocklets
+const getSharedConfigs = (child, parent) => {
+  const sharedConfigs = {};
+  if (parent && Array.isArray(parent.configs) && child.meta.did !== parent.meta.did) {
+    const parentKeys = parent.configs.filter((x) => x.secure === false).map((x) => x.key);
+    const childKeys = child.configs.map((x) => x.key);
+    const sharedKeys = intersection(parentKeys, childKeys);
+    sharedKeys.forEach((key) => {
+      if (!child.configObj[key]) {
+        sharedConfigs[key] = parent.configObj[key];
+      }
+    });
+  }
+  return sharedConfigs;
+};
+
 const isUsefulError = (err) => err && err.message !== 'process or namespace not found';
 
 const getHealthyCheckTimeout = (blocklet, { checkHealthImmediately } = {}) => {

package/lib/util/{get-ip-dns-domain-for-blocklet.js → get-domain-for-blocklet.js}

@@ -16,4 +16,8 @@ const getIpDnsDomainForBlocklet = (blocklet, blockletInterface) => {
   }${iName}-${SLOT_FOR_IP_DNS_SITE}.${DEFAULT_IP_DNS_DOMAIN_SUFFIX}`;
 };
 
-module.exports = getIpDnsDomainForBlocklet;
+const getDidDomainForBlocklet = ({ appId, didDomain }) => {
+  return `${appId.toLowerCase()}.${didDomain}`;
+};
+
+module.exports = { getIpDnsDomainForBlocklet, getDidDomainForBlocklet };

package/lib/util/index.js

@@ -315,7 +315,6 @@ const getHttpsCertInfo = (certificate) => {
     validFrom,
     validTo,
     issuer,
-    serialNumber: info.serialNumber,
     sans: info.dnsNames,
     validityPeriod: info.validTo - info.validFrom,
     fingerprintAlg: 'SHA256',
@@ -332,6 +331,8 @@ const getDataDirs = (dataDir) => ({
   tmp: path.join(dataDir, 'tmp'),
   blocklets: path.join(dataDir, 'blocklets'),
   services: path.join(dataDir, 'services'),
+  modules: path.join(dataDir, 'modules'),
+  certManagerModule: path.join(dataDir, 'modules', 'certificate-manager'),
 });
 
 // Ensure data dir for Blocklet Server exists
@@ -356,39 +357,53 @@ const formatEnvironments = (environments) => Object.keys(environments).map((x) =
 const transformIPToDomain = (ip) => ip.split('.').join('-');
 
 const getBaseUrls = async (node, ips) => {
-  const ipTypes = {
-    internal: 'private',
-    external: 'public',
-  };
   const info = await node.getNodeInfo();
   const { https, httpPort, httpsPort } = info.routing;
-  const ipKeys = Object.keys(ips).filter((x) => ips[x]);
   const getPort = (port, defaultPort) => (port && port !== defaultPort ? `:${port}` : '');
+  const availableIps = ips.filter(Boolean);
+
+  const getHttpInfo = async (domain) => {
+    const certificate = https ? await node.certManager.getNormalByDomain(domain) : null;
+    const protocol = certificate ? 'https' : 'http';
+    const port = certificate ? getPort(httpsPort, DEFAULT_HTTPS_PORT) : getPort(httpPort, DEFAULT_HTTP_PORT);
+
+    return { protocol, port };
+  };
 
   if (info.routing.provider !== ROUTER_PROVIDER_NONE && info.routing.snapshotHash && info.routing.adminPath) {
     const sites = await node.getSitesFromSnapshot();
 
     const { dashboardDomain } = info.routing;
     const adminPath = normalizePathPrefix(info.routing.adminPath);
-    const httpUrls = ipKeys.map((x) => {
-      const port = getPort(httpPort, DEFAULT_HTTP_PORT);
+    const tmpHttpPort = getPort(httpPort, DEFAULT_HTTP_PORT);
+
+    const httpUrls = availableIps.map((ip) => {
       return {
-        url: `http://${ips[x]}${port}${adminPath}`,
-        type: ipTypes[x],
+        url: `http://${ip}${tmpHttpPort}${adminPath}`,
       };
     });
 
     if (dashboardDomain) {
       const site = sites.find((c) => (c.domainAliases || []).find((item) => item.value === dashboardDomain));
       if (site) {
-        const certificate = https ? await node.findCertificateByDomain(dashboardDomain) : null;
-        const protocol = certificate ? 'https' : 'http';
-        const port = certificate ? getPort(httpsPort, DEFAULT_HTTPS_PORT) : getPort(httpPort, DEFAULT_HTTP_PORT);
-        const httpsUrls = ipKeys.map((x) => ({
-          url: `${protocol}://${transformIPToDomain(ips[x])}.${dashboardDomain.substring(2)}${port}${adminPath}`,
-          type: ipTypes[x],
+        const httpInfo = await getHttpInfo(dashboardDomain);
+        const httpsUrls = availableIps.map((ip) => ({
+          url: `${httpInfo.protocol}://${transformIPToDomain(ip)}.${dashboardDomain.substring(2)}${
+            httpInfo.port
+          }${adminPath}`,
         }));
 
+        // add did domain access url
+        const didDomainAlias = site.domainAliases.find((item) => item.value.endsWith(info.didDomain));
+        if (didDomainAlias) {
+          const didDomain = didDomainAlias.value;
+          const didDomainHttpInfo = await getHttpInfo(didDomain);
+
+          httpsUrls.push({
+            url: `${didDomainHttpInfo.protocol}://${didDomain}${didDomainHttpInfo.port}${adminPath}`,
+          });
+        }
+
         return httpUrls.concat(httpsUrls);
       }
     }
@@ -397,9 +412,8 @@ const getBaseUrls = async (node, ips) => {
   }
 
   // port urls
-  return ipKeys.map((x) => ({
-    url: `http://${ips[x]}:${info.port}`,
-    type: ipTypes[x],
+  return availableIps.map((ip) => ({
+    url: `http://${ip}:${info.port}`,
   }));
 };
 

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

@@ -66,7 +66,7 @@ module.exports = ({ events, dataDirs, instance }) => {
       const webhookList = await webhookState.list();
       const nodeInfo = await nodeState.read();
       const { internal, external } = await IP.get();
-      const baseUrls = await getBaseUrls(instance, { internal, external });
+      const baseUrls = await getBaseUrls(instance, [internal, external]);
       const senderFns = {};
 
       if (webhookList.length) {
@@ -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.6",
+  "version": "1.6.10",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,26 +19,28 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.6.6",
-    "@abtnode/cron": "1.6.6",
-    "@abtnode/logger": "1.6.6",
-    "@abtnode/queue": "1.6.6",
-    "@abtnode/rbac": "1.6.6",
-    "@abtnode/router-provider": "1.6.6",
-    "@abtnode/static-server": "1.6.6",
-    "@abtnode/timemachine": "1.6.6",
-    "@abtnode/util": "1.6.6",
-    "@arcblock/did": "^1.13.77",
-    "@arcblock/event-hub": "1.13.77",
+    "@abtnode/certificate-manager": "1.6.10",
+    "@abtnode/constant": "1.6.10",
+    "@abtnode/cron": "1.6.10",
+    "@abtnode/db": "1.6.10",
+    "@abtnode/logger": "1.6.10",
+    "@abtnode/queue": "1.6.10",
+    "@abtnode/rbac": "1.6.10",
+    "@abtnode/router-provider": "1.6.10",
+    "@abtnode/static-server": "1.6.10",
+    "@abtnode/timemachine": "1.6.10",
+    "@abtnode/util": "1.6.10",
+    "@arcblock/did": "^1.13.79",
+    "@arcblock/event-hub": "1.13.79",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.13.77",
-    "@blocklet/meta": "1.6.6",
+    "@arcblock/vc": "^1.13.79",
+    "@blocklet/meta": "1.6.10",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.13.77",
-    "@ocap/util": "^1.13.77",
-    "@ocap/wallet": "^1.13.77",
+    "@ocap/mcrypto": "^1.13.79",
+    "@ocap/util": "^1.13.79",
+    "@ocap/wallet": "^1.13.79",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.21.4",
     "axon": "^2.0.3",
@@ -51,7 +53,7 @@
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
     "is-url": "^1.2.4",
-    "joi": "^17.4.0",
+    "joi": "^17.5.0",
     "js-yaml": "^3.14.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
@@ -71,7 +73,7 @@
     "compression": "^1.7.4",
     "expand-tilde": "^2.0.2",
     "express": "^4.17.1",
-    "jest": "^27.3.1"
+    "jest": "^27.4.5"
   },
-  "gitHead": "59b5e0b6f2f0e8e27aa4a50722866beda6f91b84"
+  "gitHead": "90aa29d892f9f54c87faa3041daec042997fffcc"
 }