@abtnode/util 1.6.21 → 1.6.24

package/lib/can-pkg-rw.js

@@ -3,7 +3,7 @@ const locateNpmGlobalByBinary = require('./locate-npm-global-by-binary');
 const { canReadAndWriteDir } = require('./fs');
 
 module.exports = (cmdName, packageName) => {
-  const installDir = locateNpmGlobalByBinary(cmdName);
+  const installDir = locateNpmGlobalByBinary(cmdName, packageName);
   if (!installDir) {
     throw new Error(`${packageName} is not installed as a global package`);
   }

package/lib/locate-npm-global-by-binary.js

@@ -1,22 +1,32 @@
-/* eslint-disable no-unused-vars, no-console */
-
 const fs = require('fs');
 const path = require('path');
-const shelljs = require('shelljs');
+const shell = require('shelljs');
 
-module.exports = (binaryName) => {
+module.exports = (binaryName, packageName) => {
   if (!binaryName) {
     throw new Error('binaryName is required');
   }
 
-  const result = shelljs.which(binaryName);
+  let result = shell.which(binaryName);
   if (!result || !result.stdout) {
     return '';
   }
 
-  const binPath = result.stdout;
+  const binPath = result.stdout.trim();
 
+  // Check if the package is installed via pnpm: only if we have packageName set
   let binDir = path.dirname(fs.realpathSync(binPath));
+  if (packageName) {
+    const { stdout: pnpmPath } = shell.which('pnpm');
+    if (pnpmPath) {
+      result = shell.exec('pnpm bin -g', { silent: true });
+      const pnpmBinDir = result.stdout.trim();
+      if (binDir === pnpmBinDir) {
+        result = shell.exec(`pnpm root -g ${packageName}`, { silent: true });
+        return path.join(result.stdout.trim(), packageName);
+      }
+    }
+  }
 
   while (binDir && binDir !== path.sep && path.basename(binDir) !== 'node_modules') {
     const packageJsonPath = path.join(binDir, 'package.json');

package/lib/sort-priority-url.js

@@ -0,0 +1,109 @@
+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;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.21",
+  "version": "1.6.24",
   "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.14.13",
-    "@ocap/util": "^1.14.13",
-    "@ocap/wallet": "^1.14.13",
+    "@ocap/mcrypto": "^1.14.19",
+    "@ocap/util": "^1.14.19",
+    "@ocap/wallet": "^1.14.19",
     "axios": "^0.25.0",
     "axios-mock-adapter": "^1.20.0",
     "axon": "^2.0.3",
@@ -41,7 +41,6 @@
     "semver-sort": "^0.0.4",
     "shelljs": "^0.8.4",
     "stream-to-promise": "^3.0.0",
-    "systeminformation": "^5.6.12",
     "through2-filter": "^3.0.0",
     "through2-map": "^3.0.0",
     "to-semver": "^3.0.0",
@@ -54,5 +53,5 @@
     "fs-extra": "^10.0.0",
     "jest": "^27.4.5"
   },
-  "gitHead": "864ae21711c119948475057a1f634fd7d16ae91a"
+  "gitHead": "6bd8792a155ebbbefea6ca3d42c5b59b354d9879"
 }

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 };