Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 15 matching lines...) Expand all Loading... | |
26 | 26 |
27 // The Chromium version is a build number, quite obscure. | 27 // The Chromium version is a build number, quite obscure. |
28 // Chromium 63.0.3239.x is 508578 | 28 // Chromium 63.0.3239.x is 508578 |
29 // Chromium 65.0.3325.0 is 530368 | 29 // Chromium 65.0.3325.0 is 530368 |
30 // We currently want Chromiun 63, as we still support it and that's the | 30 // We currently want Chromiun 63, as we still support it and that's the |
31 // loweset version that supports WebDriver. | 31 // loweset version that supports WebDriver. |
32 const CHROMIUM_REVISION = 508578; | 32 const CHROMIUM_REVISION = 508578; |
33 | 33 |
34 function runScript(chromiumPath, script, scriptName, scriptArgs) | 34 function runScript(chromiumPath, script, scriptName, scriptArgs) |
35 { | 35 { |
36 let {platform} = process; | |
Sebastian Noack
2018/09/28 15:37:00
Nit: This doesn't seem to be worth a temporary var
hub
2018/09/28 15:56:35
Done.
| |
36 const options = new chrome.Options() | 37 const options = new chrome.Options() |
37 .headless() | |
38 // Disabling sandboxing is needed on some system configurations | 38 // Disabling sandboxing is needed on some system configurations |
39 // like Debian 9. | 39 // like Debian 9. |
40 .addArguments("--no-sandbox") | 40 .addArguments("--no-sandbox") |
41 .setChromeBinaryPath(chromiumPath); | 41 .setChromeBinaryPath(chromiumPath); |
42 // Headless doesn't seem to work on Windows. | |
43 if (platform != "win32") | |
44 options.headless(); | |
42 | 45 |
43 const driver = new Builder() | 46 const driver = new Builder() |
44 .forBrowser("chrome") | 47 .forBrowser("chrome") |
45 .setChromeOptions(options) | 48 .setChromeOptions(options) |
46 .build(); | 49 .build(); |
47 | 50 |
48 return executeScript(driver, "Chromium (WebDriver)", | 51 return executeScript(driver, "Chromium (WebDriver)", |
49 script, scriptName, scriptArgs); | 52 script, scriptName, scriptArgs); |
50 } | 53 } |
51 | 54 |
52 module.exports = function(script, scriptName, ...scriptArgs) | 55 module.exports = function(script, scriptName, ...scriptArgs) |
53 { | 56 { |
54 return ensureChromium(CHROMIUM_REVISION) | 57 return ensureChromium(CHROMIUM_REVISION) |
55 .then(chromiumPath => runScript(chromiumPath, script, scriptName, scriptArgs )); | 58 .then(chromiumPath => runScript(chromiumPath, script, scriptName, scriptArgs )); |
56 }; | 59 }; |
OLD | NEW |