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

package/build/routes/chrome/tests/websocket.spec.js

@@ -4,9 +4,6 @@ import { deleteAsync } from 'del';
 import { expect } from 'chai';
 import puppeteer from 'puppeteer-core';
 describe('Chrome WebSocket API', function () {
-    // Server shutdown can take a few seconds
-    // and so can these tests :/
-    this.timeout(10000);
     let browserless;
     const start = ({ config = new Config(), metrics = new Metrics(), } = {}) => {
         browserless = new Browserless({ config, metrics });
@@ -345,6 +342,24 @@ describe('Chrome WebSocket API', function () {
         expect(results.rejected).to.equal(0);
         expect(results.queued).to.equal(0);
     });
+    it('runs multiple versions of playwright', async () => {
+        const config = new Config();
+        config.setToken('browserless');
+        const metrics = new Metrics();
+        await start({ config, metrics });
+        const pwVersions = Object.keys(config.getPwVersions());
+        for (const version of pwVersions) {
+            const pw = await import(config.getPwVersions()[version]);
+            const browser = await pw.chromium.connect(`ws://localhost:3000/chrome/playwright?token=browserless`);
+            await browser.close();
+            await sleep(100);
+        }
+        const results = metrics.get();
+        expect(results.timedout).to.equal(0);
+        expect(results.successful).to.equal(pwVersions.length);
+        expect(results.rejected).to.equal(0);
+        expect(results.queued).to.equal(0);
+    });
     it('rejects playwright without tokens', async () => {
         const config = new Config();
         config.setToken('browserless');

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

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

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

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

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

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

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

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

package/build/routes/chromium/tests/websocket.spec.js

@@ -345,6 +345,24 @@ describe('Chromium WebSocket API', function () {
         expect(results.rejected).to.equal(0);
         expect(results.queued).to.equal(0);
     });
+    it('runs multiple versions of playwright', async () => {
+        const config = new Config();
+        config.setToken('browserless');
+        const metrics = new Metrics();
+        await start({ config, metrics });
+        const pwVersions = Object.keys(config.getPwVersions());
+        for (const version of pwVersions) {
+            const pw = await import(config.getPwVersions()[version]);
+            const browser = await pw.chromium.connect(`ws://localhost:3000/playwright/chromium?token=browserless`);
+            await browser.close();
+            await sleep(100);
+        }
+        const results = metrics.get();
+        expect(results.timedout).to.equal(0);
+        expect(results.successful).to.equal(pwVersions.length);
+        expect(results.rejected).to.equal(0);
+        expect(results.queued).to.equal(0);
+    });
     it('rejects playwright without tokens', async () => {
         const config = new Config();
         config.setToken('browserless');

package/build/routes/firefox/tests/websocket.spec.js

@@ -4,7 +4,6 @@ import { firefox } from 'playwright-core';
 describe('Firefox Websocket API', function () {
     // Server shutdown can take a few seconds
     // and so can these tests :/
-    this.timeout(5000);
     let browserless;
     const start = ({ config = new Config(), metrics = new Metrics(), } = {}) => {
         browserless = new Browserless({ config, metrics });
@@ -21,6 +20,24 @@ describe('Firefox Websocket API', function () {
         const browser = await firefox.connect(`ws://localhost:3000/playwright/firefox?token=browserless`);
         await browser.close();
     });
+    it('runs multiple versions of playwright', async () => {
+        const config = new Config();
+        config.setToken('browserless');
+        const metrics = new Metrics();
+        await start({ config, metrics });
+        const pwVersions = Object.keys(config.getPwVersions());
+        for (const version of pwVersions) {
+            const pw = await import(config.getPwVersions()[version]);
+            const browser = await pw.firefox.connect(`ws://localhost:3000/playwright/firefox?token=browserless`);
+            await browser.close();
+            await sleep(100);
+        }
+        const results = metrics.get();
+        expect(results.timedout).to.equal(0);
+        expect(results.successful).to.equal(pwVersions.length);
+        expect(results.rejected).to.equal(0);
+        expect(results.queued).to.equal(0);
+    });
     it('rejects playwright requests', async () => {
         const config = new Config();
         config.setToken('browserless');

package/build/routes/webkit/tests/websocket.spec.js

@@ -21,6 +21,24 @@ describe('Webkit Websocket API', function () {
         const browser = await webkit.connect(`ws://localhost:3000/playwright/webkit?token=browserless`);
         await browser.close();
     });
+    it('runs multiple versions of playwright', async () => {
+        const config = new Config();
+        config.setToken('browserless');
+        const metrics = new Metrics();
+        await start({ config, metrics });
+        const pwVersions = Object.keys(config.getPwVersions());
+        for (const version of pwVersions) {
+            const pw = await import(config.getPwVersions()[version]);
+            const browser = await pw.webkit.connect(`ws://localhost:3000/playwright/webkit?token=browserless`);
+            await browser.close();
+            await sleep(100);
+        }
+        const results = metrics.get();
+        expect(results.timedout).to.equal(0);
+        expect(results.successful).to.equal(pwVersions.length);
+        expect(results.rejected).to.equal(0);
+        expect(results.queued).to.equal(0);
+    });
     it('rejects playwright requests', async () => {
         const config = new Config();
         config.setToken('browserless');

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/build/utils.d.ts

@@ -7,6 +7,15 @@ import { Duplex } from 'stream';
 import { Page } from 'puppeteer-core';
 import { ServerResponse } from 'http';
 import debug from 'debug';
+/**
+ * RegEx to match the Playwright version from the innitial request header.
+ *
+ * @example
+ * const userAgent = "Playwright/1.43.1 (x64; windows 10.0) node/20.11";
+ * userAgent.match(pwVersionRegex);
+ * // ["Playwright/1.43", "1.43"]
+ */
+export declare const pwVersionRegex: RegExp;
 export declare const buildDir: string;
 export declare const tsExtension = ".d.ts";
 export declare const jsonExtension = ".json";

package/build/utils.js

@@ -21,6 +21,15 @@ const getAuthHeaderToken = (header) => {
     }
     return null;
 };
+/**
+ * RegEx to match the Playwright version from the innitial request header.
+ *
+ * @example
+ * const userAgent = "Playwright/1.43.1 (x64; windows 10.0) node/20.11";
+ * userAgent.match(pwVersionRegex);
+ * // ["Playwright/1.43", "1.43"]
+ */
+export const pwVersionRegex = /Playwright\/(\d+\.\d+)/;
 export const buildDir = path.join(path.resolve(), 'build');
 export const tsExtension = '.d.ts';
 export const jsonExtension = '.json';

package/docker/chromium/Dockerfile

@@ -26,7 +26,8 @@ RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula sele
     fonts-ubuntu \
     fonts-wqy-zenhei
 
-RUN ./node_modules/.bin/playwright-core install --with-deps chromium &&\
+RUN npx --yes playwright install chromium &&\
+  npx --yes playwright install-deps chromium &&\
   npm run build &&\
   npm run build:function &&\
   npm prune production &&\

package/docker/firefox/Dockerfile

@@ -26,7 +26,8 @@ RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula sele
     fonts-ubuntu \
     fonts-wqy-zenhei
 
-RUN ./node_modules/.bin/playwright-core install --with-deps firefox &&\
+RUN npx --yes playwright install firefox &&\
+  npx --yes playwright install-deps firefox &&\
   npm run build &&\
   npm prune production &&\
   chown -R blessuser:blessuser $APP_DIR &&\

package/docker/multi/Dockerfile

@@ -34,7 +34,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
     rm -rf ./src/routes/chrome; \
   fi
 
-RUN ./node_modules/.bin/playwright-core install --with-deps chromium firefox webkit &&\
+RUN npx --yes playwright install --with-deps chromium firefox webkit &&\
   npm run build &&\
   npm run build:function &&\
   npm prune production &&\

package/docker/webkit/Dockerfile

@@ -27,7 +27,8 @@ RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula sele
     fonts-ubuntu \
     fonts-wqy-zenhei
 
-RUN ./node_modules/.bin/playwright-core install --with-deps webkit &&\
+RUN npx --yes playwright install webkit &&\
+  npx --yes playwright install-deps webkit &&\
   npm run build &&\
   npm prune production &&\
   chown -R blessuser:blessuser $APP_DIR &&\

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": {

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

@@ -76,7 +76,7 @@
     "description": "Message to be read by screen readers"
   },
   "popupPowerSwitchInfo2": {
-    "message": "Click to enable uBlock₀ for this site.",
+    "message": "ಈ ಸೈಟ್‌ಗಾಗಿ uBlock₀ ಸಕ್ರಿಯಗೊಳಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ.",
     "description": "Message to be read by screen readers"
   },
   "popupBlockedRequestPrompt": {
@@ -128,7 +128,7 @@
     "description": "Tooltip used for the logger icon in the panel"
   },
   "popupTipReport": {
-    "message": "Report an issue on this website",
+    "message": "ublock origin ಗೆ ಸಂಬಂಧಿಸಿದ ಈ ವೆಬ್‌ಸೈಟ್‌ನಲ್ಲಿ ಸಮಸ್ಯೆಯನ್ನು ವರದಿ ಮಾಡಿ",
     "description": "Tooltip used for the 'chat' icon in the panel"
   },
   "popupTipNoPopups": {
@@ -180,7 +180,7 @@
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipNoScripting1": {
-    "message": "Click to disable JavaScript on this site",
+    "message": "ಈ ಸೈಟ್‌ನಲ್ಲಿ ಜಾವಾಸ್ಕ್ರಿಪ್ಟ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ",
     "description": "Tooltip for the no-scripting per-site switch"
   },
   "popupTipNoScripting2": {
@@ -388,7 +388,7 @@
     "description": ""
   },
   "settingsNoScriptingPrompt": {
-    "message": "Disable JavaScript",
+    "message": "ಜಾವಾಸ್ಕ್ರಿಪ್ಟ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ",
     "description": "The default state for the per-site no-scripting switch"
   },
   "settingsNoCSPReportsPrompt": {
@@ -424,7 +424,7 @@
     "description": "Appears at the top of the _3rd-party filters_ pane"
   },
   "3pListsOfBlockedHostsPerListStats": {
-    "message": "{{used}} used out of {{total}}",
+    "message": "{{total}} ರಿಂದ {{used}} ಬಳಸಲುಗುವುತಿದೆ ",
     "description": "Appears aside each filter list in the _3rd-party filters_ pane"
   },
   "3pAutoUpdatePrompt1": {
@@ -520,7 +520,7 @@
     "description": "used as a tooltip for the out-of-date icon beside a list"
   },
   "3pViewContent": {
-    "message": "view content",
+    "message": "ವಿಷಯವನ್ನು ವೀಕ್ಷಿಸಿ",
     "description": "used as a tooltip for eye icon beside a list"
   },
   "3pLastUpdate": {
@@ -552,7 +552,7 @@
     "description": "Button in the 'My filters' pane"
   },
   "1pExport": {
-    "message": "ರಫ್ತು",
+    "message": "ರಫ್ತು...",
     "description": "Button in the 'My filters' pane"
   },
   "1pExportFilename": {
@@ -580,7 +580,7 @@
     "description": "This will persist temporary rules"
   },
   "rulesEdit": {
-    "message": "ಸಂಪಾದಿಸಿ",
+    "message": "ತಿದ್ದಿ ",
     "description": "Will enable manual-edit mode (textarea)"
   },
   "rulesEditSave": {
@@ -660,7 +660,7 @@
     "description": "English: URL"
   },
   "logRequestsHeaderFilter": {
-    "message": "Filter",
+    "message": "ಫಿಲ್ಟರ್",
     "description": "English: Filter"
   },
   "logAll": {
@@ -716,7 +716,7 @@
     "description": "Tooltip for the button to bring up logger output filtering options"
   },
   "loggerRowFiltererBuiltinNot": {
-    "message": "Not",
+    "message": "ಅಲ್ಲದ ",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltinEventful": {
@@ -780,7 +780,7 @@
     "description": "Label to identify the URL of an entry"
   },
   "loggerURLFilteringHeader": {
-    "message": "URL rule",
+    "message": "URL ನಿಯಮ ",
     "description": "Small header to identify the dynamic URL filtering section"
   },
   "loggerURLFilteringContextLabel": {

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

@@ -540,11 +540,11 @@
     "description": "Warning against copy-pasting filters from random sources"
   },
   "1pEnableMyFiltersLabel": {
-    "message": "Enable my custom filters",
+    "message": "Aktiver mine egendefinerte filtre",
     "description": "Label for the checkbox use to enable/disable 'My filters' list"
   },
   "1pTrustMyFiltersLabel": {
-    "message": "Allow custom filters requiring trust",
+    "message": "Tillat egendefinerte filtre som krever tiltro",
     "description": "Label for the checkbox use to trust the content of 'My filters' list"
   },
   "1pImport": {

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

@@ -540,11 +540,11 @@
     "description": "Warning against copy-pasting filters from random sources"
   },
   "1pEnableMyFiltersLabel": {
-    "message": "Enable my custom filters",
+    "message": "Aktiver mine egendefinerte filtre",
     "description": "Label for the checkbox use to enable/disable 'My filters' list"
   },
   "1pTrustMyFiltersLabel": {
-    "message": "Allow custom filters requiring trust",
+    "message": "Tillat egendefinerte filtre som krever tiltro",
     "description": "Label for the checkbox use to trust the content of 'My filters' list"
   },
   "1pImport": {

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

@@ -484,7 +484,7 @@
     "description": "Filter lists section name"
   },
   "3pGroupSocial": {
-    "message": "Social widgets",
+    "message": "Widget-uri sociale",
     "description": "Filter lists section name"
   },
   "3pGroupCookies": {

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

@@ -104,7 +104,7 @@
     "description": "For the new mobile-friendly popup design"
   },
   "popupBlockedSinceInstall_v2": {
-    "message": "Blockerat sedan installationen",
+    "message": "Blockerat sedan installation",
     "description": "For the new mobile-friendly popup design"
   },
   "popupDomainsConnected_v2": {