@webpod/ps 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webpod/ps",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A process lookup utility",
   "publishConfig": {
     "access": "public"
@@ -41,15 +41,15 @@
     "pid"
   ],
   "dependencies": {
-    "@webpod/ingrid": "^0.0.0-beta.3",
-    "zurk": "^0.10.2"
+    "@webpod/ingrid": "^1.0.0",
+    "zurk": "^0.11.3"
   },
   "devDependencies": {
-    "@types/node": "^22.12.0",
+    "@types/node": "^24.0.4",
     "c8": "^10.1.3",
-    "concurrently": "^9.1.2",
-    "esbuild": "^0.24.2",
-    "esbuild-node-externals": "^1.16.0",
+    "concurrently": "^9.2.0",
+    "esbuild": "^0.25.5",
+    "esbuild-node-externals": "^1.18.0",
     "esbuild-plugin-entry-chunks": "^0.1.15",
     "eslint": "^8.57.0",
     "eslint-config-qiwi": "^2.1.3",
@@ -58,8 +58,8 @@
     "mocha": "^10.8.2",
     "sinon": "^18.0.1",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.27.6",
-    "typescript": "^5.7.3"
+    "typedoc": "^0.28.6",
+    "typescript": "^5.8.3"
   },
   "repository": {
     "type": "git",

package/target/cjs/index.cjs

@@ -65,8 +65,8 @@ 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" + import_node_os.EOL;
 var isBin = (f) => {
   if (f === "") return false;
   if (!f.includes("/")) return true;
@@ -86,21 +86,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",
+    input: `wmic process get ProcessId,ParentProcessId,CommandLine${import_node_os.EOL}`,
     callback,
     sync,
     run(cb2) {
@@ -130,10 +130,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);
+  const e = stdout.lastIndexOf(import_node_os.EOL);
+  return (s > 0 ? stdout.slice(s + WMIC_INPUT.length, e) : stdout.slice(0, e)).trim();
 };
 var pickTree = (list, pid, recursive = false) => {
   const children = list.filter((p) => p.ppid === pid + "");
@@ -169,7 +169,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 });

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,8 +4,8 @@ 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" + SystemEOL;
 var isBin = (f) => {
   if (f === "") return false;
   if (!f.includes("/")) return true;
@@ -25,21 +25,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",
+    input: `wmic process get ProcessId,ParentProcessId,CommandLine${SystemEOL}`,
     callback,
     sync,
     run(cb2) {
@@ -69,10 +69,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);
+  const e = stdout.lastIndexOf(SystemEOL);
+  return (s > 0 ? stdout.slice(s + WMIC_INPUT.length, e) : stdout.slice(0, e)).trim();
 };
 var pickTree = (list, pid, recursive = false) => {
   const children = list.filter((p) => p.ppid === pid + "");