@webpod/ps 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webpod/ps",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A process lookup utility",
   "publishConfig": {
     "access": "public"
@@ -26,7 +26,7 @@
     "test": "concurrently 'npm:test:lint' 'npm:test:unit' 'npm:test:size' && npm run test:legacy",
     "test:lint": "oxlint -c oxlintrc.json src/main/ts src/test/ts",
     "test:unit": "c8 -r lcov -r text -o target/coverage -x src/scripts -x src/test -x target node --loader ts-node/esm --experimental-specifier-resolution=node src/scripts/test.mjs",
-    "test:legacy": "node ./node_modules/mocha/bin/mocha -t 0 -R spec src/test/legacy/test.cjs",
+    "test:legacy": "mocha -t 0 -R spec src/test/legacy/test.cjs",
     "test:size": "size-limit",
     "publish:draft": "npm run build && npm publish --no-git-tag-version"
   },
@@ -65,16 +65,19 @@
     "esbuild-plugin-entry-chunks": "^0.1.18",
     "fast-glob": "^3.3.3",
     "minimist": "^1.2.8",
-    "mocha": "^11.7.5",
-    "oxlint": "^1.58.0",
+    "mocha": "^12.0.0-beta-9.2",
+    "oxlint": "^1.59.0",
     "size-limit": "^12.0.1",
     "ts-node": "^10.9.2",
     "typedoc": "^0.28.18",
-    "typescript": "^5.9.2"
+    "typescript": "^6.0.2"
   },
   "repository": {
     "type": "git",
     "url": "git://github.com/webpod/ps.git"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "overrides": {
+    "chokidar": "^4.0.3"
+  }
 }

package/target/cjs/index.cjs

@@ -65,8 +65,11 @@ var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_os = __toESM(require("node:os"), 1);
 var import_ingrid = require("@webpod/ingrid");
 var import_spawn = require("zurk/spawn");
+var noop = () => {
+};
 var IS_WIN = import_node_process.default.platform === "win32";
 var IS_WIN2025_PLUS = IS_WIN && Number.parseInt(import_node_os.default.release().split(".")[2], 10) >= 26e3;
+var LOOKUP_FLOW = IS_WIN ? IS_WIN2025_PLUS ? "pwsh" : "wmic" : "ps";
 var LOOKUPS = {
   wmic: {
     cmd: "wmic process get ProcessId,ParentProcessId,CommandLine",
@@ -95,117 +98,137 @@ var LOOKUPS = {
     }
   }
 };
-var lookupFlow = IS_WIN ? IS_WIN2025_PLUS ? "pwsh" : "wmic" : "ps";
-var lookup = (query = {}, cb = noop) => _lookup({ query, cb, sync: false });
-var lookupSync = (query = {}, cb = noop) => _lookup({ query, cb, sync: true });
+var lookup = (query = {}, cb = noop) => runLookup(query, cb, false);
+var lookupSync = (query = {}, cb = noop) => runLookup(query, cb, true);
 lookup.sync = lookupSync;
-var _lookup = ({ query = {}, cb = noop, sync = false }) => {
-  const { promise, resolve, reject } = sync ? makeSyncDeferred([]) : makeDeferred();
-  const result = [];
-  const { parse: parseOutput, cmd, args: defaultArgs } = LOOKUPS[lookupFlow];
+function runLookup(query, cb, sync) {
+  const { parse: parseOutput, cmd, args: defaultArgs } = LOOKUPS[LOOKUP_FLOW];
   const args = !IS_WIN && query.psargs ? query.psargs.split(/\s+/) : defaultArgs;
-  const callback = (err, { stdout }) => {
+  let result = [];
+  let error;
+  const handle = (err, { stdout }) => {
     if (err) {
-      reject(err);
-      cb(err);
+      error = err;
       return;
     }
-    result.push(...filterProcessList(normalizeOutput(parseOutput(stdout)), query));
-    resolve(result);
-    cb(null, result);
+    result = filterProcessList(normalizeOutput(parseOutput(stdout)), query);
   };
-  (0, import_spawn.exec)({ cmd, args, callback, sync, run(cb2) {
-    cb2();
-  } });
-  return Object.assign(promise, result);
-};
-var tree = (opts, cb) => __async(null, null, function* () {
-  return _tree({ opts, cb });
-});
-var treeSync = (opts, cb) => _tree({ opts, cb, sync: true });
-tree.sync = treeSync;
-var _tree = ({ cb = noop, opts, sync = false }) => {
-  if (typeof opts === "string" || typeof opts === "number") {
-    return _tree({ opts: { pid: opts }, cb, sync });
+  if (sync) {
+    (0, import_spawn.exec)({ cmd, args, sync: true, callback: handle, run(c) {
+      c();
+    } });
+    cb(error != null ? error : null, error ? void 0 : result);
+    if (error) throw error;
+    return result;
   }
-  const onData = (all) => {
-    var _a;
-    if (opts === void 0) return all;
-    const list = pickTree(all, opts.pid, (_a = opts.recursive) != null ? _a : false);
+  return new Promise((resolve, reject) => {
+    (0, import_spawn.exec)({
+      cmd,
+      args,
+      sync: false,
+      run(c) {
+        c();
+      },
+      callback(err, ctx) {
+        handle(err, ctx);
+        if (error) {
+          cb(error);
+          reject(error);
+        } else {
+          cb(null, result);
+          resolve(result);
+        }
+      }
+    });
+  });
+}
+var tree = (_0, ..._1) => __async(null, [_0, ..._1], function* (opts, cb = noop) {
+  try {
+    const list = pickFromTree(yield lookup(), opts);
     cb(null, list);
     return list;
-  };
-  const onError = (err) => {
+  } catch (err) {
     cb(err);
     throw err;
-  };
+  }
+});
+var treeSync = (opts, cb = noop) => {
   try {
-    const all = _lookup({ sync });
-    return sync ? onData(all) : all.then(onData, onError);
+    const list = pickFromTree(lookupSync(), opts);
+    cb(null, list);
+    return list;
   } catch (err) {
     cb(err);
-    return Promise.reject(err);
+    throw err;
   }
 };
-var inflight = null;
-var queued = null;
-var sharedSnapshot = (since) => {
-  var _a;
-  if (inflight && inflight.startedAt >= since) return inflight.promise;
-  if (queued) return queued;
-  const after = (_a = inflight == null ? void 0 : inflight.promise.catch(noop)) != null ? _a : Promise.resolve();
-  return queued = after.then(() => {
-    queued = null;
-    const startedAt = Date.now();
-    const promise = lookup().then((list) => ({ startedAt, list }));
-    inflight = { startedAt, promise };
-    return promise.finally(() => {
-      inflight = (inflight == null ? void 0 : inflight.promise) === promise ? null : inflight;
-    });
-  });
+tree.sync = treeSync;
+var pickFromTree = (all, opts) => {
+  if (opts === void 0) return all;
+  const { pid, recursive = false } = typeof opts === "object" ? opts : { pid: opts };
+  return pickTree(all, pid, recursive);
 };
 var pickTree = (list, pid, recursive = false) => {
   const children = list.filter((p) => p.ppid === String(pid));
-  return [
-    ...children,
-    ...children.flatMap((p) => recursive ? pickTree(list, p.pid, true) : [])
-  ];
+  return recursive ? children.flatMap((p) => [p, ...pickTree(list, p.pid, true)]) : children;
 };
 var kill = (pid, opts, next) => {
   if (typeof opts === "function") return kill(pid, void 0, opts);
   if (typeof opts === "string" || typeof opts === "number") return kill(pid, { signal: opts }, next);
-  const { promise, resolve, reject } = makeDeferred();
   const { timeout = 30, signal = "SIGTERM", interval = 200 } = opts || {};
   const sPid = String(pid);
-  let done = false;
-  const state = {};
-  const settle = (err) => {
-    if (done) return;
-    done = true;
-    clearTimeout(state.timer);
-    if (err) reject(err);
-    else resolve(pid);
-    next == null ? void 0 : next(err != null ? err : null, pid);
-  };
-  try {
-    import_node_process.default.kill(+pid, signal);
-  } catch (e) {
-    settle(e);
-    return promise;
-  }
-  let since = Date.now();
-  state.timer = setTimeout(() => settle(new Error("Kill process timeout")), timeout * 1e3);
-  const poll = () => sharedSnapshot(since).then(({ startedAt, list }) => {
-    if (done) return;
-    since = startedAt + 1;
-    if (list.some((p) => p.pid === sPid)) {
-      setTimeout(poll, Math.max(0, startedAt + interval - Date.now()));
-    } else {
-      settle();
+  return new Promise((resolve, reject) => {
+    let done = false;
+    const entry = { pid: sPid, registered: 0, interval, settle: noop };
+    const settle = (err) => {
+      if (done) return;
+      done = true;
+      clearTimeout(timer);
+      killPending.delete(entry);
+      if (err) reject(err);
+      else resolve(pid);
+      next == null ? void 0 : next(err != null ? err : null, pid);
+    };
+    entry.settle = settle;
+    const timer = setTimeout(() => settle(new Error("Kill process timeout")), timeout * 1e3);
+    try {
+      import_node_process.default.kill(+pid, signal);
+    } catch (e) {
+      settle(e);
+      return;
+    }
+    entry.registered = Date.now();
+    killPending.add(entry);
+    scheduleKillTick();
+  });
+};
+var killPending = /* @__PURE__ */ new Set();
+var killTickTimer = null;
+var killTickRunning = false;
+var scheduleKillTick = (lastStart = 0) => {
+  if (killTickTimer || killTickRunning || killPending.size === 0) return;
+  let minInterval = Infinity;
+  for (const k of killPending) if (k.interval < minInterval) minInterval = k.interval;
+  const delay = lastStart === 0 ? 0 : Math.max(0, lastStart + minInterval - Date.now());
+  killTickTimer = setTimeout(runKillTick, delay);
+};
+var runKillTick = () => {
+  killTickTimer = null;
+  if (killPending.size === 0) return;
+  killTickRunning = true;
+  const startedAt = Date.now();
+  lookup().then((list) => {
+    const alive = new Set(list.map((p) => p.pid));
+    for (const k of killPending) {
+      if (k.registered >= startedAt) continue;
+      if (!alive.has(k.pid)) k.settle();
     }
-  }, settle);
-  poll();
-  return promise;
+    killTickRunning = false;
+    scheduleKillTick(startedAt);
+  }, (err) => {
+    for (const k of killPending) k.settle(err);
+    killTickRunning = false;
+  });
 };
 var normalizeOutput = (data) => data.flatMap((d) => {
   var _a, _b;
@@ -246,25 +269,6 @@ var isBin = (f) => {
     return false;
   }
 };
-var makeDeferred = () => {
-  let resolve;
-  let reject;
-  const promise = new Promise((res, rej) => {
-    resolve = res;
-    reject = rej;
-  });
-  return { resolve, reject, promise };
-};
-var makeSyncDeferred = (result) => ({
-  promise: result,
-  resolve: () => {
-  },
-  reject(e) {
-    throw e;
-  }
-});
-var noop = () => {
-};
 
 // src/main/ts/index.ts
 var index_default = { kill, lookup, lookupSync, tree, treeSync };

package/target/esm/index.mjs

@@ -4,8 +4,11 @@ import fs from "node:fs";
 import os from "node:os";
 import { parse } from "@webpod/ingrid";
 import { exec } from "zurk/spawn";
+var noop = () => {
+};
 var IS_WIN = process.platform === "win32";
 var IS_WIN2025_PLUS = IS_WIN && Number.parseInt(os.release().split(".")[2], 10) >= 26e3;
+var LOOKUP_FLOW = IS_WIN ? IS_WIN2025_PLUS ? "pwsh" : "wmic" : "ps";
 var LOOKUPS = {
   wmic: {
     cmd: "wmic process get ProcessId,ParentProcessId,CommandLine",
@@ -34,113 +37,137 @@ var LOOKUPS = {
     }
   }
 };
-var lookupFlow = IS_WIN ? IS_WIN2025_PLUS ? "pwsh" : "wmic" : "ps";
-var lookup = (query = {}, cb = noop) => _lookup({ query, cb, sync: false });
-var lookupSync = (query = {}, cb = noop) => _lookup({ query, cb, sync: true });
+var lookup = (query = {}, cb = noop) => runLookup(query, cb, false);
+var lookupSync = (query = {}, cb = noop) => runLookup(query, cb, true);
 lookup.sync = lookupSync;
-var _lookup = ({ query = {}, cb = noop, sync = false }) => {
-  const { promise, resolve, reject } = sync ? makeSyncDeferred([]) : makeDeferred();
-  const result = [];
-  const { parse: parseOutput, cmd, args: defaultArgs } = LOOKUPS[lookupFlow];
+function runLookup(query, cb, sync) {
+  const { parse: parseOutput, cmd, args: defaultArgs } = LOOKUPS[LOOKUP_FLOW];
   const args = !IS_WIN && query.psargs ? query.psargs.split(/\s+/) : defaultArgs;
-  const callback = (err, { stdout }) => {
+  let result = [];
+  let error;
+  const handle = (err, { stdout }) => {
     if (err) {
-      reject(err);
-      cb(err);
+      error = err;
       return;
     }
-    result.push(...filterProcessList(normalizeOutput(parseOutput(stdout)), query));
-    resolve(result);
-    cb(null, result);
+    result = filterProcessList(normalizeOutput(parseOutput(stdout)), query);
   };
-  exec({ cmd, args, callback, sync, run(cb2) {
-    cb2();
-  } });
-  return Object.assign(promise, result);
-};
-var tree = async (opts, cb) => _tree({ opts, cb });
-var treeSync = (opts, cb) => _tree({ opts, cb, sync: true });
-tree.sync = treeSync;
-var _tree = ({ cb = noop, opts, sync = false }) => {
-  if (typeof opts === "string" || typeof opts === "number") {
-    return _tree({ opts: { pid: opts }, cb, sync });
+  if (sync) {
+    exec({ cmd, args, sync: true, callback: handle, run(c) {
+      c();
+    } });
+    cb(error ?? null, error ? void 0 : result);
+    if (error) throw error;
+    return result;
   }
-  const onData = (all) => {
-    if (opts === void 0) return all;
-    const list = pickTree(all, opts.pid, opts.recursive ?? false);
+  return new Promise((resolve, reject) => {
+    exec({
+      cmd,
+      args,
+      sync: false,
+      run(c) {
+        c();
+      },
+      callback(err, ctx) {
+        handle(err, ctx);
+        if (error) {
+          cb(error);
+          reject(error);
+        } else {
+          cb(null, result);
+          resolve(result);
+        }
+      }
+    });
+  });
+}
+var tree = async (opts, cb = noop) => {
+  try {
+    const list = pickFromTree(await lookup(), opts);
     cb(null, list);
     return list;
-  };
-  const onError = (err) => {
+  } catch (err) {
     cb(err);
     throw err;
-  };
+  }
+};
+var treeSync = (opts, cb = noop) => {
   try {
-    const all = _lookup({ sync });
-    return sync ? onData(all) : all.then(onData, onError);
+    const list = pickFromTree(lookupSync(), opts);
+    cb(null, list);
+    return list;
   } catch (err) {
     cb(err);
-    return Promise.reject(err);
+    throw err;
   }
 };
-var inflight = null;
-var queued = null;
-var sharedSnapshot = (since) => {
-  if (inflight && inflight.startedAt >= since) return inflight.promise;
-  if (queued) return queued;
-  const after = inflight?.promise.catch(noop) ?? Promise.resolve();
-  return queued = after.then(() => {
-    queued = null;
-    const startedAt = Date.now();
-    const promise = lookup().then((list) => ({ startedAt, list }));
-    inflight = { startedAt, promise };
-    return promise.finally(() => {
-      inflight = inflight?.promise === promise ? null : inflight;
-    });
-  });
+tree.sync = treeSync;
+var pickFromTree = (all, opts) => {
+  if (opts === void 0) return all;
+  const { pid, recursive = false } = typeof opts === "object" ? opts : { pid: opts };
+  return pickTree(all, pid, recursive);
 };
 var pickTree = (list, pid, recursive = false) => {
   const children = list.filter((p) => p.ppid === String(pid));
-  return [
-    ...children,
-    ...children.flatMap((p) => recursive ? pickTree(list, p.pid, true) : [])
-  ];
+  return recursive ? children.flatMap((p) => [p, ...pickTree(list, p.pid, true)]) : children;
 };
 var kill = (pid, opts, next) => {
   if (typeof opts === "function") return kill(pid, void 0, opts);
   if (typeof opts === "string" || typeof opts === "number") return kill(pid, { signal: opts }, next);
-  const { promise, resolve, reject } = makeDeferred();
   const { timeout = 30, signal = "SIGTERM", interval = 200 } = opts || {};
   const sPid = String(pid);
-  let done = false;
-  const state = {};
-  const settle = (err) => {
-    if (done) return;
-    done = true;
-    clearTimeout(state.timer);
-    if (err) reject(err);
-    else resolve(pid);
-    next?.(err ?? null, pid);
-  };
-  try {
-    process.kill(+pid, signal);
-  } catch (e) {
-    settle(e);
-    return promise;
-  }
-  let since = Date.now();
-  state.timer = setTimeout(() => settle(new Error("Kill process timeout")), timeout * 1e3);
-  const poll = () => sharedSnapshot(since).then(({ startedAt, list }) => {
-    if (done) return;
-    since = startedAt + 1;
-    if (list.some((p) => p.pid === sPid)) {
-      setTimeout(poll, Math.max(0, startedAt + interval - Date.now()));
-    } else {
-      settle();
+  return new Promise((resolve, reject) => {
+    let done = false;
+    const entry = { pid: sPid, registered: 0, interval, settle: noop };
+    const settle = (err) => {
+      if (done) return;
+      done = true;
+      clearTimeout(timer);
+      killPending.delete(entry);
+      if (err) reject(err);
+      else resolve(pid);
+      next?.(err ?? null, pid);
+    };
+    entry.settle = settle;
+    const timer = setTimeout(() => settle(new Error("Kill process timeout")), timeout * 1e3);
+    try {
+      process.kill(+pid, signal);
+    } catch (e) {
+      settle(e);
+      return;
     }
-  }, settle);
-  poll();
-  return promise;
+    entry.registered = Date.now();
+    killPending.add(entry);
+    scheduleKillTick();
+  });
+};
+var killPending = /* @__PURE__ */ new Set();
+var killTickTimer = null;
+var killTickRunning = false;
+var scheduleKillTick = (lastStart = 0) => {
+  if (killTickTimer || killTickRunning || killPending.size === 0) return;
+  let minInterval = Infinity;
+  for (const k of killPending) if (k.interval < minInterval) minInterval = k.interval;
+  const delay = lastStart === 0 ? 0 : Math.max(0, lastStart + minInterval - Date.now());
+  killTickTimer = setTimeout(runKillTick, delay);
+};
+var runKillTick = () => {
+  killTickTimer = null;
+  if (killPending.size === 0) return;
+  killTickRunning = true;
+  const startedAt = Date.now();
+  lookup().then((list) => {
+    const alive = new Set(list.map((p) => p.pid));
+    for (const k of killPending) {
+      if (k.registered >= startedAt) continue;
+      if (!alive.has(k.pid)) k.settle();
+    }
+    killTickRunning = false;
+    scheduleKillTick(startedAt);
+  }, (err) => {
+    for (const k of killPending) k.settle(err);
+    killTickRunning = false;
+  });
 };
 var normalizeOutput = (data) => data.flatMap((d) => {
   const pid = (d.PID || d.ProcessId)?.[0];
@@ -180,25 +207,6 @@ var isBin = (f) => {
     return false;
   }
 };
-var makeDeferred = () => {
-  let resolve;
-  let reject;
-  const promise = new Promise((res, rej) => {
-    resolve = res;
-    reject = rej;
-  });
-  return { resolve, reject, promise };
-};
-var makeSyncDeferred = (result) => ({
-  promise: result,
-  resolve: () => {
-  },
-  reject(e) {
-    throw e;
-  }
-});
-var noop = () => {
-};
 
 // src/main/ts/index.ts
 var index_default = { kill, lookup, lookupSync, tree, treeSync };