pubo-node 1.0.165 → 1.0.167

package/lib/child-process/index.d.ts

@@ -1,4 +1,5 @@
 export declare function getProcessName(pid: any): Promise<string>;
+export declare function getPidByPort(port: any): Promise<unknown>;
 export declare function getProcessCpuUseByPid(pid: number): Promise<number>;
 export declare function getProcessCommandByPid(pid: number): Promise<string>;
 export declare function isProcessDied(pid: any): Promise<boolean>;
@@ -10,3 +11,4 @@ export declare const getAudioCards: (filter?: string) => Promise<{
     text: string;
     index: string;
 }[]>;
+export declare const getDiskUsage: () => Promise<unknown>;

package/lib/child-process/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAudioCards = exports.heartbeat = exports.getProcessTree = void 0;
+exports.getDiskUsage = exports.getAudioCards = exports.heartbeat = exports.getProcessTree = void 0;
 exports.getProcessName = getProcessName;
+exports.getPidByPort = getPidByPort;
 exports.getProcessCpuUseByPid = getProcessCpuUseByPid;
 exports.getProcessCommandByPid = getProcessCommandByPid;
 exports.isProcessDied = isProcessDied;
@@ -22,6 +23,44 @@ function getProcessName(pid) {
         });
     });
 }
+// 根据端口号获取进程PID
+async function getPidByPort(port) {
+    if (!port) {
+        return '';
+    }
+    if (process.platform === 'win32') {
+        return new Promise((resolve, reject) => {
+            (0, child_process_1.exec)(`netstat -ano | findstr "${port}"`, (error, stdout, stderr) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                const arr = stdout.split('\n');
+                if (!arr[0]) {
+                    resolve('');
+                    return;
+                }
+                const tmp = arr[0].split(' ');
+                const res = tmp.pop();
+                resolve(res);
+            });
+        });
+    }
+    return new Promise((resolve, reject) => {
+        (0, child_process_1.exec)(`lsof -i:${port} | awk '{print $2}'`, (err, stdout) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                let res = stdout.split('\n')[1];
+                if (res) {
+                    res = res.trim();
+                }
+                resolve(res);
+            }
+        });
+    });
+}
 // 获取进程 cpu 使用率
 function getProcessCpuUseByPid(pid) {
     return new Promise((resolve) => {
@@ -35,7 +74,7 @@ function getProcessCpuUseByPid(pid) {
         });
     });
 }
-// 获取进程 command 使用率
+// 获取进程 command
 function getProcessCommandByPid(pid) {
     return new Promise((resolve) => {
         (0, child_process_1.exec)(`ps -p ${pid} -o command=`, (err, stdout) => {
@@ -113,6 +152,7 @@ const flatProcessTree = (tree, tmp) => {
     tree = null;
     tmp = null;
 };
+// 杀死进程以及子进程
 async function SIGKILL(pid, signal = 2) {
     if (process.platform === 'win32') {
         return new Promise((resolve) => {
@@ -125,16 +165,17 @@ async function SIGKILL(pid, signal = 2) {
     flatProcessTree(tree, tmp);
     tmp.reverse();
     tree = null;
-    let success = true;
+    const res = { success: true, error: null };
     for (const item of tmp) {
         try {
             await _SIGKILL(item, signal);
         }
         catch (err) {
-            success = false;
+            res.error = err;
+            res.success = false;
         }
     }
-    return success;
+    return res;
 }
 // 子进程心跳包
 const heartbeat = () => {
@@ -173,3 +214,29 @@ const getAudioCards = (filter = '') => {
     });
 };
 exports.getAudioCards = getAudioCards;
+const dic = ['fileSystem', 'size', 'used', 'avail', 'use%', 'mountedOn'];
+const parser = (str) => {
+    return str
+        .split('\n')
+        .filter((item) => item)
+        .map((item) => item.split(' ').filter((s) => !!s))
+        .map((item) => {
+        const res = {};
+        dic.forEach((key, i) => (res[key] = item[i]));
+        return res;
+    })
+        .map((item) => ({ ...item, total: parseFloat(item.size), percentage: parseFloat(item['use%']) }));
+};
+const getDiskUsage = async () => {
+    return new Promise((resolve) => {
+        (0, child_process_1.exec)('df -h | grep G', (err, stdout) => {
+            if (err) {
+                resolve([]);
+            }
+            else {
+                resolve(parser(stdout.toString()));
+            }
+        });
+    });
+};
+exports.getDiskUsage = getDiskUsage;

package/lib/index.d.ts

@@ -2,7 +2,7 @@ export { JsonStorage } from './storage/json';
 export { FtpClient, FtpClientPool } from './ftp-client';
 export type { FtpConnectOptions, FtpFile } from './ftp-client';
 export { createRpcClient, GrpcList } from './grpc';
-export { SIGKILL, isProcessDied, getProcessName, getProcessTree, getProcessByPpid, getProcessCpuUseByPid, getProcessCommandByPid, heartbeat, } from './child-process';
+export { SIGKILL, isProcessDied, getProcessName, getProcessTree, getProcessByPpid, getProcessCpuUseByPid, getProcessCommandByPid, getPidByPort, heartbeat, getDiskUsage, } from './child-process';
 export { isPortAvailable } from './utils';
 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.PuboFileSystem = 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.GrpcList = exports.createRpcClient = exports.FtpClientPool = exports.FtpClient = exports.JsonStorage = void 0;
+exports.PuboFileSystem = exports.RosTopic = exports.RosTopicManager = exports.getNetworks = exports.getWifiName = exports.isPortAvailable = exports.getDiskUsage = exports.heartbeat = exports.getPidByPort = exports.getProcessCommandByPid = exports.getProcessCpuUseByPid = exports.getProcessByPpid = exports.getProcessTree = exports.getProcessName = exports.isProcessDied = exports.SIGKILL = 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");
@@ -17,7 +17,9 @@ Object.defineProperty(exports, "getProcessTree", { enumerable: true, get: functi
 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; } });
+Object.defineProperty(exports, "getPidByPort", { enumerable: true, get: function () { return child_process_1.getPidByPort; } });
 Object.defineProperty(exports, "heartbeat", { enumerable: true, get: function () { return child_process_1.heartbeat; } });
+Object.defineProperty(exports, "getDiskUsage", { enumerable: true, get: function () { return child_process_1.getDiskUsage; } });
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "isPortAvailable", { enumerable: true, get: function () { return utils_1.isPortAvailable; } });
 var network_1 = require("./utils/network");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.165",
+  "version": "1.0.167",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "sideEffects": false,
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@types/node": "^17.0.25",
-    "pubo-utils": "^1.0.164",
+    "pubo-utils": "^1.0.167",
     "yaml": "^2.5.1"
   },
-  "gitHead": "93126c2ba44c242e56b04d34871da52a763293cc",
+  "gitHead": "3e19f954e9f9cf7e8c358012818b9578007df8a0",
   "devDependencies": {
     "del": "^5.1.0",
     "eslint": "^8.42.0",