Merge 4e667c9adb into d2f71d11d6

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;

server/notification-providers/serverchan.js

@@ -12,8 +12,9 @@ class ServerChan extends NotificationProvider {
         const okMsg = "Sent Successfully.";
 
         // serverchan3 requires sending via ft07.com
-        const url = String(notification.serverChanSendKey).startsWith("sctp")
-            ? `https://${notification.serverChanSendKey}.push.ft07.com/send`
+        const matchResult = String(notification.serverChanSendKey).match(/^sctp(\d+)t/i);
+        const url = matchResult && matchResult[1]
+            ? `https://${matchResult[1]}.push.ft07.com/send/${notification.serverChanSendKey}.send`
             : `https://sctapi.ftqq.com/${notification.serverChanSendKey}.send`;
 
         try {