pubo-node 1.0.164 → 1.0.166

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>;

package/lib/child-process/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAudioCards = exports.heartbeat = exports.getProcessTree = void 0;
 exports.getProcessName = getProcessName;
+exports.getPidByPort = getPidByPort;
 exports.getProcessCpuUseByPid = getProcessCpuUseByPid;
 exports.getProcessCommandByPid = getProcessCommandByPid;
 exports.isProcessDied = isProcessDied;
@@ -17,7 +18,45 @@ function getProcessName(pid) {
                 reject(err);
             }
             else {
-                resolve(data);
+                resolve(data.toString().split(':')[1]?.trim());
+            }
+        });
+    });
+}
+// 根据端口号获取进程名称
+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);
             }
         });
     });
@@ -126,13 +165,13 @@ async function SIGKILL(pid, signal = 2) {
     tmp.reverse();
     tree = null;
     let success = true;
-    try {
-        for (const item of tmp) {
+    for (const item of tmp) {
+        try {
             await _SIGKILL(item, signal);
         }
-    }
-    catch (err) {
-        success = false;
+        catch (err) {
+            success = false;
+        }
     }
     return success;
 }

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, } 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.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,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, "getPidByPort", { enumerable: true, get: function () { return child_process_1.getPidByPort; } });
 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; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.164",
+  "version": "1.0.166",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "sideEffects": false,
@@ -21,7 +21,7 @@
     "pubo-utils": "^1.0.164",
     "yaml": "^2.5.1"
   },
-  "gitHead": "c0bff5fb6d2bb3d5429a56bf20ae01797f9266a9",
+  "gitHead": "44bdcaeb2ec41a7a07a929a74082d8aa2cf53ad1",
   "devDependencies": {
     "del": "^5.1.0",
     "eslint": "^8.42.0",