Merge ffbd312f29 into 8a432ac937

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

@@ -240,10 +240,19 @@ class RealBrowserMonitorType extends MonitorType {
         const context = await browser.newContext();
         const page = await context.newPage();
 
-        const res = await page.goto(monitor.url, {
+        let res;
-            waitUntil: "networkidle",
+        const matches = monitor.name.match(/\[(.*?)\]/);
-            timeout: monitor.interval * 1000 * 0.8,
+        if (matches) {
-        });
+            res = await page.goto(monitor.url, {
+                timeout: monitor.interval * 1000 * 0.8,
+            });
+            await page.waitForSelector(matches[1], { timeout: monitor.interval * 1000 * 0.8 });
+        } else {
+            res = await page.goto(monitor.url, {
+                waitUntil: "networkidle",
+                timeout: monitor.interval * 1000 * 0.8,
+            });
+        }
 
         let filename = jwt.sign(monitor.id, server.jwtSecret) + ".png";
 

server/socket-handlers/status-page-socket-handler.js

@@ -220,13 +220,17 @@ module.exports.statusPageSocketHandler = (socket) => {
 
             // Delete groups that are not in the list
             log.debug("socket", "Delete groups that are not in the list");
-            const slots = groupIDList.map(() => "?").join(",");
+            if (groupIDList.length === 0) {
+                await R.exec("DELETE FROM `group` WHERE status_page_id = ?", [ statusPage.id ]);
+            } else {
+                const slots = groupIDList.map(() => "?").join(",");
 
-            const data = [
+                const data = [
-                ...groupIDList,
+                    ...groupIDList,
-                statusPage.id
+                    statusPage.id
-            ];
+                ];
-            await R.exec(`DELETE FROM \`group\` WHERE id NOT IN (${slots}) AND status_page_id = ?`, data);
+                await R.exec(`DELETE FROM \`group\` WHERE id NOT IN (${slots}) AND status_page_id = ?`, data);
+            }
 
             const server = UptimeKumaServer.getInstance();