browserless 9.7.1-beta.0 → 9.7.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "browserless",
   "description": "The headless Chrome/Chromium performance driver for Node.js",
   "homepage": "https://browserless.js.org",
-  "version": "9.7.1-beta.0",
+  "version": "9.7.1",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -31,10 +31,10 @@
     "text"
   ],
   "dependencies": {
-    "@browserless/errors": "9.6.6",
-    "@browserless/goto": "9.7.0",
-    "@browserless/pdf": "9.7.0",
-    "@browserless/screenshot": "9.7.0",
+    "@browserless/errors": "workspace:*",
+    "@browserless/goto": "workspace:*",
+    "@browserless/pdf": "workspace:*",
+    "@browserless/screenshot": "workspace:*",
     "debug-logfmt": "~1.0.4",
     "kill-process-group": "~1.0.3",
     "p-reflect": "~2.1.0",
@@ -44,7 +44,7 @@
     "superlock": "~1.0.0"
   },
   "devDependencies": {
-    "@browserless/test": "9.7.0",
+    "@browserless/test": "workspace:*",
     "ava": "3"
   },
   "engines": {
@@ -53,13 +53,13 @@
   "files": [
     "src"
   ],
+  "scripts": {
+    "test": "ava"
+  },
   "license": "MIT",
   "ava": {
     "serial": true,
     "timeout": "30s",
     "verbose": true
-  },
-  "scripts": {
-    "test": "ava"
   }
-}
+}

package/src/index.js

@@ -6,7 +6,6 @@ const debug = require('debug-logfmt')('browserless')
 const createGoto = require('@browserless/goto')
 const createPdf = require('@browserless/pdf')
 const { withLock } = require('superlock')
-const { randomUUID } = require('crypto')
 const pReflect = require('p-reflect')
 const pTimeout = require('p-timeout')
 const pRetry = require('p-retry')
@@ -24,13 +23,8 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
   let isClosed = false
 
   const close = opts => {
-    debug('close', { isClosed })
     isClosed = true
-    return browserProcessPromise
-      .then(browserProcess => driver.close(browserProcess, opts))
-      .catch(error => {
-        throw ensureError(error)
-      })
+    return browserProcessPromise.then(browserProcess => driver.close(browserProcess, opts))
   }
 
   const respawn = () =>
@@ -51,7 +45,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
     })
 
     promise.then(async browser => {
-      browser.once('disconnected', getBrowser)
+      if (launchOpts.mode !== 'connect') browser.once('disconnected', getBrowser)
       debug('spawn', {
         respawn: isRespawn,
         pid: driver.pid(browser) || launchOpts.mode,
@@ -65,9 +59,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
   let browserProcessPromise = spawn()
 
   const createBrowserContext = contextOpts =>
-    getBrowser()
-      .then(browser => browser.createIncognitoBrowserContext(contextOpts))
-      .then(context => (context._id = randomUUID()) && context)
+    getBrowser().then(browser => browser.createIncognitoBrowserContext(contextOpts))
 
   const getBrowser = async () => {
     if (isClosed) return browserProcessPromise
@@ -100,7 +92,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
         getBrowserContext()
       ])
       const page = await browserContext.newPage()
-      debug('createPage', { pid: driver.pid(browserProcess), id: browserContext._id })
+      debug('createPage', { pid: driver.pid(browserProcess), id: browserContext.id })
       return page
     }
 
@@ -111,7 +103,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
           getBrowserContext(),
           pReflect(page.close())
         ])
-        debug('closePage', { pid: driver.pid(browserProcess), id: browserContext._id })
+        debug('closePage', { pid: driver.pid(browserProcess), id: browserContext.id })
       }
     }
 
@@ -170,10 +162,8 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
         getBrowser(),
         getBrowserContext()
       ])
-      const id = browserContext._id
       await pReflect(browserContext.close())
-
-      debug('destroyContext', { pid: driver.pid(browserProcess), id })
+      debug('destroyContext', { pid: driver.pid(browserProcess), id: browserContext.id })
     }
 
     return {

package/LICENSE.md

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright © 2019 Microlink <hello@microlink.io> (microlink.io)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.