chore(respect): changes after review

Author: DmitryAnansky

packages/respect-core/src/consts.ts

@@ -1,2 +1,2 @@
-export const RESPECT_TIMEOUT = 3600000; // 1 hour in milliseconds
-export const MAX_FETCH_TIMEOUT = 20000; // 20 seconds in milliseconds
+export const DEFAULT_RESPECT_TIMEOUT = 3600000; // 1 hour in milliseconds
+export const DEFAULT_MAX_FETCH_TIMEOUT = 20000; // 20 seconds in milliseconds

packages/respect-core/src/handlers/run.ts

@@ -12,8 +12,9 @@ import { DefaultLogger } from '../utils/logger/logger';
 import { exitWithError } from '../utils/exit-with-error';
 import { writeFileSync } from 'node:fs';
 import { indent } from '../utils/cli-outputs';
-import { Timer } from '../modules/timeout-timer';
-import { type JsonLogs, type CommandArgs, type RunArgv } from '../types';
+import { Timer } from '../modules/timeout-timer/timer';
+
+import type { JsonLogs, CommandArgs, RunArgv } from '../types';
 
 export type RespectOptions = {
   files: string[];

packages/respect-core/src/modules/__tests__/flow-runner/run-step.test.ts

@@ -3990,7 +3990,9 @@ describe('runStep', () => {
     const mockTimer = {
       isTimedOut: jest.fn().mockReturnValue(true),
     };
-    jest.spyOn(require('../../timeout-timer').Timer, 'getInstance').mockReturnValue(mockTimer);
+    jest
+      .spyOn(require('../../timeout-timer/timer').Timer, 'getInstance')
+      .mockReturnValue(mockTimer);
 
     const checks: Check[] = [];
     const step = {

packages/respect-core/src/modules/cli-output/display-errors.ts

@@ -48,14 +48,14 @@ export function displayErrors(workflows: WorkflowExecutionResult[]) {
 
       for (const failedCheckIndex in failedStepChecks) {
         const { name, message, severity } = failedStepChecks[failedCheckIndex];
-        const showErrorMessage = ![
+        const showRespectInnerErrorMessage = [
           CHECKS.UNEXPECTED_ERROR,
           CHECKS.GLOBAL_TIMEOUT_ERROR,
           CHECKS.MAX_STEPS_REACHED_ERROR,
         ].includes(name);
-        const messageToDisplay = showErrorMessage
-          ? indent(`${removeExtraIndentation(message)}${RESET_ESCAPE_CODE}\n`, 6)
-          : indent(`Reason: ${message}`, 4);
+        const messageToDisplay = showRespectInnerErrorMessage
+          ? indent(`Reason: ${message}`, 4)
+          : indent(`${removeExtraIndentation(message)}${RESET_ESCAPE_CODE}\n`, 6);
 
         logger.printNewLine();
 

packages/respect-core/src/modules/flow-runner/run-step.ts

@@ -18,7 +18,7 @@ import {
 } from '../config-parser';
 import { evaluateRuntimeExpressionPayload } from '../runtime-expressions';
 import { DefaultLogger } from '../../utils/logger/logger';
-import { Timer } from '../timeout-timer';
+import { Timer } from '../timeout-timer/timer';
 
 import type {
   Check,

packages/respect-core/src/modules/timeout-timer/index.ts

@@ -1,4 +1,4 @@
-import { RESPECT_TIMEOUT } from '../../consts';
+import { DEFAULT_RESPECT_TIMEOUT } from '../../consts';
 
 export class Timer {
   private static instance: Timer;
@@ -16,10 +16,9 @@ export class Timer {
   }
 
   public isTimedOut(): boolean {
-    const elapsedTime = Date.now() - this.startTime;
-    const timeout = parseInt(process.env.RESPECT_TIMEOUT || RESPECT_TIMEOUT.toString(), 10);
-    const remainingTime = Math.max(0, timeout - elapsedTime);
-
-    return remainingTime <= 0;
+    const timeout = isNaN(+(process.env.RESPECT_TIMEOUT as string))
+      ? DEFAULT_RESPECT_TIMEOUT
+      : +(process.env.RESPECT_TIMEOUT as string);
+    return Date.now() - this.startTime > timeout;
   }
 }

packages/respect-core/src/modules/timeout-timer/timer.ts

@@ -17,7 +17,7 @@ import { getResponseSchema } from '../modules/description-parser';
 import { collectSecretFields } from '../modules/flow-runner';
 import { createMtlsClient } from './mtls/create-mtls-client';
 import { DefaultLogger } from './logger/logger';
-import { MAX_FETCH_TIMEOUT } from '../consts';
+import { DEFAULT_MAX_FETCH_TIMEOUT } from '../consts';
 
 import type { RequestData } from '../modules/flow-runner';
 
@@ -239,7 +239,7 @@ export class ApiFetcher implements IFetcher {
         body: encodedBody,
       }),
       redirect: 'follow',
-      signal: AbortSignal.timeout(MAX_FETCH_TIMEOUT),
+      signal: AbortSignal.timeout(DEFAULT_MAX_FETCH_TIMEOUT),
       // Required for application/octet-stream content type requests
       ...(headers['content-type'] === 'application/octet-stream' && {
         duplex: 'half',