Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1b72af4702 | |||
| 44314c9894 | |||
| 35129df11c | |||
| 5dd6450347 | |||
| 190d57bbe2 | |||
| 8d4519d615 |
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"gitzone": {
|
"gitzone": {
|
||||||
|
"projectType": "npm",
|
||||||
"module": {
|
"module": {
|
||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "pushrocks",
|
"gitscope": "pushrocks",
|
||||||
|
|||||||
10743
package-lock.json
generated
10743
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
20
package.json
20
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartpuppeteer",
|
"name": "@pushrocks/smartpuppeteer",
|
||||||
"version": "1.0.13",
|
"version": "1.0.16",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "simplified access to puppeteer",
|
"description": "simplified access to puppeteer",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
@@ -13,18 +13,18 @@
|
|||||||
"format": "(gitzone format)"
|
"format": "(gitzone format)"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.17",
|
"@gitzone/tsbuild": "^2.1.25",
|
||||||
"@gitzone/tstest": "^1.0.28",
|
"@gitzone/tstest": "^1.0.52",
|
||||||
"@pushrocks/tapbundle": "^3.0.13",
|
"@pushrocks/tapbundle": "^3.2.9",
|
||||||
"@types/node": "^12.12.7",
|
"@types/node": "^14.14.20",
|
||||||
"tslint": "^5.20.1",
|
"tslint": "^6.1.3",
|
||||||
"tslint-config-prettier": "^1.15.0"
|
"tslint-config-prettier": "^1.15.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/smartdelay": "^2.0.6",
|
"@pushrocks/smartdelay": "^2.0.10",
|
||||||
"@pushrocks/smartenv": "^4.0.8",
|
"@pushrocks/smartenv": "^4.0.16",
|
||||||
"@types/puppeteer": "^1.20.2",
|
"@types/puppeteer": "^5.4.2",
|
||||||
"puppeteer": "^2.0.0"
|
"puppeteer": "^5.5.0"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/**/*",
|
"ts/**/*",
|
||||||
|
|||||||
42
ts/smartpuppeteer.classes.incognitobrowser.ts
Normal file
42
ts/smartpuppeteer.classes.incognitobrowser.ts
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
import { getEnvAwareBrowserInstance } from './smartpuppeteer.classes.smartpuppeteer';
|
||||||
|
import * as plugins from './smartpuppeteer.plugins';
|
||||||
|
|
||||||
|
export class IncognitoBrowser {
|
||||||
|
public status: 'started' | 'stopped' = 'stopped';
|
||||||
|
public browser: plugins.puppeteer.Browser;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* starts the IncognitoBrowser
|
||||||
|
*/
|
||||||
|
public async start() {
|
||||||
|
this.status = 'started';
|
||||||
|
this.browser = await getEnvAwareBrowserInstance();
|
||||||
|
this.browser.addListener('disconnected', async eventArg => {
|
||||||
|
try {
|
||||||
|
this.browser.removeAllListeners();
|
||||||
|
} catch(err) {}
|
||||||
|
if (this.status === 'started') {
|
||||||
|
this.browser = await getEnvAwareBrowserInstance();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* stops the IncognitoBrowser
|
||||||
|
*/
|
||||||
|
public async stop() {
|
||||||
|
this.status = 'stopped';
|
||||||
|
}
|
||||||
|
|
||||||
|
public async getNewIncognitoContext(): Promise<plugins.puppeteer.BrowserContext> {
|
||||||
|
if (this.browser) {
|
||||||
|
return this.browser.createIncognitoBrowserContext();
|
||||||
|
} else {
|
||||||
|
throw new Error('you need to start the IncognitoBrowser instance first');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,11 +16,8 @@ export const getEnvAwareBrowserInstance = async (
|
|||||||
};
|
};
|
||||||
|
|
||||||
let chromeArgs: string[] = [];
|
let chromeArgs: string[] = [];
|
||||||
if ((process.env.CI || options.forceNoSandbox) && !smartenv.isWsl) {
|
if ((process.env.CI || options.forceNoSandbox || plugins.os.userInfo().username === 'root')) {
|
||||||
chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox']);
|
chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox']);
|
||||||
} else if (smartenv.isWsl) {
|
|
||||||
console.log('Detected WSL. Using chromium.');
|
|
||||||
chromeArgs = chromeArgs.concat(['--no-sandbox', '--single-process']);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let headlessBrowser: plugins.puppeteer.Browser;
|
let headlessBrowser: plugins.puppeteer.Browser;
|
||||||
|
|||||||
@@ -1,3 +1,10 @@
|
|||||||
|
// node native scope
|
||||||
|
import * as os from 'os';
|
||||||
|
|
||||||
|
export {
|
||||||
|
os
|
||||||
|
};
|
||||||
|
|
||||||
// @pushrocks scope
|
// @pushrocks scope
|
||||||
import * as smartdelay from '@pushrocks/smartdelay';
|
import * as smartdelay from '@pushrocks/smartdelay';
|
||||||
import * as smartenv from '@pushrocks/smartenv';
|
import * as smartenv from '@pushrocks/smartenv';
|
||||||
|
|||||||
Reference in New Issue
Block a user