pubo-node 1.0.144 → 1.0.145

package/es/child-process/index.js

@@ -219,6 +219,7 @@ export var SIGKILL = _async(function (pid, signal) {
     var tmp = [tree.pid];
     flatProcessTree(tree, tmp);
     tmp.reverse();
+    tree = null;
     return _continue(_forOf(tmp, function (item) {
       return _awaitIgnored(_SIGKILL(item, signal));
     }), function () {
@@ -312,7 +313,9 @@ export function getProcessByPpid(pid) {
 }
 // 获取进程树
 export var getProcessTree = _async(function (pid, tree) {
+  var isRoot = false;
   if (!tree) {
+    isRoot = true;
     tree = {
       pid: pid,
       children: []
@@ -328,17 +331,24 @@ export var getProcessTree = _async(function (pid, tree) {
         tree.children.push(item);
       });
     }), function () {
-      return tree;
+      if (isRoot) {
+        return tree;
+      } else {
+        tree = null;
+      }
     });
   });
 });
 var flatProcessTree = function flatProcessTree(tree, tmp) {
   if (tree.children) {
-    tmp.push.apply(tmp, tree.children.map(function (item) {
+    var _tmp;
+    (_tmp = tmp).push.apply(_tmp, tree.children.map(function (item) {
       return item.pid;
     }));
     tree.children.forEach(function (item) {
       return flatProcessTree(item, tmp);
     });
   }
+  tree = null;
+  tmp = null;
 };

package/lib/child-process/index.js

@@ -1,356 +1,142 @@
 "use strict";
-
-function _await(value, then, direct) {
-  if (direct) {
-    return then ? then(value) : value;
-  }
-  if (!value || !value.then) {
-    value = Promise.resolve(value);
-  }
-  return then ? value.then(then) : value;
-}
-var SIGKILL = _async(function (pid, signal) {
-  if (signal === void 0) {
-    signal = 2;
-  }
-  return process.platform === 'win32' ? new Promise(function (resolve, reject) {
-    (0, child_process_1.exec)("taskkill /pid " + pid + " /T /F", function (err) {
-      if (err) {
-        reject(err);
-      } else {
-        resolve('');
-      }
-    });
-  }) : _await((0, exports.getProcessTree)(pid), function (tree) {
-    // 获取所有进程PID,从叶到根
-    var tmp = [tree.pid];
-    flatProcessTree(tree, tmp);
-    tmp.reverse();
-    return _continue(_forOf(tmp, function (item) {
-      return _awaitIgnored(_SIGKILL(item, signal));
-    }), function () {
-      return 'success';
-    });
-  });
-});
-var _iteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator")) : "@@iterator";
-function _settle(pact, state, value) {
-  if (!pact.s) {
-    if (value instanceof _Pact) {
-      if (value.s) {
-        if (state & 1) {
-          state = value.s;
-        }
-        value = value.v;
-      } else {
-        value.o = _settle.bind(null, pact, state);
-        return;
-      }
-    }
-    if (value && value.then) {
-      value.then(_settle.bind(null, pact, state), _settle.bind(null, pact, 2));
-      return;
-    }
-    pact.s = state;
-    pact.v = value;
-    var observer = pact.o;
-    if (observer) {
-      observer(pact);
-    }
-  }
-}
-var _Pact = /*#__PURE__*/function () {
-  function _Pact() {}
-  _Pact.prototype.then = function (onFulfilled, onRejected) {
-    var result = new _Pact();
-    var state = this.s;
-    if (state) {
-      var callback = state & 1 ? onFulfilled : onRejected;
-      if (callback) {
-        try {
-          _settle(result, 1, callback(this.v));
-        } catch (e) {
-          _settle(result, 2, e);
-        }
-        return result;
-      } else {
-        return this;
-      }
-    }
-    this.o = function (_this) {
-      try {
-        var value = _this.v;
-        if (_this.s & 1) {
-          _settle(result, 1, onFulfilled ? onFulfilled(value) : value);
-        } else if (onRejected) {
-          _settle(result, 1, onRejected(value));
-        } else {
-          _settle(result, 2, value);
-        }
-      } catch (e) {
-        _settle(result, 2, e);
-      }
-    };
-    return result;
-  };
-  return _Pact;
-}();
-function _isSettledPact(thenable) {
-  return thenable instanceof _Pact && thenable.s & 1;
-}
-function _forTo(array, body, check) {
-  var i = -1,
-    pact,
-    reject;
-  function _cycle(result) {
-    try {
-      while (++i < array.length && (!check || !check())) {
-        result = body(i);
-        if (result && result.then) {
-          if (_isSettledPact(result)) {
-            result = result.v;
-          } else {
-            result.then(_cycle, reject || (reject = _settle.bind(null, pact = new _Pact(), 2)));
-            return;
-          }
-        }
-      }
-      if (pact) {
-        _settle(pact, 1, result);
-      } else {
-        pact = result;
-      }
-    } catch (e) {
-      _settle(pact || (pact = new _Pact()), 2, e);
-    }
-  }
-  _cycle();
-  return pact;
-}
-// 杀死进程
-var _SIGKILL = _async(function (pid, signal, times) {
-  if (signal === void 0) {
-    signal = 2;
-  }
-  if (times === void 0) {
-    times = 1;
-  }
-  if (times > 5) {
-    throw new Error('SIGKILL 失败. times > 5');
-  }
-  if (process.platform === 'win32') {
-    process.kill(pid, signal);
-    return;
-  }
-  (0, child_process_1.exec)("kill -" + signal + " " + pid);
-  return _continueIgnored(_catch(function () {
-    return _awaitIgnored((0, pubo_utils_1.waitFor)(function () {
-      return isProcessDied(pid);
-    }, {
-      checkTime: 1000,
-      timeout: 10000
-    }));
-  }, function () {
-    return _awaitIgnored(_SIGKILL(pid, 9, times + 1));
-  }));
-}); // 广度优先遍历进程树，将pid放入tmp
-function _forOf(target, body, check) {
-  if (typeof target[_iteratorSymbol] === "function") {
-    var _cycle = function _cycle(result) {
-      try {
-        while (!(step = iterator.next()).done && (!check || !check())) {
-          result = body(step.value);
-          if (result && result.then) {
-            if (_isSettledPact(result)) {
-              result = result.v;
-            } else {
-              result.then(_cycle, reject || (reject = _settle.bind(null, pact = new _Pact(), 2)));
-              return;
-            }
-          }
-        }
-        if (pact) {
-          _settle(pact, 1, result);
-        } else {
-          pact = result;
-        }
-      } catch (e) {
-        _settle(pact || (pact = new _Pact()), 2, e);
-      }
-    };
-    var iterator = target[_iteratorSymbol](),
-      step,
-      pact,
-      reject;
-    _cycle();
-    if (iterator["return"]) {
-      var _fixup = function _fixup(value) {
-        try {
-          if (!step.done) {
-            iterator["return"]();
-          }
-        } catch (e) {}
-        return value;
-      };
-      if (pact && pact.then) {
-        return pact.then(_fixup, function (e) {
-          throw _fixup(e);
-        });
-      }
-      _fixup();
-    }
-    return pact;
-  }
-  // No support for Symbol.iterator
-  if (!("length" in target)) {
-    throw new TypeError("Object is not iterable");
-  }
-  // Handle live collections properly
-  var values = [];
-  for (var i = 0; i < target.length; i++) {
-    values.push(target[i]);
-  }
-  return _forTo(values, function (i) {
-    return body(values[i]);
-  }, check);
-}
-// 判断进程是否死亡
-var isProcessDied = _async(function (pid) {
-  return _await(getProcessCpuUseByPid(pid), function (used) {
-    return used < 0;
-  });
-});
-function _continue(value, then) {
-  return value && value.then ? value.then(then) : then(value);
-}
-function _async(f) {
-  return function () {
-    for (var args = [], i = 0; i < arguments.length; i++) {
-      args[i] = arguments[i];
-    }
-    try {
-      return Promise.resolve(f.apply(this, args));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-}
-function _empty() {}
-function _awaitIgnored(value, direct) {
-  if (!direct) {
-    return value && value.then ? value.then(_empty) : Promise.resolve();
-  }
-}
-function _catch(body, recover) {
-  try {
-    var result = body();
-  } catch (e) {
-    return recover(e);
-  }
-  if (result && result.then) {
-    return result.then(void 0, recover);
-  }
-  return result;
-}
-function _continueIgnored(value) {
-  if (value && value.then) {
-    return value.then(_empty);
-  }
-}
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.SIGKILL = exports.getProcessTree = exports.getProcessByPpid = exports.isProcessDied = exports.getProcessCommandByPid = exports.getProcessCpuUseByPid = exports.getProcessName = void 0;
-var child_process_1 = require("child_process");
-var pubo_utils_1 = require("pubo-utils");
+const child_process_1 = require("child_process");
+const pubo_utils_1 = require("pubo-utils");
 // 获取进程名称
 function getProcessName(pid) {
-  return new Promise(function (resolve, reject) {
-    (0, child_process_1.exec)("grep \"Name:\" /proc/" + pid + "/status", function (err, data) {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(data);
-      }
+    return new Promise((resolve, reject) => {
+        (0, child_process_1.exec)(`grep "Name:" /proc/${pid}/status`, (err, data) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve(data);
+            }
+        });
     });
-  });
 }
 exports.getProcessName = getProcessName;
 // 获取进程 cpu 使用率
 function getProcessCpuUseByPid(pid) {
-  return new Promise(function (resolve) {
-    (0, child_process_1.exec)("ps -p " + pid + " -o %cpu=", function (err, stdout) {
-      if (err) {
-        resolve(-1);
-      } else {
-        resolve(parseFloat(stdout.toString()));
-      }
+    return new Promise((resolve) => {
+        (0, child_process_1.exec)(`ps -p ${pid} -o %cpu=`, (err, stdout) => {
+            if (err) {
+                resolve(-1);
+            }
+            else {
+                resolve(parseFloat(stdout.toString()));
+            }
+        });
     });
-  });
 }
 exports.getProcessCpuUseByPid = getProcessCpuUseByPid;
 // 获取进程 command 使用率
 function getProcessCommandByPid(pid) {
-  return new Promise(function (resolve) {
-    (0, child_process_1.exec)("ps -p " + pid + " -o command=", function (err, stdout) {
-      if (err) {
-        resolve('');
-      } else {
-        resolve(stdout.toString().split('\n')[0]);
-      }
+    return new Promise((resolve) => {
+        (0, child_process_1.exec)(`ps -p ${pid} -o command=`, (err, stdout) => {
+            if (err) {
+                resolve('');
+            }
+            else {
+                resolve(stdout.toString().split('\n')[0]);
+            }
+        });
     });
-  });
 }
 exports.getProcessCommandByPid = getProcessCommandByPid;
+// 判断进程是否死亡
+async function isProcessDied(pid) {
+    const used = await getProcessCpuUseByPid(pid);
+    return used < 0;
+}
 exports.isProcessDied = isProcessDied;
 // 获取子进程
 function getProcessByPpid(pid) {
-  return new Promise(function (resolve) {
-    (0, child_process_1.exec)("ps -o pid --no-headers --ppid " + pid, function (err, stdout) {
-      if (err) {
-        resolve([]);
-      } else {
-        resolve(stdout.split('\n').filter(function (item) {
-          return !!item;
-        }).map(function (item) {
-          return parseFloat(item.trim());
-        }));
-      }
+    return new Promise((resolve) => {
+        (0, child_process_1.exec)(`ps -o pid --no-headers --ppid ${pid}`, (err, stdout) => {
+            if (err) {
+                resolve([]);
+            }
+            else {
+                resolve(stdout
+                    .split('\n')
+                    .filter((item) => !!item)
+                    .map((item) => parseFloat(item.trim())));
+            }
+        });
     });
-  });
 }
 exports.getProcessByPpid = getProcessByPpid;
 // 获取进程树
-var getProcessTree = _async(function (pid, tree) {
-  if (!tree) {
-    tree = {
-      pid: pid,
-      children: []
-    };
-  }
-  return _await(getProcessByPpid(pid), function (pids) {
-    return _continue(_forOf(pids, function (id) {
-      var item = {
-        pid: id,
-        children: []
-      };
-      return _await((0, exports.getProcessTree)(id, item), function () {
+const getProcessTree = async (pid, tree) => {
+    let isRoot = false;
+    if (!tree) {
+        isRoot = true;
+        tree = { pid, children: [] };
+    }
+    const pids = await getProcessByPpid(pid);
+    for (const id of pids) {
+        const item = { pid: id, children: [] };
+        await (0, exports.getProcessTree)(id, item);
         tree.children.push(item);
-      });
-    }), function () {
-      return tree;
-    });
-  });
-});
+    }
+    if (isRoot) {
+        return tree;
+    }
+    else {
+        tree = null;
+    }
+};
 exports.getProcessTree = getProcessTree;
-var flatProcessTree = function flatProcessTree(tree, tmp) {
-  if (tree.children) {
-    tmp.push.apply(tmp, tree.children.map(function (item) {
-      return item.pid;
-    }));
-    tree.children.forEach(function (item) {
-      return flatProcessTree(item, tmp);
-    });
-  }
+// 杀死进程
+async function _SIGKILL(pid, signal = 2, times = 1) {
+    if (times > 5) {
+        throw new Error('SIGKILL 失败. times > 5');
+    }
+    if (process.platform === 'win32') {
+        process.kill(pid, signal);
+        return;
+    }
+    (0, child_process_1.exec)(`kill -${signal} ${pid}`);
+    try {
+        await (0, pubo_utils_1.waitFor)(async () => isProcessDied(pid), { checkTime: 1000, timeout: 10000 });
+    }
+    catch (err) {
+        await _SIGKILL(pid, 9, times + 1);
+    }
+}
+// 广度优先遍历进程树，将pid放入tmp
+const flatProcessTree = (tree, tmp) => {
+    if (tree.children) {
+        tmp.push(...tree.children.map((item) => item.pid));
+        tree.children.forEach((item) => flatProcessTree(item, tmp));
+    }
+    tree = null;
+    tmp = null;
 };
-exports.SIGKILL = SIGKILL;
+async function SIGKILL(pid, signal = 2) {
+    if (process.platform === 'win32') {
+        return new Promise((resolve, reject) => {
+            (0, child_process_1.exec)(`taskkill /pid ${pid} /T /F`, (err) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve('');
+                }
+            });
+        });
+    }
+    let tree = await (0, exports.getProcessTree)(pid);
+    // 获取所有进程PID,从叶到根
+    const tmp = [tree.pid];
+    flatProcessTree(tree, tmp);
+    tmp.reverse();
+    tree = null;
+    for (const item of tmp) {
+        await _SIGKILL(item, signal);
+    }
+    return 'success';
+}
+exports.SIGKILL = SIGKILL;

package/lib/file-system/index.js

@@ -1,70 +1,52 @@
 "use strict";
-
-var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  var desc = Object.getOwnPropertyDescriptor(m, k);
-  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-    desc = {
-      enumerable: true,
-      get: function get() {
-        return m[k];
-      }
-    };
-  }
-  Object.defineProperty(o, k2, desc);
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-var __setModuleDefault = this && this.__setModuleDefault || (Object.create ? function (o, v) {
-  Object.defineProperty(o, "default", {
-    enumerable: true,
-    value: v
-  });
-} : function (o, v) {
-  o["default"] = v;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-var __importStar = this && this.__importStar || function (mod) {
-  if (mod && mod.__esModule) return mod;
-  var result = {};
-  if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-  __setModuleDefault(result, mod);
-  return result;
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.PuboFileSystem = void 0;
-var fs = __importStar(require("fs"));
-var callbackToPromise = function callbackToPromise(fn) {
-  return function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    return new Promise(function (resolve, reject) {
-      fn.apply(void 0, args.concat([function (err) {
-        if (err) {
-          reject(err);
-        }
-        for (var _len2 = arguments.length, rest = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-          rest[_key2 - 1] = arguments[_key2];
-        }
-        if (rest.length < 2) {
-          resolve(rest[0]);
-        } else {
-          resolve([].concat(rest));
-        }
-      }]));
+const fs = __importStar(require("fs"));
+const callbackToPromise = (fn) => {
+    return (...args) => new Promise((resolve, reject) => {
+        fn(...args, (err, ...rest) => {
+            if (err) {
+                reject(err);
+            }
+            if (rest.length < 2) {
+                resolve(rest[0]);
+            }
+            else {
+                resolve([...rest]);
+            }
+        });
     });
-  };
 };
 exports.PuboFileSystem = {
-  read: callbackToPromise(fs.read),
-  readFile: callbackToPromise(fs.readFile),
-  writeFile: callbackToPromise(fs.writeFile),
-  readdir: callbackToPromise(fs.readdir),
-  open: callbackToPromise(fs.open),
-  close: callbackToPromise(fs.close),
-  write: callbackToPromise(fs.write),
-  stat: callbackToPromise(fs.stat)
-};
+    read: callbackToPromise(fs.read),
+    readFile: callbackToPromise(fs.readFile),
+    writeFile: callbackToPromise(fs.writeFile),
+    readdir: callbackToPromise(fs.readdir),
+    open: callbackToPromise(fs.open),
+    close: callbackToPromise(fs.close),
+    write: callbackToPromise(fs.write),
+    stat: callbackToPromise(fs.stat),
+};