pubo-node 1.0.129 → 1.0.136

package/lib/child-process/index.js

@@ -115,53 +115,160 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
+var __values = this && this.__values || function (o) {
+  var s = typeof Symbol === "function" && Symbol.iterator,
+    m = s && o[s],
+    i = 0;
+  if (m) return m.call(o);
+  if (o && typeof o.length === "number") return {
+    next: function next() {
+      if (o && i >= o.length) o = void 0;
+      return {
+        value: o && o[i++],
+        done: !o
+      };
+    }
+  };
+  throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SIGKILL = exports.isProcessDied = exports.getProcessName = void 0;
+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");
+// 获取进程名称
 function getProcessName(pid) {
-  return __awaiter(this, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-      return [2 /*return*/, new Promise(function (resolve) {
-        var child = (0, child_process_1.exec)("grep \"Name:\" /proc/".concat(pid, "/status"));
-        var resolved = false;
-        var cb = function cb(data) {
-          if (resolved) {
-            return;
-          }
-          resolved = true;
-          resolve(data);
-          child = null;
-        };
-        child.stdout.on('data', function (data) {
-          return cb(data.toString());
-        });
-        child.stderr.on('data', function (data) {
-          return cb(data.toString());
-        });
-      })];
+  return new Promise(function (resolve, reject) {
+    (0, child_process_1.exec)("grep \"Name:\" /proc/".concat(pid, "/status"), function (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 ".concat(pid, " -o %cpu="), function (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 ".concat(pid, " -o command="), function (err, stdout) {
+      if (err) {
+        resolve('');
+      } else {
+        resolve(stdout.toString().split('\n')[0]);
+      }
+    });
+  });
+}
+exports.getProcessCommandByPid = getProcessCommandByPid;
+// 判断进程是否死亡
 function isProcessDied(pid) {
-  var _a;
   return __awaiter(this, void 0, void 0, function () {
-    var name;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
+    var used;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
         case 0:
-          return [4 /*yield*/, getProcessName(pid)];
+          return [4 /*yield*/, getProcessCpuUseByPid(pid)];
         case 1:
-          name = _b.sent();
-          return [2 /*return*/, ((_a = name.split(':')[2]) === null || _a === void 0 ? void 0 : _a.trim()) === 'No such file or directory'];
+          used = _a.sent();
+          return [2 /*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 ".concat(pid), function (err, stdout) {
+      if (err) {
+        resolve([]);
+      } else {
+        resolve(stdout.split('\n').filter(function (item) {
+          return !!item;
+        }).map(function (item) {
+          return parseFloat(item.trim());
+        }));
+      }
+    });
+  });
+}
+exports.getProcessByPpid = getProcessByPpid;
+// 获取进程树
+var getProcessTree = function getProcessTree(pid, tree) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var pids, pids_1, pids_1_1, id, item, e_1_1;
+    var e_1, _a;
+    return __generator(this, function (_b) {
+      switch (_b.label) {
+        case 0:
+          if (!tree) {
+            tree = {
+              pid: pid,
+              children: []
+            };
+          }
+          return [4 /*yield*/, getProcessByPpid(pid)];
+        case 1:
+          pids = _b.sent();
+          _b.label = 2;
+        case 2:
+          _b.trys.push([2, 7, 8, 9]);
+          pids_1 = __values(pids), pids_1_1 = pids_1.next();
+          _b.label = 3;
+        case 3:
+          if (!!pids_1_1.done) return [3 /*break*/, 6];
+          id = pids_1_1.value;
+          item = {
+            pid: id,
+            children: []
+          };
+          return [4 /*yield*/, (0, exports.getProcessTree)(id, item)];
+        case 4:
+          _b.sent();
+          tree.children.push(item);
+          _b.label = 5;
+        case 5:
+          pids_1_1 = pids_1.next();
+          return [3 /*break*/, 3];
+        case 6:
+          return [3 /*break*/, 9];
+        case 7:
+          e_1_1 = _b.sent();
+          e_1 = {
+            error: e_1_1
+          };
+          return [3 /*break*/, 9];
+        case 8:
+          try {
+            if (pids_1_1 && !pids_1_1.done && (_a = pids_1["return"])) _a.call(pids_1);
+          } finally {
+            if (e_1) throw e_1.error;
+          }
+          return [7 /*endfinally*/];
+        case 9:
+          return [2 /*return*/, tree];
+      }
+    });
+  });
+};
+exports.getProcessTree = getProcessTree;
+// 杀死进程
 function SIGKILL(pid, type) {
   if (type === void 0) {
     type = 2;

package/lib/grpc/index.d.ts

@@ -1,10 +1,28 @@
 /// <reference types="node" />
-interface CreateClientProps {
+export interface CreateClientProps {
     url: string;
     options?: any;
     ServiceImp: any;
     Grpc: any;
     cert?: Buffer;
 }
+declare class GrpcClient {
+    private readonly url;
+    private readonly options;
+    private readonly Grpc;
+    private readonly credentials;
+    private client;
+    private _timeout;
+    connections: number;
+    constructor({ url, options, Grpc, cert }: any);
+    request(service: any, method: any, data: any): Promise<any>;
+    _request({ service, method, data }: {
+        service: any;
+        method: any;
+        data: any;
+    }): Promise<unknown>;
+    close(): void;
+}
+export declare const GrpcList: GrpcClient[];
 export declare function createRpcClient<T>({ url, options, ServiceImp, Grpc, cert }: CreateClientProps): T;
 export {};

package/lib/grpc/index.js

@@ -10,10 +10,128 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+    while (g && (g = 0, op[0] && (_ = 0)), _) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+        case 7:
+          op = _.ops.pop();
+          _.trys.pop();
+          continue;
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+            _.ops.push(op);
+            break;
+          }
+          if (t[2]) _.ops.pop();
+          _.trys.pop();
+          continue;
+      }
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createRpcClient = void 0;
+exports.createRpcClient = exports.GrpcList = void 0;
+function passThrough(argument) {
+  return argument;
+}
 var GrpcClient = /** @class */function () {
   function GrpcClient(_a) {
     var url = _a.url,
@@ -22,6 +140,7 @@ var GrpcClient = /** @class */function () {
       Grpc = _a.Grpc,
       cert = _a.cert;
     var _c;
+    this.connections = 0;
     var opt = __assign({
       'grpc.max_send_message_length': -1,
       'grpc.max_receive_message_length': -1
@@ -31,37 +150,95 @@ var GrpcClient = /** @class */function () {
     this.Grpc = Grpc;
     this.credentials = credentials;
     this.options = opt;
-    this.options.timeout = (_c = this.options.timeout) !== null && _c !== void 0 ? _c : 5000;
+    this.options.timeout = (_c = this.options.timeout) !== null && _c !== void 0 ? _c : 60000;
   }
-  GrpcClient.prototype.passThrough = function (argument) {
-    return argument;
-  };
-  GrpcClient.prototype.reset = function () {
-    if (!this.client) {
-      return;
-    }
-    this.client.close();
-    this.client = null;
-  };
   GrpcClient.prototype.request = function (service, method, data) {
+    return __awaiter(this, void 0, void 0, function () {
+      var error, result, err_1;
+      var _this = this;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            this.connections += 1;
+            if (!this.client) {
+              this.client = new this.Grpc.Client(this.url, this.credentials, this.options);
+            }
+            _a.label = 1;
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+            return [4 /*yield*/, this._request({
+              service: service,
+              method: method,
+              data: data
+            })];
+          case 2:
+            result = _a.sent();
+            return [3 /*break*/, 4];
+          case 3:
+            err_1 = _a.sent();
+            error = err_1;
+            return [3 /*break*/, 4];
+          case 4:
+            this.connections -= 1;
+            if (this.connections < 0) {
+              this.connections = 0;
+            }
+            if (this.connections < 1) {
+              if (this._timeout) {
+                clearTimeout(this._timeout);
+                this._timeout = null;
+              }
+              this._timeout = setTimeout(function () {
+                return _this.close();
+              }, 60000);
+            }
+            if (error) {
+              this.close();
+              throw new Error('grpc connection error.');
+            }
+            return [2 /*return*/, result];
+        }
+      });
+    });
+  };
+  GrpcClient.prototype._request = function (_a) {
     var _this = this;
-    var path = "/".concat(service, "/").concat(method);
-    if (!this.client) {
-      this.client = new this.Grpc.Client(this.url, this.credentials, this.options);
-    }
+    var service = _a.service,
+      method = _a.method,
+      data = _a.data;
     return new Promise(function (resolve, reject) {
-      _this.client.makeUnaryRequest(path, _this.passThrough, _this.passThrough, data, function (err, res) {
+      var _ended = false;
+      var _timeout = setTimeout(function () {
+        _ended = true;
+        _this.close();
+        console.log('rpc request timeout');
+        reject(new Error('timeout'));
+      }, _this.options.timeout);
+      var _onResponse = function onResponse(err, res) {
+        if (_ended) {
+          return;
+        } else {
+          clearTimeout(_timeout);
+        }
         if (err) {
-          _this.reset();
           reject(err);
         } else {
           resolve(res);
         }
-      });
+        _onResponse = null;
+      };
+      _this.client.makeUnaryRequest("/".concat(service, "/").concat(method), passThrough, passThrough, data, _onResponse);
     });
   };
+  GrpcClient.prototype.close = function () {
+    var _a;
+    (_a = this.client) === null || _a === void 0 ? void 0 : _a.close();
+    this.client = null;
+    delete this.client;
+  };
   return GrpcClient;
 }();
+exports.GrpcList = [];
 function createRpcClient(_a) {
   var url = _a.url,
     _b = _a.options,
@@ -75,6 +252,7 @@ function createRpcClient(_a) {
     Grpc: Grpc,
     cert: cert
   });
+  exports.GrpcList.push(client);
   return new ServiceImp({
     request: client.request.bind(client)
   });

package/lib/index.d.ts

@@ -2,8 +2,8 @@ export { JsonStorage } from './storage/json';
 export { FtpClient, FtpClientPool, FtpConnectOptions, FtpFile } from './ftp-client';
 export { createRpcClient } from './grpc';
 export { PuboFileSystem } from './file-system';
-export { SIGKILL, isProcessDied, getProcessName } from './child-process';
+export { SIGKILL, isProcessDied, getProcessName, getProcessTree, getProcessByPpid, getProcessCpuUseByPid, getProcessCommandByPid, } from './child-process';
 export { isPortAvailable } from './utils';
 export { pitch } from './pitch';
 export { getWifiName, getNetworks } from './utils/network';
-export { RosTopic, RosTopicManager } from './ros/topic';
+export { RosTopicManager, RosTopic } from './ros/topic';

package/lib/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RosTopicManager = exports.RosTopic = exports.getNetworks = exports.getWifiName = exports.pitch = exports.isPortAvailable = exports.getProcessName = exports.isProcessDied = exports.SIGKILL = exports.PuboFileSystem = exports.createRpcClient = exports.FtpClientPool = exports.FtpClient = exports.JsonStorage = void 0;
+exports.RosTopic = exports.RosTopicManager = exports.getNetworks = exports.getWifiName = exports.pitch = exports.isPortAvailable = exports.getProcessCommandByPid = exports.getProcessCpuUseByPid = exports.getProcessByPpid = exports.getProcessTree = exports.getProcessName = exports.isProcessDied = exports.SIGKILL = exports.PuboFileSystem = exports.createRpcClient = exports.FtpClientPool = exports.FtpClient = exports.JsonStorage = void 0;
 var json_1 = require("./storage/json");
 Object.defineProperty(exports, "JsonStorage", {
   enumerable: true,
@@ -57,6 +57,30 @@ Object.defineProperty(exports, "getProcessName", {
     return child_process_1.getProcessName;
   }
 });
+Object.defineProperty(exports, "getProcessTree", {
+  enumerable: true,
+  get: function get() {
+    return child_process_1.getProcessTree;
+  }
+});
+Object.defineProperty(exports, "getProcessByPpid", {
+  enumerable: true,
+  get: function get() {
+    return child_process_1.getProcessByPpid;
+  }
+});
+Object.defineProperty(exports, "getProcessCpuUseByPid", {
+  enumerable: true,
+  get: function get() {
+    return child_process_1.getProcessCpuUseByPid;
+  }
+});
+Object.defineProperty(exports, "getProcessCommandByPid", {
+  enumerable: true,
+  get: function get() {
+    return child_process_1.getProcessCommandByPid;
+  }
+});
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "isPortAvailable", {
   enumerable: true,
@@ -85,15 +109,15 @@ Object.defineProperty(exports, "getNetworks", {
   }
 });
 var topic_1 = require("./ros/topic");
-Object.defineProperty(exports, "RosTopic", {
+Object.defineProperty(exports, "RosTopicManager", {
   enumerable: true,
   get: function get() {
-    return topic_1.RosTopic;
+    return topic_1.RosTopicManager;
   }
 });
-Object.defineProperty(exports, "RosTopicManager", {
+Object.defineProperty(exports, "RosTopic", {
   enumerable: true,
   get: function get() {
-    return topic_1.RosTopicManager;
+    return topic_1.RosTopic;
   }
 });

package/lib/ros/topic.js

@@ -89,18 +89,13 @@ var RosTopic = /** @class */function () {
   RosTopic.prototype.publish = function (payload) {
     var _this = this;
     var data = YAML.stringify(payload);
-    return new Promise(function (resolve) {
-      var _a, _b;
-      var child = (0, child_process_1.exec)("rostopic pub -1 ".concat(_this.topic, " ").concat(_this.messageType, " \"").concat(data, "\""));
-      (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.once('data', function (buf) {
-        console.log(buf.toString());
-        (child === null || child === void 0 ? void 0 : child.pid) && (0, child_process_2.SIGKILL)(child === null || child === void 0 ? void 0 : child.pid);
-        resolve('');
-      });
-      (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.once('data', function (err) {
-        console.log(err.toString());
-        (child === null || child === void 0 ? void 0 : child.pid) && (0, child_process_2.SIGKILL)(child === null || child === void 0 ? void 0 : child.pid);
-        resolve('');
+    return new Promise(function (resolve, reject) {
+      (0, child_process_1.exec)("rostopic pub -1 ".concat(_this.topic, " ").concat(_this.messageType, " \"").concat(data, "\""), function (err, stdout) {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(stdout);
+        }
       });
     });
   };

package/lib/storage/json.d.ts

@@ -1,8 +1,10 @@
+export interface JsonStorageOptions {
+    initialState?: any;
+    defaultState?: any;
+}
 export declare class JsonStorage {
     private readonly instance;
-    constructor(path: string, options?: {
-        initialState: any;
-    });
+    constructor(path: string, options: JsonStorageOptions);
     private getState;
     private setState;
     get(key?: string): Promise<any>;

package/lib/storage/json.js

@@ -139,8 +139,9 @@ var fs_1 = require("fs");
 var pubo_utils_1 = require("pubo-utils");
 var uuid_1 = require("uuid");
 var cluster = require('cluster');
+// 主线程的实现
 var Manager = /** @class */function () {
-  function Manager(path) {
+  function Manager(path, defaultState) {
     var _this = this;
     this._state = {};
     this.queue = new pubo_utils_1.SyncQueue();
@@ -169,6 +170,7 @@ var Manager = /** @class */function () {
             payload = _a.sent();
             return [3 /*break*/, 4];
           case 2:
+            if (!(message.type === 'set')) return [3 /*break*/, 4];
             return [4 /*yield*/, this.setState(message.payload)];
           case 3:
             payload = _a.sent();
@@ -220,6 +222,7 @@ var Manager = /** @class */function () {
     });
   };
   Manager.prototype.restore = function () {
+    var _a;
     try {
       var buf = (0, fs_1.readFileSync)(this.path);
       this._state = JSON.parse(buf.toString());
@@ -230,7 +233,7 @@ var Manager = /** @class */function () {
           recursive: true
         });
       }
-      this._state = {};
+      this.setState((_a = this.defaultState) !== null && _a !== void 0 ? _a : {});
     }
   };
   Manager.prototype.getState = function () {
@@ -257,6 +260,7 @@ var Manager = /** @class */function () {
 
   return Manager;
 }();
+// work 线程的实现
 var Worker = /** @class */function () {
   function Worker(path) {
     this.callback = {};
@@ -318,13 +322,8 @@ var Worker = /** @class */function () {
 }();
 var JsonStorage = /** @class */function () {
   function JsonStorage(path, options) {
-    if (options === void 0) {
-      options = {
-        initialState: null
-      };
-    }
     if (cluster.isPrimary) {
-      this.instance = new Manager(path);
+      this.instance = new Manager(path, options.defaultState);
     } else {
       this.instance = new Worker(path);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.129",
+  "version": "1.0.136",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -24,7 +24,7 @@
     "pubo-utils": "^1.0.129",
     "tree-kill": "^1.2.2"
   },
-  "gitHead": "49ff87b8c7333f1e5861c4f83fd0f743d498ae1e",
+  "gitHead": "44d452591168455d16a1eefcf65b221df5e8e6e8",
   "devDependencies": {
     "@babel/cli": "^7.10.1",
     "@babel/core": "^7.10.2",