pubo-node 1.0.155 → 1.0.157

package/es/index.js

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

package/es/ros/topic.js

@@ -2,122 +2,79 @@ import { exec, spawn } from 'child_process';
 import { Emitter, WatchDog, StringSplit, sleep } from 'pubo-utils';
 import * as YAML from 'yaml';
 import { SIGKILL } from '../child-process';
-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;
-}
-export var RosTopic = /*#__PURE__*/function () {
-  function RosTopic(topic, messageType) {
-    this.topic = void 0;
-    this.messageType = void 0;
-    this.emitter = new Emitter();
-    this.subscribed = false;
-    this.dog = new WatchDog({
-      limit: 10,
-      onTimeout: this.onTimeout.bind(this)
-    });
-    this.strSplit = new StringSplit('---');
-    this.subscribeChildProcess = void 0;
-    this.topic = topic;
-    this.messageType = messageType;
-    this.subscribed = false;
-    this.emitter = new Emitter();
-  }
-  var _proto = RosTopic.prototype;
-  _proto.onTimeout = function onTimeout() {
-    try {
-      var _this = this;
-      if (!_this.subscribed) {
-        return _await();
-      }
-      return _await(_this.unsubscribe(), function () {
-        return _await(sleep(1000), function () {
-          return _awaitIgnored(_this.subscribe());
-        });
-      });
-    } catch (e) {
-      return Promise.reject(e);
+export class RosTopic {
+    topic;
+    messageType;
+    emitter = new Emitter();
+    subscribed = false;
+    dog = new WatchDog({ limit: 10, onTimeout: this.onTimeout.bind(this) });
+    strSplit = new StringSplit('---');
+    subscribeChildProcess;
+    constructor(topic, messageType) {
+        this.topic = topic;
+        this.messageType = messageType;
+        this.subscribed = false;
+        this.emitter = new Emitter();
     }
-  };
-  _proto.onData = function onData(data) {
-    var tmp = this.strSplit.split(data.toString()).slice(-1)[0];
-    if (!tmp) {
-      return;
+    async onTimeout() {
+        if (!this.subscribed) {
+            return;
+        }
+        await this.unsubscribe();
+        await sleep(1000);
+        await this.subscribe();
     }
-    this.dog.feed();
-    var res = YAML.parse(tmp);
-    this.emitter.emit('message', res);
-  };
-  _proto.subscribe = function subscribe() {
-    try {
-      var _this2 = this;
-      if (_this2.subscribeChildProcess) {
-        return _await();
-      }
-      _this2.subscribed = true;
-      _this2.dog.init();
-      _this2.subscribeChildProcess = spawn("rostopic", ['echo', _this2.topic]);
-      _this2.subscribeChildProcess.stdout.on('data', _this2.onData.bind(_this2));
-      _this2.subscribeChildProcess.stderr.on('data', function (buf) {
-        return console.log(buf.toString());
-      });
-      return _await();
-    } catch (e) {
-      return Promise.reject(e);
+    onData(data) {
+        const tmp = this.strSplit.split(data.toString()).slice(-1)[0];
+        if (!tmp) {
+            return;
+        }
+        this.dog.feed();
+        const res = YAML.parse(tmp);
+        this.emitter.emit('message', res);
     }
-  };
-  _proto.unsubscribe = function unsubscribe() {
-    try {
-      var _this3 = this;
-      if (!_this3.subscribeChildProcess) {
-        return _await();
-      }
-      _this3.dog.stop();
-      _this3.subscribed = false;
-      return _await(SIGKILL(_this3.subscribeChildProcess.pid), function () {
-        _this3.subscribeChildProcess = null;
-      });
-    } catch (e) {
-      return Promise.reject(e);
+    async subscribe() {
+        if (this.subscribeChildProcess) {
+            return;
+        }
+        this.subscribed = true;
+        this.dog.init();
+        this.subscribeChildProcess = spawn(`rostopic`, ['echo', this.topic]);
+        this.subscribeChildProcess.stdout.on('data', this.onData.bind(this));
+        this.subscribeChildProcess.stderr.on('data', (buf) => console.log(buf.toString()));
     }
-  };
-  _proto.publish = function publish(payload) {
-    var _this4 = this;
-    var data = YAML.stringify(payload);
-    return new Promise(function (resolve, reject) {
-      exec("rostopic pub -1 " + _this4.topic + " " + _this4.messageType + " \"" + data + "\"", function (err, stdout) {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(stdout);
+    async unsubscribe() {
+        if (!this.subscribeChildProcess) {
+            return;
         }
-      });
-    });
-  };
-  return RosTopic;
-}();
-export var RosTopicManager = {
-  cache: [],
-  getTopic: function getTopic(topic, messageType) {
-    var tmp = this.cache.find(function (item) {
-      return item.topic === topic;
-    });
-    if (tmp) {
-      return tmp;
+        this.dog.stop();
+        this.subscribed = false;
+        await SIGKILL(this.subscribeChildProcess.pid);
+        this.subscribeChildProcess = null;
+    }
+    publish(payload) {
+        const data = YAML.stringify(payload);
+        return new Promise((resolve, reject) => {
+            exec(`rostopic pub -1 ${this.topic} ${this.messageType} "${data}"`, (err, stdout) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(stdout);
+                }
+            });
+        });
     }
-    var instance = new RosTopic(topic, messageType);
-    this.cache.push(instance);
-    return instance;
-  }
-};
+}
+export const RosTopicManager = {
+    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/es/storage/json.js

@@ -2,323 +2,180 @@ import { readFileSync, writeFile, mkdirSync, writeFileSync } from 'fs';
 import { SyncQueue } from 'pubo-utils';
 import { v4 as uuid } from 'uuid';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-
-function _empty() {}
-var cluster = require('cluster');
+const cluster = require('cluster');
 // 主线程的实现
-
-function _awaitIgnored(value, direct) {
-  if (!direct) {
-    return value && value.then ? value.then(_empty) : Promise.resolve();
-  }
-}
-var Manager = /*#__PURE__*/function () {
-  function Manager(path, defaultState) {
-    var _this = this;
-    this.path = void 0;
-    this._state = {};
-    this.queue = new 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) {
-        _this.onMessage(message, worker);
-        message = null;
-      });
-    });
-    cluster.on('exit', function (worker) {
-      worker.removeAllListeners('message');
-      worker = null;
-    });
-    this.restore();
-    if (global.GlobalEmitter) {
-      global.GlobalEmitter.on('SIGINT', this.kill.bind(this));
-    }
-  }
-  // 进程退出时,同步文件
-  var _proto = Manager.prototype;
-  _proto.kill = function kill() {
-    try {
-      var _this2 = this;
-      return _await(_awaitIgnored(_this2.queue.push(function () {
-        return _this2.syncFile();
-      })));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  _proto.onMessage = function onMessage(message, worker) {
-    try {
-      var _this3 = this;
-      if (message.key !== _this3.key) {
-        return _await();
-      }
-      var payload;
-      return _await(_invoke(function () {
-        if (message.type === 'get') {
-          return _await(_this3.getState(), function (_this3$getState) {
-            payload = _this3$getState;
-          });
-        } else return _invokeIgnored(function () {
-          if (message.type === 'set') {
-            return _await(_this3.setState(message.payload), function (_this3$setState) {
-              payload = _this3$setState;
+class Manager {
+    path;
+    _state = {};
+    queue = new 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);
+                message = null;
             });
-          }
         });
-      }, function () {
-        worker.send({
-          uid: message.uid,
-          key: _this3.key,
-          payload: payload
+        cluster.on('exit', (worker) => {
+            worker.removeAllListeners('message');
+            worker = null;
         });
+        this.restore();
+        if (global.GlobalEmitter) {
+            global.GlobalEmitter.on('SIGINT', this.kill.bind(this));
+        }
+        else {
+            process.on('SIGINT', () => {
+                this.kill().then(() => process.exit(0));
+            });
+        }
+    }
+    // 进程退出时,同步文件
+    async kill() {
+        await this.queue.push(() => this.syncFile());
+    }
+    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 });
         message = null;
         worker = null;
-      }));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  _proto.sync = function sync() {
-    if (this.queue.length > 0) {
-      return;
     }
-    this.queue.push(this._syncFile.bind(this));
-  }
-  // 同步文件备份
-  ;
-  _proto.syncFile = function syncFile() {
-    writeFileSync(this.path, JSON.stringify(this._state));
-  }
-  // 异步文件备份
-  ;
-  _proto._syncFile = function _syncFile() {
-    try {
-      var _this4 = this;
-      return _await(new Promise(function (resolve, reject) {
-        writeFile(_this4.path, JSON.stringify(_this4._state), function (err) {
-          if (err) {
-            reject(err);
-          } else {
-            setTimeout(resolve, 100);
-          }
+    sync() {
+        if (this.queue.length > 0) {
+            return;
+        }
+        this.queue.push(this._syncFile.bind(this));
+    }
+    // 同步文件备份
+    syncFile() {
+        writeFileSync(this.path, JSON.stringify(this._state));
+    }
+    // 异步文件备份
+    async _syncFile() {
+        return new Promise((resolve, reject) => {
+            writeFile(this.path, JSON.stringify(this._state), (err) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    setTimeout(resolve, 100);
+                }
+            });
         });
-      }));
-    } catch (e) {
-      return Promise.reject(e);
     }
-  };
-  _proto.restore = function restore() {
-    try {
-      var buf = readFileSync(this.path);
-      this._state = JSON.parse(buf.toString());
-    } catch (err) {
-      var _this$defaultState;
-      var str = process.platform === 'win32' ? '\\' : '/';
-      if (str) {
-        mkdirSync(this.path.split(str).slice(0, -1).join(str), {
-          recursive: true
-        });
-      }
-      this.setState((_this$defaultState = this.defaultState) != null ? _this$defaultState : {});
+    restore() {
+        try {
+            const buf = readFileSync(this.path);
+            this._state = JSON.parse(buf.toString());
+        }
+        catch (err) {
+            const str = process.platform === 'win32' ? '\\' : '/';
+            if (str) {
+                mkdirSync(this.path.split(str).slice(0, -1).join(str), { recursive: true });
+            }
+            this.setState(this.defaultState ?? {});
+        }
     }
-  };
-  _proto.getState = function getState() {
-    try {
-      var _this5 = this;
-      return _await(_this5._state);
-    } catch (e) {
-      return Promise.reject(e);
+    async getState() {
+        return this._state;
     }
-  };
-  _proto.setState = function setState(values) {
-    try {
-      var _this6 = this;
-      _this6._state = values;
-      _this6.sync();
-      return _await();
-    } catch (e) {
-      return Promise.reject(e);
+    async setState(values) {
+        this._state = values;
+        this.sync();
     }
-  };
-  return Manager;
-}(); // work 线程的实现
-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 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;
-    }
-    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];
+        }
+        message = null;
     }
-    message = null;
-  };
-  _proto2.call = function call(_ref) {
-    var type = _ref.type,
-      payload = _ref.payload;
-    try {
-      var _this7 = this;
-      return _await(new Promise(function (resolve) {
-        var uid = uuid();
-        _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 = uuid();
+            this.callback[uid] = (data) => resolve(data);
+            //@ts-ignore
+            process.send({ uid, type, payload, key: this.key });
+            payload = null;
+            type = null;
         });
-        payload = null;
-        type = null;
-      }));
-    } 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);
+    async getState() {
+        return this.call({ type: 'get', payload: {} });
     }
-  };
-  _proto2.setState = function setState(payload) {
-    try {
-      var _this9 = this;
-      return _await(_this9.call({
-        type: 'set',
-        payload: payload
-      }));
-    } catch (e) {
-      return Promise.reject(e);
+    async setState(payload) {
+        return this.call({ type: 'set', payload });
     }
-  };
-  return Worker;
-}();
-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);
-}
-export var JsonStorage = /*#__PURE__*/function () {
-  function JsonStorage(path, options) {
-    var _options;
-    if (options === void 0) {
-      options = {};
-    }
-    this.instance = void 0;
-    this.queue = new SyncQueue();
-    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);
+export class JsonStorage {
+    instance;
+    queue = new SyncQueue();
+    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.queue.push(_this10.instance.getState.bind(_this10.instance)));
-    } catch (e) {
-      return Promise.reject(e);
+    async getState() {
+        return this.queue.push(this.instance.getState.bind(this.instance));
     }
-  };
-  _proto3.setState = function setState(state) {
-    try {
-      var _this11 = this;
-      return _await(_this11.queue.push(function () {
-        return _this11.instance.setState(state);
-      }));
-    } catch (e) {
-      return Promise.reject(e);
+    async setState(state) {
+        return this.queue.push(() => 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;
-}();
+}