@browserless.io/browserless 2.34.0-beta-0 → 2.34.1

package/extensions/ublocklite/rulesets/strictblock/vie-1.json

@@ -16,6 +16,7 @@
    "adtima-static.zascdn.me",
    "adtimaserver.vn",
    "ae.carnelbawrel.com",
+   "afzamltca.com",
    "aiactiv.io",
    "aj1047.online",
    "aj2393.online",
@@ -71,7 +72,6 @@
    "syphonseity.com",
    "tags.fly-ads.net",
    "tags.native-ad.net",
-   "urgerrebasis.com",
    "ut.uranininnage.com",
    "v9banners.com",
    "vads.net.vn",

package/extensions/ublocklite/rulesets/urlskip/ublock-filters.json

@@ -370,6 +370,13 @@
    "?url"
   ]
  },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?jdoqocy\\.com/click-\\S*?\\?url=https%3a%2f%2fwww\\.gog\\.com%2f",
+  "steps": [
+   "?url",
+   "-blocked"
+  ]
+ },
  {
   "re": "^[a-z-]+://(?:[^/?#]+\\.)?click\\.linksynergy\\.com/\\S*?(?:[^%.0-9a-z_-]|$)murl=http",
   "steps": [
@@ -579,12 +586,6 @@
    "?url"
   ]
  },
- {
-  "re": "^[a-z-]+://(?:[^/?#]+\\.)?t\\.mailpgn\\.com/l/\\S*?(?:[^%.0-9a-z_-]|$)fl=http",
-  "steps": [
-   "?fl"
-  ]
- },
  {
   "re": "^[a-z-]+://(?:[^/?#]+\\.)?jsv3\\.recruitics\\.com/redirect\\S*?(?:[^%.0-9a-z_-]|$)rx_url=http",
   "steps": [
@@ -679,12 +680,6 @@
    "?url"
   ]
  },
- {
-  "re": "^[a-z-]+://(?:[^/?#]+\\.)?redir\\.tradedoubler\\.com/projectr/\\?_td_deeplink=http",
-  "steps": [
-   "?_td_deeplink"
-  ]
- },
  {
   "re": "^[a-z-]+://(?:[^/?#]+\\.)?track\\.webgains\\.com/click\\.html\\S*?(?:[^%.0-9a-z_-]|$)wgtarget=http",
   "steps": [
@@ -1067,6 +1062,12 @@
    "-base64"
   ]
  },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?tatrck\\.com/\\S*?(?:[^%.0-9a-z_-]|$)url=http",
+  "steps": [
+   "?url"
+  ]
+ },
  {
   "re": "/vp/player/to/\\?u=http",
   "steps": [
@@ -1104,5 +1105,29 @@
    "?a8ejpredirect",
    "-uricomponent"
   ]
+ },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?affiliate\\.suruga-ya\\.jp/modules/af/af_jump\\.php\\?\\S*?&goods_url=",
+  "steps": [
+   "?goods_url"
+  ]
+ },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?al\\.dmm\\.com/\\?lurl=",
+  "steps": [
+   "?lurl"
+  ]
+ },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?ck\\.jp\\.ap\\.valuecommerce\\.com/servlet/referral\\?\\S*?&vc_url=",
+  "steps": [
+   "?vc_url"
+  ]
+ },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?hb\\.afl\\.rakuten\\.co\\.jp/hgc/\\S*?/\\?pc=",
+  "steps": [
+   "?pc"
+  ]
  }
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.34.0-beta-0",
+  "version": "2.34.1",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -64,7 +64,7 @@
     "playwright-1.52": "npm:playwright-core@1.52.0",
     "playwright-1.53": "npm:playwright-core@1.53.2",
     "playwright-core": "1.54.2",
-    "puppeteer-core": "24.15.0",
+    "puppeteer-core": "24.16.2",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "queue": "^7.0.0",
@@ -78,20 +78,20 @@
     "@types/http-proxy": "^1.17.16",
     "@types/micromatch": "^4.0.9",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^24.2.0",
+    "@types/node": "^24.3.0",
     "@types/sinon": "^17.0.4",
-    "@typescript-eslint/eslint-plugin": "^8.39.0",
+    "@typescript-eslint/eslint-plugin": "^8.40.0",
     "@typescript-eslint/parser": "^8.38.0",
     "assert": "^2.0.0",
-    "chai": "^5.2.1",
+    "chai": "^5.3.1",
     "cross-env": "^10.0.0",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.25.8",
+    "esbuild": "^0.25.9",
     "esbuild-plugin-polyfill-node": "^0.3.0",
-    "eslint": "^9.32.0",
+    "eslint": "^9.33.0",
     "extract-zip": "^2.0.1",
     "gunzip-maybe": "^1.4.2",
-    "marked": "^16.1.2",
+    "marked": "^16.2.0",
     "mocha": "^11.7.1",
     "move-file": "^3.1.0",
     "prettier": "^3.6.2",

package/scripts/build-open-api.js

@@ -46,6 +46,17 @@ const sortSwaggerRequiredAlpha = (prop, otherProp) => {
   return Number(otherProp.required) - Number(prop.required);
 };
 
+const cleanupAbsolutePaths = (swaggerJSON) => {
+  const jsonString = JSON.stringify(swaggerJSON);
+  
+  const cleanedString = jsonString.replace(
+    /"\$ref":\s*"#\/definitions\/import\([^)]+\)\.([^"]+)"/g,
+    '"$ref": "#/definitions/$1"'
+  );
+  
+  return JSON.parse(cleanedString);
+};
+
 const buildOpenAPI = async (
   externalHTTPRoutes = [],
   externalWebSocketRoutes = [],
@@ -298,7 +309,10 @@ const buildOpenAPI = async (
     JSON.stringify(swaggerJSON, null, '  '),
   );
   swaggerJSON.info.description = readme + `\n# Changelog\n` + changelog;
-  await fs.writeFile(swaggerJSONPath, JSON.stringify(swaggerJSON, null, '  '));
+  
+  const cleanedSwaggerJSON = cleanupAbsolutePaths(swaggerJSON);
+  
+  await fs.writeFile(swaggerJSONPath, JSON.stringify(cleanedSwaggerJSON, null, '  '));
 };
 
 export default buildOpenAPI;

package/src/shared/content.http.ts

@@ -18,6 +18,7 @@ import {
   bestAttempt,
   bestAttemptCatch,
   contentTypes,
+  isBase64Encoded,
   noop,
   rejectRequestPattern,
   rejectResourceTypes,
@@ -174,7 +175,14 @@ export default class ChromiumContentPostRoute extends BrowserHTTPRoute {
           req.url().match(r.pattern),
         );
         if (interceptor) {
-          return req.respond(interceptor.response);
+          return req.respond({
+            ...interceptor.response,
+            body: interceptor.response.body
+              ? isBase64Encoded(interceptor.response.body as string)
+                ? Buffer.from(interceptor.response.body, 'base64')
+                : interceptor.response.body
+              : undefined,
+          });
         }
         return req.continue();
       });

package/src/shared/pdf.http.ts

@@ -19,6 +19,7 @@ import {
   bestAttemptCatch,
   contentTypes,
   dedent,
+  isBase64Encoded,
   noop,
   rejectRequestPattern,
   rejectResourceTypes,
@@ -179,7 +180,14 @@ export default class ChromiumPDFPostRoute extends BrowserHTTPRoute {
           req.url().match(r.pattern),
         );
         if (interceptor) {
-          return req.respond(interceptor.response);
+          return req.respond({
+            ...interceptor.response,
+            body: interceptor.response.body
+              ? isBase64Encoded(interceptor.response.body as string)
+                ? Buffer.from(interceptor.response.body, 'base64')
+                : interceptor.response.body
+              : undefined,
+          });
         }
         return req.continue();
       });

package/src/shared/scrape.http.ts

@@ -25,6 +25,7 @@ import {
   contentTypes,
   debugScreenshotOpts,
   dedent,
+  isBase64Encoded,
   jsonResponse,
   noop,
   rejectRequestPattern,
@@ -345,7 +346,14 @@ export default class ChromiumScrapePostRoute extends BrowserHTTPRoute {
           req.url().match(r.pattern),
         );
         if (interceptor) {
-          return req.respond(interceptor.response);
+          return req.respond({
+            ...interceptor.response,
+            body: interceptor.response.body
+              ? isBase64Encoded(interceptor.response.body as string)
+                ? Buffer.from(interceptor.response.body, 'base64')
+                : interceptor.response.body
+              : undefined,
+          });
         }
         return req.continue();
       });

package/src/shared/screenshot.http.ts

@@ -19,6 +19,7 @@ import {
   bestAttemptCatch,
   contentTypes,
   dedent,
+  isBase64Encoded,
   noop,
   rejectRequestPattern,
   rejectResourceTypes,
@@ -189,7 +190,14 @@ export default class ScreenshotPost extends BrowserHTTPRoute {
           req.url().match(r.pattern),
         );
         if (interceptor) {
-          return req.respond(interceptor.response);
+          return req.respond({
+            ...interceptor.response,
+            body: interceptor.response.body
+              ? isBase64Encoded(interceptor.response.body as string)
+                ? Buffer.from(interceptor.response.body, 'base64')
+                : interceptor.response.body
+              : undefined,
+          });
         }
         return req.continue();
       });

package/src/types.ts

@@ -542,7 +542,13 @@ export type requestInterceptors = {
    * corresponding responses to use in order to fulfill those requests.
    */
   pattern: string;
-  response: Partial<ResponseForRequest>;
+  response: Partial<Omit<ResponseForRequest, 'body'>> & {
+    /**
+     * A string representation of the body to return. Can be a base64-encoded
+     * string but please omit any leading content-type data (eg "data:image/png;base64,").
+     */
+    body?: string;
+  };
 };
 
 export interface IResourceLoad {

package/src/utils.ts

@@ -344,7 +344,7 @@ export const readBody = async (
 ): Promise<ReturnType<typeof safeParse>> => {
   if (
     typeof req.body === 'string' &&
-    (isBase64.test(req.body) || req.body.startsWith('{'))
+    (isBase64Encoded(req.body) || req.body.startsWith('{'))
   ) {
     return safeParse(convertIfBase64(req.body));
   }
@@ -500,8 +500,10 @@ export const fileExists = async (path: string): Promise<boolean> =>
 const isBase64 =
   /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/;
 
+export const isBase64Encoded = (item: string): boolean => isBase64.test(item);
+
 export const convertIfBase64 = (item: string): string =>
-  isBase64.test(item) ? Buffer.from(item, 'base64').toString() : item;
+  isBase64Encoded(item) ? Buffer.from(item, 'base64').toString() : item;
 
 export const availableBrowsers = Promise.all([
   exists(playwright.chromium.executablePath()),