fix: parse ps cpu time formats

steipete · steipete · commit 031117135027 · 2026-05-28T13:10:28.000-04:00
diff --git a/extensions/qa-lab/src/process-tree-cpu.test.ts b/extensions/qa-lab/src/process-tree-cpu.test.ts
@@ -10,13 +10,19 @@ import {
 describe("process tree CPU helpers", () => {
   it("parses ps CPU time strings", () => {
     expect(parsePsCpuTimeMs("00:01")).toBe(1_000);
+    expect(parsePsCpuTimeMs("00:00.12")).toBe(120);
     expect(parsePsCpuTimeMs("01:02")).toBe(62_000);
-    expect(parsePsCpuTimeMs("01:02:03")).toBe(3_723_000);
+    expect(parsePsCpuTimeMs("01:02:03.45")).toBe(3_723_450);
+    expect(parsePsCpuTimeMs("1-02:03:04.5")).toBe(93_784_500);
   });
 
   it("rejects malformed ps CPU time strings", () => {
     expect(parsePsCpuTimeMs("")).toBeNull();
     expect(parsePsCpuTimeMs("nope")).toBeNull();
+    expect(parsePsCpuTimeMs("1::02")).toBeNull();
+    expect(parsePsCpuTimeMs("1-02:03")).toBeNull();
+    expect(parsePsCpuTimeMs("01:60")).toBeNull();
+    expect(parsePsCpuTimeMs("01:02:60")).toBeNull();
     expect(parsePsCpuTimeMs("1:2:3:4")).toBeNull();
   });
 
diff --git a/extensions/qa-lab/src/process-tree-cpu.ts b/extensions/qa-lab/src/process-tree-cpu.ts
@@ -41,17 +41,35 @@ function parseNonNegativeNumber(value: unknown): number | null {
 }
 
 export function parsePsCpuTimeMs(raw: string): number | null {
-  const parts = raw.trim().split(":").map(Number);
-  if (parts.some((part) => !Number.isFinite(part) || part < 0)) {
+  const match = raw.trim().match(/^(?:(\d+)-)?(\d+):(\d{2}(?:\.\d+)?)(?::(\d{2}(?:\.\d+)?))?$/u);
+  if (!match) {
     return null;
   }
-  if (parts.length === 2) {
-    return Math.round((parts[0] * 60 + parts[1]) * 1000);
+  const [, daysRaw, firstRaw, secondRaw, thirdRaw] = match;
+  if (daysRaw !== undefined && thirdRaw === undefined) {
+    return null;
+  }
+  const days = daysRaw === undefined ? 0 : Number(daysRaw);
+  const first = Number(firstRaw);
+  const second = Number(secondRaw);
+  const third = thirdRaw === undefined ? 0 : Number(thirdRaw);
+  const values = [days, first, second, third];
+  if (values.some((part) => !Number.isFinite(part) || part < 0)) {
+    return null;
+  }
+  if (thirdRaw !== undefined && !Number.isInteger(second)) {
+    return null;
+  }
+  if (second >= 60 || (thirdRaw !== undefined && third >= 60)) {
+    return null;
+  }
+  if (daysRaw !== undefined && thirdRaw !== undefined) {
+    return Math.round((days * 24 * 60 * 60 + first * 60 * 60 + second * 60 + third) * 1000);
   }
-  if (parts.length === 3) {
-    return Math.round((parts[0] * 60 * 60 + parts[1] * 60 + parts[2]) * 1000);
+  if (thirdRaw !== undefined) {
+    return Math.round((first * 60 * 60 + second * 60 + third) * 1000);
   }
-  return null;
+  return Math.round((first * 60 + second) * 1000);
 }
 
 export function parsePsRssBytes(raw: string): number | null {
