@abtnode/core 1.6.21 → 1.6.22

package/lib/migrations/1.6.21-rename-ip-echo-domain.js

@@ -2,13 +2,18 @@ const yaml = require('js-yaml');
 const fs = require('fs');
 const set = require('lodash/set');
 const omit = require('lodash/omit');
-const { DEFAULT_WILDCARD_CERT_HOST, DEFAULT_DID_DOMAIN, DEFAULT_DID_REGISTRY } = require('@abtnode/constant');
+const {
+  DEFAULT_WILDCARD_CERT_HOST,
+  DEFAULT_DID_DOMAIN,
+  DEFAULT_DID_REGISTRY,
+  DEFAULT_IP_DOMAIN,
+} = require('@abtnode/constant');
 
 module.exports = async ({ states, printInfo, configFile }) => {
   printInfo('Try to rename dashboardDomain to ipWildcardDomain in db...');
 
   let info = await states.node.read();
-  set(info, 'routing.ipWildcardDomain', info.routing.dashboardDomain);
+  set(info, 'routing.ipWildcardDomain', info.routing.dashboardDomain || DEFAULT_IP_DOMAIN);
   set(info, 'routing.wildcardCertHost', DEFAULT_WILDCARD_CERT_HOST);
   set(info, 'didDomain', DEFAULT_DID_DOMAIN);
   set(info, 'didRegistry', DEFAULT_DID_REGISTRY);
@@ -16,12 +21,15 @@ module.exports = async ({ states, printInfo, configFile }) => {
 
   await states.node.updateNodeInfo(info);
 
-  let rawConfig = yaml.safeLoad(fs.readFileSync(configFile).toString());
-  set(rawConfig, 'node.routing.ipWildcardDomain', info.routing.ipWildcardDomain);
-  set(rawConfig, 'node.routing.wildcardCertHost', DEFAULT_WILDCARD_CERT_HOST);
-  set(rawConfig, 'node.didDomain', DEFAULT_DID_DOMAIN);
-  set(rawConfig, 'node.didRegistry', DEFAULT_DID_REGISTRY);
-  rawConfig = omit(rawConfig, 'node.routing.dashboardDomain');
-  fs.writeFileSync(configFile, yaml.dump(rawConfig));
+  if (process.env.NODE_ENV !== 'development') {
+    let rawConfig = yaml.safeLoad(fs.readFileSync(configFile).toString());
+    set(rawConfig, 'node.routing.ipWildcardDomain', info.routing.ipWildcardDomain);
+    set(rawConfig, 'node.routing.wildcardCertHost', DEFAULT_WILDCARD_CERT_HOST);
+    set(rawConfig, 'node.didDomain', DEFAULT_DID_DOMAIN);
+    set(rawConfig, 'node.didRegistry', DEFAULT_DID_REGISTRY);
+    rawConfig = omit(rawConfig, 'node.routing.dashboardDomain');
+    fs.writeFileSync(configFile, yaml.dump(rawConfig));
+  }
+
   printInfo(`> Persist new config to file: ${configFile}`);
 };

package/lib/migrations/index.js

@@ -132,9 +132,13 @@ const runMigrationScripts = async ({
   for (let i = 0; i < scripts.length; i++) {
     const { script, version } = scripts[i];
     try {
-      const executed = await node.isMigrationExecuted({ script, version });
-      if (executed === false) {
+      if (process.env.NODE_ENV === 'development') {
         pending.push(scripts[i]);
+      } else {
+        const executed = await node.isMigrationExecuted({ script, version });
+        if (executed === false) {
+          pending.push(scripts[i]);
+        }
       }
     } catch (err) {
       printError(`Failed to detect migration script execution status: ${script}, error: ${err.message}`);

package/lib/router/helper.js

@@ -223,6 +223,19 @@ const ensureServiceRule = async (sites) => {
     return site;
   });
 };
+const ensureRootRule = async (sites) => {
+  return sites.map((site) => {
+    if (!isBasicSite(site.domain) && !site.rules.some((x) => x.from.pathPrefix === '/')) {
+      site.rules.push({
+        from: { pathPrefix: '/' },
+        to: {
+          type: ROUTING_RULE_TYPES.NONE,
+        },
+      });
+    }
+    return site;
+  });
+};
 
 const ensureLatestNodeInfo = async (sites = [], { withDefaultCors = true } = {}) => {
   const info = await states.node.read();
@@ -1178,6 +1191,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
             sites = await ensureLatestInfo(sites);
             sites = await ensureAuthService(sites, blockletManager);
             sites = await ensureServiceRule(sites);
+            sites = await ensureRootRule(sites);
 
             const certificates = httpsEnabled ? await certManager.getAllNormal() : [];
 

package/lib/router/index.js

@@ -5,7 +5,7 @@ const {
   DOMAIN_FOR_DEFAULT_SITE,
   DOMAIN_FOR_IP_SITE_REGEXP,
   ROUTING_RULE_TYPES,
-  DEFAULT_DASHBOARD_DOMAIN,
+  DEFAULT_IP_DOMAIN,
   BLOCKLET_PROXY_PATH_PREFIX,
   BLOCKLET_SITE_GROUP_SUFFIX,
 } = require('@abtnode/constant');
@@ -219,7 +219,7 @@ Router.formatSites = (sites = []) => {
 
 Router.flattenSitesToRules = (sites = [], info = {}) => {
   const result = [];
-  const ipWildcardDomain = get(info, 'routing.ipWildcardDomain', DEFAULT_DASHBOARD_DOMAIN);
+  const ipWildcardDomain = get(info, 'routing.ipWildcardDomain', DEFAULT_IP_DOMAIN);
   sites.forEach((site) => {
     const aliases = (site.domainAliases || [])
       .map((x) => (typeof x === 'string' ? x : x.value))

package/lib/util/get-accessible-external-node-ip.js

@@ -1,9 +1,9 @@
 const joinUrl = require('url-join');
 const axios = require('@abtnode/util/lib/axios');
-const { DEFAULT_DASHBOARD_DOMAIN, DEFAULT_ADMIN_PATH } = require('@abtnode/constant');
+const { DEFAULT_IP_DOMAIN, DEFAULT_ADMIN_PATH } = require('@abtnode/constant');
 const { get: getIp } = require('./ip');
 
-const getNodeDomain = (ip) => (ip ? DEFAULT_DASHBOARD_DOMAIN.replace(/^\*/, ip.replace(/\./g, '-')) : '');
+const getNodeDomain = (ip) => (ip ? DEFAULT_IP_DOMAIN.replace(/^\*/, ip.replace(/\./g, '-')) : '');
 
 let cache = null;
 

package/lib/webhook/index.js

@@ -1,13 +1,13 @@
 const logger = require('@abtnode/logger')('@abtnode/core:webhook:index');
-const upperFirst = require('lodash/upperFirst');
 
+const sortPriorityUrl = require('@abtnode/util/lib/sort-priority-url');
 const WebHookSender = require('./sender');
 const createQueue = require('../queue');
 const IP = require('../util/ip');
 const states = require('../states');
 const { getBaseUrls } = require('../util');
 
-const getSlackUrlInfo = (actionPath = '/notifications', urls) => {
+const getSlackUrlInfo = async (actionPath = '/notifications', urls) => {
   const info = [];
 
   if (actionPath && actionPath.startsWith('/blocklet/')) {
@@ -28,29 +28,27 @@ const getSlackUrlInfo = (actionPath = '/notifications', urls) => {
     });
   }
 
-  const httpUrls = urls.filter((x) => x.url.startsWith('http://'));
-  const httpsUrls = urls.filter((x) => x.url.startsWith('https://'));
-
-  const showUrls = httpsUrls.length ? httpsUrls : httpUrls;
-  const elements = [];
-  showUrls.forEach((x) => {
-    const { protocol } = new URL(x.url);
-    const normalized = `${x.url}${actionPath}`.replace(`${protocol}//`, '').replace(/\/+/g, '/');
-    const url = `${protocol}//${normalized}`;
-    elements.push({
-      type: 'button',
-      text: {
-        type: 'plain_text',
-        text: `${upperFirst(x.type)} Address`,
-      },
-      style: 'primary',
-      value: `${upperFirst(x.type)} Address`,
-      url,
-    });
-  });
+  const prioritys = await sortPriorityUrl(urls);
+  const priorityUrl = prioritys[0].url;
+
+  const { protocol } = new URL(priorityUrl);
+  const normalized = `${priorityUrl}${actionPath}`.replace(`${protocol}//`, '').replace(/\/+/g, '/');
+  const url = `${protocol}//${normalized}`;
+
   info.push({
     type: 'actions',
-    elements,
+    elements: [
+      {
+        type: 'button',
+        text: {
+          type: 'plain_text',
+          text: 'Click Me',
+        },
+        style: 'primary',
+        value: 'Click Me',
+        url,
+      },
+    ],
   });
 
   return info;
@@ -79,7 +77,8 @@ module.exports = ({ events, dataDirs, instance }) => {
           const { name } = nodeInfo;
           const options = { ...message, nodeInfo: `*${name}*` };
           if (item.type === 'slack') {
-            options.urlInfo = getSlackUrlInfo(message.action, baseUrls);
+            // eslint-disable-next-line
+            options.urlInfo = await getSlackUrlInfo(message.action, baseUrls);
           }
           try {
             // eslint-disable-next-line

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.21",
+  "version": "1.6.22",
   "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.21",
-    "@abtnode/constant": "1.6.21",
-    "@abtnode/cron": "1.6.21",
-    "@abtnode/db": "1.6.21",
-    "@abtnode/logger": "1.6.21",
-    "@abtnode/queue": "1.6.21",
-    "@abtnode/rbac": "1.6.21",
-    "@abtnode/router-provider": "1.6.21",
-    "@abtnode/static-server": "1.6.21",
-    "@abtnode/timemachine": "1.6.21",
-    "@abtnode/util": "1.6.21",
-    "@arcblock/did": "^1.14.13",
-    "@arcblock/event-hub": "1.14.13",
+    "@abtnode/certificate-manager": "1.6.22",
+    "@abtnode/constant": "1.6.22",
+    "@abtnode/cron": "1.6.22",
+    "@abtnode/db": "1.6.22",
+    "@abtnode/logger": "1.6.22",
+    "@abtnode/queue": "1.6.22",
+    "@abtnode/rbac": "1.6.22",
+    "@abtnode/router-provider": "1.6.22",
+    "@abtnode/static-server": "1.6.22",
+    "@abtnode/timemachine": "1.6.22",
+    "@abtnode/util": "1.6.22",
+    "@arcblock/did": "^1.14.16",
+    "@arcblock/event-hub": "1.14.16",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.14.13",
-    "@blocklet/meta": "1.6.21",
+    "@arcblock/vc": "^1.14.16",
+    "@blocklet/meta": "1.6.22",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.14.13",
-    "@ocap/util": "^1.14.13",
-    "@ocap/wallet": "^1.14.13",
+    "@ocap/mcrypto": "^1.14.16",
+    "@ocap/util": "^1.14.16",
+    "@ocap/wallet": "^1.14.16",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.25.0",
     "axon": "^2.0.3",
@@ -75,5 +75,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "864ae21711c119948475057a1f634fd7d16ae91a"
+  "gitHead": "18ac52a439dbd04e4ace98d796b6de517503fb14"
 }