@browserless.io/browserless 2.15.0 → 2.16.0-beta-1

package/src/browsers/browsers.playwright.ts

@@ -27,8 +27,10 @@ class BasePlaywright extends EventEmitter {
   protected proxy = httpProxy.createProxyServer();
   protected browser: playwright.BrowserServer | null = null;
   protected browserWSEndpoint: string | null = null;
-  protected playwrightBrowserType: PlaywrightBrowserTypes = PlaywrightBrowserTypes.chromium;
-  protected executablePath = () => playwright[this.playwrightBrowserType].executablePath();
+  protected playwrightBrowserType: PlaywrightBrowserTypes =
+    PlaywrightBrowserTypes.chromium;
+  protected executablePath = () =>
+    playwright[this.playwrightBrowserType].executablePath();
 
   constructor({
     config,
@@ -107,17 +109,22 @@ class BasePlaywright extends EventEmitter {
         `${this.constructor.name} hasn't been launched yet!`,
       );
     }
-    const browser = await playwright[this.playwrightBrowserType].connect(this.browserWSEndpoint);
+    const browser = await playwright[this.playwrightBrowserType].connect(
+      this.browserWSEndpoint,
+    );
     return await browser.newPage();
   }
 
-  public async launch(laucherOpts: BrowserLauncherOptions): Promise<playwright.BrowserServer> {
+  public async launch(
+    laucherOpts: BrowserLauncherOptions,
+  ): Promise<playwright.BrowserServer> {
     const { options, pwVersion } = laucherOpts;
     this.logger.info(`Launching ${this.constructor.name} Handler`);
 
     const opts = this.makeLaunchOptions(options);
     const versionedPw = await this.config.loadPwVersion(pwVersion!);
-    const browser = await versionedPw[this.playwrightBrowserType].launchServer(opts);
+    const browser =
+      await versionedPw[this.playwrightBrowserType].launchServer(opts);
     const browserWSEndpoint = browser.wsEndpoint();
 
     this.logger.info(

package/src/browsers/index.ts

@@ -535,7 +535,7 @@ export class BrowserManager {
       options: launchOptions as BrowserServerOptions,
       pwVersion,
       req,
-      stealth: launchOptions?.stealth
+      stealth: launchOptions?.stealth,
     });
     await this.hooks.browser({ browser, req });
 

package/src/limiter.spec.ts

@@ -22,6 +22,7 @@ describe(`Limiter`, () => {
     webHooks.callRejectAlertURL.resetHistory();
     webHooks.callTimeoutAlertURL.resetHistory();
     webHooks.callErrorAlertURL.resetHistory();
+
     hooks.before.resetHistory();
     hooks.after.resetHistory();
     hooks.browser.resetHistory();
@@ -119,6 +120,32 @@ describe(`Limiter`, () => {
     expect(handlerTwo.calledOnce).to.be.true;
   });
 
+  it('continues to process jobs even if an earlier job errors', (d) => {
+    const config = new Config();
+    const monitoring = new Monitoring(config);
+    const metrics = new Metrics();
+
+    config.setConcurrent(1);
+    config.setQueued(1);
+    config.setTimeout(-1);
+
+    const limiter = new Limiter(config, metrics, monitoring, webHooks, hooks);
+    const errorJob = () =>
+      Promise.reject(new Error('Danger, danger. High voltage!'));
+    const okJob = spy();
+
+    const jobOne = limiter.limit(errorJob, asyncNoop, asyncNoop, noop);
+    const jobTwo = limiter.limit(okJob, asyncNoop, asyncNoop, noop);
+
+    jobOne();
+    jobTwo();
+
+    limiter.addEventListener('end', () => {
+      expect(okJob.calledOnce).to.be.true;
+      d(undefined);
+    });
+  });
+
   it('bubbles up errors', async () => {
     const config = new Config();
     const monitoring = new Monitoring(config);

package/src/utils.ts

@@ -23,6 +23,7 @@ import { Page } from 'puppeteer-core';
 import { ServerResponse } from 'http';
 import crypto from 'crypto';
 import debug from 'debug';
+import { fileURLToPath } from 'url';
 import gradient from 'gradient-string';
 import { homedir } from 'os';
 import path from 'path';
@@ -33,6 +34,8 @@ const isHTTP = (
   return (writeable as ServerResponse).writeHead !== undefined;
 };
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
 const getAuthHeaderToken = (header: string) => {
   if (header.startsWith('Basic')) {
     const username = header.split(/\s+/).pop() || '';
@@ -475,10 +478,11 @@ export const queryParamsToObject = (
 ): Record<string, unknown> =>
   [...params.entries()].reduce(
     (accum, [key, value]) => {
-      accum[key] = value;
+      accum[key] =
+        value === '' || value === undefined || value === null ? true : value;
       return accum;
     },
-    {} as Record<string, string>,
+    {} as ReturnType<typeof queryParamsToObject>,
   );
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -844,3 +848,5 @@ export const getCDPClient = (page: Page): CDPSession => {
 
   return typeof c === 'function' ? c.call(page) : c;
 };
+
+export const ublockPath = path.join(__dirname, '..', 'extensions', 'ublock');