@browserless.io/browserless 2.7.1 → 2.9.0

package/build/browsers/chromium.cdp.js

@@ -1,4 +1,4 @@
-import { BLESS_PAGE_IDENTIFIER, ServerError, createLogger, noop, once, } from '@browserless.io/browserless';
+import { BLESS_PAGE_IDENTIFIER, ServerError, noop, once, } from '@browserless.io/browserless';
 import puppeteer from 'puppeteer-core';
 import { EventEmitter } from 'events';
 import StealthPlugin from 'puppeteer-extra-plugin-stealth';
@@ -17,15 +17,16 @@ export class ChromiumCDP extends EventEmitter {
     browser = null;
     browserWSEndpoint = null;
     port;
-    debug = createLogger('browsers:chromium:cdp');
+    logger;
     proxy = httpProxy.createProxyServer();
     executablePath = playwright.chromium.executablePath();
-    constructor({ blockAds, config, userDataDir, }) {
+    constructor({ blockAds, config, userDataDir, logger, }) {
         super();
         this.userDataDir = userDataDir;
         this.config = config;
         this.blockAds = blockAds;
-        this.debug(`Starting new browser instance`);
+        this.logger = logger;
+        this.logger.info(`Starting new ${this.constructor.name} instance`);
     }
     cleanListeners() {
         this.browser?.removeAllListeners();
@@ -38,27 +39,44 @@ export class ChromiumCDP extends EventEmitter {
     onTargetCreated = async (target) => {
         if (target.type() === 'page') {
             const page = await target.page().catch((e) => {
-                this.debug(`Error in new page ${e}`);
+                this.logger.error(`Error in ${this.constructor.name} new page ${e}`);
                 return null;
             });
             if (page) {
-                if (!this.config.getAllowFileProtocol()) {
-                    this.debug(`Setting up file:// protocol request rejection`);
-                    page.on('request', async (request) => {
-                        if (request.url().startsWith('file://')) {
-                            this.debug(`File protocol request found in request, terminating`);
-                            page.close().catch(noop);
-                            this.close();
-                        }
-                    });
-                    page.on('response', async (response) => {
-                        if (response.url().startsWith('file://')) {
-                            this.debug(`File protocol request found in response, terminating`);
-                            page.close().catch(noop);
-                            this.close();
-                        }
-                    });
-                }
+                this.logger.trace(`Setting up file:// protocol request rejection`);
+                page.on('error', (err) => {
+                    this.logger.error(err);
+                });
+                page.on('pageerror', (err) => {
+                    this.logger.warn(err);
+                });
+                page.on('framenavigated', (frame) => {
+                    this.logger.trace(`Navigation to ${frame.url()}`);
+                });
+                page.on('console', (message) => {
+                    this.logger.trace(`${message.type()}: ${message.text()}`);
+                });
+                page.on('requestfailed', (req) => {
+                    this.logger.warn(`"${req.failure()?.errorText}": ${req.url()}`);
+                });
+                page.on('request', async (request) => {
+                    this.logger.trace(`${request.method()}: ${request.url()}`);
+                    if (!this.config.getAllowFileProtocol() &&
+                        request.url().startsWith('file://')) {
+                        this.logger.error(`File protocol request found in request to ${this.constructor.name}, terminating`);
+                        page.close().catch(noop);
+                        this.close();
+                    }
+                });
+                page.on('response', async (response) => {
+                    this.logger.trace(`${response.status()}: ${response.url()}`);
+                    if (!this.config.getAllowFileProtocol() &&
+                        response.url().startsWith('file://')) {
+                        this.logger.error(`File protocol request found in response to ${this.constructor.name}, terminating`);
+                        page.close().catch(noop);
+                        this.close();
+                    }
+                });
                 this.emit('newPage', page);
             }
         }
@@ -66,13 +84,13 @@ export class ChromiumCDP extends EventEmitter {
     isRunning = () => this.running;
     newPage = async () => {
         if (!this.browser) {
-            throw new ServerError(`Browser hasn't been launched yet!`);
+            throw new ServerError(`${this.constructor.name} hasn't been launched yet!`);
         }
         return this.browser.newPage();
     };
     close = async () => {
         if (this.browser) {
-            this.debug(`Closing browser process and all listeners`);
+            this.logger.info(`Closing ${this.constructor.name} process and all listeners`);
             this.emit('close');
             this.cleanListeners();
             this.browser.removeAllListeners();
@@ -86,7 +104,7 @@ export class ChromiumCDP extends EventEmitter {
     process = () => this.browser?.process() || null;
     launch = async (options = {}) => {
         this.port = await getPort();
-        this.debug(`Got open port ${this.port}`);
+        this.logger.info(`${this.constructor.name} got open port ${this.port}`);
         const __dirname = path.dirname(fileURLToPath(import.meta.url));
         const finalOptions = {
             ...options,
@@ -107,13 +125,12 @@ export class ChromiumCDP extends EventEmitter {
         const launch = options.stealth
             ? puppeteerStealth.launch.bind(puppeteerStealth)
             : puppeteer.launch.bind(puppeteer);
-        this.debug(finalOptions, `Launching CDP Handler`);
-        // @ts-ignore mis-matched types from stealth...
+        this.logger.info(finalOptions, `Launching ${this.constructor.name} Handler`);
         this.browser = (await launch(finalOptions));
         this.browser.on('targetcreated', this.onTargetCreated);
         this.running = true;
         this.browserWSEndpoint = this.browser.wsEndpoint();
-        this.debug(`Browser is running on ${this.browserWSEndpoint}`);
+        this.logger.info(`${this.constructor.name} is running on ${this.browserWSEndpoint}`);
         return this.browser;
     };
     wsEndpoint = () => this.browserWSEndpoint;
@@ -134,7 +151,7 @@ export class ChromiumCDP extends EventEmitter {
             throw new ServerError(`No browserWSEndpoint found, did you launch first?`);
         }
         socket.once('close', resolve);
-        this.debug(`Proxying ${req.parsed.href}`);
+        this.logger.info(`Proxying ${req.parsed.href} to ${this.constructor.name}`);
         const shouldMakePage = req.parsed.pathname.includes(BLESS_PAGE_IDENTIFIER);
         const page = shouldMakePage ? await this.browser.newPage() : null;
         const pathname = page
@@ -148,7 +165,7 @@ export class ChromiumCDP extends EventEmitter {
             changeOrigin: true,
             target,
         }, (error) => {
-            this.debug(`Error proxying session: ${error}`);
+            this.logger.error(`Error proxying session to ${this.constructor.name}: ${error}`);
             this.close();
             return reject(error);
         });
@@ -166,7 +183,7 @@ export class ChromiumCDP extends EventEmitter {
         this.browser?.once('close', close);
         this.browser?.process()?.once('close', close);
         socket.once('close', close);
-        this.debug(`Proxying ${req.parsed.href} to browser ${this.browserWSEndpoint}`);
+        this.logger.info(`Proxying ${req.parsed.href} to ${this.constructor.name} ${this.browserWSEndpoint}`);
         req.url = '';
         // Delete headers known to cause issues
         delete req.headers.origin;
@@ -174,7 +191,7 @@ export class ChromiumCDP extends EventEmitter {
             changeOrigin: true,
             target: this.browserWSEndpoint,
         }, (error) => {
-            this.debug(`Error proxying session: ${error}`);
+            this.logger.error(`Error proxying session to ${this.constructor.name}: ${error}`);
             this.close();
             return reject(error);
         });

package/build/browsers/chromium.playwright.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="node" />
-/// <reference types="debug" />
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { BrowserServerOptions, Config, Request } from '@browserless.io/browserless';
+import { BrowserServerOptions, Config, Logger, Request } from '@browserless.io/browserless';
 import playwright, { Page } from 'playwright-core';
 import { Duplex } from 'stream';
 import { EventEmitter } from 'events';
@@ -12,13 +11,14 @@ export declare class ChromiumPlaywright extends EventEmitter {
     protected config: Config;
     protected userDataDir: string | null;
     protected running: boolean;
+    protected logger: Logger;
     protected proxy: httpProxy<import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>>;
     protected browser: playwright.BrowserServer | null;
     protected browserWSEndpoint: string | null;
-    protected debug: import("debug").Debugger;
     protected executablePath: string;
-    constructor({ config, userDataDir, }: {
+    constructor({ config, userDataDir, logger, }: {
         config: Config;
+        logger: Logger;
         userDataDir: ChromiumPlaywright['userDataDir'];
     });
     protected cleanListeners(): void;

package/build/browsers/chromium.playwright.js

@@ -1,4 +1,4 @@
-import { ServerError, createLogger, } from '@browserless.io/browserless';
+import { ServerError, } from '@browserless.io/browserless';
 import playwright from 'playwright-core';
 import { EventEmitter } from 'events';
 import httpProxy from 'http-proxy';
@@ -7,16 +7,17 @@ export class ChromiumPlaywright extends EventEmitter {
     config;
     userDataDir;
     running = false;
+    logger;
     proxy = httpProxy.createProxyServer();
     browser = null;
     browserWSEndpoint = null;
-    debug = createLogger('browsers:chromium:playwright');
     executablePath = playwright.chromium.executablePath();
-    constructor({ config, userDataDir, }) {
+    constructor({ config, userDataDir, logger, }) {
         super();
         this.userDataDir = userDataDir;
         this.config = config;
-        this.debug(`Starting new browser instance`);
+        this.logger = logger;
+        this.logger.info(`Starting new ${this.constructor.name} instance`);
     }
     cleanListeners() {
         this.removeAllListeners();
@@ -24,7 +25,7 @@ export class ChromiumPlaywright extends EventEmitter {
     isRunning = () => this.running;
     close = async () => {
         if (this.browser) {
-            this.debug(`Closing browser process and all listeners`);
+            this.logger.info(`Closing ${this.constructor.name} process and all listeners`);
             this.emit('close');
             this.cleanListeners();
             this.browser.close();
@@ -35,20 +36,20 @@ export class ChromiumPlaywright extends EventEmitter {
     };
     pages = async () => [];
     getPageId = () => {
-        throw new ServerError(`#getPageId is not yet supported with this browser.`);
+        throw new ServerError(`#getPageId is not yet supported with ${this.constructor.name}.`);
     };
     makeLiveURL = () => {
-        throw new ServerError(`Live URLs are not yet supported with this browser. In the future this will be at "${this.config.getExternalAddress()}"`);
+        throw new ServerError(`Live URLs are not yet supported with ${this.constructor.name}. In the future this will be at "${this.config.getExternalAddress()}"`);
     };
     newPage = async () => {
         if (!this.browser || !this.browserWSEndpoint) {
-            throw new ServerError(`Browser hasn't been launched yet!`);
+            throw new ServerError(`${this.constructor.name} hasn't been launched yet!`);
         }
         const browser = await playwright.chromium.connect(this.browserWSEndpoint);
         return await browser.newPage();
     };
     launch = async (options = {}) => {
-        this.debug(`Launching Playwright Handler`);
+        this.logger.info(`Launching ${this.constructor.name} Handler`);
         this.browser = await playwright.chromium.launchServer({
             ...options,
             args: [
@@ -59,7 +60,7 @@ export class ChromiumPlaywright extends EventEmitter {
             executablePath: this.executablePath,
         });
         const browserWSEndpoint = this.browser.wsEndpoint();
-        this.debug(`Browser is running on ${browserWSEndpoint}`);
+        this.logger.info(`${this.constructor.name} is running on ${browserWSEndpoint}`);
         this.running = true;
         this.browserWSEndpoint = browserWSEndpoint;
         return this.browser;
@@ -78,14 +79,14 @@ export class ChromiumPlaywright extends EventEmitter {
         return externalURL.href;
     };
     proxyPageWebSocket = async () => {
-        console.warn(`Not yet implemented`);
+        this.logger.warn(`${this.constructor.name} Not yet implemented`);
     };
     proxyWebSocket = async (req, socket, head) => new Promise((resolve, reject) => {
         if (!this.browserWSEndpoint) {
             throw new ServerError(`No browserWSEndpoint found, did you launch first?`);
         }
         socket.once('close', resolve);
-        this.debug(`Proxying ${req.parsed.href} to browser ${this.browserWSEndpoint}`);
+        this.logger.info(`Proxying ${req.parsed.href} to ${this.constructor.name} ${this.browserWSEndpoint}`);
         // Delete headers known to cause issues
         delete req.headers.origin;
         req.url = '';
@@ -93,7 +94,7 @@ export class ChromiumPlaywright extends EventEmitter {
             changeOrigin: true,
             target: this.browserWSEndpoint,
         }, (error) => {
-            this.debug(`Error proxying session: ${error}`);
+            this.logger.error(`Error proxying session to ${this.constructor.name}: ${error}`);
             this.close();
             return reject(error);
         });

package/build/browsers/firefox.playwright.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="node" />
-/// <reference types="debug" />
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { BrowserServerOptions, Config, Request } from '@browserless.io/browserless';
+import { BrowserServerOptions, Config, Logger, Request } from '@browserless.io/browserless';
 import playwright, { Page } from 'playwright-core';
 import { Duplex } from 'stream';
 import { EventEmitter } from 'events';
@@ -12,12 +11,13 @@ export declare class FirefoxPlaywright extends EventEmitter {
     protected config: Config;
     protected userDataDir: string | null;
     protected running: boolean;
+    protected logger: Logger;
     protected proxy: httpProxy<import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>>;
     protected browser: playwright.BrowserServer | null;
     protected browserWSEndpoint: string | null;
-    protected debug: import("debug").Debugger;
-    constructor({ config, userDataDir, }: {
+    constructor({ config, userDataDir, logger, }: {
         config: Config;
+        logger: Logger;
         userDataDir: FirefoxPlaywright['userDataDir'];
     });
     protected cleanListeners(): void;

package/build/browsers/firefox.playwright.js

@@ -1,4 +1,4 @@
-import { ServerError, createLogger, } from '@browserless.io/browserless';
+import { ServerError, } from '@browserless.io/browserless';
 import playwright from 'playwright-core';
 import { EventEmitter } from 'events';
 import httpProxy from 'http-proxy';
@@ -7,15 +7,16 @@ export class FirefoxPlaywright extends EventEmitter {
     config;
     userDataDir;
     running = false;
+    logger;
     proxy = httpProxy.createProxyServer();
     browser = null;
     browserWSEndpoint = null;
-    debug = createLogger('browsers:firefox:playwright');
-    constructor({ config, userDataDir, }) {
+    constructor({ config, userDataDir, logger, }) {
         super();
         this.userDataDir = userDataDir;
         this.config = config;
-        this.debug(`Starting new browser instance`);
+        this.logger = logger;
+        this.logger.info(`Starting new ${this.constructor.name} instance`);
     }
     cleanListeners() {
         this.removeAllListeners();
@@ -23,7 +24,7 @@ export class FirefoxPlaywright extends EventEmitter {
     isRunning = () => this.running;
     close = async () => {
         if (this.browser) {
-            this.debug(`Closing browser process and all listeners`);
+            this.logger.trace(`Closing ${this.constructor.name} process and all listeners`);
             this.emit('close');
             this.cleanListeners();
             this.browser.close();
@@ -34,16 +35,16 @@ export class FirefoxPlaywright extends EventEmitter {
     };
     pages = async () => [];
     getPageId = () => {
-        throw new ServerError(`#getPageId is not yet supported with this browser.`);
+        throw new ServerError(`#getPageId is not yet supported with ${this.constructor.name}.`);
     };
     makeLiveURL = () => {
-        throw new ServerError(`Live URLs are not yet supported with this browser.`);
+        throw new ServerError(`Live URLs are not yet supported with ${this.constructor.name}.`);
     };
     newPage = async () => {
-        throw new ServerError(`Can't create new page with this browser`);
+        throw new ServerError(`Can't create new page with ${this.constructor.name}`);
     };
     launch = async (options = {}) => {
-        this.debug(`Launching Playwright Handler`);
+        this.logger.info(`Launching ${this.constructor.name} Handler`);
         this.browser = await playwright.firefox.launchServer({
             ...options,
             args: [
@@ -53,7 +54,7 @@ export class FirefoxPlaywright extends EventEmitter {
             executablePath: playwright.firefox.executablePath(),
         });
         const browserWSEndpoint = this.browser.wsEndpoint();
-        this.debug(`Browser is running on ${browserWSEndpoint}`);
+        this.logger.info(`${this.constructor.name} is running on ${browserWSEndpoint}`);
         this.browserWSEndpoint = browserWSEndpoint;
         this.running = true;
         return this.browser;
@@ -72,14 +73,14 @@ export class FirefoxPlaywright extends EventEmitter {
         return externalURL.href;
     };
     proxyPageWebSocket = async () => {
-        console.warn(`Not yet implemented`);
+        this.logger.warn(`Not yet implemented in ${this.constructor.name}`);
     };
     proxyWebSocket = async (req, socket, head) => new Promise((resolve, reject) => {
         if (!this.browserWSEndpoint) {
             throw new ServerError(`No browserWSEndpoint found, did you launch first?`);
         }
         socket.once('close', resolve);
-        this.debug(`Proxying ${req.parsed.href} to browser ${this.browserWSEndpoint}`);
+        this.logger.info(`Proxying ${req.parsed.href} to ${this.constructor.name} ${this.browserWSEndpoint}`);
         // Delete headers known to cause issues
         delete req.headers.origin;
         req.url = '';
@@ -87,7 +88,7 @@ export class FirefoxPlaywright extends EventEmitter {
             changeOrigin: true,
             target: this.browserWSEndpoint,
         }, (error) => {
-            this.debug(`Error proxying session: ${error}`);
+            this.logger.error(`Error proxying session to ${this.constructor.name}: ${error}`);
             this.close();
             return reject(error);
         });

package/build/browsers/index.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="debug" />
-import { BrowserHTTPRoute, BrowserInstance, BrowserWebsocketRoute, BrowserlessSession, BrowserlessSessionJSON, CDPJSONPayload, ChromiumCDP, Config, Hooks, Request } from '@browserless.io/browserless';
+import { BrowserHTTPRoute, BrowserInstance, BrowserServerOptions, BrowserWebsocketRoute, BrowserlessSession, BrowserlessSessionJSON, CDPJSONPayload, CDPLaunchOptions, ChromiumCDP, Config, Hooks, Logger, Request } from '@browserless.io/browserless';
 import { Page } from 'puppeteer-core';
 export declare class BrowserManager {
     protected config: Config;
@@ -7,11 +6,11 @@ export declare class BrowserManager {
     protected browsers: Map<BrowserInstance, BrowserlessSession>;
     protected launching: Map<string, Promise<unknown>>;
     protected timers: Map<string, number>;
-    protected debug: import("debug").Debugger;
+    protected log: Logger;
     protected chromeBrowsers: (typeof ChromiumCDP)[];
     protected playwrightBrowserNames: string[];
     constructor(config: Config, hooks: Hooks);
-    private browserIsChrome;
+    protected browserIsChrome: (b: BrowserInstance) => boolean;
     protected removeUserDataDir: (userDataDir: string | null) => Promise<void>;
     protected onNewPage: (req: Request, page: Page) => Promise<void>;
     /**
@@ -19,24 +18,41 @@ export declare class BrowserManager {
      * and modifies URLs to set them to the appropriate addresses configured.
      * When both Chrome and Chromium are installed, defaults to Chromium.
      */
-    getProtocolJSON: () => Promise<object>;
+    getProtocolJSON: (logger: Logger) => Promise<object>;
     /**
      * Returns the /json/version API from Chromium or Chrome, whichever is installed,
      * and modifies URLs to set them to the appropriate addresses configured.
      * When both Chrome and Chromium are installed, defaults to Chromium.
      */
-    getVersionJSON: () => Promise<CDPJSONPayload>;
+    getVersionJSON: (logger: Logger) => Promise<CDPJSONPayload>;
     /**
      * Returns a list of all Chrome-like browsers (both Chromium and Chrome) with
      * their respective /json/list contents. URLs are modified so that subsequent
      * calls can be forwarded to the appropriate destination
      */
     getJSONList: () => Promise<Array<CDPJSONPayload>>;
-    private generateSessionJson;
+    protected generateSessionJson: (browser: BrowserInstance, session: BrowserlessSession) => Promise<{
+        browser: string;
+        browserId: string;
+        initialConnectURL: string;
+        killURL: string | null;
+        running: boolean;
+        timeAliveMs: number;
+        type: string;
+        id: string | null;
+        isTempDataDir: boolean;
+        launchOptions: CDPLaunchOptions | BrowserServerOptions;
+        numbConnected: number;
+        resolver: (val: unknown) => void;
+        routePath: string | string[];
+        startedOn: number;
+        ttl: number;
+        userDataDir: string | null;
+    }[]>;
     close: (browser: BrowserInstance, session: BrowserlessSession) => Promise<void>;
     getAllSessions: () => Promise<BrowserlessSessionJSON[]>;
     complete: (browser: BrowserInstance) => Promise<void>;
-    getBrowserForRequest: (req: Request, router: BrowserHTTPRoute | BrowserWebsocketRoute) => Promise<BrowserInstance>;
+    getBrowserForRequest: (req: Request, router: BrowserHTTPRoute | BrowserWebsocketRoute, logger: Logger) => Promise<BrowserInstance>;
     shutdown: () => Promise<void>;
     /**
      * Left blank for downstream SDK modules to optionally implement.

package/build/browsers/index.js

@@ -1,4 +1,4 @@
-import { BLESS_PAGE_IDENTIFIER, BadRequest, ChromeCDP, ChromePlaywright, ChromiumCDP, ChromiumPlaywright, FirefoxPlaywright, HTTPManagementRoutes, NotFound, ServerError, WebkitPlaywright, availableBrowsers, convertIfBase64, createLogger, exists, generateDataDir, makeExternalURL, noop, parseBooleanParam, } from '@browserless.io/browserless';
+import { BLESS_PAGE_IDENTIFIER, BadRequest, ChromeCDP, ChromePlaywright, ChromiumCDP, ChromiumPlaywright, FirefoxPlaywright, HTTPManagementRoutes, Logger, NotFound, ServerError, WebkitPlaywright, availableBrowsers, convertIfBase64, exists, generateDataDir, makeExternalURL, noop, parseBooleanParam, } from '@browserless.io/browserless';
 import { deleteAsync } from 'del';
 import path from 'path';
 export class BrowserManager {
@@ -7,7 +7,7 @@ export class BrowserManager {
     browsers = new Map();
     launching = new Map();
     timers = new Map();
-    debug = createLogger('browser-manager');
+    log = new Logger('browser-manager');
     chromeBrowsers = [ChromiumCDP, ChromeCDP];
     playwrightBrowserNames = [
         ChromiumPlaywright.name,
@@ -22,9 +22,9 @@ export class BrowserManager {
     browserIsChrome = (b) => this.chromeBrowsers.some((chromeBrowser) => b instanceof chromeBrowser);
     removeUserDataDir = async (userDataDir) => {
         if (userDataDir && (await exists(userDataDir))) {
-            this.debug(`Deleting data directory "${userDataDir}"`);
+            this.log.info(`Deleting data directory "${userDataDir}"`);
             await deleteAsync(userDataDir, { force: true }).catch((err) => {
-                this.debug(`Error cleaning up user-data-dir "${err}" at ${userDataDir}`);
+                this.log.error(`Error cleaning up user-data-dir "${err}" at ${userDataDir}`);
             });
         }
     };
@@ -36,7 +36,7 @@ export class BrowserManager {
      * and modifies URLs to set them to the appropriate addresses configured.
      * When both Chrome and Chromium are installed, defaults to Chromium.
      */
-    getProtocolJSON = async () => {
+    getProtocolJSON = async (logger) => {
         const Browser = (await availableBrowsers).find((InstalledBrowser) => this.chromeBrowsers.some((ChromeBrowser) => InstalledBrowser === ChromeBrowser));
         if (!Browser) {
             throw new Error(`No Chrome or Chromium browsers are installed!`);
@@ -44,6 +44,7 @@ export class BrowserManager {
         const browser = new Browser({
             blockAds: false,
             config: this.config,
+            logger,
             userDataDir: null,
         });
         await browser.launch();
@@ -62,8 +63,8 @@ export class BrowserManager {
      * and modifies URLs to set them to the appropriate addresses configured.
      * When both Chrome and Chromium are installed, defaults to Chromium.
      */
-    getVersionJSON = async () => {
-        this.debug(`Launching Chromium to generate /json/version results`);
+    getVersionJSON = async (logger) => {
+        this.log.info(`Launching Chromium to generate /json/version results`);
         const Browser = (await availableBrowsers).find((InstalledBrowser) => this.chromeBrowsers.some((ChromeBrowser) => InstalledBrowser === ChromeBrowser));
         if (!Browser) {
             throw new ServerError(`No Chrome or Chromium browsers are installed!`);
@@ -71,6 +72,7 @@ export class BrowserManager {
         const browser = new Browser({
             blockAds: false,
             config: this.config,
+            logger,
             userDataDir: null,
         });
         await browser.launch();
@@ -178,15 +180,15 @@ export class BrowserManager {
     };
     close = async (browser, session) => {
         const cleanupACtions = [];
-        this.debug(`${session.numbConnected} Client(s) are currently connected`);
+        this.log.info(`${session.numbConnected} Client(s) are currently connected`);
         // Don't close if there's clients still connected
         if (session.numbConnected > 0) {
             return;
         }
-        this.debug(`Closing browser session`);
+        this.log.info(`Closing browser session`);
         cleanupACtions.push(() => browser.close());
         if (session.isTempDataDir) {
-            this.debug(`Deleting "${session.userDataDir}" user-data-dir and session from memory`);
+            this.log.info(`Deleting "${session.userDataDir}" user-data-dir and session from memory`);
             this.browsers.delete(browser);
             cleanupACtions.push(() => this.removeUserDataDir(session.userDataDir));
         }
@@ -204,7 +206,7 @@ export class BrowserManager {
     complete = async (browser) => {
         const session = this.browsers.get(browser);
         if (!session) {
-            this.debug(`Couldn't locate session for browser, proceeding with close`);
+            this.log.info(`Couldn't locate session for browser, proceeding with close`);
             return browser.close();
         }
         const { id, resolver } = session;
@@ -215,7 +217,7 @@ export class BrowserManager {
         --session.numbConnected;
         this.close(browser, session);
     };
-    getBrowserForRequest = async (req, router) => {
+    getBrowserForRequest = async (req, router, logger) => {
         const { browser: Browser } = router;
         const blockAds = parseBooleanParam(req.parsed.searchParams, 'blockAds', false);
         const decodedLaunchOptions = convertIfBase64(req.parsed.searchParams.get('launch') || '{}');
@@ -228,7 +230,7 @@ export class BrowserManager {
             if (found) {
                 const [browser, session] = found;
                 ++session.numbConnected;
-                this.debug(`Located browser with ID ${id}`);
+                this.log.debug(`Located browser with ID ${id}`);
                 return browser;
             }
             throw new NotFound(`Couldn't locate browser "${id}" for request "${req.parsed.pathname}"`);
@@ -259,6 +261,8 @@ export class BrowserManager {
                 }));
                 const found = allPages.flat().find((b) => b.id === id);
                 if (found) {
+                    const session = this.browsers.get(found.browser);
+                    ++session.numbConnected;
                     return found.browser;
                 }
                 throw new NotFound(`Couldn't locate browser "${id}" for request "${req.parsed.pathname}"`);
@@ -299,6 +303,7 @@ export class BrowserManager {
         const browser = new Browser({
             blockAds,
             config: this.config,
+            logger,
             userDataDir,
         });
         const connectionMeta = {
@@ -323,7 +328,7 @@ export class BrowserManager {
         return browser;
     };
     shutdown = async () => {
-        this.debug(`Closing down browser instances`);
+        this.log.info(`Closing down browser instances`);
         const sessions = Array.from(this.browsers);
         await Promise.all(sessions.map(([b]) => b.close()));
         const timers = Array.from(this.timers);
@@ -332,7 +337,7 @@ export class BrowserManager {
         this.browsers = new Map();
         this.timers = new Map();
         await this.stop();
-        this.debug(`Shutdown complete`);
+        this.log.info(`Shutdown complete`);
     };
     /**
      * Left blank for downstream SDK modules to optionally implement.

package/build/browsers/webkit.playwright.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="node" />
-/// <reference types="debug" />
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { BrowserServerOptions, Config, Request } from '@browserless.io/browserless';
+import { BrowserServerOptions, Config, Logger, Request } from '@browserless.io/browserless';
 import playwright, { Page } from 'playwright-core';
 import { Duplex } from 'stream';
 import { EventEmitter } from 'events';
@@ -15,9 +14,10 @@ export declare class WebkitPlaywright extends EventEmitter {
     protected proxy: httpProxy<import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>>;
     protected browser: playwright.BrowserServer | null;
     protected browserWSEndpoint: string | null;
-    protected debug: import("debug").Debugger;
-    constructor({ config, userDataDir, }: {
+    protected logger: Logger;
+    constructor({ config, userDataDir, logger, }: {
         config: Config;
+        logger: Logger;
         userDataDir: WebkitPlaywright['userDataDir'];
     });
     protected cleanListeners(): void;