pubo-node 1.0.168 → 1.0.172

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

@@ -5,7 +5,8 @@ export declare function getProcessCommandByPid(pid: number): Promise<string>;
 export declare function isProcessDied(pid: any): Promise<boolean>;
 export declare function getProcessByPpid(pid: number): Promise<number[]>;
 export declare const getProcessTree: (pid: number, tree?: any) => Promise<any>;
-export declare function SIGKILL(pid: number, signal?: number): Promise<unknown>;
+export declare const getProcessList: (pid: any) => Promise<number[]>;
+export declare function SIGKILL(pid: number, signal?: number, times?: number): Promise<unknown>;
 export declare const heartbeat: () => void;
 export declare const getAudioCards: (filter?: string) => Promise<{
     text: string;

package/lib/child-process/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDiskUsage = exports.getAudioCards = exports.heartbeat = exports.getProcessTree = void 0;
+exports.getDiskUsage = exports.getAudioCards = exports.heartbeat = exports.getProcessList = exports.getProcessTree = void 0;
 exports.getProcessName = getProcessName;
 exports.getPidByPort = getPidByPort;
 exports.getProcessCpuUseByPid = getProcessCpuUseByPid;
@@ -95,15 +95,18 @@ async function isProcessDied(pid) {
 // 获取子进程
 function getProcessByPpid(pid) {
     return new Promise((resolve) => {
-        (0, child_process_1.exec)(`ps -o pid --no-headers --ppid ${pid}`, (err, stdout) => {
+        let child = (0, child_process_1.exec)(`ps -o pid --no-headers --ppid ${pid}`, (err, stdout) => {
             if (err) {
                 resolve([]);
+                child = null;
             }
             else {
                 resolve(stdout
                     .split('\n')
                     .filter((item) => !!item)
-                    .map((item) => parseFloat(item.trim())));
+                    .map((item) => parseFloat(item.trim()))
+                    .filter((item) => item !== child.pid));
+                child = null;
             }
         });
     });
@@ -152,23 +155,32 @@ const flatProcessTree = (tree, tmp) => {
     tree = null;
     tmp = null;
 };
+// 获取所有进程PID,从叶到根
+const getProcessList = async (pid) => {
+    let tree = await (0, exports.getProcessTree)(pid);
+    const tmp = [];
+    if (!tree.pid) {
+        return tmp;
+    }
+    tmp.push(tree.pid);
+    flatProcessTree(tree, tmp);
+    tmp.reverse();
+    tree = null;
+    return tmp;
+};
+exports.getProcessList = getProcessList;
 // 杀死进程以及子进程
-async function SIGKILL(pid, signal = 2) {
+async function SIGKILL(pid, signal = 2, times = 1) {
     if (process.platform === 'win32') {
         return new Promise((resolve) => {
             (0, child_process_1.exec)(`taskkill /pid ${pid} /T /F`, resolve);
         });
     }
-    let tree = await (0, exports.getProcessTree)(pid);
-    // 获取所有进程PID,从叶到根
-    const tmp = [tree.pid];
-    flatProcessTree(tree, tmp);
-    tmp.reverse();
-    tree = null;
+    const tmp = await (0, exports.getProcessList)(pid);
     const res = { success: true, error: null };
     for (const item of tmp) {
         try {
-            await _SIGKILL(item, signal);
+            await _SIGKILL(item, signal, times);
         }
         catch (err) {
             res.error = err;

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, getPidByPort, heartbeat, getDiskUsage, } from './child-process';
+export { SIGKILL, isProcessDied, getProcessName, getProcessTree, getProcessByPpid, getProcessCpuUseByPid, getProcessCommandByPid, getProcessList, 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.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;
+exports.PuboFileSystem = exports.RosTopic = exports.RosTopicManager = exports.getNetworks = exports.getWifiName = exports.isPortAvailable = exports.getDiskUsage = exports.heartbeat = exports.getPidByPort = exports.getProcessList = 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,6 +17,7 @@ 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, "getProcessList", { enumerable: true, get: function () { return child_process_1.getProcessList; } });
 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; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.168",
+  "version": "1.0.172",
   "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.167",
+    "pubo-utils": "^1.0.172",
     "yaml": "^2.5.1"
   },
-  "gitHead": "a096fe8903a1e2e9a146469254a0d255ff9189e3",
+  "gitHead": "2caf39c9d826bfd2b30665bdff5c661f2d85e10f",
   "devDependencies": {
     "del": "^5.1.0",
     "eslint": "^8.42.0",