@browserless.io/browserless 2.12.0-beta-4 → 2.12.0

package/build/metrics.d.ts

@@ -12,16 +12,16 @@ export declare class Metrics extends EventEmitter {
     protected running: number;
     protected unhealthy: number;
     protected error: number;
-    addSuccessful: (sessionTime: number) => number;
-    addTimedout: (sessionTime: number) => number;
-    addError: (sessionTime: number) => number;
-    addQueued: () => number;
-    addRejected: () => number;
-    addUnhealthy: () => number;
-    addUnauthorized: () => number;
-    addRunning: () => number;
-    get: () => Omit<IBrowserlessStats, 'cpu' | 'memory'>;
-    reset: () => void;
+    addSuccessful(sessionTime: number): number;
+    addTimedout(sessionTime: number): number;
+    addError(sessionTime: number): number;
+    addQueued(): number;
+    addRejected(): number;
+    addUnhealthy(): number;
+    addUnauthorized(): number;
+    addRunning(): number;
+    get(): Omit<IBrowserlessStats, 'cpu' | 'memory'>;
+    reset(): void;
     protected calculateStats(sessionTimes: number[]): {
         maxTime: number;
         meanTime: number;
@@ -33,9 +33,9 @@ export declare class Metrics extends EventEmitter {
      * Implement any browserless-core-specific shutdown logic here.
      * Calls the empty-SDK stop method for downstream implementations.
      */
-    shutdown: () => Promise<void>;
+    shutdown(): Promise<void>;
     /**
      * Left blank for downstream SDK modules to optionally implement.
      */
-    stop: () => void;
+    stop(): void;
 }

package/build/metrics.js

@@ -10,41 +10,41 @@ export class Metrics extends EventEmitter {
     running = 0;
     unhealthy = 0;
     error = 0;
-    addSuccessful = (sessionTime) => {
+    addSuccessful(sessionTime) {
         --this.running;
         this.sessionTimes.push(sessionTime);
         return ++this.successful;
-    };
-    addTimedout = (sessionTime) => {
+    }
+    addTimedout(sessionTime) {
         --this.running;
         this.sessionTimes.push(sessionTime);
         return ++this.timedout;
-    };
-    addError = (sessionTime) => {
+    }
+    addError(sessionTime) {
         --this.running;
         this.sessionTimes.push(sessionTime);
         return ++this.error;
-    };
-    addQueued = () => {
+    }
+    addQueued() {
         return ++this.queued;
-    };
-    addRejected = () => {
+    }
+    addRejected() {
         return ++this.rejected;
-    };
-    addUnhealthy = () => {
+    }
+    addUnhealthy() {
         return ++this.unhealthy;
-    };
-    addUnauthorized = () => {
+    }
+    addUnauthorized() {
         return ++this.unauthorized;
-    };
-    addRunning = () => {
+    }
+    addRunning() {
         ++this.running;
         if (this.concurrent < this.running) {
             this.concurrent = this.running;
         }
         return this.running;
-    };
-    get = () => {
+    }
+    get() {
         const currentStat = {
             error: this.error,
             maxConcurrent: this.concurrent,
@@ -62,8 +62,8 @@ export class Metrics extends EventEmitter {
             ...this.calculateStats(currentStat.sessionTimes),
             date: Date.now(),
         };
-    };
-    reset = () => {
+    }
+    reset() {
         this.successful = 0;
         this.error = 0;
         this.queued = 0;
@@ -74,7 +74,7 @@ export class Metrics extends EventEmitter {
         this.running = 0;
         this.unhealthy = 0;
         this.sessionTimes = [];
-    };
+    }
     calculateStats(sessionTimes) {
         return {
             maxTime: Math.max(...sessionTimes) || 0,
@@ -88,11 +88,11 @@ export class Metrics extends EventEmitter {
      * Implement any browserless-core-specific shutdown logic here.
      * Calls the empty-SDK stop method for downstream implementations.
      */
-    shutdown = async () => {
+    async shutdown() {
         await this.stop();
-    };
+    }
     /**
      * Left blank for downstream SDK modules to optionally implement.
      */
-    stop = () => { };
+    stop() { }
 }

package/build/monitoring.d.ts

@@ -5,8 +5,8 @@ export declare class Monitoring extends EventEmitter {
     protected config: Config;
     protected log: Logger;
     constructor(config: Config);
-    getMachineStats: () => Promise<IResourceLoad>;
-    overloaded: () => Promise<{
+    getMachineStats(): Promise<IResourceLoad>;
+    overloaded(): Promise<{
         cpuInt: number | null;
         cpuOverloaded: boolean;
         memoryInt: number | null;
@@ -16,9 +16,9 @@ export declare class Monitoring extends EventEmitter {
      * Implement any browserless-core-specific shutdown logic here.
      * Calls the empty-SDK stop method for downstream implementations.
      */
-    shutdown: () => Promise<void>;
+    shutdown(): Promise<void>;
     /**
      * Left blank for downstream SDK modules to optionally implement.
      */
-    stop: () => void;
+    stop(): void;
 }

package/build/monitoring.js

@@ -8,7 +8,7 @@ export class Monitoring extends EventEmitter {
         super();
         this.config = config;
     }
-    getMachineStats = async () => {
+    async getMachineStats() {
         const [cpuLoad, memLoad] = await Promise.all([
             si.currentLoad(),
             si.mem(),
@@ -22,8 +22,8 @@ export class Monitoring extends EventEmitter {
             cpu,
             memory,
         };
-    };
-    overloaded = async () => {
+    }
+    async overloaded() {
         const { cpu, memory } = await this.getMachineStats();
         const cpuInt = cpu && Math.ceil(cpu * 100);
         const memoryInt = memory && Math.ceil(memory * 100);
@@ -36,16 +36,16 @@ export class Monitoring extends EventEmitter {
             memoryInt,
             memoryOverloaded,
         };
-    };
+    }
     /**
      * Implement any browserless-core-specific shutdown logic here.
      * Calls the empty-SDK stop method for downstream implementations.
      */
-    shutdown = async () => {
-        await this.stop();
-    };
+    async shutdown() {
+        return await this.stop();
+    }
     /**
      * Left blank for downstream SDK modules to optionally implement.
      */
-    stop = () => { };
+    stop() { }
 }

package/build/router.d.ts

@@ -14,12 +14,12 @@ export declare class Router extends EventEmitter {
     protected webSocketRoutes: Array<WebSocketRoute | BrowserWebsocketRoute>;
     constructor(config: Config, browserManager: BrowserManager, limiter: Limiter, logger: typeof Logger);
     protected getTimeout(req: Request): number | undefined;
-    protected onQueueFullHTTP: (_req: Request, res: Response) => void;
-    protected onQueueFullWebSocket: (_req: Request, socket: stream.Duplex) => void;
-    protected onHTTPTimeout: (_req: Request, res: Response) => void;
-    protected onWebsocketTimeout: (_req: Request, socket: stream.Duplex) => void;
-    protected wrapHTTPHandler: (route: HTTPRoute | BrowserHTTPRoute, handler: HTTPRoute['handler'] | BrowserHTTPRoute['handler']) => (req: Request, res: Response) => Promise<unknown>;
-    protected wrapWebSocketHandler: (route: WebSocketRoute | BrowserWebsocketRoute, handler: WebSocketRoute['handler'] | BrowserWebsocketRoute['handler']) => (req: Request, socket: stream.Duplex, head: Buffer) => Promise<unknown>;
+    protected onQueueFullHTTP(_req: Request, res: Response): void;
+    protected onQueueFullWebSocket(_req: Request, socket: stream.Duplex): void;
+    protected onHTTPTimeout(_req: Request, res: Response): void;
+    protected onWebsocketTimeout(_req: Request, socket: stream.Duplex): void;
+    protected wrapHTTPHandler(route: HTTPRoute | BrowserHTTPRoute, handler: HTTPRoute['handler'] | BrowserHTTPRoute['handler']): (req: Request, res: Response) => Promise<unknown>;
+    protected wrapWebSocketHandler(route: WebSocketRoute | BrowserWebsocketRoute, handler: WebSocketRoute['handler'] | BrowserWebsocketRoute['handler']): (req: Request, socket: stream.Duplex, head: Buffer) => Promise<unknown>;
     registerHTTPRoute(route: HTTPRoute | BrowserHTTPRoute): HTTPRoute | BrowserHTTPRoute;
     registerWebSocketRoute(route: WebSocketRoute | BrowserWebsocketRoute): WebSocketRoute | BrowserWebsocketRoute;
     getStaticHandler(): HTTPRoute;
@@ -29,9 +29,9 @@ export declare class Router extends EventEmitter {
      * Implement any browserless-core-specific shutdown logic here.
      * Calls the empty-SDK stop method for downstream implementations.
      */
-    shutdown: () => Promise<void>;
+    shutdown(): Promise<void>;
     /**
      * Left blank for downstream SDK modules to optionally implement.
      */
-    stop: () => void;
+    stop(): void;
 }

package/build/router.js

@@ -20,94 +20,98 @@ export class Router extends EventEmitter {
         const timer = req.parsed.searchParams.get('timeout');
         return timer ? +timer : undefined;
     }
-    onQueueFullHTTP = (_req, res) => {
+    onQueueFullHTTP(_req, res) {
         this.log.warn(`Queue is full, sending 429 response`);
         return writeResponse(res, 429, 'Too many requests');
-    };
-    onQueueFullWebSocket = (_req, socket) => {
+    }
+    onQueueFullWebSocket(_req, socket) {
         this.log.warn(`Queue is full, sending 429 response`);
         return writeResponse(socket, 429, 'Too many requests');
-    };
-    onHTTPTimeout = (_req, res) => {
+    }
+    onHTTPTimeout(_req, res) {
         this.log.error(`HTTP job has timedout, sending 429 response`);
         return writeResponse(res, 408, 'Request has timed out');
-    };
-    onWebsocketTimeout = (_req, socket) => {
+    }
+    onWebsocketTimeout(_req, socket) {
         this.log.error(`Websocket job has timedout, sending 429 response`);
         return writeResponse(socket, 408, 'Request has timed out');
-    };
-    wrapHTTPHandler = (route, handler) => async (req, res) => {
-        if (!isConnected(res)) {
-            this.log.warn(`HTTP Request has closed prior to running`);
-            return Promise.resolve();
-        }
-        const logger = new this.logger(route.name, req);
-        if ('browser' in route && route.browser) {
-            const browser = await this.browserManager.getBrowserForRequest(req, route, logger);
+    }
+    wrapHTTPHandler(route, handler) {
+        return async (req, res) => {
             if (!isConnected(res)) {
                 this.log.warn(`HTTP Request has closed prior to running`);
-                this.browserManager.complete(browser);
                 return Promise.resolve();
             }
-            if (!browser) {
-                return writeResponse(res, 500, `Error loading the browser`);
-            }
-            try {
-                this.log.trace(`Running found HTTP handler.`);
-                return await Promise.race([
-                    handler(req, res, logger, browser),
-                    new Promise((resolve, reject) => {
-                        res.once('close', () => {
-                            if (!res.writableEnded) {
-                                reject(new Error(`Request closed prior to writing results`));
-                            }
-                            this.log.trace(`Response has been written, resolving`);
-                            resolve(null);
-                        });
-                    }),
-                ]);
+            const logger = new this.logger(route.name, req);
+            if ('browser' in route && route.browser) {
+                const browser = await this.browserManager.getBrowserForRequest(req, route, logger);
+                if (!isConnected(res)) {
+                    this.log.warn(`HTTP Request has closed prior to running`);
+                    this.browserManager.complete(browser);
+                    return Promise.resolve();
+                }
+                if (!browser) {
+                    return writeResponse(res, 500, `Error loading the browser`);
+                }
+                try {
+                    this.log.trace(`Running found HTTP handler.`);
+                    return await Promise.race([
+                        handler(req, res, logger, browser),
+                        new Promise((resolve, reject) => {
+                            res.once('close', () => {
+                                if (!res.writableEnded) {
+                                    reject(new Error(`Request closed prior to writing results`));
+                                }
+                                this.log.trace(`Response has been written, resolving`);
+                                resolve(null);
+                            });
+                        }),
+                    ]);
+                }
+                finally {
+                    this.log.trace(`HTTP Request handler has finished.`);
+                    this.browserManager.complete(browser);
+                }
             }
-            finally {
-                this.log.trace(`HTTP Request handler has finished.`);
-                this.browserManager.complete(browser);
-            }
-        }
-        return handler(req, res, logger);
-    };
-    wrapWebSocketHandler = (route, handler) => async (req, socket, head) => {
-        if (!isConnected(socket)) {
-            this.log.warn(`WebSocket Request has closed prior to running`);
-            return Promise.resolve();
-        }
-        const logger = new this.logger(route.name, req);
-        if ('browser' in route && route.browser) {
-            const browser = await this.browserManager.getBrowserForRequest(req, route, logger);
+            return handler(req, res, logger);
+        };
+    }
+    wrapWebSocketHandler(route, handler) {
+        return async (req, socket, head) => {
             if (!isConnected(socket)) {
                 this.log.warn(`WebSocket Request has closed prior to running`);
-                this.browserManager.complete(browser);
                 return Promise.resolve();
             }
-            if (!browser) {
-                return writeResponse(socket, 500, `Error loading the browser.`);
-            }
-            try {
-                this.log.trace(`Running found WebSocket handler.`);
-                await handler(req, socket, head, logger, browser);
-            }
-            finally {
-                this.log.trace(`WebSocket Request handler has finished.`);
-                this.browserManager.complete(browser);
+            const logger = new this.logger(route.name, req);
+            if ('browser' in route && route.browser) {
+                const browser = await this.browserManager.getBrowserForRequest(req, route, logger);
+                if (!isConnected(socket)) {
+                    this.log.warn(`WebSocket Request has closed prior to running`);
+                    this.browserManager.complete(browser);
+                    return Promise.resolve();
+                }
+                if (!browser) {
+                    return writeResponse(socket, 500, `Error loading the browser.`);
+                }
+                try {
+                    this.log.trace(`Running found WebSocket handler.`);
+                    await handler(req, socket, head, logger, browser);
+                }
+                finally {
+                    this.log.trace(`WebSocket Request handler has finished.`);
+                    this.browserManager.complete(browser);
+                }
+                return;
             }
-            return;
-        }
-        return handler(req, socket, head, logger);
-    };
+            return handler(req, socket, head, logger);
+        };
+    }
     registerHTTPRoute(route) {
         this.log.trace(`Registering HTTP ${route.method.toUpperCase()} ${route.path}`);
         const bound = route.handler.bind(route);
         const wrapped = this.wrapHTTPHandler(route, bound);
         route.handler = route.concurrency
-            ? this.limiter.limit(wrapped, this.onQueueFullHTTP, this.onHTTPTimeout, this.getTimeout)
+            ? this.limiter.limit(wrapped, this.onQueueFullHTTP.bind(this), this.onHTTPTimeout.bind(this), this.getTimeout.bind(this))
             : wrapped;
         route.path = Array.isArray(route.path) ? route.path : [route.path];
         const registeredPaths = this.httpRoutes.map((r) => r.path).flat();
@@ -123,7 +127,7 @@ export class Router extends EventEmitter {
         const bound = route.handler.bind(route);
         const wrapped = this.wrapWebSocketHandler(route, bound);
         route.handler = route.concurrency
-            ? this.limiter.limit(wrapped, this.onQueueFullWebSocket, this.onWebsocketTimeout, this.getTimeout)
+            ? this.limiter.limit(wrapped, this.onQueueFullWebSocket.bind(this), this.onWebsocketTimeout.bind(this), this.getTimeout.bind(this))
             : wrapped;
         route.path = Array.isArray(route.path) ? route.path : [route.path];
         const registeredPaths = this.webSocketRoutes.map((r) => r.path).flat();
@@ -160,13 +164,13 @@ export class Router extends EventEmitter {
      * Implement any browserless-core-specific shutdown logic here.
      * Calls the empty-SDK stop method for downstream implementations.
      */
-    shutdown = async () => {
+    async shutdown() {
         this.httpRoutes = [];
         this.webSocketRoutes = [];
-        await this.stop();
-    };
+        return await this.stop();
+    }
     /**
      * Left blank for downstream SDK modules to optionally implement.
      */
-    stop = () => { };
+    stop() { }
 }

package/build/routes/chrome/http/pdf.post.body.json

@@ -535,14 +535,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@87555": {
+                "__@toStringTag@87548": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@87555",
+                "__@toStringTag@87548",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -577,13 +577,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@87555": {
+        "__@toStringTag@87548": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@87555",
+        "__@toStringTag@87548",
         "byteLength"
       ]
     },
@@ -593,18 +593,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@87656": {
+        "__@species@87649": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@87555": {
+        "__@toStringTag@87548": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@87656",
-        "__@toStringTag@87555",
+        "__@species@87649",
+        "__@toStringTag@87548",
         "byteLength"
       ]
     },

package/build/routes/chrome/http/scrape.post.body.json

@@ -441,14 +441,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@98721": {
+                "__@toStringTag@109614": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@98721",
+                "__@toStringTag@109614",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -483,13 +483,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@98721": {
+        "__@toStringTag@109614": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@98721",
+        "__@toStringTag@109614",
         "byteLength"
       ]
     },
@@ -499,18 +499,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@98822": {
+        "__@species@109715": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@98721": {
+        "__@toStringTag@109614": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@98822",
-        "__@toStringTag@98721",
+        "__@species@109715",
+        "__@toStringTag@109614",
         "byteLength"
       ]
     },

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

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

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

@@ -394,14 +394,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@121117": {
+                "__@toStringTag@132010": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@121117",
+                "__@toStringTag@132010",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -436,13 +436,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@121117": {
+        "__@toStringTag@132010": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@121117",
+        "__@toStringTag@132010",
         "byteLength"
       ]
     },
@@ -452,18 +452,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@121218": {
+        "__@species@132111": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@121117": {
+        "__@toStringTag@132010": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@121218",
-        "__@toStringTag@121117",
+        "__@species@132111",
+        "__@toStringTag@132010",
         "byteLength"
       ]
     },