Merge 4e667c9adb into 4228dd0a29

server/monitor-types/real-browser-monitor-type.js

@@ -228,6 +228,20 @@ async function testRemoteBrowser(remoteBrowserURL) {
         throw new Error(e.message);
     }
 }
+
+/**
+ * Cleanup function to terminate all browser processes and clear cache after each monitoring check.
+ * @param {import ("playwright-core").Page} page The page to close
+ * @returns {Promise<void>}
+ */
+async function cleanupBrowser(page) {
+    if (page) {
+        await page.context().clearCookies();
+        await page.context().clearPermissions();
+        await page.close();
+    }
+}
+
 class RealBrowserMonitorType extends MonitorType {
 
     name = "real-browser";
@@ -251,7 +265,7 @@ class RealBrowserMonitorType extends MonitorType {
             path: path.join(Database.screenshotDir, filename),
         });
 
-        await context.close();
+        await cleanupBrowser(page); // Ensure cleanup is called after each monitoring check
 
         if (res.status() >= 200 && res.status() < 400) {
             heartbeat.status = UP;

src/pages/EditMonitor.vue

@@ -1443,11 +1443,14 @@ message HealthCheckResponse {
                 }
             }
 
-            if (this.monitor.type === "snmp") {
+            // Set a default timeout if the monitor type has changed or if it's a new monitor
+            if (oldType || this.isAdd) {
+                if (this.monitor.type === "snmp") {
                 // snmp is not expected to be executed via the internet => we can choose a lower default timeout
-                this.monitor.timeout = 5;
+                    this.monitor.timeout = 5;
-            } else {
+                } else {
-                this.monitor.timeout = 48;
+                    this.monitor.timeout = 48;
+                }
             }
 
             // Set default SNMP version