From eda4fc74489c67fc3dc5dfbbdba1fb315f1ca50c Mon Sep 17 00:00:00 2001 From: Marshall Quander <marshall@quander.me> Date: Wed, 25 Jul 2018 16:56:06 -0700 Subject: [PATCH] Update puppeteer for bots, bypass CSP for bots --- scripts/bot/package.json | 2 +- scripts/bot/run-bot.js | 1 + scripts/bot/yarn.lock | 31 ++++++++++++++++++------------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/scripts/bot/package.json b/scripts/bot/package.json index d9072e158..180d1dcf0 100644 --- a/scripts/bot/package.json +++ b/scripts/bot/package.json @@ -4,7 +4,7 @@ "license": "MPL-2.0", "devDependencies": { "docopt": "^0.6.2", - "puppeteer": "1.1.0", + "puppeteer": "1.3.0", "query-string": "^5.0.1" } } diff --git a/scripts/bot/run-bot.js b/scripts/bot/run-bot.js index 2af6b8462..fbcef11f4 100755 --- a/scripts/bot/run-bot.js +++ b/scripts/bot/run-bot.js @@ -28,6 +28,7 @@ function error(...objs) { (async () => { const browser = await puppeteer.launch({ ignoreHTTPSErrors: true }); const page = await browser.newPage(); + await page.setBypassCSP(true); page.on("console", msg => log("PAGE: ", msg.text())); page.on("error", err => error("ERROR: ", err.toString().split("\n")[0])); page.on("pageerror", err => error("PAGE ERROR: ", err.toString().split("\n")[0])); diff --git a/scripts/bot/yarn.lock b/scripts/bot/yarn.lock index 2a00417d6..8bca021da 100644 --- a/scripts/bot/yarn.lock +++ b/scripts/bot/yarn.lock @@ -23,14 +23,19 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +buffer-from@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04" + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" +concat-stream@1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" dependencies: + buffer-from "^1.0.0" inherits "^2.0.3" readable-stream "^2.2.2" typedarray "^0.0.6" @@ -70,12 +75,12 @@ es6-promisify@^5.0.0: es6-promise "^4.0.3" extract-zip@^1.6.5: - version "1.6.6" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c" + version "1.6.7" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" dependencies: - concat-stream "1.6.0" + concat-stream "1.6.2" debug "2.6.9" - mkdirp "0.5.0" + mkdirp "0.5.1" yauzl "2.4.1" fd-slicer@~1.0.1: @@ -135,9 +140,9 @@ minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -mkdirp@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" +mkdirp@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: minimist "0.0.8" @@ -175,9 +180,9 @@ proxy-from-env@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" -puppeteer@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.1.0.tgz#97fbc2fbbf9ab659e7e202a68ac1ba54b8bc0a25" +puppeteer@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.3.0.tgz#f571c5f27153ca164a8188e6328ce2e4946878f3" dependencies: debug "^2.6.8" extract-zip "^1.6.5" -- GitLab