From 7170dd72c670bfd397f9911fdb9bfae911cd3d3f Mon Sep 17 00:00:00 2001 From: spiduler Date: Tue, 20 Oct 2020 15:43:41 +0900 Subject: [PATCH] sdfdsf --- src/component/SeleniumBrowser.js | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/component/SeleniumBrowser.js b/src/component/SeleniumBrowser.js index d748610..7e5d611 100644 --- a/src/component/SeleniumBrowser.js +++ b/src/component/SeleniumBrowser.js @@ -7,20 +7,22 @@ const logger = require("logops") , { Options } = require('selenium-webdriver/chrome'); class SeleniumBrowser { - constructor() { - this.config = { useHub: true, browser: 'chrome' } + constructor() { + this.config = { + useHub: true, browser: 'chrome', + browserArgs: ['--no-sandbox', '--headless', '--disable-dev-shm-usage', '--proxy-server=spiduler-tor:8118'] + } this.capabilities = Capabilities.chrome() this.sleep = m => new Promise(r => setTimeout(r, m)) - this.isRecaptchaReseponseEmpty = false + this.isRecaptchaReseponseEmpty = false } getDriver() { let opts = new Options; - opts.addArguments(this.getChromeArgs()) + opts.addArguments(this.config.browserArgs) return new Builder() .usingServer('http://spiduler-chrome:4444/wd/hub') .withCapabilities(this.capabilities) - .setProxy(proxy.manual({http: 'spiduler-tor:8118'})) .forBrowser(this.config.browser) .setChromeOptions(opts) .build(); @@ -116,17 +118,6 @@ class SeleniumBrowser { }); } - getChromeArgs() { - let args = ['--no-sandbox', '--headless', '--disable-dev-shm-usage'] - if (config.proxy) { - args.push('--proxy-server=' + config.proxy) - } - if (config.chrome) { - config.chrome.split(' ').map(a => args.push('--' + a)) - } - return args - } - loggingChrome() { let logPath = __dirname + '/storage/chrome-logs.txt' logger.info('Chrome logging into %s', logPath)