@browserless.io/browserless 2.3.0-beta-1 → 2.3.0-beta-2

package/src/types.ts

@@ -104,6 +104,12 @@ abstract class Route {
     protected _monitoring: Browserless['monitoring'],
   ) {}
 
+  /**
+   * A unique name to identify this route. Used in downstream
+   * SDKs to potentially remove or disable.
+   */
+  abstract name: string;
+
   /**
    * A boolean, or a function that returns a boolean, on
    * whether the route requires an API token to access.
@@ -602,3 +608,63 @@ export interface CDPJSONPayload {
    */
   webSocketDebuggerUrl: string;
 }
+
+export const BrowserlessChromeRoutes = {
+  ChromeBrowserWebSocketRoute: 'ChromeBrowserWebSocketRoute',
+  ChromeCDPWebSocketRoute: 'ChromeCDPWebSocketRoute',
+  ChromeContentPostRoute: 'ChromeContentPostRoute',
+  ChromeDownloadPostRoute: 'ChromeDownloadPostRoute',
+  ChromeFunctionPostRoute: 'ChromeFunctionPostRoute',
+  ChromeJSONListGetRoute: 'ChromeJSONListGetRoute',
+  ChromeJSONNewPutRoute: 'ChromeJSONNewPutRoute',
+  ChromeJSONProtocolGetRoute: 'ChromeJSONProtocolGetRoute',
+  ChromeJSONVersionGetRoute: 'ChromeJSONVersionGetRoute',
+  ChromePDFPostRoute: 'ChromePDFPostRoute',
+  ChromePageWebSocketRoute: 'ChromePageWebSocketRoute',
+  ChromePerformancePostRoute: 'ChromePerformancePostRoute',
+  ChromePlaywrightWebSocketRoute: 'ChromePlaywrightWebSocketRoute',
+  ChromeScrapePostRoute: 'ChromeScrapePostRoute',
+  ChromeScreenshotPostRoute: 'ChromeScreenshotPostRoute',
+};
+
+export const BrowserlessChromiumRoutes = {
+  ChromiumBrowserWebSocketRoute: 'ChromiumBrowserWebSocketRoute',
+  ChromiumCDPWebSocketRoute: 'ChromiumCDPWebSocketRoute',
+  ChromiumContentPostRoute: 'ChromiumContentPostRoute',
+  ChromiumDownloadPostRoute: 'ChromiumDownloadPostRoute',
+  ChromiumFunctionPostRoute: 'ChromiumFunctionPostRoute',
+  ChromiumJSONListGetRoute: 'ChromiumJSONListGetRoute',
+  ChromiumJSONNewPutRoute: 'ChromiumJSONNewPutRoute',
+  ChromiumJSONProtocolGetRoute: 'ChromiumJSONProtocolGetRoute',
+  ChromiumJSONVersionGetRoute: 'ChromiumJSONVersionGetRoute',
+  ChromiumPDFPostRoute: 'ChromiumPDFPostRoute',
+  ChromiumPageWebSocketRoute: 'ChromiumPageWebSocketRoute',
+  ChromiumPerformancePostRoute: 'ChromiumPerformancePostRoute',
+  ChromiumPlaywrightWebSocketRoute: 'ChromiumPlaywrightWebSocketRoute',
+  ChromiumScrapePostRoute: 'ChromiumScrapePostRoute',
+  ChromiumScreenshotPostRoute: 'ChromiumScreenshotPostRoute',
+};
+
+export const BrowserlessFirefoxRoutes = {
+  FirefoxPlaywrightWebSocketRoute: 'FirefoxPlaywrightWebSocketRoute',
+};
+
+export const BrowserlessWebKitRoutes = {
+  WebKitPlaywrightWebSocketRoute: 'WebKitPlaywrightWebSocketRoute',
+};
+
+export const BrowserlessManagementRoutes = {
+  ConfigGetRoute: 'ConfigGetRoute',
+  MetricsGetRoute: 'MetricsGetRoute',
+  MetricsTotalGetRoute: 'MetricsTotalGetRoute',
+  SessionsGetRoute: 'SessionsGetRoute',
+  StaticGetRoute: 'StaticGetRoute',
+};
+
+export const BrowserlessRoutes = {
+  ...BrowserlessChromeRoutes,
+  ...BrowserlessChromiumRoutes,
+  ...BrowserlessFirefoxRoutes,
+  ...BrowserlessWebKitRoutes,
+  ...BrowserlessManagementRoutes,
+};

package/src/utils.ts

@@ -303,12 +303,18 @@ export const readBody = async (
  * Lists the path of Chromes (stable) install since
  * no library or utility out there does it including playwright.
  */
-export const chromeExecutablePath =
-  process.platform === 'win32'
-    ? `%ProgramFiles%\\Google\\Chrome\\Application\\chrome.exe`
-    : process.platform === 'darwin'
-      ? '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
-      : '/usr/bin/google-chrome-stable';
+export const chromeExecutablePath = () => {
+  if (process.platform === 'win32') {
+    // Windows always includes the ProgramFiles variable in the environment
+    return `${process.env['ProgramFiles']}\\Google\\Chrome\\Application\\chrome.exe`;
+  }
+
+  if (process.platform === 'darwin') {
+    return '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome';
+  }
+
+  return '/usr/bin/google-chrome-stable';
+};
 
 export const getRouteFiles = async (config: Config): Promise<string[][]> => {
   const routes = config.getRoutes();
@@ -432,7 +438,7 @@ export const availableBrowsers = Promise.all([
   exists(playwright.chromium.executablePath()),
   exists(playwright.firefox.executablePath()),
   exists(playwright.webkit.executablePath()),
-  exists(chromeExecutablePath),
+  exists(chromeExecutablePath()),
 ]).then(([chromiumExists, firefoxExists, webkitExists, chromeExists]) => {
   const availableBrowsers = [];