@browserless.io/browserless 2.8.0 → 2.9.0

package/build/routes/chromium/http/screenshot.post.body.json

@@ -484,14 +484,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@240378": {
+                "__@toStringTag@252176": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@240378",
+                "__@toStringTag@252176",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -526,13 +526,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@240378": {
+        "__@toStringTag@252176": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@240378",
+        "__@toStringTag@252176",
         "byteLength"
       ]
     },
@@ -542,18 +542,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@240479": {
+        "__@species@252277": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@240378": {
+        "__@toStringTag@252176": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@240479",
-        "__@toStringTag@240378",
+        "__@species@252277",
+        "__@toStringTag@252176",
         "byteLength"
       ]
     },

package/build/routes/management/http/static.get.js

@@ -4,7 +4,7 @@ import path from 'path';
 const pathMap = new Map();
 const streamFile = (logger, res, file, contentType) => new Promise((resolve, reject) => {
     if (contentType) {
-        logger.log(`Setting content-type ${contentType}`);
+        logger.debug(`Setting content-type ${contentType}`);
         res.setHeader('Content-Type', contentType);
     }
     return createReadStream(file)
@@ -49,10 +49,10 @@ export default class StaticGetRoute extends HTTPRoute {
             throw new NotFound(`No route or file found for resource ${req.method}: ${pathname}`);
         }
         if (foundFilePaths.length > 1) {
-            logger.log(`Multiple files found for request to "${pathname}". Only the first file is served, so please name your files uniquely.`);
+            logger.warn(`Multiple files found for request to "${pathname}". Only the first file is served, so please name your files uniquely.`);
         }
         const [foundFilePath] = foundFilePaths;
-        logger.verbose(`Found new file "${foundFilePath}", caching path and serving`);
+        logger.info(`Found new file "${foundFilePath}", caching path and serving`);
         const contentType = mimeTypes.get(path.extname(foundFilePath));
         if (contentType) {
             res.setHeader('Content-Type', contentType);

package/build/routes/management/tests/management.spec.js

@@ -45,4 +45,13 @@ describe('Management APIs', function () {
             expect(res.status).to.equal(204);
         });
     });
+    it('allows HEAD requests to /active', async () => {
+        await start();
+        await fetch('http://localhost:3000/active?token=6R0W53R135510', {
+            method: 'HEAD',
+        }).then(async (res) => {
+            expect(res.headers.get('content-type')).to.equal('text/plain; charset=UTF-8');
+            expect(res.status).to.equal(204);
+        });
+    });
 });

package/build/server.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="debug" />
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
@@ -24,8 +23,7 @@ export declare class HTTPServer extends EventEmitter {
     protected server: http.Server;
     protected port: number;
     protected host?: string;
-    protected log: import("debug").Debugger;
-    protected verbose: import("debug").Debugger;
+    protected logger: BlessLogger;
     constructor(config: Config, metrics: Metrics, token: Token, router: Router, hooks: Hooks, Logger: typeof BlessLogger);
     protected onHTTPUnauthorized: (_req: Request, res: Response) => void;
     protected onWebsocketUnauthorized: (_req: Request, socket: stream.Duplex) => void;

package/build/server.js

@@ -1,5 +1,5 @@
 import * as http from 'http';
-import { BadRequest, NotFound, Timeout, TooManyRequests, Unauthorized, contentTypes, convertPathToURL, createLogger, queryParamsToObject, readBody, shimLegacyRequests, writeResponse, } from '@browserless.io/browserless';
+import { BadRequest, Logger as BlessLogger, NotFound, Timeout, TooManyRequests, Unauthorized, contentTypes, convertPathToURL, queryParamsToObject, readBody, shimLegacyRequests, writeResponse, } from '@browserless.io/browserless';
 import { EventEmitter } from 'events';
 // @ts-ignore
 import Enjoi from 'enjoi';
@@ -13,8 +13,7 @@ export class HTTPServer extends EventEmitter {
     server = http.createServer();
     port;
     host;
-    log = createLogger('server');
-    verbose = createLogger('server:verbose');
+    logger = new BlessLogger('server');
     constructor(config, metrics, token, router, hooks, Logger) {
         super();
         this.config = config;
@@ -25,20 +24,20 @@ export class HTTPServer extends EventEmitter {
         this.Logger = Logger;
         this.host = config.getHost();
         this.port = config.getPort();
-        this.log(`Server instantiated with host "${this.host}" on port "${this.port}" using token "${this.config.getToken()}"`);
+        this.logger.info(`Server instantiated with host "${this.host}" on port "${this.port}" using token "${this.config.getToken()}"`);
     }
     onHTTPUnauthorized = (_req, res) => {
-        this.log(`HTTP request is not properly authorized, responding with 401`);
+        this.logger.error(`HTTP request is not properly authorized, responding with 401`);
         this.metrics.addUnauthorized();
         return writeResponse(res, 401, 'Bad or missing authentication.');
     };
     onWebsocketUnauthorized = (_req, socket) => {
-        this.log(`Websocket request is not properly authorized, responding with 401`);
+        this.logger.error(`Websocket request is not properly authorized, responding with 401`);
         this.metrics.addUnauthorized();
         return writeResponse(socket, 401, 'Bad or missing authentication.');
     };
     async start() {
-        this.log(`HTTP Server is starting`);
+        this.logger.info(`HTTP Server is starting`);
         this.server.on('request', this.handleRequest);
         this.server.on('upgrade', this.handleWebSocket);
         const listenMessage = [
@@ -50,13 +49,13 @@ export class HTTPServer extends EventEmitter {
                 host: this.host,
                 port: this.port,
             }, undefined, () => {
-                this.log(listenMessage);
+                this.logger.info(listenMessage);
                 r(undefined);
             });
         });
     }
     handleRequest = async (request, res) => {
-        this.verbose(`Handling inbound HTTP request on "${request.method}: ${request.url}"`);
+        this.logger.trace(`Handling inbound HTTP request on "${request.method}: ${request.url}"`);
         const req = request;
         const proceed = await this.hooks.before({ req, res });
         req.parsed = convertPathToURL(request.url || '', this.config);
@@ -70,6 +69,10 @@ export class HTTPServer extends EventEmitter {
                 return res.end();
             }
         }
+        if (req.method?.toLowerCase() === 'head') {
+            this.logger.debug(`Inbound HEAD request, setting to GET`);
+            req.method = 'GET';
+        }
         if (this.config.getAllowGetCalls() &&
             req.method === 'GET' &&
             req.parsed.searchParams.has('body')) {
@@ -80,13 +83,13 @@ export class HTTPServer extends EventEmitter {
         }
         const route = await this.router.getRouteForHTTPRequest(req);
         if (!route) {
-            this.log(`No matching HTTP route handler for "${req.method}: ${req.parsed.href}"`);
+            this.logger.error(`No matching HTTP route handler for "${req.method}: ${req.parsed.href}"`);
             writeResponse(res, 404, 'Not Found');
             return Promise.resolve();
         }
-        this.verbose(`Found matching HTTP route handler "${route.path}"`);
+        this.logger.trace(`Found matching HTTP route handler "${route.path}"`);
         if (route?.auth) {
-            this.verbose(`Authorizing HTTP request to "${request.url}"`);
+            this.logger.trace(`Authorizing HTTP request to "${request.url}"`);
             const isPermitted = await this.token.isAuthorized(req, route);
             if (!isPermitted) {
                 return this.onHTTPUnauthorized(req, res);
@@ -104,7 +107,7 @@ export class HTTPServer extends EventEmitter {
             return Promise.resolve();
         }
         if (route.querySchema) {
-            this.verbose(`Validating route query-params with QUERY schema`);
+            this.logger.trace(`Validating route query-params with QUERY schema`);
             try {
                 const schema = Enjoi.schema(route.querySchema);
                 const valid = schema.validate(req.queryParams, {
@@ -114,19 +117,19 @@ export class HTTPServer extends EventEmitter {
                     const errorDetails = valid.error.details
                         .map(({ message, context, }) => context?.message || message)
                         .join('\n');
-                    this.log(`HTTP query-params contain errors sending 400:${errorDetails}`);
+                    this.logger.error(`HTTP query-params contain errors sending 400:${errorDetails}`);
                     writeResponse(res, 400, `Query-parameter validation failed: ${errorDetails}`, contentTypes.text);
                     return Promise.resolve();
                 }
             }
             catch (e) {
-                this.log(`Error parsing body schema`, e);
+                this.logger.error(`Error parsing body schema`, e);
                 writeResponse(res, 500, 'There was an error handling your request', contentTypes.text);
                 return Promise.resolve();
             }
         }
         if (route.bodySchema) {
-            this.verbose(`Validating route payload with BODY schema`);
+            this.logger.trace(`Validating route payload with BODY schema`);
             try {
                 const schema = Enjoi.schema(route.bodySchema);
                 const valid = schema.validate(body, { abortEarly: false });
@@ -134,13 +137,13 @@ export class HTTPServer extends EventEmitter {
                     const errorDetails = valid.error.details
                         .map(({ message, context, }) => context?.message || message)
                         .join('\n');
-                    this.log(`HTTP body contain errors sending 400:${errorDetails}`);
+                    this.logger.error(`HTTP body contain errors sending 400:${errorDetails}`);
                     writeResponse(res, 400, `POST Body validation failed: ${errorDetails}`, contentTypes.text);
                     return Promise.resolve();
                 }
             }
             catch (e) {
-                this.log(`Error parsing body schema`, e);
+                this.logger.error(`Error parsing body schema`, e);
                 writeResponse(res, 500, 'There was an error handling your request', contentTypes.text);
                 return Promise.resolve();
             }
@@ -148,7 +151,7 @@ export class HTTPServer extends EventEmitter {
         return route
             .handler(req, res, new this.Logger(route.name, req))
             .then(() => {
-            this.verbose('HTTP connection complete');
+            this.logger.trace('HTTP connection complete');
         })
             .catch((e) => {
             if (e instanceof BadRequest) {
@@ -170,7 +173,7 @@ export class HTTPServer extends EventEmitter {
         });
     };
     handleWebSocket = async (request, socket, head) => {
-        this.verbose(`Handling inbound WebSocket request on "${request.url}"`);
+        this.logger.trace(`Handling inbound WebSocket request on "${request.url}"`);
         const req = request;
         const proceed = await this.hooks.before({ head, req, socket });
         req.parsed = convertPathToURL(request.url || '', this.config);
@@ -180,16 +183,16 @@ export class HTTPServer extends EventEmitter {
         req.queryParams = queryParamsToObject(req.parsed.searchParams);
         const route = await this.router.getRouteForWebSocketRequest(req);
         if (route) {
-            this.verbose(`Found matching WebSocket route handler "${route.path}"`);
+            this.logger.trace(`Found matching WebSocket route handler "${route.path}"`);
             if (route?.auth) {
-                this.verbose(`Authorizing WebSocket request to "${req.parsed.href}"`);
+                this.logger.trace(`Authorizing WebSocket request to "${req.parsed.href}"`);
                 const isPermitted = await this.token.isAuthorized(req, route);
                 if (!isPermitted) {
                     return this.onWebsocketUnauthorized(req, socket);
                 }
             }
             if (route.querySchema) {
-                this.verbose(`Validating route query-params with QUERY schema`);
+                this.logger.trace(`Validating route query-params with QUERY schema`);
                 try {
                     const schema = Enjoi.schema(route.querySchema);
                     const valid = schema.validate(req.queryParams, {
@@ -199,13 +202,13 @@ export class HTTPServer extends EventEmitter {
                         const errorDetails = valid.error.details
                             .map(({ message, context, }) => context?.message || message)
                             .join('\n');
-                        this.log(`WebSocket query-params contain errors sending 400:${errorDetails}`);
+                        this.logger.error(`WebSocket query-params contain errors sending 400:${errorDetails}`);
                         writeResponse(socket, 400, `Query-parameter validation failed: ${errorDetails}`, contentTypes.text);
                         return Promise.resolve();
                     }
                 }
                 catch (e) {
-                    this.log(`Error parsing query-params schema`, e);
+                    this.logger.error(`Error parsing query-params schema`, e);
                     writeResponse(socket, 500, 'There was an error handling your request', contentTypes.text);
                     return Promise.resolve();
                 }
@@ -213,7 +216,7 @@ export class HTTPServer extends EventEmitter {
             return route
                 .handler(req, socket, head, new this.Logger(route.name, req))
                 .then(() => {
-                this.verbose('Websocket connection complete');
+                this.logger.trace('Websocket connection complete');
             })
                 .catch((e) => {
                 if (e instanceof BadRequest) {
@@ -228,20 +231,20 @@ export class HTTPServer extends EventEmitter {
                 if (e instanceof TooManyRequests) {
                     return writeResponse(socket, 429, e.message);
                 }
-                this.log(`Error handling request at "${route.path}": ${e}\n${e.stack}`);
+                this.logger.error(`Error handling request at "${route.path}": ${e}\n${e.stack}`);
                 return writeResponse(socket, 500, e.message);
             });
         }
-        this.log(`No matching WebSocket route handler for "${req.parsed.href}"`);
+        this.logger.error(`No matching WebSocket route handler for "${req.parsed.href}"`);
         return writeResponse(socket, 404, 'Not Found');
     };
     async shutdown() {
-        this.log(`HTTP Server is shutting down`);
+        this.logger.info(`HTTP Server is shutting down`);
         await new Promise((r) => this.server.close(r));
         this.server && this.server.removeAllListeners();
         // @ts-ignore garbage collect this reference
         this.server = null;
-        this.log(`HTTP Server shutdown complete`);
+        this.logger.info(`HTTP Server shutdown complete`);
     }
     /**
      * Left blank for downstream SDK modules to optionally implement.

package/build/shared/content.http.d.ts

@@ -43,5 +43,5 @@ export default class ChromiumContentPostRoute extends BrowserHTTPRoute {
     method: Methods;
     path: HTTPRoutes[];
     tags: APITags[];
-    handler: (req: Request, res: ServerResponse, _logger: Logger, browser: BrowserInstance) => Promise<void>;
+    handler: (req: Request, res: ServerResponse, logger: Logger, browser: BrowserInstance) => Promise<void>;
 }

package/build/shared/content.http.js

@@ -10,7 +10,8 @@ export default class ChromiumContentPostRoute extends BrowserHTTPRoute {
     method = Methods.post;
     path = [HTTPRoutes.content, HTTPRoutes.chromiumContent];
     tags = [APITags.browserAPI];
-    handler = async (req, res, _logger, browser) => {
+    handler = async (req, res, logger, browser) => {
+        logger.info('Content API invoked with body:', req.body);
         const contentType = !req.headers.accept || req.headers.accept?.includes('*')
             ? contentTypes.html
             : req.headers.accept;
@@ -53,6 +54,7 @@ export default class ChromiumContentPostRoute extends BrowserHTTPRoute {
             page.on('request', (req) => {
                 if (!!rejectRequestPattern.find((pattern) => req.url().match(pattern)) ||
                     rejectResourceTypes.includes(req.resourceType())) {
+                    logger.debug(`Aborting request ${req.method()}: ${req.url()}`);
                     return req.abort();
                 }
                 const interceptor = requestInterceptors.find((r) => req.url().match(r.pattern));
@@ -102,6 +104,7 @@ export default class ChromiumContentPostRoute extends BrowserHTTPRoute {
         }
         const markup = await page.content();
         page.close().catch(noop);
+        logger.info('Content API request completed');
         return writeResponse(res, 200, markup, contentTypes.html);
     };
 }

package/build/shared/download.http.js

@@ -24,11 +24,11 @@ export default class ChromiumDownloadPostRoute extends BrowserHTTPRoute {
     handler = async (req, res, logger, browser) => new Promise(async (resolve, reject) => {
         const config = this.config();
         const downloadPath = path.join(await config.getDownloadsDir(), `.browserless.download.${id()}`);
-        logger.log(`Generating a download directory at "${downloadPath}"`);
+        logger.info(`Generating a download directory at "${downloadPath}"`);
         await mkdir(downloadPath);
         const handler = functionHandler(config, logger, { downloadPath });
         const response = await handler(req, browser).catch((e) => {
-            logger.log(`Error running download code handler: "${e}"`);
+            logger.error(`Error running download code handler: "${e}"`);
             reject(e);
             return null;
         });
@@ -36,10 +36,10 @@ export default class ChromiumDownloadPostRoute extends BrowserHTTPRoute {
             return;
         }
         const { page } = response;
-        logger.log(`Download function has returned, finding downloads...`);
+        logger.info(`Download function has returned, finding downloads...`);
         async function checkIfDownloadComplete() {
             if (res.headersSent) {
-                logger.log(`Request headers have been sent, terminating download watch.`);
+                logger.trace(`Request headers have been sent, terminating download watch.`);
                 return null;
             }
             const [fileName] = await readdir(downloadPath);
@@ -47,20 +47,20 @@ export default class ChromiumDownloadPostRoute extends BrowserHTTPRoute {
                 await sleep(500);
                 return checkIfDownloadComplete();
             }
-            logger.log(`All files have finished downloading`);
+            logger.info(`All files have finished downloading`);
             return path.join(downloadPath, fileName);
         }
         const filePath = await checkIfDownloadComplete();
-        logger.log(`Closing pages.`);
+        logger.info(`Closing pages.`);
         page.close();
         page.removeAllListeners();
         const rmDownload = once(() => filePath &&
             deleteAsync(filePath, { force: true })
                 .then(() => {
-                logger.log(`Successfully deleted downloads from disk at "${filePath}"`);
+                logger.info(`Successfully deleted downloads from disk at "${filePath}"`);
             })
                 .catch((err) => {
-                logger.log(`Error cleaning up downloaded files: "${err}" at "${filePath}"`);
+                logger.error(`Error cleaning up downloaded files: "${err}" at "${filePath}"`);
             }));
         if (res.headersSent || !filePath) {
             rmDownload();
@@ -78,7 +78,7 @@ export default class ChromiumDownloadPostRoute extends BrowserHTTPRoute {
             }
         })
             .on('end', () => {
-            logger.log(`Downloads successfully sent`);
+            logger.info(`Downloads successfully sent`);
             rmDownload();
             return resolve();
         })

package/build/shared/function.http.js

@@ -22,7 +22,7 @@ export default class ChromiumFunctionPostRoute extends BrowserHTTPRoute {
         const config = this.config();
         const handler = functionHandler(config, logger);
         const { contentType, payload, page } = await handler(req, browser);
-        logger.log(`Got function response of "${contentType}"`);
+        logger.info(`Got function response of "${contentType}"`);
         page.close();
         page.removeAllListeners();
         if (contentType === 'uint8array') {
@@ -33,7 +33,7 @@ export default class ChromiumFunctionPostRoute extends BrowserHTTPRoute {
                 throw new BadRequest(`Couldn't determine function's response type.`);
             }
             else {
-                logger.log(`Sending file-type response of "${type}"`);
+                logger.info(`Sending file-type response of "${type}"`);
                 const readStream = new Stream.PassThrough();
                 readStream.end(response);
                 res.setHeader('Content-Type', type);

package/build/shared/json-protocol.http.d.ts

@@ -1,7 +1,7 @@
-import { APITags, HTTPRoute, HTTPRoutes, Methods, Request, Response, contentTypes } from '@browserless.io/browserless';
+import { APITags, HTTPRoute, HTTPRoutes, Logger, Methods, Request, Response, contentTypes } from '@browserless.io/browserless';
 export type ResponseSchema = object;
 export default class ChromiumJSONProtocolGetRoute extends HTTPRoute {
-    private cachedProtocol;
+    protected cachedProtocol: object | undefined;
     name: string;
     accepts: contentTypes[];
     auth: boolean;
@@ -12,5 +12,5 @@ export default class ChromiumJSONProtocolGetRoute extends HTTPRoute {
     method: Methods;
     path: HTTPRoutes;
     tags: APITags[];
-    handler: (_req: Request, res: Response) => Promise<void>;
+    handler: (_req: Request, res: Response, logger: Logger) => Promise<void>;
 }

package/build/shared/json-protocol.http.js

@@ -11,10 +11,10 @@ export default class ChromiumJSONProtocolGetRoute extends HTTPRoute {
     method = Methods.get;
     path = HTTPRoutes.jsonProtocol;
     tags = [APITags.browserAPI];
-    handler = async (_req, res) => {
+    handler = async (_req, res, logger) => {
         const browserManager = this.browserManager();
         if (!this.cachedProtocol) {
-            this.cachedProtocol = await browserManager.getProtocolJSON();
+            this.cachedProtocol = await browserManager.getProtocolJSON(logger);
         }
         return jsonResponse(res, 200, this.cachedProtocol);
     };

package/build/shared/json-version.http.d.ts

@@ -1,7 +1,7 @@
-import { APITags, BrowserManager, HTTPRoute, HTTPRoutes, Methods, Request, Response, UnwrapPromise, contentTypes } from '@browserless.io/browserless';
+import { APITags, BrowserManager, HTTPRoute, HTTPRoutes, Logger, Methods, Request, Response, UnwrapPromise, contentTypes } from '@browserless.io/browserless';
 export type ResponseSchema = UnwrapPromise<ReturnType<BrowserManager['getVersionJSON']>>;
 export default class ChromiumJSONVersionGetRoute extends HTTPRoute {
-    private cachedJSON;
+    protected cachedJSON: ResponseSchema | undefined;
     name: string;
     accepts: contentTypes[];
     auth: boolean;
@@ -12,5 +12,5 @@ export default class ChromiumJSONVersionGetRoute extends HTTPRoute {
     method: Methods;
     path: HTTPRoutes;
     tags: APITags[];
-    handler: (req: Request, res: Response) => Promise<void>;
+    handler: (req: Request, res: Response, logger: Logger) => Promise<void>;
 }

package/build/shared/json-version.http.js

@@ -11,14 +11,14 @@ export default class ChromiumJSONVersionGetRoute extends HTTPRoute {
     method = Methods.get;
     path = HTTPRoutes.jsonVersion;
     tags = [APITags.browserAPI];
-    handler = async (req, res) => {
+    handler = async (req, res, logger) => {
         const baseUrl = req.parsed.host;
         const protocol = req.parsed.protocol.includes('s') ? 'wss' : 'ws';
         try {
             if (!this.cachedJSON) {
                 const browserManager = this.browserManager();
                 this.cachedJSON = {
-                    ...(await browserManager.getVersionJSON()),
+                    ...(await browserManager.getVersionJSON(logger)),
                     webSocketDebuggerUrl: `${protocol}://${baseUrl}`,
                 };
             }

package/build/shared/pdf.http.d.ts

@@ -43,5 +43,5 @@ export default class ChromiumPDFPostRoute extends BrowserHTTPRoute {
     method: Methods;
     path: HTTPRoutes[];
     tags: APITags[];
-    handler: (req: Request, res: ServerResponse, _logger: Logger, browser: BrowserInstance) => Promise<void>;
+    handler: (req: Request, res: ServerResponse, logger: Logger, browser: BrowserInstance) => Promise<void>;
 }

package/build/shared/pdf.http.js

@@ -1,4 +1,4 @@
-import { APITags, BadRequest, BrowserHTTPRoute, BrowserlessRoutes, ChromiumCDP, HTTPRoutes, Methods, bestAttemptCatch, contentTypes, dedent, noop, sleep, waitForEvent as waitForEvt, waitForFunction as waitForFn, writeResponse, } from '@browserless.io/browserless';
+import { APITags, BadRequest, BrowserHTTPRoute, BrowserlessRoutes, ChromiumCDP, HTTPRoutes, Methods, bestAttemptCatch, contentTypes, dedent, noop, sleep, waitForEvent as waitForEvt, waitForFunction as waitForFn, } from '@browserless.io/browserless';
 import { Stream } from 'stream';
 export default class ChromiumPDFPostRoute extends BrowserHTTPRoute {
     name = BrowserlessRoutes.ChromiumPDFPostRoute;
@@ -16,13 +16,13 @@ export default class ChromiumPDFPostRoute extends BrowserHTTPRoute {
     method = Methods.post;
     path = [HTTPRoutes.pdf, HTTPRoutes.chromiumPdf];
     tags = [APITags.browserAPI];
-    handler = async (req, res, _logger, browser) => {
+    handler = async (req, res, logger, browser) => {
+        logger.info('PDF API invoked with body:', req.body);
         const contentType = !req.headers.accept || req.headers.accept?.includes('*')
             ? 'application/pdf'
             : req.headers.accept;
         if (!req.body) {
-            writeResponse(res, 400, `Couldn't parse JSON body`);
-            return;
+            throw new BadRequest(`Couldn't parse JSON body`);
         }
         res.setHeader('Content-Type', contentType);
         const { url, gotoOptions, authenticate, html, addScriptTag = [], addStyleTag = [], cookies = [], emulateMediaType, rejectRequestPattern = [], requestInterceptors = [], rejectResourceTypes = [], options, setExtraHTTPHeaders, setJavaScriptEnabled, userAgent, viewport, waitForEvent, waitForFunction, waitForSelector, waitForTimeout, bestAttempt = false, } = req.body;
@@ -60,6 +60,7 @@ export default class ChromiumPDFPostRoute extends BrowserHTTPRoute {
             page.on('request', (req) => {
                 if (!!rejectRequestPattern.find((pattern) => req.url().match(pattern)) ||
                     rejectResourceTypes.includes(req.resourceType())) {
+                    logger.debug(`Aborting request ${req.method()}: ${req.url()}`);
                     return req.abort();
                 }
                 const interceptor = requestInterceptors.find((r) => req.url().match(r.pattern));
@@ -112,5 +113,6 @@ export default class ChromiumPDFPostRoute extends BrowserHTTPRoute {
         readStream.end(pdfBuffer);
         await new Promise((r) => readStream.pipe(res).once('close', r));
         page.close().catch(noop);
+        logger.info('PDF API request completed');
     };
 }

package/build/shared/performance.http.js

@@ -16,6 +16,7 @@ export default class PerformancePost extends BrowserHTTPRoute {
         const response = await main({
             browser,
             context: req.body,
+            logger: _logger,
             timeout: config.getTimeout(),
         });
         return jsonResponse(res, 200, response);

package/build/shared/scrape.http.d.ts

@@ -115,5 +115,5 @@ export default class ChromiumScrapePostRoute extends BrowserHTTPRoute {
     method: Methods;
     path: HTTPRoutes[];
     tags: APITags[];
-    handler: (req: Request, res: ServerResponse, _logger: Logger, browser: BrowserInstance) => Promise<void>;
+    handler: (req: Request, res: ServerResponse, logger: Logger, browser: BrowserInstance) => Promise<void>;
 }

package/build/shared/scrape.http.js

@@ -54,7 +54,8 @@ export default class ChromiumScrapePostRoute extends BrowserHTTPRoute {
     method = Methods.post;
     path = [HTTPRoutes.scrape, HTTPRoutes.chromiumScrape];
     tags = [APITags.browserAPI];
-    handler = async (req, res, _logger, browser) => {
+    handler = async (req, res, logger, browser) => {
+        logger.info('Scrape API invoked with body:', req.body);
         const contentType = !req.headers.accept || req.headers.accept?.includes('*')
             ? contentTypes.html
             : req.headers.accept;
@@ -121,6 +122,7 @@ export default class ChromiumScrapePostRoute extends BrowserHTTPRoute {
             page.on('request', (req) => {
                 if (!!rejectRequestPattern.find((pattern) => req.url().match(pattern)) ||
                     rejectResourceTypes.includes(req.resourceType())) {
+                    logger.debug(`Aborting request ${req.method()}: ${req.url()}`);
                     return req.abort();
                 }
                 const interceptor = requestInterceptors.find((r) => req.url().match(r.pattern));
@@ -198,6 +200,7 @@ export default class ChromiumScrapePostRoute extends BrowserHTTPRoute {
             debug: debugData,
         };
         page.close().catch(noop);
+        logger.info('Scrape API request completed');
         return jsonResponse(res, 200, response, false);
     };
 }

package/build/shared/screenshot.http.d.ts

@@ -46,5 +46,5 @@ export default class ScreenshotPost extends BrowserHTTPRoute {
     method: Methods;
     path: HTTPRoutes[];
     tags: APITags[];
-    handler: (req: Request, res: ServerResponse, _logger: Logger, browser: BrowserInstance) => Promise<void>;
+    handler: (req: Request, res: ServerResponse, logger: Logger, browser: BrowserInstance) => Promise<void>;
 }

package/build/shared/screenshot.http.js

@@ -15,7 +15,8 @@ export default class ScreenshotPost extends BrowserHTTPRoute {
     method = Methods.post;
     path = [HTTPRoutes.screenshot, HTTPRoutes.chromiumScreenshot];
     tags = [APITags.browserAPI];
-    handler = async (req, res, _logger, browser) => {
+    handler = async (req, res, logger, browser) => {
+        logger.info('Screenshot API invoked with body:', req.body);
         const contentType = !req.headers.accept || req.headers.accept?.includes('*')
             ? 'image/png'
             : req.headers.accept;
@@ -61,6 +62,7 @@ export default class ScreenshotPost extends BrowserHTTPRoute {
             page.on('request', (req) => {
                 if (!!rejectRequestPattern.find((pattern) => req.url().match(pattern)) ||
                     rejectResourceTypes.includes(req.resourceType())) {
+                    logger.debug(`Aborting request ${req.method()}: ${req.url()}`);
                     return req.abort();
                 }
                 const interceptor = requestInterceptors.find((r) => req.url().match(r.pattern));
@@ -122,5 +124,6 @@ export default class ScreenshotPost extends BrowserHTTPRoute {
         readStream.end(buffer);
         await new Promise((r) => readStream.pipe(res).once('close', r));
         page.close().catch(noop);
+        logger.info('Screenshot API request completed');
     };
 }