Skip to content

refactor: use superlock over mutexify #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2022
Merged

refactor: use superlock over mutexify #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/browserless/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
"@browserless/screenshot": "^9.6.0",
"debug-logfmt": "~1.0.4",
"kill-process-group": "~1.0.3",
"mutexify": "~1.4.0",
"p-reflect": "~2.1.0",
"p-retry": "~4.6.1",
"p-timeout": "~4.1.0",
"require-one-of": "~1.0.16"
"require-one-of": "~1.0.16",
"superlock": "~1.0.0"
},
"devDependencies": {
"@browserless/test": "latest",
Expand Down
21 changes: 8 additions & 13 deletions packages/browserless/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const createScreenshot = require('@browserless/screenshot')
const debug = require('debug-logfmt')('browserless')
const createGoto = require('@browserless/goto')
const createPdf = require('@browserless/pdf')
const mutexify = require('mutexify/promise')
const { withLock } = require('superlock')
const pReflect = require('p-reflect')
const pTimeout = require('p-timeout')
const pRetry = require('p-retry')
Expand All @@ -14,7 +14,7 @@ const { AbortError } = pRetry

const driver = require('./driver')

const lock = mutexify()
const lock = withLock()

module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
const goto = createGoto({ timeout: globalTimeout, ...launchOpts })
Expand Down Expand Up @@ -64,18 +64,13 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
const getBrowser = async () => {
if (isClosed) return browserProcessPromise

const release = await lock()
const browserProcess = await browserProcessPromise

if (browserProcess.isConnected()) {
release()
return browserProcess
}

await respawn()
release()
const browserProcess = await lock(async () => {
const browserProcess = await browserProcessPromise
if (browserProcess.isConnected()) return browserProcess
respawn()
})

return getBrowser()
return browserProcess || getBrowser()
}

const createContext = async ({ retry = 2, timeout: contextTimeout } = {}) => {
Expand Down