Add support for HEAD requests in WebsiteMonitor and update request ha…

…ndling
OneUptime · Nov 13, 2024 · eded26d · eded26d
1 parent 517d00d
commit eded26d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/Probe/Utils/Monitors/Monitor.ts b/Probe/Utils/Monitors/Monitor.ts
@@ -360,6 +360,7 @@ export default class MonitorUtil {
       const response: ProbeWebsiteResponse | null = await WebsiteMonitor.ping(
         monitorStep.data?.monitorDestination as URL,
         {
+          isHeadRequest: MonitorUtil.isHeadRequest(monitorStep),
           monitorId: monitorId,
           retry: 10,
           timeout: new PositiveNumber(60000), // 60 seconds

diff --git a/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts
@@ -29,6 +29,7 @@ export default class WebsiteMonitor {
     url: URL,
     options: {
       retry?: number | undefined;
+      isHeadRequest?: boolean | undefined;
       currentRetryCount?: number | undefined;
       monitorId?: ObjectID | undefined;
       isOnlineCheckRequest?: boolean | undefined;
@@ -44,7 +45,11 @@ export default class WebsiteMonitor {
       options.currentRetryCount = 1;
     }
 
-    const requestType: HTTPMethod = HTTPMethod.GET;
+    let requestType: HTTPMethod = HTTPMethod.GET;
+
+    if (options.isHeadRequest) {
+      requestType = HTTPMethod.HEAD;
+    }
 
     try {
       logger.debug(
@@ -53,13 +58,26 @@ export default class WebsiteMonitor {
         }`,
       );
 
-      const startTime: [number, number] = process.hrtime();
-      const result: WebsiteResponse = await WebsiteRequest.fetch(url, {
-        isHeadRequest: false,
+      let startTime: [number, number] = process.hrtime();
+      let result: WebsiteResponse = await WebsiteRequest.fetch(url, {
+        isHeadRequest: options.isHeadRequest,
         timeout: options.timeout?.toNumber() || 5000,
         doNotFollowRedirects: options.doNotFollowRedirects || false,
       });
 
+      if (
+        result.responseStatusCode >= 400 &&
+        result.responseStatusCode < 600 &&
+        requestType === HTTPMethod.HEAD
+      ) {
+        startTime = process.hrtime();
+        result = await WebsiteRequest.fetch(url, {
+          isHeadRequest: false,
+          timeout: options.timeout?.toNumber() || 5000,
+          doNotFollowRedirects: options.doNotFollowRedirects || false,
+        });
+      }
+
       const endTime: [number, number] = process.hrtime(startTime);
       const responseTimeInMS: PositiveNumber = new PositiveNumber(
         (endTime[0] * 1000000000 + endTime[1]) / 1000000,