@abtnode/util 1.15.17 → 1.16.0-beta-8ee536d7

package/lib/sleep.js

@@ -1 +1,2 @@
+// eslint-disable-next-line no-promise-executor-return
 module.exports = (timeout = 0) => new Promise((resolve) => setTimeout(resolve, timeout));

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,86 @@
+const checkURLAccessibleInBrowser = require('./check-accessible-browser');
+
+const isIpAddress = (hostname) => {
+  return /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/.test(hostname);
+};
+
+const isIpEcho = (hostname) => {
+  return hostname.endsWith('.ip.abtnet.io');
+};
+
+const isDidDomain = (hostname) => {
+  return hostname.endsWith('.did.abtnet.io');
+};
+
+const isCustomDomain = (domain) => {
+  return !isIpEcho(domain) && !isDidDomain(domain) && !isIpAddress(domain);
+};
+
+/**
+ * 用于评估 url 可访问性/使用优先级 (考虑 node/browser 两种环境)
+ */
+const evaluateURL = async (url, options = {}) => {
+  const { timeout = 5000, checkAccessible = checkURLAccessibleInBrowser } = options;
+  const { protocol, port, hostname } = new URL(url);
+  // https +1000 分
+  let score = protocol === 'https:' ? 1000 : 0;
+  // 自定义域名，优先级最高 (即使不可访问)
+  if (isCustomDomain(hostname)) {
+    score += 30000;
+    // 子层越多越靠后
+    score -= hostname.split('.').length;
+  } else {
+    // 优先级高于 ip echo 地址
+    if (isDidDomain(hostname)) {
+      score += 21;
+    }
+
+    // ip echo, +20
+    if (isIpEcho(hostname)) {
+      score += 20;
+    }
+    // 纯 ip 地址
+    if (isIpAddress(hostname)) {
+      score += 1;
+    }
+    // 带端口优先权放后
+    if (port) {
+      score -= 1;
+    }
+  }
+  // 不可访问, 减 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/lib/user-avatar.js

@@ -0,0 +1,69 @@
+const path = require('path');
+const fs = require('fs-extra');
+
+const { USER_AVATAR_DIR, USER_AVATAR_URL_PREFIX } = require('@abtnode/constant');
+
+const md5 = require('./md5');
+
+const getAvatarFile = (dataDir, fileName) =>
+  path.join(dataDir, USER_AVATAR_DIR, fileName.substring(0, 2), fileName.substring(2));
+
+/**
+ * save base64 avatar data to storage and return url
+ */
+const extractUserAvatar = async (avatar, { dataDir } = {}) => {
+  if (!avatar) {
+    return avatar;
+  }
+
+  const regex = /^data:image\/(\w+);base64,/;
+  const match = regex.exec(avatar);
+
+  if (!match) {
+    return avatar;
+  }
+
+  const fileData = Buffer.from(avatar.replace(regex, ''), 'base64');
+  const fileName = `${md5(fileData)}.${match[1]}`;
+
+  const avatarFile = getAvatarFile(dataDir, fileName);
+  await fs.outputFile(avatarFile, fileData);
+
+  const url = `${USER_AVATAR_URL_PREFIX}/${fileName}`;
+
+  return url;
+};
+
+/**
+ * generate base64 avatar data to from file by url
+ */
+const parseUserAvatar = async (avatar, { dataDir } = {}) => {
+  if (!avatar) {
+    return avatar;
+  }
+
+  if (!avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
+    return avatar;
+  }
+
+  const fileName = avatar.split('/').slice(-1)[0];
+
+  const avatarFile = getAvatarFile(dataDir, fileName);
+
+  if (!fs.existsSync(avatarFile)) {
+    return avatar;
+  }
+
+  const buf = await fs.promises.readFile(avatarFile);
+  const extname = path.extname(fileName).substring(1);
+
+  const data = `data:image/${extname};base64,${buf.toString('base64')}`;
+
+  return data;
+};
+
+module.exports = {
+  extractUserAvatar,
+  parseUserAvatar,
+  getAvatarFile,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.15.17",
+  "version": "1.16.0-beta-8ee536d7",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,34 +18,57 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@ocap/mcrypto": "^1.13.61",
-    "@ocap/wallet": "^1.13.61",
-    "axios": "^0.21.4",
-    "axios-mock-adapter": "^1.20.0",
+    "@abtnode/constant": "1.16.0-beta-8ee536d7",
+    "@abtnode/logger": "1.16.0-beta-8ee536d7",
+    "@arcblock/jwt": "^1.18.62",
+    "@blocklet/constant": "1.16.0-beta-8ee536d7",
+    "@ocap/mcrypto": "1.18.62",
+    "@ocap/util": "1.18.62",
+    "@ocap/wallet": "1.18.62",
+    "archiver": "^5.3.1",
+    "axios": "^0.27.2",
+    "axios-mock-adapter": "^1.21.2",
     "axon": "^2.0.3",
-    "debug": "^4.3.2",
+    "cross-spawn": "^7.0.3",
+    "dayjs": "^1.11.7",
+    "debug": "^4.3.4",
+    "fast-glob": "^3.2.12",
     "find-up": "^5.0.0",
     "flush-write-stream": "^2.0.0",
     "folder-walker": "^3.2.0",
-    "hasha": "^5.2.0",
-    "internal-ip": "^6.1.0",
-    "is-docker": "^2.1.1",
+    "form-data": "^4.0.0",
+    "get-folder-size": "^2.0.1",
+    "hasha": "^5.2.2",
+    "hpagent": "^1.1.0",
+    "internal-ip": "^6.2.0",
+    "is-docker": "^2.2.1",
+    "json-stable-stringify": "^1.0.1",
+    "lodash": "^4.17.21",
+    "multiformats": "9.9.0",
+    "p-retry": "4.6.1",
     "parallel-transform": "^1.2.0",
-    "public-ip": "^4.0.2",
+    "public-ip": "^4.0.4",
     "pump": "^3.0.0",
-    "semver-sort": "^0.0.4",
-    "shelljs": "^0.8.4",
+    "read-last-lines": "^1.8.0",
+    "semver": "^7.3.8",
+    "semver-sort": "^1.0.0",
+    "shelljs": "^0.8.5",
+    "slugify": "^1.6.5",
     "stream-to-promise": "^3.0.0",
-    "systeminformation": "^5.6.12",
+    "tail": "^2.2.4",
+    "tar": "^6.1.11",
     "through2-filter": "^3.0.0",
     "through2-map": "^3.0.0",
-    "to-semver": "^3.0.0"
+    "to-semver": "^3.0.0",
+    "url-join": "^4.0.1",
+    "which": "^2.0.2"
   },
   "devDependencies": {
-    "detect-port": "^1.3.0",
-    "express": "^4.17.1",
-    "fs-extra": "^10.0.0",
-    "jest": "^27.3.1"
+    "detect-port": "^1.5.1",
+    "express": "^4.18.2",
+    "fs-extra": "^10.1.0",
+    "jest": "^27.5.1",
+    "unzipper": "^0.10.11"
   },
-  "gitHead": "22715c3ea74d0230f3413162a17f491614b6735a"
+  "gitHead": "57d0c45be311a5fbc1c0fffa2814b62c1a3ee34c"
 }

package/lib/sys-info.js

@@ -1,56 +0,0 @@
-const si = require('systeminformation');
-
-const systemConfig = {
-  cpu: 'cores',
-  mem: '*',
-  currentLoad: '*',
-  fsSize: '*',
-  diskLayout: '*',
-  osInfo: 'platform',
-};
-
-const get = async () => {
-  const info = await si.get(systemConfig); // prettier-ignore
-
-  // 物理磁盘。一些VM，或者Docker环境下无
-  const physicalDisk = (info.diskLayout || []).filter((x) => Number(x.size) > 0);
-  const fsSizeInfo = (info.fsSize || []).filter((x) => Number(x.size) > 0);
-
-  // HACK 目前我们支持的系统是 Mac Vm Docker 如果支持windows 下面代码可能会有问题
-  // 目前强制过滤出苹果文件系统(APFS) 其他的都是 mount 的文件系统
-  // 这样有物理磁盘(Mac) 磁盘总计为 physicalDisk + mountFsSize
-  // 无物理磁盘的 磁盘总计为 fsSizeInfo
-  const mountFsSize = (info.fsSize || []).filter((x) => x.type.toUpperCase() !== 'APFS');
-
-  const getTotalFn = (data, key) => data.reduce((total, x) => total + Number(x[key]), 0);
-  const fsTotalFn = (key) => getTotalFn(fsSizeInfo, key);
-
-  const baseSystemInfo = {
-    cpu: {
-      ...info.currentLoad,
-      ...info.cpu,
-    },
-    mem: info.mem,
-    osInfo: info.osInfo,
-  };
-
-  if (info.osInfo.platform === 'darwin') {
-    return {
-      ...baseSystemInfo,
-      disk: {
-        total: getTotalFn(physicalDisk, 'size') + getTotalFn(mountFsSize, 'size'),
-        used: fsTotalFn('used'),
-      },
-    };
-  }
-
-  return {
-    ...baseSystemInfo,
-    disk: {
-      total: fsTotalFn('size'),
-      used: fsTotalFn('used'),
-    },
-  };
-};
-
-module.exports = { get };