[DDW-826] Removed risky Promise.race

Author: danielmain

source/main/config.js

@@ -164,8 +164,6 @@ export const DISK_SPACE_CHECK_MEDIUM_INTERVAL = 60 * 1000; // 1 minute | unit: m
 export const DISK_SPACE_CHECK_SHORT_INTERVAL = isTest ? 2000 : 10 * 1000; // 10 seconds | unit: milliseconds
 export const DISK_SPACE_RECOMMENDED_PERCENTAGE = 15; // 15% of the total disk space
 
-export const DISK_SPACE_CHECK_TIMEOUT = 5000; // Timeout for checking disks pace
-
 export const BLOCK_REPLAY_PROGRESS_CHECK_INTERVAL = 1 * 1000; // 1 seconds | unit: milliseconds
 
 // Used if token metadata server URL is not defined in launcher config

source/main/utils/handleDiskSpace.js

@@ -8,7 +8,6 @@ import {
   DISK_SPACE_CHECK_LONG_INTERVAL,
   DISK_SPACE_CHECK_MEDIUM_INTERVAL,
   DISK_SPACE_CHECK_SHORT_INTERVAL,
-  DISK_SPACE_CHECK_TIMEOUT,
   DISK_SPACE_RECOMMENDED_PERCENTAGE,
   DISK_SPACE_REQUIRED,
   DISK_SPACE_REQUIRED_MARGIN_PERCENTAGE,
@@ -19,8 +18,7 @@ import { CardanoNode } from '../cardano/CardanoNode';
 import type { CheckDiskSpaceResponse } from '../../common/types/no-disk-space.types';
 
 const getDiskCheckReport = async (
-  path: string,
-  timeout: number = DISK_SPACE_CHECK_TIMEOUT
+  path: string
 ): Promise<CheckDiskSpaceResponse> => {
   const initialReport: CheckDiskSpaceResponse = {
     isNotEnoughDiskSpace: false,
@@ -34,36 +32,22 @@ const getDiskCheckReport = async (
     isError: false,
   };
 
-  return Promise.race([
-    new Promise((resolve, reject) => {
-      checkDiskSpace(path)
-        .then(({ free, size }) => {
-          logger.info('[DISK-SPACE-DEBUG] Disk space check completed', {
-            free,
-            size,
-          });
-          resolve({
-            ...initialReport,
-            diskSpaceAvailableRaw: free,
-            diskSpaceAvailable: prettysize(free),
-            diskTotalSpace: size,
-          });
-        })
-        .catch((error) => {
-          logger.error(
-            '[DISK-SPACE-DEBUG] Error getting diskCheckReport',
-            error
-          );
-          reject();
-        });
-    }),
-    // Timeout promise
-    new Promise((resolve) => {
-      setTimeout(() => {
-        resolve({ ...initialReport, isError: true });
-      }, timeout);
-    }),
-  ]);
+  try {
+    const { free, size } = await checkDiskSpace(path);
+    logger.info('[DISK-SPACE-DEBUG] Disk space check completed', {
+      free,
+      size,
+    });
+    return {
+      ...initialReport,
+      diskSpaceAvailableRaw: free,
+      diskSpaceAvailable: prettysize(free),
+      diskTotalSpace: size,
+    };
+  } catch (error) {
+    logger.error('[DISK-SPACE-DEBUG] Error getting diskCheckReport', error);
+    return { ...initialReport, isError: true };
+  }
 };
 
 export const handleDiskSpace = (
@@ -82,7 +66,7 @@ export const handleDiskSpace = (
 
     const response = await getDiskCheckReport(stateDirectoryPath);
 
-    if (!response || response.isError) {
+    if (response.isError) {
       logger.info(
         '[DISK-SPACE-DEBUG] We could not check disk space, but we will try to start cardano-node anyway'
       );