Support getting the browser level ChromeDevToolsService

cdt-java-client/src/main/java/com/github/kklisura/cdt/services/ChromeService.java

@@ -79,7 +79,7 @@ public interface ChromeService {
    * @return Version info.
    * @throws ChromeServiceException If request fails for any reason.
    */
-  ChromeVersion getVersion() throws ChromeServiceException;;
+  ChromeVersion getVersion() throws ChromeServiceException;
 
   /**
    * Creates a dev tools service to specified tab.
@@ -99,4 +99,21 @@ ChromeDevToolsService createDevToolsService(
    * @return Dev tools.
    */
   ChromeDevToolsService createDevToolsService(ChromeTab tab) throws ChromeServiceException;
+
+  /**
+   * Creates a dev tools service to the browser.
+   *
+   * @param chromeDevToolsServiceConfiguration Service configuration.
+   * @return Dev tools.
+   */
+  ChromeDevToolsService createDevToolsService(
+      ChromeDevToolsServiceConfiguration chromeDevToolsServiceConfiguration)
+      throws ChromeServiceException;
+
+  /**
+   * Creates a dev tools service to the browser with default service configuration.
+   *
+   * @return Dev tools.
+   */
+  ChromeDevToolsService createDevToolsService() throws ChromeServiceException;
 }

cdt-java-client/src/main/java/com/github/kklisura/cdt/services/impl/ChromeServiceImpl.java

@@ -156,22 +156,40 @@ public ChromeVersion getVersion() throws ChromeServiceException {
   }
 
   @Override
-  public synchronized ChromeDevToolsService createDevToolsService(ChromeTab tab)
-      throws ChromeServiceException {
+  public ChromeDevToolsService createDevToolsService() throws ChromeServiceException {
+    return createDevToolsService(null, new ChromeDevToolsServiceConfiguration());
+  }
+
+  @Override
+  public ChromeDevToolsService createDevToolsService(ChromeTab tab) throws ChromeServiceException {
     return createDevToolsService(tab, new ChromeDevToolsServiceConfiguration());
   }
 
+  @Override
+  public ChromeDevToolsService createDevToolsService(
+      ChromeDevToolsServiceConfiguration chromeDevToolsServiceConfiguration)
+      throws ChromeServiceException {
+    return createDevToolsService(null, chromeDevToolsServiceConfiguration);
+  }
+
   @Override
   public synchronized ChromeDevToolsService createDevToolsService(
       ChromeTab tab, ChromeDevToolsServiceConfiguration chromeDevToolsServiceConfiguration)
       throws ChromeServiceException {
+    String id, webSocketDebuggerUrl;
+    if (tab == null) {
+      id = "browser";
+      webSocketDebuggerUrl = getVersion().getWebSocketDebuggerUrl();
+    } else {
+      id = tab.getId();
+      webSocketDebuggerUrl = tab.getWebSocketDebuggerUrl();
+    }
     try {
-      if (isChromeDevToolsServiceCached(tab)) {
-        return getCachedChromeDevToolsService(tab);
+      if (isChromeDevToolsServiceCached(id)) {
+        return getCachedChromeDevToolsService(id);
       }
 
       // Connect to a tab via web socket
-      String webSocketDebuggerUrl = tab.getWebSocketDebuggerUrl();
       WebSocketService webSocketService =
           webSocketServiceFactory.createWebSocketService(webSocketDebuggerUrl);
 
@@ -199,7 +217,7 @@ public synchronized ChromeDevToolsService createDevToolsService(
       commandInvocationHandler.setChromeDevToolsService(chromeDevToolsService);
 
       // Cache it up.
-      cacheChromeDevToolsService(tab, chromeDevToolsService);
+      cacheChromeDevToolsService(id, chromeDevToolsService);
 
       return chromeDevToolsService;
     } catch (WebSocketServiceException ex) {
@@ -238,17 +256,16 @@ public void clearChromeDevToolsServiceCache(ChromeTab tab) {
     }
   }
 
-  private boolean isChromeDevToolsServiceCached(ChromeTab tab) {
-    return chromeDevToolServiceCache.get(tab.getId()) != null;
+  private boolean isChromeDevToolsServiceCached(String id) {
+    return chromeDevToolServiceCache.get(id) != null;
   }
 
-  private ChromeDevToolsService getCachedChromeDevToolsService(ChromeTab tab) {
-    return chromeDevToolServiceCache.get(tab.getId());
+  private ChromeDevToolsService getCachedChromeDevToolsService(String id) {
+    return chromeDevToolServiceCache.get(id);
   }
 
-  private void cacheChromeDevToolsService(
-      ChromeTab tab, ChromeDevToolsService chromeDevToolsService) {
-    chromeDevToolServiceCache.put(tab.getId(), chromeDevToolsService);
+  private void cacheChromeDevToolsService(String id, ChromeDevToolsService chromeDevToolsService) {
+    chromeDevToolServiceCache.put(id, chromeDevToolsService);
   }
 
   /**

cdt-java-client/src/test/java/com/github/kklisura/cdt/services/impl/ChromeServiceImplTest.java

@@ -351,6 +351,36 @@ public void testGetDevTools()
     assertNotNull(devTools);
   }
 
+  @Test
+  public void testGetBrowserDevTools()
+      throws IOException, ChromeServiceException, WebSocketServiceException {
+    MockWebServer server = new MockWebServer();
+    String fixture = ChromeServiceImpl.inputStreamToString(getFixture("chrome/version.json"));
+    server.enqueue(new MockResponse().setBody(fixture));
+    server.start();
+
+    ChromeServiceImpl service =
+        new ChromeServiceImpl(server.getHostName(), server.getPort(), webSocketServiceFactory);
+
+    ObjectMapper mapper = new ObjectMapper();
+
+    expect(
+            webSocketServiceFactory.createWebSocketService(
+                mapper.readTree(fixture).path("webSocketDebuggerUrl").asText()))
+        .andReturn(webSocketService);
+
+    webSocketService.addMessageHandler(anyObject());
+
+    replayAll();
+
+    ChromeDevTools devTools = service.createDevToolsService();
+
+    verifyAll();
+
+    assertNotNull(devTools);
+    server.shutdown();
+  }
+
   @Test
   public void testGetDevToolsIsCachedPerTab()
       throws IOException, ChromeServiceException, WebSocketServiceException {