npm - @browserless.io/browserless - Versions diffs - 2.5.0 → 2.6.1-beta-1 - Mend

@browserless.io/browserless 2.5.0 → 2.6.1-beta-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (195) hide show

package/CHANGELOG.md +9 -1
package/README.md +55 -36
package/build/config.d.ts +2 -2
package/build/config.js +3 -3
package/build/data/classes.json +1 -1
package/build/data/selectors.json +1 -1
package/build/http.d.ts +1 -0
package/build/http.js +1 -0
package/build/routes/chrome/http/content.post.body.json +8 -8
package/build/routes/chrome/http/pdf.post.body.json +8 -8
package/build/routes/chrome/http/scrape.post.body.json +8 -8
package/build/routes/chrome/http/screenshot.post.body.json +9 -9
package/build/routes/chromium/http/content.post.body.json +8 -8
package/build/routes/chromium/http/pdf.post.body.json +8 -8
package/build/routes/chromium/http/scrape.post.body.json +8 -8
package/build/routes/chromium/http/screenshot.post.body.json +9 -9
package/build/routes/management/http/active.get.d.ts +16 -0
package/build/routes/management/http/active.get.js +17 -0
package/build/routes/management/tests/management.spec.js +7 -0
package/build/server.js +1 -1
package/build/shared/utils/function/handler.js +3 -2
package/build/types.d.ts +6 -4
package/build/types.js +1 -0
package/build/utils.d.ts +1 -1
package/docker/base/Dockerfile +1 -1
package/extensions/ublock/1p-filters.html +4 -3
package/extensions/ublock/3p-filters.html +3 -3
package/extensions/ublock/_locales/ar/messages.json +16 -4
package/extensions/ublock/_locales/az/messages.json +16 -4
package/extensions/ublock/_locales/be/messages.json +19 -7
package/extensions/ublock/_locales/bg/messages.json +16 -4
package/extensions/ublock/_locales/bn/messages.json +33 -21
package/extensions/ublock/_locales/br_FR/messages.json +33 -21
package/extensions/ublock/_locales/bs/messages.json +16 -4
package/extensions/ublock/_locales/ca/messages.json +16 -4
package/extensions/ublock/_locales/cs/messages.json +16 -4
package/extensions/ublock/_locales/cv/messages.json +16 -4
package/extensions/ublock/_locales/cy/messages.json +16 -4
package/extensions/ublock/_locales/da/messages.json +21 -9
package/extensions/ublock/_locales/de/messages.json +17 -5
package/extensions/ublock/_locales/el/messages.json +16 -4
package/extensions/ublock/_locales/en/messages.json +16 -4
package/extensions/ublock/_locales/en_GB/messages.json +16 -4
package/extensions/ublock/_locales/eo/messages.json +17 -5
package/extensions/ublock/_locales/es/messages.json +16 -4
package/extensions/ublock/_locales/et/messages.json +16 -4
package/extensions/ublock/_locales/eu/messages.json +16 -4
package/extensions/ublock/_locales/fa/messages.json +24 -12
package/extensions/ublock/_locales/fi/messages.json +16 -4
package/extensions/ublock/_locales/fil/messages.json +16 -4
package/extensions/ublock/_locales/fr/messages.json +16 -4
package/extensions/ublock/_locales/fy/messages.json +16 -4
package/extensions/ublock/_locales/gl/messages.json +16 -4
package/extensions/ublock/_locales/gu/messages.json +16 -4
package/extensions/ublock/_locales/he/messages.json +25 -13
package/extensions/ublock/_locales/hi/messages.json +31 -19
package/extensions/ublock/_locales/hr/messages.json +16 -4
package/extensions/ublock/_locales/hu/messages.json +16 -4
package/extensions/ublock/_locales/hy/messages.json +17 -5
package/extensions/ublock/_locales/id/messages.json +16 -4
package/extensions/ublock/_locales/it/messages.json +17 -5
package/extensions/ublock/_locales/ja/messages.json +16 -4
package/extensions/ublock/_locales/ka/messages.json +16 -4
package/extensions/ublock/_locales/kk/messages.json +16 -4
package/extensions/ublock/_locales/kn/messages.json +74 -62
package/extensions/ublock/_locales/ko/messages.json +16 -4
package/extensions/ublock/_locales/lt/messages.json +23 -11
package/extensions/ublock/_locales/lv/messages.json +16 -4
package/extensions/ublock/_locales/mk/messages.json +16 -4
package/extensions/ublock/_locales/ml/messages.json +19 -7
package/extensions/ublock/_locales/mr/messages.json +16 -4
package/extensions/ublock/_locales/ms/messages.json +16 -4
package/extensions/ublock/_locales/nb/messages.json +16 -4
package/extensions/ublock/_locales/nl/messages.json +16 -4
package/extensions/ublock/_locales/no/messages.json +16 -4
package/extensions/ublock/_locales/oc/messages.json +16 -4
package/extensions/ublock/_locales/pa/messages.json +16 -4
package/extensions/ublock/_locales/pl/messages.json +17 -5
package/extensions/ublock/_locales/pt_BR/messages.json +16 -4
package/extensions/ublock/_locales/pt_PT/messages.json +16 -4
package/extensions/ublock/_locales/ro/messages.json +17 -5
package/extensions/ublock/_locales/ru/messages.json +16 -4
package/extensions/ublock/_locales/si/messages.json +16 -4
package/extensions/ublock/_locales/sk/messages.json +16 -4
package/extensions/ublock/_locales/sl/messages.json +16 -4
package/extensions/ublock/_locales/so/messages.json +16 -4
package/extensions/ublock/_locales/sq/messages.json +16 -4
package/extensions/ublock/_locales/sr/messages.json +16 -4
package/extensions/ublock/_locales/sv/messages.json +20 -8
package/extensions/ublock/_locales/sw/messages.json +16 -4
package/extensions/ublock/_locales/ta/messages.json +16 -4
package/extensions/ublock/_locales/te/messages.json +16 -4
package/extensions/ublock/_locales/th/messages.json +42 -30
package/extensions/ublock/_locales/tr/messages.json +19 -7
package/extensions/ublock/_locales/uk/messages.json +16 -4
package/extensions/ublock/_locales/ur/messages.json +16 -4
package/extensions/ublock/_locales/vi/messages.json +16 -4
package/extensions/ublock/_locales/zh_CN/messages.json +16 -4
package/extensions/ublock/_locales/zh_TW/messages.json +42 -30
package/extensions/ublock/assets/assets.json +95 -78
package/extensions/ublock/assets/resources/scriptlets.js +70 -24
package/extensions/ublock/assets/thirdparties/easylist/easylist.txt +6258 -3453
package/extensions/ublock/assets/thirdparties/easylist/easyprivacy.txt +277 -40
package/extensions/ublock/assets/thirdparties/pgl.yoyo.org/as/serverlist +8 -32
package/extensions/ublock/assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat +107 -12
package/extensions/ublock/assets/thirdparties/urlhaus-filter/urlhaus-filter-online.txt +1160 -954
package/extensions/ublock/assets/ublock/badlists.txt +1 -2
package/extensions/ublock/assets/ublock/badware.min.txt +395 -270
package/extensions/ublock/assets/ublock/filters.min.txt +1176 -1238
package/extensions/ublock/assets/ublock/privacy.min.txt +32 -31
package/extensions/ublock/assets/ublock/quick-fixes.min.txt +120 -110
package/extensions/ublock/assets/ublock/unbreak.min.txt +75 -36
package/extensions/ublock/css/1p-filters.css +2 -1
package/extensions/ublock/css/3p-filters.css +1 -16
package/extensions/ublock/css/advanced-settings.css +1 -0
package/extensions/ublock/css/asset-viewer.css +1 -0
package/extensions/ublock/css/code-viewer.css +1 -0
package/extensions/ublock/css/codemirror.css +37 -10
package/extensions/ublock/css/common.css +36 -2
package/extensions/ublock/css/dashboard.css +9 -3
package/extensions/ublock/css/devtools.css +1 -0
package/extensions/ublock/css/document-blocked.css +3 -3
package/extensions/ublock/css/dom-inspector.css +1 -0
package/extensions/ublock/css/dyna-rules.css +1 -0
package/extensions/ublock/css/epicker-ui.css +76 -66
package/extensions/ublock/css/fa-icons.css +1 -0
package/extensions/ublock/css/logger-ui.css +2 -0
package/extensions/ublock/css/popup-fenix.css +1 -0
package/extensions/ublock/css/whitelist.css +1 -0
package/extensions/ublock/dashboard.html +20 -13
package/extensions/ublock/devtools.html +2 -0
package/extensions/ublock/dyna-rules.html +2 -2
package/extensions/ublock/img/flags-of-the-world/np.png +0 -0
package/extensions/ublock/img/fontawesome/fontawesome-defs.svg +1 -0
package/extensions/ublock/js/1p-filters.js +72 -23
package/extensions/ublock/js/3p-filters.js +71 -25
package/extensions/ublock/js/asset-viewer.js +1 -0
package/extensions/ublock/js/assets.js +83 -89
package/extensions/ublock/js/background.js +20 -27
package/extensions/ublock/js/base64-custom.js +1 -102
package/extensions/ublock/js/benchmarks.js +36 -21
package/extensions/ublock/js/biditrie.js +8 -23
package/extensions/ublock/js/broadcast.js +2 -4
package/extensions/ublock/js/cachestorage.js +594 -396
package/extensions/ublock/js/codemirror/search.js +49 -37
package/extensions/ublock/js/codemirror/ubo-static-filtering.js +233 -215
package/extensions/ublock/js/contentscript-extra.js +31 -1
package/extensions/ublock/js/cosmetic-filtering.js +35 -33
package/extensions/ublock/js/dashboard.js +11 -7
package/extensions/ublock/js/devtools.js +22 -0
package/extensions/ublock/js/dom.js +2 -2
package/extensions/ublock/js/dyna-rules.js +17 -16
package/extensions/ublock/js/epicker-ui.js +41 -16
package/extensions/ublock/js/fa-icons.js +1 -0
package/extensions/ublock/js/hntrie.js +10 -25
package/extensions/ublock/js/i18n.js +15 -15
package/extensions/ublock/js/logger-ui.js +9 -6
package/extensions/ublock/js/messaging.js +51 -26
package/extensions/ublock/js/pagestore.js +21 -23
package/extensions/ublock/js/popup-fenix.js +35 -22
package/extensions/ublock/js/redirect-engine.js +15 -30
package/extensions/ublock/js/reverselookup.js +1 -1
package/extensions/ublock/js/s14e-serializer.js +1405 -0
package/extensions/ublock/js/scriptlet-filtering-core.js +1 -1
package/extensions/ublock/js/scriptlets/epicker.js +27 -18
package/extensions/ublock/js/settings.js +32 -21
package/extensions/ublock/js/start.js +121 -62
package/extensions/ublock/js/static-ext-filtering-db.js +6 -6
package/extensions/ublock/js/static-ext-filtering.js +17 -28
package/extensions/ublock/js/static-filtering-parser.js +26 -4
package/extensions/ublock/js/static-net-filtering.js +69 -168
package/extensions/ublock/js/storage.js +178 -155
package/extensions/ublock/js/traffic.js +11 -7
package/extensions/ublock/js/vapi-background.js +49 -62
package/extensions/ublock/js/vapi-client.js +13 -16
package/extensions/ublock/js/webext.js +10 -2
package/extensions/ublock/js/whitelist.js +27 -25
package/extensions/ublock/lib/publicsuffixlist/publicsuffixlist.js +3 -7
package/extensions/ublock/manifest.json +2 -1
package/extensions/ublock/web_accessible_resources/epicker-ui.html +5 -8
package/extensions/ublock/whitelist.html +3 -4
package/package.json +12 -12
package/scripts/build-function.js +42 -12
package/src/config.ts +3 -4
package/src/http.ts +1 -0
package/src/routes/management/http/active.get.ts +30 -0
package/src/routes/management/tests/management.spec.ts +13 -0
package/src/server.ts +3 -1
package/src/shared/utils/function/handler.ts +5 -2
package/src/types.ts +2 -1
package/static/docs/swagger.json +57 -11
package/static/docs/swagger.min.json +56 -10
package/static/function/client.js +4155 -3350
package/static/function/index.html +33094 -1
package/extensions/ublock/_locales/ku/messages.json +0 -1294

package/scripts/build-function.js CHANGED Viewed

@@ -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/config.ts CHANGED Viewed

@@ -399,7 +399,7 @@ export class Config extends EventEmitter {
         : `http://${this.host}:${this.port}`;
   /**
-   * Returns the the fully-qualified URL for the
+   * Returns the fully-qualified URL for the
    * external address that browserless might be
    * running behind *or* the server address if
    * no external URL is provided.
@@ -416,11 +416,10 @@ export class Config extends EventEmitter {
    * @param address The fully-qualified URL, eg https://www.example.com/
    * @returns {string} The address
    */
-  public setExternalAddress = (address: string) =>
-    this.external = address;
+  public setExternalAddress = (address: string) => (this.external = address);
   /**
-   * Returns the the fully-qualified WebSocket URL for the
+   * Returns the fully-qualified WebSocket URL for the
    * external address that browserless might be
    * running behind *or* the server address if
    * no external URL is provided.

package/src/http.ts CHANGED Viewed

@@ -124,6 +124,7 @@ export enum HTTPRoutes {
 }
 export enum HTTPManagementRoutes {
+  active = '/active',
   config = '/config',
   metrics = '/metrics',
   metricsTotal = '/metrics/total',

package/src/routes/management/http/active.get.ts ADDED Viewed

@@ -0,0 +1,30 @@
+import {
+  APITags,
+  BrowserlessRoutes,
+  HTTPManagementRoutes,
+  HTTPRoute,
+  Methods,
+  Request,
+  contentTypes,
+  dedent,
+  writeResponse,
+} from '@browserless.io/browserless';
+import { ServerResponse } from 'http';
+export default class ActiveGetRoute extends HTTPRoute {
+  name = BrowserlessRoutes.ActiveGetRoute;
+  accepts = [contentTypes.any];
+  auth = true;
+  browser = null;
+  concurrency = false;
+  contentTypes = [contentTypes.text];
+  description = dedent(`
+    Returns a simple "204" HTTP code, with no response, indicating that the service itself is up and running.
+    Useful for liveliness probes or other external checks.
+  `);
+  method = Methods.get;
+  path = HTTPManagementRoutes.active;
+  tags = [APITags.management];
+  handler = async (_req: Request, res: ServerResponse): Promise<void> =>
+    writeResponse(res, 204, '', contentTypes.text);
+}

package/src/routes/management/tests/management.spec.ts CHANGED Viewed

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

package/src/server.ts CHANGED Viewed

@@ -143,7 +143,9 @@ export class HTTPServer extends EventEmitter {
     const route = await this.router.getRouteForHTTPRequest(req);
     if (!route) {
-      this.log(`No matching WebSocket route handler for "${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 CHANGED Viewed

@@ -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/src/types.ts CHANGED Viewed

@@ -231,7 +231,7 @@ abstract class BasicHTTPRoute extends Route {
   abstract accepts: Array<contentTypes>;
   /**
-   * The Content-Types that this route will will respond with, and must match the Accepts
+   * The Content-Types that this route will respond with, and must match the Accepts
    * Header from a client if present. If a request comes in with an Accepts of "application/json"
    * then the contentTypes here would need to include ["application/json"] in order to not 404.
    */
@@ -650,6 +650,7 @@ export const BrowserlessWebKitRoutes = {
 };
 export const BrowserlessManagementRoutes = {
+  ActiveGetRoute: 'ActiveGetRoute',
   ConfigGetRoute: 'ConfigGetRoute',
   MetricsGetRoute: 'MetricsGetRoute',
   MetricsTotalGetRoute: 'MetricsTotalGetRoute',