pubo-node 1.0.152 → 1.0.154

package/lib/file-system/index.d.ts

@@ -18,6 +18,8 @@ interface PuboFileSystemInterface {
     } | null) => Promise<string[]>;
     open: (path: fs.PathLike, flags?: fs.OpenMode, mode?: fs.Mode | null) => Promise<number>;
     close: (fd: number) => Promise<void>;
+    mkdir: (path: fs.PathLike, options?: fs.MakeDirectoryOptions) => Promise<void>;
+    rm: (path: fs.PathLike) => Promise<void>;
     write: <TBuffer extends NodeJS.ArrayBufferView>(fd: number, buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null) => Promise<void>;
 }
 export declare const PuboFileSystem: PuboFileSystemInterface;

package/lib/file-system/index.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PuboFileSystem = void 0;
 const fs = __importStar(require("fs"));
-const callbackToPromise = (fn) => {
+const callback2promise = (fn) => {
     return (...args) => new Promise((resolve, reject) => {
         fn(...args, (err, ...rest) => {
             if (err) {
@@ -41,12 +41,14 @@ const callbackToPromise = (fn) => {
     });
 };
 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: callback2promise(fs.read),
+    readFile: callback2promise(fs.readFile),
+    writeFile: callback2promise(fs.writeFile),
+    readdir: callback2promise(fs.readdir),
+    open: callback2promise(fs.open),
+    close: callback2promise(fs.close),
+    write: callback2promise(fs.write),
+    stat: callback2promise(fs.stat),
+    mkdir: callback2promise(fs.mkdir),
+    rm: callback2promise(fs.rm),
 };

package/lib/grpc/index.d.ts

@@ -14,7 +14,6 @@ declare class GrpcClient {
     private client;
     private _timeout;
     connections: number;
-    private closing;
     constructor({ url, options, Grpc, cert }: any);
     request(service: any, method: any, data: any): Promise<Buffer>;
     _request({ service, method, data }: {
@@ -22,7 +21,6 @@ declare class GrpcClient {
         method: any;
         data: any;
     }): Promise<Buffer>;
-    restart(): Promise<void>;
     close(): void;
 }
 export declare const GrpcList: GrpcClient[];

package/lib/grpc/index.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRpcClient = exports.GrpcList = void 0;
-const pubo_utils_1 = require("pubo-utils");
-function passThrough(argument) {
-    return argument;
-}
+const passThrough = (argument) => argument;
 class GrpcClient {
     url;
     options;
@@ -13,7 +10,6 @@ class GrpcClient {
     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();
@@ -21,11 +17,15 @@ class GrpcClient {
         this.Grpc = Grpc;
         this.credentials = credentials;
         this.options = opt;
-        this.options.timeout = this.options.timeout ?? 60000;
+        this.options.timeout = this.options.timeout ?? 10000;
+        Grpc = null;
+        options = null;
+        cert = null;
     }
     async request(service, method, data) {
-        if (this.closing) {
-            await (0, pubo_utils_1.waitFor)(async () => !this.closing, { checkTime: 100, timeout: 20000 });
+        if (this._timeout) {
+            clearTimeout(this._timeout);
+            this._timeout = null;
         }
         this.connections += 1;
         if (!this.client) {
@@ -39,6 +39,9 @@ class GrpcClient {
         catch (err) {
             error = err;
         }
+        service = null;
+        method = null;
+        data = null;
         this.connections -= 1;
         if (this.connections < 0) {
             this.connections = 0;
@@ -51,7 +54,8 @@ class GrpcClient {
             this._timeout = setTimeout(() => this.close(), 60000);
         }
         if (error) {
-            this.restart();
+            console.log(error);
+            this.close();
             throw new Error('grpc connection error.');
         }
         return result;
@@ -61,11 +65,11 @@ class GrpcClient {
             let _ended = false;
             const _timeout = setTimeout(() => {
                 _ended = true;
-                this.restart();
+                this.close();
                 console.log('rpc request timeout');
                 reject(new Error('timeout'));
             }, this.options.timeout);
-            let onResponse = (err, res) => {
+            const onResponse = (err, res) => {
                 if (_ended) {
                     return;
                 }
@@ -78,22 +82,15 @@ class GrpcClient {
                 else {
                     resolve(res);
                 }
-                onResponse = null;
             };
-            this.client.makeUnaryRequest(`/${service}/${method}`, passThrough, passThrough, data, onResponse);
+            this.client.makeUnaryRequest(`/${service}/${method}`, passThrough, passThrough, data ? Buffer.from(data) : Buffer.alloc(0), onResponse);
         });
     }
-    async restart() {
-        if (this.closing) {
-            return;
-        }
-        console.log('rpc client restarting.');
-        this.closing = true;
-        this.close();
-        await (0, pubo_utils_1.sleep)(2000);
-        this.closing = false;
-    }
     close() {
+        if (this._timeout) {
+            clearTimeout(this._timeout);
+            delete this._timeout;
+        }
         this.client?.close();
         this.client = null;
         delete this.client;
@@ -103,6 +100,8 @@ exports.GrpcList = [];
 function createRpcClient({ url, options = {}, ServiceImp, Grpc, cert }) {
     const client = new GrpcClient({ url, options, Grpc, cert });
     exports.GrpcList.push(client);
+    Grpc = null;
+    options = null;
     return new ServiceImp({ request: client.request.bind(client) });
 }
 exports.createRpcClient = createRpcClient;

package/lib/index.d.ts

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

package/lib/index.js

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

package/lib/ros/topic.d.ts

@@ -10,8 +10,8 @@ export declare class RosTopic {
     constructor(topic: any, messageType: any);
     private onTimeout;
     private onData;
-    subscribe(): void;
-    unsubscribe(): void;
+    subscribe(): Promise<void>;
+    unsubscribe(): Promise<void>;
     publish(payload: any): Promise<unknown>;
 }
 export declare const RosTopicManager: {

package/lib/ros/topic.js

@@ -33,7 +33,7 @@ class RosTopic {
     messageType;
     emitter = new pubo_utils_1.Emitter();
     subscribed = false;
-    dog = new pubo_utils_1.WatchDog({ limit: 60, onTimeout: this.onTimeout.bind(this) });
+    dog = new pubo_utils_1.WatchDog({ limit: 10, onTimeout: this.onTimeout.bind(this) });
     strSplit = new pubo_utils_1.StringSplit('---');
     subscribeChildProcess;
     constructor(topic, messageType) {
@@ -42,37 +42,40 @@ class RosTopic {
         this.subscribed = false;
         this.emitter = new pubo_utils_1.Emitter();
     }
-    onTimeout() {
+    async onTimeout() {
         if (!this.subscribed) {
             return;
         }
-        this.unsubscribe();
-        this.subscribe();
+        await this.unsubscribe();
+        await (0, pubo_utils_1.sleep)(1000);
+        await this.subscribe();
     }
     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);
     }
-    subscribe() {
+    async subscribe() {
         if (this.subscribeChildProcess) {
             return;
         }
         this.subscribed = true;
+        this.dog.init();
         this.subscribeChildProcess = (0, child_process_1.spawn)(`rostopic`, ['echo', this.topic]);
         this.subscribeChildProcess.stdout.on('data', this.onData.bind(this));
-        this.dog.init();
+        this.subscribeChildProcess.stderr.on('data', (buf) => console.log(buf.toString()));
     }
-    unsubscribe() {
-        if (this.subscribeChildProcess) {
+    async unsubscribe() {
+        if (!this.subscribeChildProcess) {
             return;
         }
         this.dog.stop();
         this.subscribed = false;
-        (0, child_process_2.SIGKILL)(this.subscribeChildProcess.pid);
+        await (0, child_process_2.SIGKILL)(this.subscribeChildProcess.pid);
         this.subscribeChildProcess = null;
     }
     publish(payload) {

package/lib/storage/json.d.ts

@@ -4,6 +4,7 @@ export interface JsonStorageOptions {
 }
 export declare class JsonStorage {
     private readonly instance;
+    private readonly queue;
     constructor(path: string, options?: JsonStorageOptions);
     private getState;
     private setState;

package/lib/storage/json.js

@@ -4,6 +4,7 @@ exports.JsonStorage = void 0;
 const fs_1 = require("fs");
 const pubo_utils_1 = require("pubo-utils");
 const uuid_1 = require("uuid");
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const cluster = require('cluster');
 // 主线程的实现
 class Manager {
@@ -27,6 +28,18 @@ class Manager {
             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) {
@@ -43,12 +56,17 @@ class Manager {
         message = null;
         worker = null;
     }
-    async sync() {
+    sync() {
         if (this.queue.length > 0) {
             return;
         }
-        await this.queue.push(this._syncFile.bind(this));
+        this.queue.push(this._syncFile.bind(this));
+    }
+    // 同步文件备份
+    syncFile() {
+        (0, fs_1.writeFileSync)(this.path, JSON.stringify(this._state));
     }
+    // 异步文件备份
     async _syncFile() {
         return new Promise((resolve, reject) => {
             (0, fs_1.writeFile)(this.path, JSON.stringify(this._state), (err) => {
@@ -56,7 +74,7 @@ class Manager {
                     reject(err);
                 }
                 else {
-                    resolve('');
+                    setTimeout(resolve, 100);
                 }
             });
         });
@@ -79,7 +97,7 @@ class Manager {
     }
     async setState(values) {
         this._state = values;
-        await this.sync();
+        this.sync();
     }
 }
 // work 线程的实现
@@ -104,7 +122,7 @@ class Worker {
         return new Promise((resolve) => {
             const uid = (0, uuid_1.v4)();
             this.callback[uid] = (data) => resolve(data);
-            // @ts-ignore
+            //@ts-ignore
             process.send({ uid, type, payload, key: this.key });
             payload = null;
             type = null;
@@ -119,6 +137,7 @@ class Worker {
 }
 class JsonStorage {
     instance;
+    queue = new pubo_utils_1.SyncQueue();
     constructor(path, options = {}) {
         if (cluster.isPrimary) {
             this.instance = new Manager(path, options.defaultState);
@@ -131,10 +150,10 @@ class JsonStorage {
         }
     }
     async getState() {
-        return this.instance.getState();
+        return this.queue.push(this.instance.getState.bind(this.instance));
     }
     async setState(state) {
-        return this.instance.setState(state);
+        return this.queue.push(() => this.instance.setState(state));
     }
     async get(key) {
         if (!key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.152",
+  "version": "1.0.154",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -23,7 +23,7 @@
     "pubo-utils": "^1.0.149",
     "yaml": "^2.5.1"
   },
-  "gitHead": "979ca9bba4c9d5b9b7b9192e835bb0ef8e50ad67",
+  "gitHead": "e8e06a2f442fb00ba254b78fecc7b49fc81579e8",
   "devDependencies": {
     "@babel/cli": "^7.10.1",
     "@babel/core": "^7.10.2",

package/es/pitch.d.ts

@@ -1,4 +0,0 @@
-/**
- * nodejs 12 兼容性补丁
- */
-export declare const pitch: () => void;

package/es/pitch.js

@@ -1,23 +0,0 @@
-/**
- * nodejs 12 兼容性补丁
- */
-export 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));
-  };
-};

package/lib/pitch.d.ts

@@ -1,4 +0,0 @@
-/**
- * nodejs 12 兼容性补丁
- */
-export declare const pitch: () => void;

package/lib/pitch.js

@@ -1,15 +0,0 @@
-"use strict";
-/**
- * nodejs 12 兼容性补丁
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pitch = void 0;
-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;