diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts index 2321a8096..93aac2b12 100644 --- a/scripts/generateReport.ts +++ b/scripts/generateReport.ts @@ -44,8 +44,6 @@ const browser = await pup.launch({ }); const page = await browser.newPage(); -await page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"); -await page.setBypassCSP(true); async function maybeGetError(handle: JSHandle): Promise { return await (handle as JSHandle)?.getProperty("message") @@ -184,6 +182,10 @@ async function printReport() { } } await Promise.all([ + page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"), + + page.setBypassCSP(true), + page.on("console", async e => { const level = e.type(); const rawArgs = e.args(); @@ -301,7 +303,16 @@ await Promise.all([ } else { report.ignoredErrors.push(e.message); } - }) + }), + + page.evaluateOnNewDocument(` + if (location.host.endsWith("discord.com")) { + ${readFileSync("./dist/browser/browser.js", "utf-8")}; + (${reporterRuntime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)}); + } + `), + + page.goto(CANARY ? "https://canary.discord.com/login" : "https://discord.com/login") ]); async function reporterRuntime(token: string) { @@ -313,12 +324,3 @@ async function reporterRuntime(token: string) { } ); } - -await page.evaluateOnNewDocument(` - if (location.host.endsWith("discord.com")) { - ${readFileSync("./dist/browser/browser.js", "utf-8")}; - (${reporterRuntime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)}); - } -`); - -await page.goto(CANARY ? "https://canary.discord.com/login" : "https://discord.com/login");