@abtnode/util 1.8.28 → 1.8.30

package/lib/format-back-slash.js

@@ -0,0 +1,9 @@
+const lodash = require('lodash');
+
+/**
+ * Replace the back slack('\') with forward slash('/')
+ * @param {*} str
+ * @param {*} flag RegExp flag, default is 'g'
+ * @returns
+ */
+module.exports = (str) => lodash.replace(str, new RegExp(lodash.escapeRegExp('\\'), 'g'), '/');

package/lib/get-folder-size.js

@@ -1,6 +1,7 @@
+const getSize = require('get-folder-size');
 const exec = require('child_process').execFile;
 
-module.exports = (dir) => {
+const getOnUnixLike = (dir) => {
   const regex = /^(\d*)/;
 
   return new Promise((resolve, reject) => {
@@ -16,3 +17,17 @@ module.exports = (dir) => {
     });
   });
 };
+
+const getOnWindows = (dir) => {
+  return new Promise((resolve, reject) => {
+    getSize(dir, (err, size) => {
+      if (err) {
+        return reject(err);
+      }
+
+      return resolve(size);
+    });
+  });
+};
+
+module.exports = process.platform === 'win32' ? getOnWindows : getOnUnixLike;

package/lib/log.js

@@ -58,7 +58,12 @@ class StreamLog {
         if (!file || !fs.existsSync(file)) {
           return;
         }
-        this._tails[level] = new Tail(file);
+
+        // 测试发现 Windows 下 fs.watch 没有效果，但是 fs.watch 的性能更好，所以只在 windows 下使用 fs.watchFile
+        this._tails[level] = new Tail(file, {
+          useWatchFile: process.platform === 'win32',
+          fsWatchOptions: { interval: 1500 },
+        });
       });
       return this._tails;
     } catch (error) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.28",
+  "version": "1.8.30",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,10 +18,10 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.28",
-    "@abtnode/logger": "1.8.28",
+    "@abtnode/constant": "1.8.30",
+    "@abtnode/logger": "1.8.30",
     "@arcblock/jwt": "^1.17.23",
-    "@blocklet/constant": "1.8.28",
+    "@blocklet/constant": "1.8.30",
     "@ocap/mcrypto": "1.17.23",
     "@ocap/util": "1.17.23",
     "@ocap/wallet": "1.17.23",
@@ -34,6 +34,7 @@
     "flush-write-stream": "^2.0.0",
     "folder-walker": "^3.2.0",
     "form-data": "^4.0.0",
+    "get-folder-size": "^2.0.1",
     "hasha": "^5.2.2",
     "hpagent": "^1.1.0",
     "internal-ip": "^6.2.0",
@@ -62,5 +63,5 @@
     "fs-extra": "^10.1.0",
     "jest": "^27.5.1"
   },
-  "gitHead": "af7aacf5507177600ae563ab597cb42d7223b113"
+  "gitHead": "cb294f4ee7382c6ef7692b6c2c33ad080fced13e"
 }