pubo-node 1.0.144 → 1.0.145

package/lib/ros/topic.js

@@ -1,122 +1,104 @@
 "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.RosTopicManager = exports.RosTopic = void 0;
-var child_process_1 = require("child_process");
-var pubo_utils_1 = require("pubo-utils");
-var YAML = __importStar(require("yaml"));
-var child_process_2 = require("../child-process");
-var RosTopic = /*#__PURE__*/function () {
-  function RosTopic(topic, messageType) {
-    this.topic = void 0;
-    this.messageType = void 0;
-    this.emitter = new pubo_utils_1.Emitter();
-    this.subscribed = false;
-    this.dog = new pubo_utils_1.WatchDog({
-      limit: 60,
-      onTimeout: this.onTimeout.bind(this)
-    });
-    this.strSplit = new pubo_utils_1.StringSplit('---');
-    this.subscribeChildProcess = void 0;
-    this.topic = topic;
-    this.messageType = messageType;
-    this.subscribed = false;
-    this.emitter = new pubo_utils_1.Emitter();
-  }
-  var _proto = RosTopic.prototype;
-  _proto.onTimeout = function onTimeout() {
-    if (!this.subscribed) {
-      return;
+const child_process_1 = require("child_process");
+const pubo_utils_1 = require("pubo-utils");
+const YAML = __importStar(require("yaml"));
+const child_process_2 = require("../child-process");
+class RosTopic {
+    topic;
+    messageType;
+    emitter = new pubo_utils_1.Emitter();
+    subscribed = false;
+    dog = new pubo_utils_1.WatchDog({ limit: 60, onTimeout: this.onTimeout.bind(this) });
+    strSplit = new pubo_utils_1.StringSplit('---');
+    subscribeChildProcess;
+    constructor(topic, messageType) {
+        this.topic = topic;
+        this.messageType = messageType;
+        this.subscribed = false;
+        this.emitter = new pubo_utils_1.Emitter();
     }
-    this.unsubscribe();
-    this.subscribe();
-  };
-  _proto.onData = function onData(data) {
-    var tmp = this.strSplit.split(data.toString()).slice(-1)[0];
-    if (!tmp) {
-      return;
+    onTimeout() {
+        if (!this.subscribed) {
+            return;
+        }
+        this.unsubscribe();
+        this.subscribe();
     }
-    var res = YAML.parse(tmp);
-    this.emitter.emit('message', res);
-  };
-  _proto.subscribe = function subscribe() {
-    if (this.subscribeChildProcess) {
-      return;
+    onData(data) {
+        const tmp = this.strSplit.split(data.toString()).slice(-1)[0];
+        if (!tmp) {
+            return;
+        }
+        const res = YAML.parse(tmp);
+        this.emitter.emit('message', res);
     }
-    this.subscribed = true;
-    this.subscribeChildProcess = (0, child_process_1.spawn)("rostopic", ['echo', this.topic]);
-    this.subscribeChildProcess.stdout.on('data', this.onData.bind(this));
-    this.dog.init();
-  };
-  _proto.unsubscribe = function unsubscribe() {
-    if (this.subscribeChildProcess) {
-      return;
+    subscribe() {
+        if (this.subscribeChildProcess) {
+            return;
+        }
+        this.subscribed = true;
+        this.subscribeChildProcess = (0, child_process_1.spawn)(`rostopic`, ['echo', this.topic]);
+        this.subscribeChildProcess.stdout.on('data', this.onData.bind(this));
+        this.dog.init();
     }
-    this.dog.stop();
-    this.subscribed = false;
-    (0, child_process_2.SIGKILL)(this.subscribeChildProcess.pid);
-    this.subscribeChildProcess = null;
-  };
-  _proto.publish = function publish(payload) {
-    var _this = this;
-    var data = YAML.stringify(payload);
-    return new Promise(function (resolve, reject) {
-      (0, child_process_1.exec)("rostopic pub -1 " + _this.topic + " " + _this.messageType + " \"" + data + "\"", function (err, stdout) {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(stdout);
+    unsubscribe() {
+        if (this.subscribeChildProcess) {
+            return;
         }
-      });
-    });
-  };
-  return RosTopic;
-}();
+        this.dog.stop();
+        this.subscribed = false;
+        (0, child_process_2.SIGKILL)(this.subscribeChildProcess.pid);
+        this.subscribeChildProcess = null;
+    }
+    publish(payload) {
+        const data = YAML.stringify(payload);
+        return new Promise((resolve, reject) => {
+            (0, child_process_1.exec)(`rostopic pub -1 ${this.topic} ${this.messageType} "${data}"`, (err, stdout) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(stdout);
+                }
+            });
+        });
+    }
+}
 exports.RosTopic = RosTopic;
 exports.RosTopicManager = {
-  cache: [],
-  getTopic: function getTopic(topic, messageType) {
-    var tmp = this.cache.find(function (item) {
-      return item.topic === topic;
-    });
-    if (tmp) {
-      return tmp;
-    }
-    var instance = new RosTopic(topic, messageType);
-    this.cache.push(instance);
-    return instance;
-  }
-};
+    cache: [],
+    getTopic: function (topic, messageType) {
+        const tmp = this.cache.find((item) => item.topic === topic);
+        if (tmp) {
+            return tmp;
+        }
+        const instance = new RosTopic(topic, messageType);
+        this.cache.push(instance);
+        return instance;
+    },
+};

package/lib/storage/json.js

@@ -1,298 +1,154 @@
 "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;
-}
-function _empty() {}
-function _invokeIgnored(body) {
-  var result = body();
-  if (result && result.then) {
-    return result.then(_empty);
-  }
-}
-function _invoke(body, then) {
-  var result = body();
-  if (result && result.then) {
-    return result.then(then);
-  }
-  return then(result);
-}
-function _awaitIgnored(value, direct) {
-  if (!direct) {
-    return value && value.then ? value.then(_empty) : Promise.resolve();
-  }
-}
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonStorage = void 0;
-var fs_1 = require("fs");
-var pubo_utils_1 = require("pubo-utils");
-var uuid_1 = require("uuid");
-var cluster = require('cluster');
+const fs_1 = require("fs");
+const pubo_utils_1 = require("pubo-utils");
+const uuid_1 = require("uuid");
+const cluster = require('cluster');
 // 主线程的实现
-var Manager = /*#__PURE__*/function () {
-  function Manager(path, defaultState) {
-    var _this = this;
-    this.path = void 0;
-    this._state = {};
-    this.queue = new pubo_utils_1.SyncQueue();
-    this.key = void 0;
-    this.defaultState = void 0;
-    this.path = path;
-    this.defaultState = defaultState;
-    this.key = encodeURIComponent(path);
-    cluster.on('online', function (worker) {
-      worker.on('message', function (message) {
-        return _this.onMessage(message, worker);
-      });
-    });
-    this.restore();
-  }
-  var _proto = Manager.prototype;
-  _proto.onMessage = function onMessage(message, worker) {
-    try {
-      var _this2 = this;
-      if (message.key !== _this2.key) {
-        return _await();
-      }
-      var payload;
-      return _await(_invoke(function () {
-        if (message.type === 'get') {
-          return _await(_this2.getState(), function (_this2$getState) {
-            payload = _this2$getState;
-          });
-        } else return _invokeIgnored(function () {
-          if (message.type === 'set') {
-            return _await(_this2.setState(message.payload), function (_this2$setState) {
-              payload = _this2$setState;
-            });
-          }
+class Manager {
+    path;
+    _state = {};
+    queue = new pubo_utils_1.SyncQueue();
+    key;
+    defaultState;
+    constructor(path, defaultState) {
+        this.path = path;
+        this.defaultState = defaultState;
+        this.key = encodeURIComponent(path);
+        cluster.on('online', (worker) => {
+            worker.on('message', (message) => this.onMessage(message, worker));
         });
-      }, function () {
-        worker.send({
-          uid: message.uid,
-          key: _this2.key,
-          payload: payload
-        });
-      }));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  _proto.sync = function sync() {
-    try {
-      var _this3 = this;
-      if (_this3.queue.length > 0) {
-        return _await();
-      }
-      return _await(_awaitIgnored(_this3.queue.push(_this3._syncFile.bind(_this3))));
-    } catch (e) {
-      return Promise.reject(e);
+        this.restore();
     }
-  };
-  _proto._syncFile = function _syncFile() {
-    try {
-      var _this4 = this;
-      return _await(new Promise(function (resolve, reject) {
-        (0, fs_1.writeFile)(_this4.path, JSON.stringify(_this4._state), function (err) {
-          if (err) {
-            reject(err);
-          } else {
-            resolve('');
-          }
-        });
-      }));
-    } catch (e) {
-      return Promise.reject(e);
+    async onMessage(message, worker) {
+        if (message.key !== this.key) {
+            return;
+        }
+        let payload;
+        if (message.type === 'get') {
+            payload = await this.getState();
+        }
+        else if (message.type === 'set') {
+            payload = await this.setState(message.payload);
+        }
+        worker.send({ uid: message.uid, key: this.key, payload });
     }
-  };
-  _proto.restore = function restore() {
-    try {
-      var buf = (0, fs_1.readFileSync)(this.path);
-      this._state = JSON.parse(buf.toString());
-    } catch (err) {
-      var _this$defaultState;
-      var str = process.platform === 'win32' ? '\\' : '/';
-      if (str) {
-        (0, fs_1.mkdirSync)(this.path.split(str).slice(0, -1).join(str), {
-          recursive: true
+    async sync() {
+        if (this.queue.length > 0) {
+            return;
+        }
+        await this.queue.push(this._syncFile.bind(this));
+    }
+    async _syncFile() {
+        return new Promise((resolve, reject) => {
+            (0, fs_1.writeFile)(this.path, JSON.stringify(this._state), (err) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve('');
+                }
+            });
         });
-      }
-      this.setState((_this$defaultState = this.defaultState) != null ? _this$defaultState : {});
     }
-  };
-  _proto.getState = function getState() {
-    try {
-      var _this5 = this;
-      return _await(_this5._state);
-    } catch (e) {
-      return Promise.reject(e);
+    restore() {
+        try {
+            const buf = (0, fs_1.readFileSync)(this.path);
+            this._state = JSON.parse(buf.toString());
+        }
+        catch (err) {
+            const str = process.platform === 'win32' ? '\\' : '/';
+            if (str) {
+                (0, fs_1.mkdirSync)(this.path.split(str).slice(0, -1).join(str), { recursive: true });
+            }
+            this.setState(this.defaultState ?? {});
+        }
     }
-  };
-  _proto.setState = function setState(values) {
-    try {
-      var _this6 = this;
-      _this6._state = values;
-      return _await(_awaitIgnored(_this6.sync()));
-    } catch (e) {
-      return Promise.reject(e);
+    async getState() {
+        return this._state;
     }
-  };
-  return Manager;
-}(); // work 线程的实现
-var Worker = /*#__PURE__*/function () {
-  function Worker(path) {
-    this.key = void 0;
-    this.callback = {};
-    this.key = encodeURIComponent(path);
-    process.on('message', this.onMessage.bind(this));
-  }
-  var _proto2 = Worker.prototype;
-  _proto2.onMessage = function onMessage(message) {
-    if (message.key !== this.key) {
-      return;
+    async setState(values) {
+        this._state = values;
+        await this.sync();
     }
-    if (typeof this.callback[message.uid] === 'function') {
-      this.callback[message.uid](message.payload);
-      delete this.callback[message.uid];
+}
+// work 线程的实现
+class Worker {
+    key;
+    callback = {};
+    constructor(path) {
+        this.key = encodeURIComponent(path);
+        process.on('message', this.onMessage.bind(this));
+    }
+    onMessage(message) {
+        if (message.key !== this.key) {
+            return;
+        }
+        if (typeof this.callback[message.uid] === 'function') {
+            this.callback[message.uid](message.payload);
+            delete this.callback[message.uid];
+        }
     }
-  };
-  _proto2.call = function call(_ref) {
-    var type = _ref.type,
-      payload = _ref.payload;
-    try {
-      var _this7 = this;
-      return _await(new Promise(function (resolve) {
-        var uid = (0, uuid_1.v4)();
-        _this7.callback[uid] = function (data) {
-          return resolve(data);
-        };
-        // @ts-ignore
-        process.send({
-          uid: uid,
-          type: type,
-          payload: payload,
-          key: _this7.key
+    async call({ type, payload }) {
+        return new Promise((resolve) => {
+            const uid = (0, uuid_1.v4)();
+            this.callback[uid] = (data) => resolve(data);
+            // @ts-ignore
+            process.send({ uid, type, payload, key: this.key });
         });
-      }));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  _proto2.getState = function getState() {
-    try {
-      var _this8 = this;
-      return _await(_this8.call({
-        type: 'get',
-        payload: {}
-      }));
-    } catch (e) {
-      return Promise.reject(e);
     }
-  };
-  _proto2.setState = function setState(payload) {
-    try {
-      var _this9 = this;
-      return _await(_this9.call({
-        type: 'set',
-        payload: payload
-      }));
-    } catch (e) {
-      return Promise.reject(e);
+    async getState() {
+        return this.call({ type: 'get', payload: {} });
     }
-  };
-  return Worker;
-}();
-var JsonStorage = /*#__PURE__*/function () {
-  function JsonStorage(path, options) {
-    var _options;
-    if (options === void 0) {
-      options = {};
+    async setState(payload) {
+        return this.call({ type: 'set', payload });
     }
-    this.instance = void 0;
-    if (cluster.isPrimary) {
-      this.instance = new Manager(path, options.defaultState);
-    } else {
-      this.instance = new Worker(path);
-    }
-    if ((_options = options) != null && _options.initialState) {
-      this.merge(options.initialState);
+}
+class JsonStorage {
+    instance;
+    constructor(path, options = {}) {
+        if (cluster.isPrimary) {
+            this.instance = new Manager(path, options.defaultState);
+        }
+        else {
+            this.instance = new Worker(path);
+        }
+        if (options?.initialState) {
+            this.merge(options.initialState);
+        }
     }
-  }
-  var _proto3 = JsonStorage.prototype;
-  _proto3.getState = function getState() {
-    try {
-      var _this10 = this;
-      return _await(_this10.instance.getState());
-    } catch (e) {
-      return Promise.reject(e);
+    async getState() {
+        return this.instance.getState();
     }
-  };
-  _proto3.setState = function setState(state) {
-    try {
-      var _this11 = this;
-      return _await(_this11.instance.setState(state));
-    } catch (e) {
-      return Promise.reject(e);
+    async setState(state) {
+        return this.instance.setState(state);
     }
-  };
-  _proto3.get = function get(key) {
-    try {
-      var _this12 = this;
-      if (!key) {
-        return _await(_this12.getState());
-      } else {
-        return _await(_this12.getState(), function (state) {
-          return state[key];
-        });
-      }
-    } catch (e) {
-      return Promise.reject(e);
+    async get(key) {
+        if (!key) {
+            return this.getState();
+        }
+        else {
+            const state = await this.getState();
+            return state[key];
+        }
     }
-  };
-  _proto3.set = function set(key, values) {
-    try {
-      var _this13 = this;
-      return _await(_this13.getState(), function (state) {
+    async set(key, values) {
+        const state = await this.getState();
         state[key] = values;
-        return _awaitIgnored(_this13.setState(state));
-      });
-    } catch (e) {
-      return Promise.reject(e);
+        await this.setState(state);
     }
-  };
-  _proto3.merge = function merge(values) {
-    try {
-      var _this14 = this;
-      return _await(_this14.getState(), function (state) {
-        for (var _i = 0, _Object$keys = Object.keys(values); _i < _Object$keys.length; _i++) {
-          var key = _Object$keys[_i];
-          state[key] = values[key];
+    async merge(values) {
+        const state = await this.getState();
+        for (const key of Object.keys(values)) {
+            state[key] = values[key];
         }
-        return _awaitIgnored(_this14.setState(state));
-      });
-    } catch (e) {
-      return Promise.reject(e);
+        await this.setState(state);
     }
-  };
-  _proto3.remove = function remove(key) {
-    try {
-      var _this15 = this;
-      return _await(_this15.getState(), function (state) {
+    async remove(key) {
+        const state = await this.getState();
         delete state[key];
-        return _awaitIgnored(_this15.setState(state));
-      });
-    } catch (e) {
-      return Promise.reject(e);
+        await this.setState(state);
     }
-  };
-  return JsonStorage;
-}();
-exports.JsonStorage = JsonStorage;
+}
+exports.JsonStorage = JsonStorage;

package/lib/utils/index.js

@@ -1,21 +1,18 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPortAvailable = void 0;
-var isPortAvailable = function isPortAvailable(port) {
-  return new Promise(function (resolve) {
-    var net = require('net');
-    var server = net.createServer();
-    server.listen(port, function () {
-      resolve(true);
-      server.close();
+const isPortAvailable = (port) => {
+    return new Promise((resolve) => {
+        const net = require('net');
+        const server = net.createServer();
+        server.listen(port, () => {
+            resolve(true);
+            server.close();
+        });
+        server.on('error', () => {
+            resolve(false);
+            server.close();
+        });
     });
-    server.on('error', function () {
-      resolve(false);
-      server.close();
-    });
-  });
 };
-exports.isPortAvailable = isPortAvailable;
+exports.isPortAvailable = isPortAvailable;