@webpod/ps 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webpod/ps",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "A process lookup utility",
   "publishConfig": {
     "access": "public"
@@ -41,14 +41,14 @@
     "pid"
   ],
   "dependencies": {
-    "@webpod/ingrid": "^0.0.0-beta.3",
-    "zurk": "^0.11.2"
+    "@webpod/ingrid": "^1.1.1",
+    "zurk": "^0.11.4"
   },
   "devDependencies": {
-    "@types/node": "^22.13.16",
+    "@types/node": "^24.0.13",
     "c8": "^10.1.3",
-    "concurrently": "^9.1.2",
-    "esbuild": "^0.25.2",
+    "concurrently": "^9.2.0",
+    "esbuild": "^0.25.6",
     "esbuild-node-externals": "^1.18.0",
     "esbuild-plugin-entry-chunks": "^0.1.15",
     "eslint": "^8.57.0",
@@ -58,8 +58,8 @@
     "mocha": "^10.8.2",
     "sinon": "^18.0.1",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.28.1",
-    "typescript": "^5.8.2"
+    "typedoc": "^0.28.7",
+    "typescript": "^5.8.3"
   },
   "repository": {
     "type": "git",

package/target/cjs/index.cjs

@@ -65,11 +65,14 @@ var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_os = require("node:os");
 var import_ingrid = require("@webpod/ingrid");
 var import_spawn = require("zurk/spawn");
-var EOL = /\n\r?|\r\n?/;
 var IS_WIN = import_node_process.default.platform === "win32";
+var WMIC_INPUT = "wmic process get ProcessId,ParentProcessId,CommandLine";
 var isBin = (f) => {
   if (f === "") return false;
   if (!f.includes("/")) return true;
+  if (!f.includes("\\")) return true;
+  if (f.length > 3 && f[0] === '"')
+    return f[f.length - 1] === '"' ? isBin(f.slice(1, -1)) : false;
   if (!import_node_fs.default.existsSync(f)) return false;
   const stat = import_node_fs.default.lstatSync(f);
   return stat.isFile() || stat.isSymbolicLink();
@@ -86,21 +89,21 @@ var _lookup = ({
   const { promise, resolve, reject } = pFactory();
   const { psargs = ["-lx"] } = query;
   const args = Array.isArray(psargs) ? psargs : psargs.split(/\s+/);
-  const extract = IS_WIN ? extractWmic : identity;
-  let result = [];
+  const result = [];
+  const extract = IS_WIN ? removeWmicPrefix : identity;
   const callback = (err, { stdout }) => {
     if (err) {
       reject(err);
       cb(err);
       return;
     }
-    result = parseProcessList(extract(stdout), query);
+    result.push(...parseProcessList(extract(stdout), query));
     resolve(result);
     cb(null, result);
   };
   const ctx = IS_WIN ? {
-    cmd: "cmd",
-    input: "wmic process get ProcessId,ParentProcessId,CommandLine \n",
+    cmd: WMIC_INPUT,
+    args: [],
     callback,
     sync,
     run(cb2) {
@@ -119,7 +122,7 @@ var _lookup = ({
   return Object.assign(promise, result);
 };
 var parseProcessList = (output, query = {}) => {
-  const processList = parseGrid(output.trim());
+  const processList = parseGrid(output);
   const pidList = (query.pid === void 0 ? [] : [query.pid].flat(1)).map((v) => v + "");
   const filters = [
     (p) => query.command ? new RegExp(query.command, "i").test(p.command) : true,
@@ -130,10 +133,10 @@ var parseProcessList = (output, query = {}) => {
     (p) => (pidList.length === 0 || pidList.includes(p.pid)) && filters.every((f) => f(p))
   );
 };
-var extractWmic = (stdout) => {
-  const _stdout = stdout.split(EOL);
-  const beginRow = _stdout.findIndex((out) => out.startsWith("CommandLine"));
-  return _stdout.slice(beginRow + 1, -1).join(import_node_os.EOL);
+var removeWmicPrefix = (stdout) => {
+  const s = stdout.indexOf(WMIC_INPUT + import_node_os.EOL);
+  const e = stdout.includes(">") ? stdout.trimEnd().lastIndexOf(import_node_os.EOL) : stdout.length;
+  return (s > 0 ? stdout.slice(s + WMIC_INPUT.length, e) : stdout.slice(0, e)).trimStart();
 };
 var pickTree = (list, pid, recursive = false) => {
   const children = list.filter((p) => p.ppid === pid + "");
@@ -169,7 +172,7 @@ var _tree = ({
     return Promise.reject(err);
   }
 };
-var tree = (opts, cb) => __async(void 0, null, function* () {
+var tree = (opts, cb) => __async(null, null, function* () {
   return _tree({ opts, cb });
 });
 var treeSync = (opts, cb) => _tree({ opts, cb, sync: true });
@@ -232,7 +235,8 @@ var formatOutput = (data) => data.reduce((m, d) => {
   var _a, _b, _c, _d;
   const pid = ((_a = d.PID) == null ? void 0 : _a[0]) || ((_b = d.ProcessId) == null ? void 0 : _b[0]);
   const ppid = ((_c = d.PPID) == null ? void 0 : _c[0]) || ((_d = d.ParentProcessId) == null ? void 0 : _d[0]);
-  const cmd = d.CMD || d.CommandLine || d.COMMAND || [];
+  const _cmd = d.CMD || d.CommandLine || d.COMMAND || [];
+  const cmd = _cmd.length === 1 ? _cmd[0].split(/\s+/) : _cmd;
   if (pid && cmd.length > 0) {
     const c = cmd.findIndex((_v, i) => isBin(cmd.slice(0, i).join(" ")));
     const command = cmd.slice(0, c).join(" ");

package/target/dts/ps.d.ts

@@ -25,9 +25,7 @@ export type TPsNext = (err?: any, data?: any) => void;
  * @param {String} query.command RegExp String
  * @param {String} query.arguments RegExp String
  * @param {String|String[]} query.psargs
- * @param {Function} [cb]
- * @param {Object=null} cb.err
- * @param {TPsLookupEntry[]} cb.processList
+ * @param {TPsLookupCallback} cb
  * @return {Promise<TPsLookupEntry[]>}
  */
 export declare const lookup: {
@@ -41,14 +39,12 @@ export declare const lookup: {
  * @param {String} query.command RegExp String
  * @param {String} query.arguments RegExp String
  * @param {String|String[]} query.psargs
- * @param {Function} [cb]
- * @param {Object=null} cb.err
- * @param {Object[]} cb.processList
+ * @param {TPsLookupCallback} cb
  * @return {TPsLookupEntry[]}
  */
 export declare const lookupSync: (query?: TPsLookupQuery, cb?: TPsLookupCallback) => TPsLookupEntry[];
 export declare const parseProcessList: (output: string, query?: TPsLookupQuery) => TPsLookupEntry[];
-export declare const extractWmic: (stdout: string) => string;
+export declare const removeWmicPrefix: (stdout: string) => string;
 export type TPsTreeOpts = {
     pid: string | number;
     recursive?: boolean;

package/target/esm/index.mjs

@@ -4,11 +4,14 @@ import fs from "node:fs";
 import { EOL as SystemEOL } from "node:os";
 import { parse } from "@webpod/ingrid";
 import { exec } from "zurk/spawn";
-var EOL = /\n\r?|\r\n?/;
 var IS_WIN = process.platform === "win32";
+var WMIC_INPUT = "wmic process get ProcessId,ParentProcessId,CommandLine";
 var isBin = (f) => {
   if (f === "") return false;
   if (!f.includes("/")) return true;
+  if (!f.includes("\\")) return true;
+  if (f.length > 3 && f[0] === '"')
+    return f[f.length - 1] === '"' ? isBin(f.slice(1, -1)) : false;
   if (!fs.existsSync(f)) return false;
   const stat = fs.lstatSync(f);
   return stat.isFile() || stat.isSymbolicLink();
@@ -25,21 +28,21 @@ var _lookup = ({
   const { promise, resolve, reject } = pFactory();
   const { psargs = ["-lx"] } = query;
   const args = Array.isArray(psargs) ? psargs : psargs.split(/\s+/);
-  const extract = IS_WIN ? extractWmic : identity;
-  let result = [];
+  const result = [];
+  const extract = IS_WIN ? removeWmicPrefix : identity;
   const callback = (err, { stdout }) => {
     if (err) {
       reject(err);
       cb(err);
       return;
     }
-    result = parseProcessList(extract(stdout), query);
+    result.push(...parseProcessList(extract(stdout), query));
     resolve(result);
     cb(null, result);
   };
   const ctx = IS_WIN ? {
-    cmd: "cmd",
-    input: "wmic process get ProcessId,ParentProcessId,CommandLine \n",
+    cmd: WMIC_INPUT,
+    args: [],
     callback,
     sync,
     run(cb2) {
@@ -58,7 +61,7 @@ var _lookup = ({
   return Object.assign(promise, result);
 };
 var parseProcessList = (output, query = {}) => {
-  const processList = parseGrid(output.trim());
+  const processList = parseGrid(output);
   const pidList = (query.pid === void 0 ? [] : [query.pid].flat(1)).map((v) => v + "");
   const filters = [
     (p) => query.command ? new RegExp(query.command, "i").test(p.command) : true,
@@ -69,10 +72,10 @@ var parseProcessList = (output, query = {}) => {
     (p) => (pidList.length === 0 || pidList.includes(p.pid)) && filters.every((f) => f(p))
   );
 };
-var extractWmic = (stdout) => {
-  const _stdout = stdout.split(EOL);
-  const beginRow = _stdout.findIndex((out) => out.startsWith("CommandLine"));
-  return _stdout.slice(beginRow + 1, -1).join(SystemEOL);
+var removeWmicPrefix = (stdout) => {
+  const s = stdout.indexOf(WMIC_INPUT + SystemEOL);
+  const e = stdout.includes(">") ? stdout.trimEnd().lastIndexOf(SystemEOL) : stdout.length;
+  return (s > 0 ? stdout.slice(s + WMIC_INPUT.length, e) : stdout.slice(0, e)).trimStart();
 };
 var pickTree = (list, pid, recursive = false) => {
   const children = list.filter((p) => p.ppid === pid + "");
@@ -168,7 +171,8 @@ var parseGrid = (output) => output ? formatOutput(parse(output, { format: IS_WIN
 var formatOutput = (data) => data.reduce((m, d) => {
   const pid = d.PID?.[0] || d.ProcessId?.[0];
   const ppid = d.PPID?.[0] || d.ParentProcessId?.[0];
-  const cmd = d.CMD || d.CommandLine || d.COMMAND || [];
+  const _cmd = d.CMD || d.CommandLine || d.COMMAND || [];
+  const cmd = _cmd.length === 1 ? _cmd[0].split(/\s+/) : _cmd;
   if (pid && cmd.length > 0) {
     const c = cmd.findIndex((_v, i) => isBin(cmd.slice(0, i).join(" ")));
     const command = cmd.slice(0, c).join(" ");