mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-11-23 23:04:04 +00:00
Fix: Make sure browser is connected before returning (#4417)
This commit is contained in:
parent
b4e45c7ce8
commit
288cab6dd7
1 changed files with 14 additions and 2 deletions
|
@ -9,6 +9,10 @@ const Database = require("../database");
|
||||||
const jwt = require("jsonwebtoken");
|
const jwt = require("jsonwebtoken");
|
||||||
const config = require("../config");
|
const config = require("../config");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cached instance of a browser
|
||||||
|
* @type {import ("playwright-core").Browser}
|
||||||
|
*/
|
||||||
let browser = null;
|
let browser = null;
|
||||||
|
|
||||||
let allowedList = [];
|
let allowedList = [];
|
||||||
|
@ -62,8 +66,15 @@ async function isAllowedChromeExecutable(executablePath) {
|
||||||
return allowedList.includes(executablePath);
|
return allowedList.includes(executablePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the current instance of the browser. If there isn't one, create
|
||||||
|
* it.
|
||||||
|
* @returns {Promise<import ("playwright-core").Browser>} The browser
|
||||||
|
*/
|
||||||
async function getBrowser() {
|
async function getBrowser() {
|
||||||
if (!browser) {
|
if (browser && browser.isConnected()) {
|
||||||
|
return browser;
|
||||||
|
} else {
|
||||||
let executablePath = await Settings.get("chromeExecutable");
|
let executablePath = await Settings.get("chromeExecutable");
|
||||||
|
|
||||||
executablePath = await prepareChromeExecutable(executablePath);
|
executablePath = await prepareChromeExecutable(executablePath);
|
||||||
|
@ -72,8 +83,9 @@ async function getBrowser() {
|
||||||
//headless: false,
|
//headless: false,
|
||||||
executablePath,
|
executablePath,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return browser;
|
||||||
}
|
}
|
||||||
return browser;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function prepareChromeExecutable(executablePath) {
|
async function prepareChromeExecutable(executablePath) {
|
||||||
|
|
Loading…
Reference in a new issue