Skip to content

#16645 switch DevTools connection between tabs/windows #16647

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

Merged
diemol merged 4 commits into from
Dec 4, 2025
Merged

#16645 switch DevTools connection between tabs/windows #16647

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3548e2d
#16645 switch DevTools connection between tabs/windows
asolntsev Nov 27, 2025
e90c246
#16645 suggested by GitHub AI: use "endsWith" instead of "contains"
asolntsev Dec 1, 2025
8847701
Merge branch 'trunk' into fix/16645-switch-devtools-between-tabs
diemol Dec 4, 2025
fda1fe0
Merge branch 'trunk' into fix/16645-switch-devtools-between-tabs
diemol Dec 4, 2025
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
30 changes: 24 additions & 6 deletions java/src/org/openqa/selenium/devtools/DevTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.Closeable;
import java.time.Duration;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
Expand All @@ -31,6 +32,8 @@
import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.devtools.idealized.Domains;
import org.openqa.selenium.devtools.idealized.target.model.SessionID;
Expand All @@ -44,7 +47,8 @@ public class DevTools implements Closeable {
private final Domains protocol;
private final Duration timeout = Duration.ofSeconds(30);
private final Connection connection;
private SessionID cdpSession = null;
private volatile String windowHandle;
private volatile SessionID cdpSession;

public DevTools(Function<DevTools, Domains> protocol, Connection connection) {
this.connection = Require.nonNull("WebSocket connection", connection);
Expand Down Expand Up @@ -73,6 +77,8 @@ public void disconnectSession() {

SessionID id = cdpSession;
cdpSession = null;
windowHandle = null;

try {
connection.sendAndWait(
cdpSession,
Expand Down Expand Up @@ -132,17 +138,20 @@ public void clearListeners() {
}

public void createSessionIfThereIsNotOne() {
createSessionIfThereIsNotOne(null);
createSessionIfThereIsNotOne(windowHandle);
}

public void createSessionIfThereIsNotOne(String windowHandle) {
public void createSessionIfThereIsNotOne(@Nullable String windowHandle) {
if (cdpSession == null) {
createSession(windowHandle);
} else if (!Objects.equals(this.windowHandle, windowHandle)) {
disconnectSession();
attachToWindow(windowHandle);
}
}

public void createSession() {
createSession(null);
createSession(windowHandle);
}

/**
Expand All @@ -152,12 +161,20 @@ public void createSession() {
*
* @param windowHandle result of {@link WebDriver#getWindowHandle()}, optional.
*/
public void createSession(String windowHandle) {
public void createSession(@Nullable String windowHandle) {
if (connection.isClosed()) {
connection.reopen();
}
attachToWindow(windowHandle);
}

private void attachToWindow(String windowHandle) {
TargetID targetId = findTarget(windowHandle);
attachToTarget(targetId);
this.windowHandle = windowHandle;
}

private void attachToTarget(TargetID targetId) {
// Starts the session
// CDP creates a parent browser session when websocket connection is made
// Create session that is child of parent browser session and not child of already existing
Expand Down Expand Up @@ -193,6 +210,7 @@ public void createSession(String windowHandle) {
}
}

@NonNull
private TargetID findTarget(String windowHandle) {
// Figure out the targets.
List<TargetInfo> infos =
Expand All @@ -204,7 +222,7 @@ private TargetID findTarget(String windowHandle) {
return infos.stream()
.filter(info -> "page".equals(info.getType()))
.map(TargetInfo::getTargetId)
.filter(id -> windowHandle == null || windowHandle.contains(id.toString()))
.filter(id -> windowHandle == null || windowHandle.endsWith(id.toString()))
.findAny()
.orElseThrow(() -> new DevToolsException("Unable to find target id of a page"));
}
Expand Down
Loading