@browserless.io/browserless 2.6.0 → 2.6.1-beta-2

package/build/browsers/chromium.cdp.js

@@ -121,14 +121,15 @@ export class ChromiumCDP extends EventEmitter {
         if (!this.browserWSEndpoint) {
             return null;
         }
-        const serverURL = new URL(this.config.getExternalWebSocketAddress());
-        const wsURL = new URL(this.browserWSEndpoint);
-        wsURL.host = serverURL.host;
-        wsURL.port = serverURL.port;
+        const externalURL = new URL(this.config.getExternalWebSocketAddress());
+        const internalURL = new URL(this.browserWSEndpoint);
+        internalURL.host = externalURL.host;
+        internalURL.port = externalURL.port;
+        internalURL.protocol = externalURL.protocol;
         if (token) {
-            wsURL.searchParams.set('token', token);
+            internalURL.searchParams.set('token', token);
         }
-        return wsURL.href;
+        return internalURL.href;
     };
     proxyPageWebSocket = async (req, socket, head) => new Promise(async (resolve, reject) => {
         if (!this.browserWSEndpoint || !this.browser) {

package/build/browsers/chromium.playwright.js

@@ -68,14 +68,15 @@ export class ChromiumPlaywright extends EventEmitter {
         if (!this.browserWSEndpoint) {
             return null;
         }
-        const serverURL = new URL(this.config.getExternalWebSocketAddress());
-        const wsURL = new URL(this.browserWSEndpoint);
-        wsURL.host = serverURL.host;
-        wsURL.port = serverURL.port;
+        const externalURL = new URL(this.config.getExternalWebSocketAddress());
+        const internalURL = new URL(this.browserWSEndpoint);
+        internalURL.host = externalURL.host;
+        internalURL.port = externalURL.port;
+        internalURL.protocol = externalURL.protocol;
         if (token) {
-            wsURL.searchParams.set('token', token);
+            internalURL.searchParams.set('token', token);
         }
-        return wsURL.href;
+        return internalURL.href;
     };
     proxyPageWebSocket = async () => {
         console.warn(`Not yet implemented`);

package/build/browsers/firefox.playwright.js

@@ -62,14 +62,15 @@ export class FirefoxPlaywright extends EventEmitter {
         if (!this.browserWSEndpoint) {
             return null;
         }
-        const serverURL = new URL(this.config.getExternalWebSocketAddress());
-        const wsURL = new URL(this.browserWSEndpoint);
-        wsURL.host = serverURL.host;
-        wsURL.port = serverURL.port;
+        const externalURL = new URL(this.config.getExternalWebSocketAddress());
+        const internalURL = new URL(this.browserWSEndpoint);
+        internalURL.host = externalURL.host;
+        internalURL.port = externalURL.port;
+        internalURL.protocol = externalURL.protocol;
         if (token) {
-            wsURL.searchParams.set('token', token);
+            internalURL.searchParams.set('token', token);
         }
-        return wsURL.href;
+        return internalURL.href;
     };
     proxyPageWebSocket = async () => {
         console.warn(`Not yet implemented`);

package/build/browsers/webkit.playwright.js

@@ -62,14 +62,15 @@ export class WebkitPlaywright extends EventEmitter {
         if (!this.browserWSEndpoint) {
             return null;
         }
-        const serverURL = new URL(this.config.getExternalWebSocketAddress());
-        const wsURL = new URL(this.browserWSEndpoint);
-        wsURL.host = serverURL.host;
-        wsURL.port = serverURL.port;
+        const externalURL = new URL(this.config.getExternalWebSocketAddress());
+        const internalURL = new URL(this.browserWSEndpoint);
+        internalURL.host = externalURL.host;
+        internalURL.port = externalURL.port;
+        internalURL.protocol = externalURL.protocol;
         if (token) {
-            wsURL.searchParams.set('token', token);
+            internalURL.searchParams.set('token', token);
         }
-        return wsURL.href;
+        return internalURL.href;
     };
     proxyPageWebSocket = async () => {
         console.warn(`Not yet implemented`);

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

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

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

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

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

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

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

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

package/build/shared/utils/function/handler.js

@@ -29,7 +29,7 @@ export default (config, debug, options = {}) => async (req, browser) => {
      */
     page.on('request', async (request) => {
         const requestUrl = request.url();
-        debug(`/function.js: Page Request: "${requestUrl}"`);
+        debug(`Outbound Page Request: "${requestUrl}"`);
         if (requestUrl.startsWith(functionRequestPath)) {
             const filename = path.basename(requestUrl);
             if (filename === functionCodeJS) {
@@ -55,10 +55,10 @@ export default (config, debug, options = {}) => async (req, browser) => {
                 status: 404,
             });
         }
+        debug(`Request: "${requestUrl}" no responder found, continuing...`);
         return request.continue();
     });
     page.on('response', (res) => {
-        debug(`/function.js: Page Response: "${res.url()}"`);
         if (res.status() !== 200) {
             debug(`Received a non-200 response for request "${res.url()}"`);
         }
@@ -73,6 +73,7 @@ export default (config, debug, options = {}) => async (req, browser) => {
             import('./' + functionCodeJS),
         ]);
         console.log('/function.js: imported successfully.');
+        console.log(`/function.js: BrowserlessFunctionRunner: ${typeof window.BrowserlessFunctionRunner}`);
         const helper = new window.BrowserlessFunctionRunner();
         const options = JSON.parse(serializedOptions);
         console.log('/function.js: executing puppeteer code.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.6.0",
+  "version": "2.6.1-beta-2",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",

package/scripts/build-function.js

@@ -1,18 +1,48 @@
 #!/usr/bin/env node
+/* eslint-disable no-undef */
+
 'use strict';
 
 import { build } from 'esbuild';
+import fs from 'fs/promises';
+import { join } from 'path';
 import { polyfillNode } from 'esbuild-plugin-polyfill-node';
 
-build({
-  bundle: true,
-  entryPoints: ['src/shared/utils/function/client.ts'],
-  outfile: 'static/function/client.js',
-  plugins: [
-    polyfillNode({
-      globals: {
-        process: false,
-      },
-    }),
-  ],
-});
+const html = (contents) => `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>browserless.io function runner</title>
+    <script type="module">
+    ${contents}
+    </script>
+  </head>
+  <body>
+  </body>
+</html>
+`;
+
+const entryPoints = ['src/shared/utils/function/client.ts'];
+const outfile = join(process.cwd(), 'static/function/client.js');
+const htmlLocation = join(process.cwd(), 'static/function/index.html');
+
+(async () => {
+  await build({
+    bundle: true,
+    entryPoints,
+    outfile,
+    plugins: [
+      polyfillNode({
+        globals: {
+          process: false,
+        },
+      }),
+    ],
+  });
+  const contents = await fs.readFile(outfile, 'utf-8');
+  const final = html(contents);
+
+  await fs.writeFile(htmlLocation, final);
+})();

package/src/browsers/chromium.cdp.ts

@@ -175,16 +175,17 @@ export class ChromiumCDP extends EventEmitter {
       return null;
     }
 
-    const serverURL = new URL(this.config.getExternalWebSocketAddress());
-    const wsURL = new URL(this.browserWSEndpoint);
-    wsURL.host = serverURL.host;
-    wsURL.port = serverURL.port;
+    const externalURL = new URL(this.config.getExternalWebSocketAddress());
+    const internalURL = new URL(this.browserWSEndpoint);
+    internalURL.host = externalURL.host;
+    internalURL.port = externalURL.port;
+    internalURL.protocol = externalURL.protocol;
 
     if (token) {
-      wsURL.searchParams.set('token', token);
+      internalURL.searchParams.set('token', token);
     }
 
-    return wsURL.href;
+    return internalURL.href;
   };
 
   public proxyPageWebSocket = async (

package/src/browsers/chromium.playwright.ts

@@ -104,16 +104,17 @@ export class ChromiumPlaywright extends EventEmitter {
       return null;
     }
 
-    const serverURL = new URL(this.config.getExternalWebSocketAddress());
-    const wsURL = new URL(this.browserWSEndpoint);
-    wsURL.host = serverURL.host;
-    wsURL.port = serverURL.port;
+    const externalURL = new URL(this.config.getExternalWebSocketAddress());
+    const internalURL = new URL(this.browserWSEndpoint);
+    internalURL.host = externalURL.host;
+    internalURL.port = externalURL.port;
+    internalURL.protocol = externalURL.protocol;
 
     if (token) {
-      wsURL.searchParams.set('token', token);
+      internalURL.searchParams.set('token', token);
     }
 
-    return wsURL.href;
+    return internalURL.href;
   };
 
   public proxyPageWebSocket = async () => {

package/src/browsers/firefox.playwright.ts

@@ -96,16 +96,17 @@ export class FirefoxPlaywright extends EventEmitter {
       return null;
     }
 
-    const serverURL = new URL(this.config.getExternalWebSocketAddress());
-    const wsURL = new URL(this.browserWSEndpoint);
-    wsURL.host = serverURL.host;
-    wsURL.port = serverURL.port;
+    const externalURL = new URL(this.config.getExternalWebSocketAddress());
+    const internalURL = new URL(this.browserWSEndpoint);
+    internalURL.host = externalURL.host;
+    internalURL.port = externalURL.port;
+    internalURL.protocol = externalURL.protocol;
 
     if (token) {
-      wsURL.searchParams.set('token', token);
+      internalURL.searchParams.set('token', token);
     }
 
-    return wsURL.href;
+    return internalURL.href;
   };
 
   public proxyPageWebSocket = async () => {

package/src/browsers/webkit.playwright.ts

@@ -96,16 +96,17 @@ export class WebkitPlaywright extends EventEmitter {
       return null;
     }
 
-    const serverURL = new URL(this.config.getExternalWebSocketAddress());
-    const wsURL = new URL(this.browserWSEndpoint);
-    wsURL.host = serverURL.host;
-    wsURL.port = serverURL.port;
+    const externalURL = new URL(this.config.getExternalWebSocketAddress());
+    const internalURL = new URL(this.browserWSEndpoint);
+    internalURL.host = externalURL.host;
+    internalURL.port = externalURL.port;
+    internalURL.protocol = externalURL.protocol;
 
     if (token) {
-      wsURL.searchParams.set('token', token);
+      internalURL.searchParams.set('token', token);
     }
 
-    return wsURL.href;
+    return internalURL.href;
   };
 
   public proxyPageWebSocket = async () => {

package/src/server.ts

@@ -143,7 +143,9 @@ 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.log(
+        `No matching HTTP route handler for "${req.method}: ${req.parsed.href}"`,
+      );
       writeResponse(res, 404, 'Not Found');
       return Promise.resolve();
     }

package/src/shared/utils/function/handler.ts

@@ -88,7 +88,7 @@ export default (
      */
     page.on('request', async (request) => {
       const requestUrl = request.url();
-      debug(`/function.js: Page Request: "${requestUrl}"`);
+      debug(`Outbound Page Request: "${requestUrl}"`);
       if (requestUrl.startsWith(functionRequestPath)) {
         const filename = path.basename(requestUrl);
         if (filename === functionCodeJS) {
@@ -116,11 +116,11 @@ export default (
           status: 404,
         });
       }
+      debug(`Request: "${requestUrl}" no responder found, continuing...`);
       return request.continue();
     });
 
     page.on('response', (res) => {
-      debug(`/function.js: Page Response: "${res.url()}"`);
       if (res.status() !== 200) {
         debug(`Received a non-200 response for request "${res.url()}"`);
       }
@@ -144,6 +144,9 @@ export default (
             import('./' + functionCodeJS),
           ]);
           console.log('/function.js: imported successfully.');
+          console.log(
+            `/function.js: BrowserlessFunctionRunner: ${typeof window.BrowserlessFunctionRunner}`,
+          );
           const helper = new window.BrowserlessFunctionRunner();
           const options = JSON.parse(serializedOptions);
           console.log('/function.js: executing puppeteer code.');

package/static/docs/swagger.json

@@ -1098,7 +1098,7 @@
   },
   "info": {
     "title": "Browserless",
-    "version": "2.6.0",
+    "version": "2.6.1-beta-2",
     "x-logo": {
       "altText": "browserless logo",
       "url": "./docs/browserless-logo-inline.svg"

package/static/docs/swagger.min.json

@@ -1098,7 +1098,7 @@
   },
   "info": {
     "title": "Browserless",
-    "version": "2.6.0",
+    "version": "2.6.1-beta-2",
     "x-logo": {
       "altText": "browserless logo",
       "url": "./docs/browserless-logo-inline.svg"