Skip to content

List and close existing tabs #86 #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidcockbill wants to merge 1 commit into
base: master
Choose a base branch
from
Open

List and close existing tabs #86 #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 36 additions & 15 deletions ...DevToolsClient/src/main/java/com/hubspot/chrome/devtools/client/ChromeDevToolsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,25 @@ public ChromeDevToolsSession connect(String host, int port) throws URISyntaxExce
);
}

@Override
public void close() {
try {
executorService.shutdown();
httpClient.close();
} catch (Throwable t) {
LOG.error("Could not properly close chrome client", t);
public List<ChromeSessionInfo> listTargets(String host, int port) {
String url = String.format("http://%s:%d/json/list", host, port);
HttpRequest httpRequest = HttpRequest
.newBuilder()
.setUrl(url)
.setMethod(Method.GET)
.build();

HttpResponse response = httpClient.execute(httpRequest);

if (response.isError()) {
throw new ChromeDevToolsException("Unable to find available chrome session info.");
}

return response.getAs(new TypeReference<>() {});
}

private TargetID getFirstAvailableTargetId(String host, int port) {
if (defaultStartNewTarget) {
return startNewTarget(host, port);
}
String url = String.format("http://%s:%d/json/list", host, port);
public boolean closeTarget(String host, int port, String targetId) {
String url = String.format("http://%s:%d/json/close/%s", host, port, targetId);
HttpRequest httpRequest = HttpRequest
.newBuilder()
.setUrl(url)
Expand All @@ -106,11 +110,28 @@ private TargetID getFirstAvailableTargetId(String host, int port) {
HttpResponse response = httpClient.execute(httpRequest);

if (response.isError()) {
throw new ChromeDevToolsException("Unable to find available chrome session info.");
throw new ChromeDevToolsException("Unable to close target.");
}

return response.isSuccess();
}

@Override
public void close() {
try {
executorService.shutdown();
httpClient.close();
} catch (Throwable t) {
LOG.error("Could not properly close chrome client", t);
}
}

List<ChromeSessionInfo> sessions = response.getAs(new TypeReference<>() {});
if (sessions.size() == 0) {
private TargetID getFirstAvailableTargetId(String host, int port) {
if (defaultStartNewTarget) {
return startNewTarget(host, port);
}
List<ChromeSessionInfo> sessions = listTargets(host, port);
if (sessions.isEmpty()) {
return startNewTarget(host, port);
}
return new TargetID(sessions.get(0).getId());
Expand Down