Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1b72af4702 | |||
| 44314c9894 | |||
| 35129df11c | |||
| 5dd6450347 | |||
| 190d57bbe2 | |||
| 8d4519d615 | |||
| 42a68434c0 | |||
| 35fd4678d1 | |||
| 01a4122529 | |||
| fbb94fe51e | |||
| 656e21c8fd | |||
| 53b5cca687 | |||
| 25d191a95b | |||
| d5b3e48f8d | |||
| dd6f24551d | |||
| f4d0e9ad87 |
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"gitzone": {
|
"gitzone": {
|
||||||
|
"projectType": "npm",
|
||||||
"module": {
|
"module": {
|
||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "pushrocks",
|
"gitscope": "pushrocks",
|
||||||
|
|||||||
10744
package-lock.json
generated
10744
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
19
package.json
19
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartpuppeteer",
|
"name": "@pushrocks/smartpuppeteer",
|
||||||
"version": "1.0.8",
|
"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,17 +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/smartenv": "^4.0.8",
|
"@pushrocks/smartdelay": "^2.0.10",
|
||||||
"@types/puppeteer": "^1.20.2",
|
"@pushrocks/smartenv": "^4.0.16",
|
||||||
"puppeteer": "^2.0.0"
|
"@types/puppeteer": "^5.4.2",
|
||||||
|
"puppeteer": "^5.5.0"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/**/*",
|
"ts/**/*",
|
||||||
|
|||||||
10
readme.md
10
readme.md
@@ -18,10 +18,14 @@ simplified access to puppeteer
|
|||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
## Contribution
|
Use TypeScript for best in class intellisense.
|
||||||
|
|
||||||
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
|
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
const headlessBrowser = await smartpuppeteer.getEnvAwareBrowserInstance({
|
||||||
|
forceNoSandbox: true // if you really want no sandbox, you can do this. Otherwise its starting things as necessary
|
||||||
|
});
|
||||||
|
await headlessBrowser.close();
|
||||||
|
```
|
||||||
|
|
||||||
## Contribution
|
## Contribution
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
});
|
});
|
||||||
|
|||||||
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,26 +16,16 @@ 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([
|
chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox']);
|
||||||
'--no-sandbox',
|
|
||||||
'--disable-setuid-sandbox'
|
|
||||||
// '--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);
|
||||||
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({
|
|
||||||
executablePath: '/usr/bin/chromium-browser'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return headlessBrowser;
|
return headlessBrowser;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,7 +1,15 @@
|
|||||||
|
// node native scope
|
||||||
|
import * as os from 'os';
|
||||||
|
|
||||||
|
export {
|
||||||
|
os
|
||||||
|
};
|
||||||
|
|
||||||
// @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';
|
||||||
|
|||||||
Reference in New Issue
Block a user