brow3c/bro-app-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

destroy session for all error

Browse Source
This commit is contained in:
spiduler
2021-01-18 12:13:59 +09:00
parent 8c6616c8bd
commit cb7da3daf3
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
index.js
View File

@@ -66,11 +66,7 @@ process.on('SIGTERM', exitHandler.bind(null, { cleanup: true }));
*/ */
app.post('/', async (req, res, next) => { app.post('/', async (req, res, next) => {
browser.get(req.body).then(html => res.send(html)).catch(e => { browser.get(req.body).then(html => res.send(html)).catch(e => {
if (e instanceof NoSuchSessionError) { logger.error({ message: e.message, info: e.info }, 'Browser error')
logger.error({ reason: e.message, url: req.url }, 'Browser session expired')
} else {
logger.error(Object.assign({ message: e.message }, { info: e.info }), 'Browser error occured')
}
res.status(500).send({ code: 500, message: e.message }) res.status(500).send({ code: 500, message: e.message })
}) })
}) })

4
src/component/SeleniumBrowser.js
View File

@@ -21,10 +21,8 @@ class SeleniumBrowser {
.then(() => driver.findElement(By.css('body'))) .then(() => driver.findElement(By.css('body')))
.then(body => body.getAttribute('innerHTML')) .then(body => body.getAttribute('innerHTML'))
.catch(e => { .catch(e => {
if (e instanceof NoSuchSessionError) {
this.pool.destroy(driver) this.pool.destroy(driver)
throw new NoSuchSessionError throw new Error(e.message)
}
}) })
let p = captcha.isCaptchaPage(html) ? captcha.resolveCaptcha(driver, this.pool) : this.getHtml(driver, html, params) let p = captcha.isCaptchaPage(html) ? captcha.resolveCaptcha(driver, this.pool) : this.getHtml(driver, html, params)
html = await p html = await p