feat: add abbility for detecting puppeteer dep

Author: Kikobeats

README.md

@@ -25,7 +25,7 @@ $ npm install puppeteer browserless --save
 
 ## Usage
 
-**browserless** is an high level API simplification over  for do common actions.
+**browserless** is an high level API simplification over for doing common actions.
 
 For example, if you want to take an screenshot, just do:
 
@@ -47,7 +47,8 @@ All methods follow the same interface:
 
 - `url` (*required*): The target URL
 - `options`: Specific settings for the method (*optional*).
-- `callback`: Node.js callback. If you don't provide one, the method will return a `Promise`.
+
+The methods returns a Promise or a Node.js callback if pass an additional function as the last parameter.
 
 ### .constructor(options)
 
@@ -87,10 +88,19 @@ default: `30000`
 
 This setting will change the default maximum navigation time.
 
+##### puppeteer
+
+type:`Puppeteer`</br>
+default: `puppeteer`|`puppeteer-core`|`puppeteer-firefox`
+
+It's automatically detected based on your `dependencies` being supported [puppeteer](https://www.npmjs.com/package/puppeteer), [puppeteer-core](https://www.npmjs.com/package/puppeteer-core) or [puppeteer-firefox](https://www.npmjs.com/package/puppeteer-firefox).
+
+Alternatively, you can pass it.
+
 ##### incognito
 
 type:`boolean`</br>
-default: `true`
+default: `false`
 
 Every time a new page is created, it will be an incognito page.
 

packages/benchmark/index.js

@@ -1,8 +1,7 @@
 'use strict'
 
 const createBrowserless = require('browserless')
-createBrowserless.pool = require('@browserless/pool')
-
+const createBrowserlessPool = require('@browserless/pool')
 const { includes, reduce } = require('lodash')
 const processStats = require('process-stats')
 const asciichart = require('asciichart')
@@ -24,6 +23,7 @@ const cli = meow(
       --pool-min       Mininum of instances in pool mode.
       --pool-max       Maximum of instances in pool mode.
       --concurrency    Define number of concurrent request.
+      --firefox        Use Firefox browser.
 
     Options
       The rest of parameters provided are passed as options.
@@ -45,6 +45,10 @@ const cli = meow(
       iterations: {
         type: 'number',
         default: 10
+      },
+      firefox: {
+        type: 'boolean',
+        default: false
       }
     }
   }
@@ -86,14 +90,19 @@ const benchmark = async ({
     poolMin,
     poolMax,
     iterations,
+    firefox,
     ...opts
   } = cli.flags
 
   if (!method) throw new TypeError('Need to provide a method to run.')
 
+  const puppeteer = firefox
+    ? require('puppeteer-firefox')
+    : require('puppeteer')
+
   const browserless = isPool
-    ? createBrowserless.pool({ min: poolMin, max: poolMax, ...opts })
-    : createBrowserless(opts)
+    ? createBrowserlessPool({ min: poolMin, max: poolMax, puppeteer, ...opts })
+    : createBrowserless({ puppeteer, ...opts })
 
   console.log(prettyObj(cli.flags))
 

packages/benchmark/package.json

@@ -41,6 +41,7 @@
     "pretty-ms": "latest",
     "process-stats": "latest",
     "puppeteer": "latest",
+    "puppeteer-firefox": "latest",
     "time-span": "latest"
   },
   "engines": {

packages/browserless/package.json

@@ -54,8 +54,5 @@
     "coveralls": "nyc report --reporter=text-lcov | coveralls",
     "test": "nyc ava"
   },
-  "license": "MIT",
-  "peerDependencies": {
-    "puppeteer": "1.x"
-  }
+  "license": "MIT"
 }

packages/browserless/src/index.js

@@ -2,7 +2,6 @@
 
 const extractDomain = require('extract-domain')
 const debug = require('debug')('browserless')
-const puppeteer = require('puppeteer')
 
 const { getDevice } = require('./devices')
 const isTracker = require('./is-tracker')
@@ -20,8 +19,30 @@ const isEmpty = val => val == null || !(Object.keys(val) || val).length
 // The puppeteer launch causes many events to be emitted.
 process.setMaxListeners(0)
 
+const hasModule = m => {
+  try {
+    require.resolve(m)
+  } catch (e) {
+    return false
+  }
+
+  return true
+}
+
+function requireOneOf (modules) {
+  for (let module of modules) if (hasModule(module)) return require(module)
+  throw new TypeError(`'${modules.join(', ')}' not found on the system.`)
+}
+
+const _puppeteer = requireOneOf([
+  'puppeteer',
+  'puppeteer-core',
+  'puppeteer-firefox'
+])
+
 module.exports = ({
-  incognito = true,
+  puppeteer = _puppeteer,
+  incognito = false,
   timeout = 30000,
   ...launchOpts
 } = {}) => {