1.0.7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartpuppeteer",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "private": false,
   "description": "simplified access to puppeteer",
   "main": "dist/index.js",
@@ -9,20 +9,21 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild --web)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.7",
+    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^10.11.7",
+    "@types/node": "^12.12.7",
-    "tslint": "^5.11.0",
+    "tslint": "^5.20.1",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@types/puppeteer": "^1.12.4",
+    "@pushrocks/smartenv": "^4.0.8",
-    "puppeteer": "^1.17.0"
+    "@types/puppeteer": "^1.20.2",
+    "puppeteer": "^2.0.0"
   },
   "files": [
     "ts/*",

test/test.ts

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

ts/index.ts

@@ -1,14 +1,9 @@
-import puppeteer from 'puppeteer';
+// module exports
 
-export const getEnvAwareBrowserInstance = async (): Promise<puppeteer.Browser> => {
+export * from './smartpuppeteer.classes.smartpuppeteer';
-  let chromeArgs: string[] = [];
-  if (process.env.CI) {
-    chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox']);
-  }
-  const headlessBrowser = await puppeteer.launch({
-    args: chromeArgs
-  });
-  return headlessBrowser;
-};
 
+// direct exports
+import { puppeteer } from './smartpuppeteer.plugins';
 export { puppeteer };
+
+

ts/smartpuppeteer.classes.smartpuppeteer.ts

@@ -0,0 +1,39 @@
+import * as plugins from './smartpuppeteer.plugins';
+
+export interface IEnvAwareOptions {
+  forceNoSandbox?: boolean;
+}
+
+export const getEnvAwareBrowserInstance = async (
+  optionsArg: IEnvAwareOptions = {}
+): Promise<plugins.puppeteer.Browser> => {
+  const smartenv = new plugins.smartenv.Smartenv();
+  const options: IEnvAwareOptions = {
+    ...{
+      forceNoSandbox: false
+    },
+    ...optionsArg
+  };
+
+  let chromeArgs: string[] = [];
+  if ((process.env.CI || options.forceNoSandbox) && !smartenv.isWsl) {
+    chromeArgs = chromeArgs.concat([
+      '--no-sandbox',
+      '--disable-setuid-sandbox'
+      // '--disable-dev-shm-usage'
+    ]);
+  }
+
+  let headlessBrowser: plugins.puppeteer.Browser;
+  if (!smartenv.isWsl) {
+    // lets get the actual instance
+    headlessBrowser = await plugins.puppeteer.launch({
+      args: chromeArgs
+    });
+  } else {
+    console.log('Detected WSL. Using chromium.');
+    headlessBrowser = await plugins.puppeteer.launch({executablePath: '/usr/bin/chromium-browser'});
+  }
+
+  return headlessBrowser;
+};

ts/smartpuppeteer.plugins.ts

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