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

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

@@ -26,7 +26,7 @@ export declare class ChromiumCDP extends EventEmitter {
         userDataDir: ChromiumCDP['userDataDir'];
     });
     protected cleanListeners(): void;
-    keepAlive(): boolean;
+    keepUntil(): number;
     getPageId: (page: Page) => string;
     protected onTargetCreated: (target: Target) => Promise<void>;
     isRunning: () => boolean;

package/build/browsers/chromium.cdp.js

@@ -32,8 +32,8 @@ export class ChromiumCDP extends EventEmitter {
         this.browser?.removeAllListeners();
         this.removeAllListeners();
     }
-    keepAlive() {
-        return false;
+    keepUntil() {
+        return 0;
     }
     getPageId = (page) => {
         // @ts-ignore

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

@@ -22,7 +22,7 @@ export declare class ChromiumPlaywright extends EventEmitter {
         userDataDir: ChromiumPlaywright['userDataDir'];
     });
     protected cleanListeners(): void;
-    keepAlive(): boolean;
+    keepUntil(): number;
     isRunning: () => boolean;
     close: () => Promise<void>;
     pages: () => Promise<[]>;

package/build/browsers/chromium.playwright.js

@@ -22,8 +22,8 @@ export class ChromiumPlaywright extends EventEmitter {
     cleanListeners() {
         this.removeAllListeners();
     }
-    keepAlive() {
-        return false;
+    keepUntil() {
+        return 0;
     }
     isRunning = () => this.running;
     close = async () => {

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

@@ -21,7 +21,7 @@ export declare class FirefoxPlaywright extends EventEmitter {
         userDataDir: FirefoxPlaywright['userDataDir'];
     });
     protected cleanListeners(): void;
-    keepAlive(): boolean;
+    keepUntil(): number;
     isRunning: () => boolean;
     close: () => Promise<void>;
     pages: () => Promise<[]>;

package/build/browsers/firefox.playwright.js

@@ -21,8 +21,8 @@ export class FirefoxPlaywright extends EventEmitter {
     cleanListeners() {
         this.removeAllListeners();
     }
-    keepAlive() {
-        return false;
+    keepUntil() {
+        return 0;
     }
     isRunning = () => this.running;
     close = async () => {

package/build/browsers/index.d.ts

@@ -1,10 +1,11 @@
+/// <reference types="node" />
 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;
     protected hooks: Hooks;
     protected browsers: Map<BrowserInstance, BrowserlessSession>;
-    protected timers: Map<string, number>;
+    protected timers: Map<string, NodeJS.Timeout>;
     protected log: Logger;
     protected chromeBrowsers: (typeof ChromiumCDP)[];
     protected playwrightBrowserNames: string[];
@@ -38,7 +39,7 @@ export declare class BrowserManager {
         running: boolean;
         timeAliveMs: number;
         type: string;
-        id: string | null;
+        id: string;
         isTempDataDir: boolean;
         launchOptions: CDPLaunchOptions | BrowserServerOptions;
         numbConnected: number;

package/build/browsers/index.js

@@ -145,7 +145,7 @@ export class BrowserManager {
             {
                 ...session,
                 browser: browser.constructor.name,
-                browserId: browser.wsEndpoint()?.split('/').pop(),
+                browserId: session.id,
                 initialConnectURL: new URL(session.initialConnectURL, serverAddress)
                     .href,
                 killURL: session.id
@@ -178,20 +178,39 @@ export class BrowserManager {
         return sessions;
     };
     close = async (browser, session) => {
+        const now = Date.now();
+        const keepUntil = browser.keepUntil();
+        const connected = session.numbConnected;
+        const hasKeepUntil = keepUntil > now;
+        const keepOpen = connected > 0 || hasKeepUntil;
         const cleanupACtions = [];
-        this.log.info(`${session.numbConnected} Client(s) are currently connected`);
-        // Don't close if there's clients still connected
-        if (session.numbConnected > 0 || browser.keepAlive()) {
-            return;
+        const priorTimer = this.timers.get(session.id);
+        if (priorTimer) {
+            this.log.info(`Deleting prior keep-until timer for "${session.id}"`);
+            global.clearTimeout(priorTimer);
         }
-        this.log.info(`Closing browser session`);
-        cleanupACtions.push(() => browser.close());
-        if (session.isTempDataDir) {
-            this.log.info(`Deleting "${session.userDataDir}" user-data-dir and session from memory`);
-            this.browsers.delete(browser);
-            cleanupACtions.push(() => this.removeUserDataDir(session.userDataDir));
+        this.log.info(`${session.numbConnected} Client(s) are currently connected, Keep-until: ${keepUntil}`);
+        if (hasKeepUntil) {
+            const timeout = keepUntil - now;
+            this.log.trace(`Setting timer ${timeout.toLocaleString()} for "${session.id}"`);
+            this.timers.set(session.id, global.setTimeout(() => {
+                const session = this.browsers.get(browser);
+                if (session) {
+                    this.log.trace(`Timer hit for "${session.id}"`),
+                        this.close(browser, session);
+                }
+            }, timeout));
+        }
+        if (!keepOpen) {
+            this.log.info(`Closing browser session`);
+            cleanupACtions.push(() => browser.close());
+            if (session.isTempDataDir) {
+                this.log.info(`Deleting "${session.userDataDir}" user-data-dir and session from memory`);
+                this.browsers.delete(browser);
+                cleanupACtions.push(() => this.removeUserDataDir(session.userDataDir));
+            }
+            await Promise.all(cleanupACtions.map((a) => a()));
         }
-        await Promise.all(cleanupACtions.map((a) => a()));
     };
     getAllSessions = async () => {
         const sessions = Array.from(this.browsers);
@@ -307,8 +326,12 @@ export class BrowserManager {
             logger,
             userDataDir,
         });
+        const match = (req.headers['user-agent'] || '').match(pwVersionRegex);
+        const pwVersion = match ? match[1] : 'default';
+        await browser.launch(launchOptions, pwVersion);
+        await this.hooks.browser({ browser, meta: req.parsed });
         const session = {
-            id: null,
+            id: browser.wsEndpoint()?.split('/').pop(),
             initialConnectURL: path.join(req.parsed.pathname, req.parsed.search) || '',
             isTempDataDir: !manualUserDataDir,
             launchOptions,
@@ -320,10 +343,6 @@ export class BrowserManager {
             userDataDir,
         };
         this.browsers.set(browser, session);
-        const match = (req.headers['user-agent'] || '').match(pwVersionRegex);
-        const pwVersion = match ? match[1] : 'default';
-        await browser.launch(launchOptions, pwVersion);
-        await this.hooks.browser({ browser, meta: req.parsed });
         browser.on('newPage', async (page) => {
             await this.onNewPage(req, page);
             (router.onNewPage || noop)(req.parsed || '', page);

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

@@ -21,7 +21,7 @@ export declare class WebkitPlaywright extends EventEmitter {
         userDataDir: WebkitPlaywright['userDataDir'];
     });
     protected cleanListeners(): void;
-    keepAlive(): boolean;
+    keepUntil(): number;
     isRunning: () => boolean;
     close: () => Promise<void>;
     pages: () => Promise<[]>;

package/build/browsers/webkit.playwright.js

@@ -21,8 +21,8 @@ export class WebkitPlaywright extends EventEmitter {
     cleanListeners() {
         this.removeAllListeners();
     }
-    keepAlive() {
-        return false;
+    keepUntil() {
+        return 0;
     }
     isRunning = () => this.running;
     close = async () => {
@@ -48,14 +48,14 @@ export class WebkitPlaywright extends EventEmitter {
     };
     launch = async (options = {}, version) => {
         this.logger.info(`Launching ${this.constructor.name} Handler`);
-        const opts = ({
+        const opts = {
             ...options,
             args: [
                 ...(options.args || []),
                 this.userDataDir ? `-profile=${this.userDataDir}` : '',
             ],
             executablePath: playwright.webkit.executablePath(),
-        });
+        };
         const versionedPw = await this.config.loadPwVersion(version);
         this.browser = await versionedPw.webkit.launchServer(opts);
         const browserWSEndpoint = this.browser.wsEndpoint();

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

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

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

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

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

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

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

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

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

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

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

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

package/build/types.d.ts

@@ -274,7 +274,7 @@ export interface BrowserServerOptions {
     tracesDir?: string;
 }
 export interface BrowserlessSession {
-    id: string | null;
+    id: string;
     initialConnectURL: string;
     isTempDataDir: boolean;
     launchOptions: CDPLaunchOptions | BrowserServerOptions;

package/extensions/ublock/_locales/eu/messages.json

@@ -56,7 +56,7 @@
     "description": "appears as tab name in dashboard"
   },
   "supportPageName": {
-    "message": "Laguntza",
+    "message": "Soportea",
     "description": "appears as tab name in dashboard"
   },
   "assetViewerPageName": {
@@ -484,11 +484,11 @@
     "description": "Filter lists section name"
   },
   "3pGroupSocial": {
-    "message": "Social widgets",
+    "message": "Widgets Sozialak",
     "description": "Filter lists section name"
   },
   "3pGroupCookies": {
-    "message": "Cookie notices",
+    "message": "Cookie oharrak",
     "description": "Filter lists section name"
   },
   "3pGroupAnnoyances": {
@@ -544,7 +544,7 @@
     "description": "Label for the checkbox use to enable/disable 'My filters' list"
   },
   "1pTrustMyFiltersLabel": {
-    "message": "Allow custom filters requiring trust",
+    "message": "Konfiantza behar duten iragazki pertsonalizatuak baimendu",
     "description": "Label for the checkbox use to trust the content of 'My filters' list"
   },
   "1pImport": {

package/extensions/ublock/_locales/hi/messages.json

@@ -548,7 +548,7 @@
     "description": "Label for the checkbox use to trust the content of 'My filters' list"
   },
   "1pImport": {
-    "message": "इम्पोर्ट करें और जोड़ें",
+    "message": "इम्पोर्ट करें और जोड़ें...",
     "description": "Button in the 'My filters' pane"
   },
   "1pExport": {
@@ -612,7 +612,7 @@
     "description": "English: dynamic rule syntax and full documentation."
   },
   "rulesSort": {
-    "message": "क्रम में लगाये",
+    "message": "क्रम में लगाये:",
     "description": "English: label for sort option."
   },
   "rulesSortByType": {
@@ -620,7 +620,7 @@
     "description": "English: a sort option for list of rules."
   },
   "rulesSortBySource": {
-    "message": "स्रोत",
+    "message": "मूल",
     "description": "English: a sort option for list of rules."
   },
   "rulesSortByDestination": {
@@ -632,11 +632,11 @@
     "description": "A concise description of the 'Trusted sites' pane."
   },
   "whitelistImport": {
-    "message": "इम्पोर्ट करें और जोड़ें",
+    "message": "इम्पोर्ट करें और जोड़ें...",
     "description": "Button in the 'Trusted sites' pane"
   },
   "whitelistExport": {
-    "message": "निर्यात करें",
+    "message": "निर्यात करें...",
     "description": "Button in the 'Trusted sites' pane"
   },
   "whitelistExportFilename": {