pubo-node 1.0.194 → 1.0.197

package/lib/child-process/index.js

@@ -110,6 +110,7 @@ function getProcessCommandByPid(pid) {
 // 判断进程是否死亡
 async function isProcessDied(pid) {
     const used = await getProcessCpuUseByPid(pid);
+    // console.log(`pid: ${pid}, used: ${used}`);
     return used < 0;
 }
 // 获取子进程
@@ -124,8 +125,8 @@ function getProcessByPpid(pid) {
                 resolve(stdout
                     .split('\n')
                     .filter((item) => !!item)
-                    .map((item) => parseFloat(item.trim()))
-                    .filter((item) => item !== child.pid));
+                    .map((item) => parseInt(item.trim()))
+                    .filter((item) => item !== child.pid && !isNaN(item)));
                 child = null;
             }
         });
@@ -158,7 +159,7 @@ async function _SIGKILL(pid, signal = 2, times = 1) {
     if (times > 5) {
         throw new Error('SIGKILL 失败. times > 5');
     }
-    (0, child_process_1.exec)(`kill -${signal} ${pid}`);
+    await new Promise((resolve) => (0, child_process_1.exec)(`kill -${signal} ${pid}`, resolve));
     try {
         await (0, pubo_utils_1.waitFor)(async () => isProcessDied(pid), {
             checkTime: 100,

package/lib/index.d.ts

@@ -2,8 +2,8 @@ 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, getProcessList, getPidByPort, heartbeat, getDiskUsage, } from './child-process';
 export { isPortAvailable } from './utils';
+export { SIGKILL, isProcessDied, getProcessName, getProcessTree, getProcessByPpid, getProcessCpuUseByPid, getProcessCommandByPid, getProcessList, getPidByPort, heartbeat, getDiskUsage, } from './child-process';
 export { getWifiName, getNetworks } from './utils/network';
 export { RosTopicManager, RosTopic } from './ros/topic';
 export { PuboFileSystem } from './file-system';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PProcess = 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;
+exports.PProcess = exports.PuboFileSystem = exports.RosTopic = exports.RosTopicManager = exports.getNetworks = exports.getWifiName = exports.getDiskUsage = exports.heartbeat = exports.getPidByPort = exports.getProcessList = exports.getProcessCommandByPid = exports.getProcessCpuUseByPid = exports.getProcessByPpid = exports.getProcessTree = exports.getProcessName = exports.isProcessDied = exports.SIGKILL = exports.isPortAvailable = 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");
@@ -9,6 +9,8 @@ Object.defineProperty(exports, "FtpClientPool", { enumerable: true, get: functio
 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 utils_1 = require("./utils");
+Object.defineProperty(exports, "isPortAvailable", { enumerable: true, get: function () { return utils_1.isPortAvailable; } });
 var child_process_1 = require("./child-process");
 Object.defineProperty(exports, "SIGKILL", { enumerable: true, get: function () { return child_process_1.SIGKILL; } });
 Object.defineProperty(exports, "isProcessDied", { enumerable: true, get: function () { return child_process_1.isProcessDied; } });
@@ -21,8 +23,6 @@ Object.defineProperty(exports, "getProcessList", { enumerable: true, get: functi
 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");
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.194",
+  "version": "1.0.197",
   "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.194",
+    "pubo-utils": "^1.0.195",
     "yaml": "^2.5.1"
   },
-  "gitHead": "7c789085970e09fe147a152b164a5f95397da92d",
+  "gitHead": "b3ec410db34a691f8f7bc82c908d0a58a00d02ce",
   "devDependencies": {
     "del": "^5.1.0",
     "eslint": "^8.42.0",