push.rocks/smartpuppeteer
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2019-11-16 00:35:03 +01:00
parent 25d191a95b
commit 53b5cca687
5 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package-lock.json generated
View File

@ -140,7 +140,6 @@
"version": "2.0.6", "version": "2.0.6",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartdelay/-/smartdelay-2.0.6.tgz", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartdelay/-/smartdelay-2.0.6.tgz",
"integrity": "sha512-4wUnzWNhRPODpaaL5GuRaje/C5dg+TMhBxmr57PKc2fqYpy6azWJwonf/s5xpcbJLCPJRbj1x8M5MqgCFq2uvg==", "integrity": "sha512-4wUnzWNhRPODpaaL5GuRaje/C5dg+TMhBxmr57PKc2fqYpy6azWJwonf/s5xpcbJLCPJRbj1x8M5MqgCFq2uvg==",
"dev": true,
"requires": { "requires": {
"@pushrocks/smartpromise": "^3.0.6" "@pushrocks/smartpromise": "^3.0.6"
} }

1
package.json
View File

@ -21,6 +21,7 @@
"tslint-config-prettier": "^1.15.0" "tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/smartdelay": "^2.0.6",
"@pushrocks/smartenv": "^4.0.8", "@pushrocks/smartenv": "^4.0.8",
"@types/puppeteer": "^1.20.2", "@types/puppeteer": "^1.20.2",
"puppeteer": "^2.0.0" "puppeteer": "^2.0.0"

2
test/test.ts
View File

@ -1,7 +1,7 @@
import { expect, tap } from '@pushrocks/tapbundle'; import { expect, tap } from '@pushrocks/tapbundle';
import * as smartpuppeteer from '../ts/index'; import * as smartpuppeteer from '../ts/index';
tap.test('first test', async () => { tap.test('first test', async (tools) => {
const headlessBrowser = await smartpuppeteer.getEnvAwareBrowserInstance({ const headlessBrowser = await smartpuppeteer.getEnvAwareBrowserInstance({
forceNoSandbox: true forceNoSandbox: true
}); });

31
ts/smartpuppeteer.classes.smartpuppeteer.ts
View File

@ -17,34 +17,21 @@ export const getEnvAwareBrowserInstance = async (
let chromeArgs: string[] = []; let chromeArgs: string[] = [];
if ((process.env.CI || options.forceNoSandbox) && !smartenv.isWsl) { if ((process.env.CI || options.forceNoSandbox) && !smartenv.isWsl) {
chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox']);
} else if (smartenv.isWsl) {
console.log('Detected WSL. Using chromium.');
chromeArgs = chromeArgs.concat([ chromeArgs = chromeArgs.concat([
'--no-sandbox', '--no-sandbox',
'--disable-setuid-sandbox', '--single-process'
// '--disable-dev-shm-usage'
]); ]);
} }
let headlessBrowser: plugins.puppeteer.Browser; let headlessBrowser: plugins.puppeteer.Browser;
if (!smartenv.isWsl) { console.log('launching puppeteer bundled chrome with arguments:');
// lets get the actual instance console.log(chromeArgs);
console.log('launching puppeteer bundled chrome'); headlessBrowser = await plugins.puppeteer.launch({
headlessBrowser = await plugins.puppeteer.launch({ args: chromeArgs
args: chromeArgs });
});
} else {
console.log('Detected WSL. Using chromium.');
headlessBrowser = await plugins.puppeteer.launch({
args: [
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-setuid-sandbox',
'--no-first-run',
'--no-sandbox',
'--no-zygote',
'--single-process'
]
});
}
return headlessBrowser; return headlessBrowser;
}; };

3
ts/smartpuppeteer.plugins.ts
View File

@ -1,7 +1,8 @@
// @pushrocks scope // @pushrocks scope
import * as smartdelay from '@pushrocks/smartdelay';
import * as smartenv from '@pushrocks/smartenv'; import * as smartenv from '@pushrocks/smartenv';
export { smartenv }; export { smartdelay, smartenv };
// third party scope // third party scope
import puppeteer from 'puppeteer'; import puppeteer from 'puppeteer';