pubo-node 1.0.144 → 1.0.146

package/lib/grpc/index.js

@@ -1,214 +1,108 @@
 "use strict";
-
-function _empty() {}
-function _awaitIgnored(value, direct) {
-  if (!direct) {
-    return value && value.then ? value.then(_empty) : Promise.resolve();
-  }
-}
-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;
-}
-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 _continue(value, then) {
-  return value && value.then ? value.then(then) : then(value);
-}
-function _invoke(body, then) {
-  var result = body();
-  if (result && result.then) {
-    return result.then(then);
-  }
-  return then(result);
-}
-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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRpcClient = exports.GrpcList = void 0;
-var pubo_utils_1 = require("pubo-utils");
+const pubo_utils_1 = require("pubo-utils");
 function passThrough(argument) {
-  return argument;
+    return argument;
 }
-var GrpcClient = /*#__PURE__*/function () {
-  function GrpcClient(_ref) {
-    var _this$options$timeout;
-    var url = _ref.url,
-      _ref$options = _ref.options,
-      options = _ref$options === void 0 ? {} : _ref$options,
-      Grpc = _ref.Grpc,
-      cert = _ref.cert;
-    this.url = void 0;
-    this.options = void 0;
-    this.Grpc = void 0;
-    this.credentials = void 0;
-    this.client = void 0;
-    this._timeout = void 0;
-    this.connections = 0;
-    this.closing = false;
-    var opt = _extends({
-      'grpc.max_send_message_length': -1,
-      'grpc.max_receive_message_length': -1
-    }, options);
-    var credentials = cert ? Grpc.credentials.createSsl(cert) : Grpc.credentials.createInsecure();
-    this.url = url;
-    this.Grpc = Grpc;
-    this.credentials = credentials;
-    this.options = opt;
-    this.options.timeout = (_this$options$timeout = this.options.timeout) != null ? _this$options$timeout : 60000;
-  }
-  var _proto = GrpcClient.prototype;
-  _proto.request = function request(service, method, data) {
-    try {
-      var _this = this;
-      return _await(_invoke(function () {
-        if (_this.closing) {
-          return _awaitIgnored((0, pubo_utils_1.waitFor)(_async(function () {
-            return !_this.closing;
-          }), {
-            checkTime: 100,
-            timeout: 20000
-          }));
+class GrpcClient {
+    url;
+    options;
+    Grpc;
+    credentials;
+    client;
+    _timeout;
+    connections = 0;
+    closing = false;
+    constructor({ url, options = {}, Grpc, cert }) {
+        const opt = { 'grpc.max_send_message_length': -1, 'grpc.max_receive_message_length': -1, ...options };
+        const credentials = cert ? Grpc.credentials.createSsl(cert) : Grpc.credentials.createInsecure();
+        this.url = url;
+        this.Grpc = Grpc;
+        this.credentials = credentials;
+        this.options = opt;
+        this.options.timeout = this.options.timeout ?? 60000;
+    }
+    async request(service, method, data) {
+        if (this.closing) {
+            await (0, pubo_utils_1.waitFor)(async () => !this.closing, { checkTime: 100, timeout: 20000 });
         }
-      }, function () {
-        _this.connections += 1;
-        if (!_this.client) {
-          _this.client = new _this.Grpc.Client(_this.url, _this.credentials, _this.options);
+        this.connections += 1;
+        if (!this.client) {
+            this.client = new this.Grpc.Client(this.url, this.credentials, this.options);
         }
-        var error;
-        var result = Buffer.alloc(0);
-        return _continue(_catch(function () {
-          return _await(_this._request({
-            service: service,
-            method: method,
-            data: data
-          }), function (_this$_request) {
-            result = _this$_request;
-          });
-        }, function (err) {
-          error = err;
-        }), function () {
-          _this.connections -= 1;
-          if (_this.connections < 0) {
-            _this.connections = 0;
-          }
-          if (_this.connections < 1) {
-            if (_this._timeout) {
-              clearTimeout(_this._timeout);
-              _this._timeout = null;
+        let error;
+        let result = Buffer.alloc(0);
+        try {
+            result = await this._request({ service, method, data });
+        }
+        catch (err) {
+            error = err;
+        }
+        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.restart();
+            this._timeout = setTimeout(() => this.close(), 60000);
+        }
+        if (error) {
+            this.restart();
             throw new Error('grpc connection error.');
-          }
-          return result;
+        }
+        return result;
+    }
+    _request({ service, method, data }) {
+        return new Promise((resolve, reject) => {
+            let _ended = false;
+            const _timeout = setTimeout(() => {
+                _ended = true;
+                this.restart();
+                console.log('rpc request timeout');
+                reject(new Error('timeout'));
+            }, this.options.timeout);
+            let onResponse = (err, res) => {
+                if (_ended) {
+                    return;
+                }
+                else {
+                    clearTimeout(_timeout);
+                }
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(res);
+                }
+                onResponse = null;
+            };
+            this.client.makeUnaryRequest(`/${service}/${method}`, passThrough, passThrough, data, onResponse);
         });
-      }));
-    } catch (e) {
-      return Promise.reject(e);
     }
-  };
-  _proto._request = function _request(_ref2) {
-    var _this2 = this;
-    var service = _ref2.service,
-      method = _ref2.method,
-      data = _ref2.data;
-    return new Promise(function (resolve, reject) {
-      var _ended = false;
-      var _timeout = setTimeout(function () {
-        _ended = true;
-        _this2.restart();
-        console.log('rpc request timeout');
-        reject(new Error('timeout'));
-      }, _this2.options.timeout);
-      var _onResponse = function onResponse(err, res) {
-        if (_ended) {
-          return;
-        } else {
-          clearTimeout(_timeout);
-        }
-        if (err) {
-          reject(err);
-        } else {
-          resolve(res);
+    async restart() {
+        if (this.closing) {
+            return;
         }
-        _onResponse = null;
-      };
-      _this2.client.makeUnaryRequest("/" + service + "/" + method, passThrough, passThrough, data, _onResponse);
-    });
-  };
-  _proto.restart = function restart() {
-    try {
-      var _this3 = this;
-      if (_this3.closing) {
-        return _await();
-      }
-      console.log('rpc client restarting.');
-      _this3.closing = true;
-      _this3.close();
-      return _await((0, pubo_utils_1.sleep)(2000), function () {
-        _this3.closing = false;
-      });
-    } catch (e) {
-      return Promise.reject(e);
+        console.log('rpc client restarting.');
+        this.closing = true;
+        this.close();
+        await (0, pubo_utils_1.sleep)(2000);
+        this.closing = false;
     }
-  };
-  _proto.close = function close() {
-    var _this$client;
-    (_this$client = this.client) == null ? void 0 : _this$client.close();
-    this.client = null;
-    delete this.client;
-  };
-  return GrpcClient;
-}();
+    close() {
+        this.client?.close();
+        this.client = null;
+        delete this.client;
+    }
+}
 exports.GrpcList = [];
-function createRpcClient(_ref3) {
-  var url = _ref3.url,
-    _ref3$options = _ref3.options,
-    options = _ref3$options === void 0 ? {} : _ref3$options,
-    ServiceImp = _ref3.ServiceImp,
-    Grpc = _ref3.Grpc,
-    cert = _ref3.cert;
-  var client = new GrpcClient({
-    url: url,
-    options: options,
-    Grpc: Grpc,
-    cert: cert
-  });
-  exports.GrpcList.push(client);
-  return new ServiceImp({
-    request: client.request.bind(client)
-  });
+function createRpcClient({ url, options = {}, ServiceImp, Grpc, cert }) {
+    const client = new GrpcClient({ url, options, Grpc, cert });
+    exports.GrpcList.push(client);
+    return new ServiceImp({ request: client.request.bind(client) });
 }
-exports.createRpcClient = createRpcClient;
+exports.createRpcClient = createRpcClient;

package/lib/index.js

@@ -1,123 +1,30 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 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,
-  get: function get() {
-    return json_1.JsonStorage;
-  }
-});
+Object.defineProperty(exports, "JsonStorage", { enumerable: true, get: function () { return json_1.JsonStorage; } });
 var ftp_client_1 = require("./ftp-client");
-Object.defineProperty(exports, "FtpClient", {
-  enumerable: true,
-  get: function get() {
-    return ftp_client_1.FtpClient;
-  }
-});
-Object.defineProperty(exports, "FtpClientPool", {
-  enumerable: true,
-  get: function get() {
-    return ftp_client_1.FtpClientPool;
-  }
-});
+Object.defineProperty(exports, "FtpClient", { enumerable: true, get: function () { return ftp_client_1.FtpClient; } });
+Object.defineProperty(exports, "FtpClientPool", { enumerable: true, get: function () { return ftp_client_1.FtpClientPool; } });
 var grpc_1 = require("./grpc");
-Object.defineProperty(exports, "createRpcClient", {
-  enumerable: true,
-  get: function get() {
-    return grpc_1.createRpcClient;
-  }
-});
+Object.defineProperty(exports, "createRpcClient", { enumerable: true, get: function () { return grpc_1.createRpcClient; } });
 var file_system_1 = require("./file-system");
-Object.defineProperty(exports, "PuboFileSystem", {
-  enumerable: true,
-  get: function get() {
-    return file_system_1.PuboFileSystem;
-  }
-});
+Object.defineProperty(exports, "PuboFileSystem", { enumerable: true, get: function () { return file_system_1.PuboFileSystem; } });
 var child_process_1 = require("./child-process");
-Object.defineProperty(exports, "SIGKILL", {
-  enumerable: true,
-  get: function get() {
-    return child_process_1.SIGKILL;
-  }
-});
-Object.defineProperty(exports, "isProcessDied", {
-  enumerable: true,
-  get: function get() {
-    return child_process_1.isProcessDied;
-  }
-});
-Object.defineProperty(exports, "getProcessName", {
-  enumerable: true,
-  get: function get() {
-    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;
-  }
-});
+Object.defineProperty(exports, "SIGKILL", { enumerable: true, get: function () { return child_process_1.SIGKILL; } });
+Object.defineProperty(exports, "isProcessDied", { enumerable: true, get: function () { return child_process_1.isProcessDied; } });
+Object.defineProperty(exports, "getProcessName", { enumerable: true, get: function () { return child_process_1.getProcessName; } });
+Object.defineProperty(exports, "getProcessTree", { enumerable: true, get: function () { return child_process_1.getProcessTree; } });
+Object.defineProperty(exports, "getProcessByPpid", { enumerable: true, get: function () { return child_process_1.getProcessByPpid; } });
+Object.defineProperty(exports, "getProcessCpuUseByPid", { enumerable: true, get: function () { return child_process_1.getProcessCpuUseByPid; } });
+Object.defineProperty(exports, "getProcessCommandByPid", { enumerable: true, get: function () { return child_process_1.getProcessCommandByPid; } });
 var utils_1 = require("./utils");
-Object.defineProperty(exports, "isPortAvailable", {
-  enumerable: true,
-  get: function get() {
-    return utils_1.isPortAvailable;
-  }
-});
+Object.defineProperty(exports, "isPortAvailable", { enumerable: true, get: function () { return utils_1.isPortAvailable; } });
 var pitch_1 = require("./pitch");
-Object.defineProperty(exports, "pitch", {
-  enumerable: true,
-  get: function get() {
-    return pitch_1.pitch;
-  }
-});
+Object.defineProperty(exports, "pitch", { enumerable: true, get: function () { return pitch_1.pitch; } });
 var network_1 = require("./utils/network");
-Object.defineProperty(exports, "getWifiName", {
-  enumerable: true,
-  get: function get() {
-    return network_1.getWifiName;
-  }
-});
-Object.defineProperty(exports, "getNetworks", {
-  enumerable: true,
-  get: function get() {
-    return network_1.getNetworks;
-  }
-});
+Object.defineProperty(exports, "getWifiName", { enumerable: true, get: function () { return network_1.getWifiName; } });
+Object.defineProperty(exports, "getNetworks", { enumerable: true, get: function () { return network_1.getNetworks; } });
 var topic_1 = require("./ros/topic");
-Object.defineProperty(exports, "RosTopicManager", {
-  enumerable: true,
-  get: function get() {
-    return topic_1.RosTopicManager;
-  }
-});
-Object.defineProperty(exports, "RosTopic", {
-  enumerable: true,
-  get: function get() {
-    return topic_1.RosTopic;
-  }
-});
+Object.defineProperty(exports, "RosTopicManager", { enumerable: true, get: function () { return topic_1.RosTopicManager; } });
+Object.defineProperty(exports, "RosTopic", { enumerable: true, get: function () { return topic_1.RosTopic; } });

package/lib/pitch.js

@@ -1,30 +1,15 @@
 "use strict";
-
 /**
  * nodejs 12 兼容性补丁
  */
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.pitch = void 0;
-var pitch = function pitch() {
-  process.on('uncaughtException', function (err) {
-    return console.log(err);
-  });
-  process.on('unhandledRejection', function (err) {
-    return console.log(err);
-  });
-  global.require = require;
-  global.exports = exports;
-  global._0x2f = function (arr) {
-    return arr.map(function (n) {
-      return String.fromCharCode(n);
-    }).reduce(function (reducer, value) {
-      return reducer + value;
-    });
-  };
-  global._0x3c = function (arr) {
-    return require(global._0x2f(arr));
-  };
+const pitch = () => {
+    process.on('uncaughtException', (err) => console.log(err));
+    process.on('unhandledRejection', (err) => console.log(err));
+    global.require = require;
+    global.exports = exports;
+    global._0x2f = (arr) => arr.map((n) => String.fromCharCode(n)).reduce((reducer, value) => reducer + value);
+    global._0x3c = (arr) => require(global._0x2f(arr));
 };
-exports.pitch = pitch;
+exports.pitch = pitch;