refactor sub-functions

Author: Hweinstock

packages/core/src/shared/utilities/processUtils.ts

@@ -104,7 +104,7 @@ export class ChildProcessTracker {
             ChildProcessTracker.logger.warn(`Missing process with id ${pid}`)
             return
         }
-        const stats = await this.getUsage(pid)
+        const stats = this.getUsage(pid)
         if (stats) {
             ChildProcessTracker.logger.debug(`Process ${pid} usage: %O`, stats)
             if (stats.memory > ChildProcessTracker.thresholds.memory) {
@@ -143,8 +143,16 @@ export class ChildProcessTracker {
         this.#processByPid.clear()
     }
 
-    public async getUsage(pid: number): Promise<ProcessStats> {
-        const getWindowsUsage = () => {
+    public getUsage(pid: number): ProcessStats {
+        try {
+            // isWin() leads to circular dependency.
+            return process.platform === 'win32' ? getWindowsUsage() : getUnixUsage()
+        } catch (e) {
+            ChildProcessTracker.logger.warn(`Failed to get process stats for ${pid}: ${e}`)
+            return { cpu: 0, memory: 0 }
+        }
+
+        function getWindowsUsage() {
             const cpuOutput = proc
                 .execFileSync('wmic', [
                     'path',
@@ -167,7 +175,8 @@ export class ChildProcessTracker {
                 memory: memoryBytes,
             }
         }
-        const getUnixUsage = () => {
+
+        function getUnixUsage() {
             const cpuMemOutput = proc.execFileSync('ps', ['-p', pid.toString(), '-o', '%cpu,%mem']).toString()
             const rssOutput = proc.execFileSync('ps', ['-p', pid.toString(), '-o', 'rss']).toString()
 
@@ -180,13 +189,6 @@ export class ChildProcessTracker {
                 memory: memoryBytes,
             }
         }
-        try {
-            // isWin() leads to circular dependency.
-            return process.platform === 'win32' ? getWindowsUsage() : getUnixUsage()
-        } catch (e) {
-            ChildProcessTracker.logger.warn(`Failed to get process stats for ${pid}: ${e}`)
-            return { cpu: 0, memory: 0 }
-        }
     }
 }
 

packages/core/src/test/shared/utilities/processUtils.test.ts

@@ -458,12 +458,12 @@ describe('ChildProcessTracker', function () {
             memory: ChildProcessTracker.thresholds.memory + 1,
         }
 
-        usageMock.resolves(highCpu)
+        usageMock.returns(highCpu)
 
         await clock.tickAsync(ChildProcessTracker.pollingInterval)
         assertLogsContain('exceeded cpu threshold', false, 'warn')
 
-        usageMock.resolves(highMemory)
+        usageMock.returns(highMemory)
         await clock.tickAsync(ChildProcessTracker.pollingInterval)
         assertLogsContain('exceeded memory threshold', false, 'warn')
 
@@ -474,7 +474,7 @@ describe('ChildProcessTracker', function () {
         const runningProcess = startSleepProcess()
         tracker.add(runningProcess.childProcess)
 
-        usageMock.resolves({
+        usageMock.returns({
             cpu: ChildProcessTracker.thresholds.cpu + 1,
             memory: 0,
         })
@@ -488,7 +488,7 @@ describe('ChildProcessTracker', function () {
     it('does not log for processes within threshold', async function () {
         const runningProcess = startSleepProcess()
 
-        usageMock.resolves({
+        usageMock.returns({
             cpu: ChildProcessTracker.thresholds.cpu - 1,
             memory: ChildProcessTracker.thresholds.memory - 1,
         })