@abtnode/util 1.7.3 → 1.7.6

package/lib/async-pm2.js

@@ -1,5 +1,6 @@
 // You must install pm2 as project dependency
 const pm2 = require('pm2'); // eslint-disable-line import/no-extraneous-dependencies
+const semver = require('semver');
 const { promisify } = require('util');
 
 const api = [
@@ -20,6 +21,23 @@ const api = [
   'stop',
 ];
 
+const nodeArgs = [];
+// https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
+if (semver.gte(process.version, '17.0.0')) {
+  nodeArgs.push('--openssl-legacy-provider');
+}
+
+const originStart = pm2.start.bind(pm2);
+pm2.start = (opts, cb) => {
+  if (opts.node_args) {
+    opts.node_args = `${opts.node_args} ${nodeArgs.join(' ')}`.trim();
+  } else {
+    opts.node_args = nodeArgs.join(' ');
+  }
+
+  return originStart(opts, cb);
+};
+
 api.forEach((x) => {
   if (typeof pm2[x] === 'function') {
     pm2[`${x}Async`] = promisify(pm2[x]).bind(pm2);

package/lib/url-evaluation/check-accessible-browser.js

@@ -0,0 +1,17 @@
+// 请求 4xx/5xx 的情况会判定为 accessible = true
+// (基于 script tag 的检测方式, 会将 404 请求判定为 accessible = false)
+// TODO: 存在 Mixed Content 问题
+module.exports = async (url, timeout = 5000) => {
+  let timer;
+  try {
+    const controller = new AbortController();
+    timer = setTimeout(() => controller.abort(), timeout);
+    // eslint-disable-next-line no-undef
+    await fetch(url, { method: 'HEAD', mode: 'no-cors', signal: controller.signal });
+    return true;
+  } catch (e) {
+    return false;
+  } finally {
+    clearTimeout(timer);
+  }
+};

package/lib/url-evaluation/check-accessible-node.js

@@ -0,0 +1,14 @@
+const axios = require('axios');
+
+module.exports = async (url, timeout = 5000) => {
+  try {
+    await axios.head(url, {
+      timeout,
+      // 只要有响应状态码就认为可访问 (包括 4xx/5xx)
+      validateStatus: null,
+    });
+    return true;
+  } catch (e) {
+    return false;
+  }
+};

package/lib/url-evaluation/index.js

@@ -0,0 +1,64 @@
+const checkURLAccessibleInBrowser = require('./check-accessible-browser');
+
+/**
+ * 用于评估 url 可访问性/使用优先级 (考虑 node/browser 两种环境)
+ */
+const evaluateURL = async (url, options = {}) => {
+  const { timeout = 5000, checkAccessible = checkURLAccessibleInBrowser } = options;
+  const { protocol, port, hostname } = new URL(url);
+  // 先进行计分，https优先级最高
+  let score = protocol === 'https:' ? 1000 : 0;
+  if (hostname.endsWith('.ip.abtnet.io')) {
+    // ip echo
+    score += 20;
+  } else {
+    // 带端口优先权放后
+    if (port) {
+      score -= 1;
+    }
+    if (/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/.test(hostname)) {
+      // 纯ip地址
+      score += 1;
+    } else {
+      // 自定义域名
+      score += 200;
+      // 子层越多越靠后
+      score -= hostname.split('.').length;
+    }
+  }
+  // 不可访问, 减 20000 分 (这里将 4xx~5xx 也认为是可访问)
+  let accessible = false;
+  if (checkAccessible) {
+    accessible = await checkAccessible(url, timeout);
+    if (!accessible) {
+      score -= 20000;
+    }
+  }
+  return { url, score, accessible };
+};
+
+/**
+ * 用于评估一组 url 的可访问性/使用优先级, 返回一组按 score 从高到低排序的 urls
+ */
+const evaluateURLs = async (urls, options = {}) => {
+  const results = await Promise.all(
+    urls.map(async (url) => {
+      try {
+        return await evaluateURL(url, options);
+      } catch (e) {
+        console.error(e);
+        return { url, score: Number.MIN_SAFE_INTEGER, accessible: false };
+      }
+    })
+  );
+  // 有些情况下可能不需要排序, 可以传入 sort: false
+  if (options.sort === false) {
+    return results;
+  }
+  return results.sort((a, b) => b.score - a.score);
+};
+
+module.exports = {
+  evaluateURL,
+  evaluateURLs,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.3",
+  "version": "1.7.6",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@ocap/mcrypto": "^1.15.3",
-    "@ocap/util": "^1.15.3",
-    "@ocap/wallet": "^1.15.3",
+    "@ocap/mcrypto": "^1.16.0",
+    "@ocap/util": "^1.16.0",
+    "@ocap/wallet": "^1.16.0",
     "axios": "^0.25.0",
     "axios-mock-adapter": "^1.20.0",
     "axon": "^2.0.3",
@@ -38,6 +38,7 @@
     "parallel-transform": "^1.2.0",
     "public-ip": "^4.0.2",
     "pump": "^3.0.0",
+    "semver": "^7.3.5",
     "semver-sort": "^0.0.4",
     "shelljs": "^0.8.4",
     "stream-to-promise": "^3.0.0",
@@ -50,8 +51,8 @@
   "devDependencies": {
     "detect-port": "^1.3.0",
     "express": "^4.17.1",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.0.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "2b965b42a59a2d98642018749a6afb6e4014a698"
+  "gitHead": "47a9dbd6ea74419ff586336824ebb9b2fe7694aa"
 }

package/lib/sort-priority-url.js

@@ -1,109 +0,0 @@
-const http = require('http');
-const https = require('https');
-
-// 根据url获取状态码
-// 更换使用XMLHttpRequest可兼容浏览器
-const getStatusCode = (url, timeout = 5000) =>
-  new Promise((resolve, reject) => {
-    const requestFunc = url.startsWith('https://') ? https : http;
-
-    let timer;
-    try {
-      const resp = requestFunc
-        .get(url, (res) => {
-          res.destroy();
-          clearTimeout(timer);
-          resolve(res.statusCode);
-        })
-        .on('error', () => {
-          clearTimeout(timer);
-          reject();
-        });
-
-      // 超时终止响应
-      timer = setTimeout(() => resp.destroy(new Error('access link timed out')), timeout);
-    } catch (err) {
-      // 报错属于完全不能访问的网页，优先级最低
-      clearTimeout(timer);
-      reject();
-    }
-  });
-
-/**
- * Filter an optimal address from the array
- * 对urls进行排序，按照以下顺序
- * 优先级最高：能正常访问的地址 => 有响应但不正常(404) => 异常地址(error)
- * 次优先级：https => 自定义域名 => 域名级别(一级>二级>...) => ip echo 地址 => http => 自定义...
- *
- * @param {Array} urls array of urls
- * @param {Number} timeout request max time (ms)
- * @returns url object
- */
-const sortPriorityUrl = async (urls, timeout = 5000) => {
-  const urlsData = urls.map((e) => {
-    // 先进行计分，https优先级最高
-    const { protocol, port, hostname } = new URL(e.url);
-
-    let score = protocol === 'https:' ? 1000 : 0;
-
-    if (hostname.endsWith('.ip.abtnet.io')) {
-      // ip echo
-      score += 20;
-    } else {
-      // 带端口号
-      if (port) {
-        // 带端口优先权放后
-        score -= 1;
-      }
-
-      if (/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/.test(hostname)) {
-        // 纯ip地址
-        score += 1;
-      } else {
-        // 自定义域名
-        score += 200;
-
-        // 子层越多越靠后
-        score -= hostname.split('.').length;
-      }
-    }
-
-    return {
-      score,
-      url: e.url,
-    };
-  });
-
-  // 不能访问的地址靠后
-  await Promise.all(
-    urlsData.map(
-      (e) =>
-        new Promise((resolve) => {
-          getStatusCode(e.url, timeout)
-            .then((statusCode) => {
-              if (/^4\d{2}/.test(statusCode)) {
-                e.score -= 10000; // 虽然4xx，起码有响应，扣分相对error少
-              }
-              e.status = statusCode;
-              resolve(e);
-            })
-            .catch(() => {
-              // 报错属于完全不能访问的网页，优先级最低
-              e.score -= 20000;
-              resolve(e);
-            });
-        })
-    )
-  );
-
-  // 根据分数进行排序
-  const sortedUrls = urlsData
-    .sort((a, b) => b.score - a.score)
-    .map((e) => {
-      return { url: e.url, status: e.status };
-    });
-
-  return sortedUrls;
-};
-
-module.exports = sortPriorityUrl;