Skip to content

Stop forcing Fly tunnel instance header #42

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
robinbraemer merged 1 commit into from
Jul 1, 2026
Merged

Stop forcing Fly tunnel instance header #42

Show file tree
Hide file tree
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
29 changes: 0 additions & 29 deletions core/src/main/java/com/minekube/connect/tunnel/WebSocketTunnelTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
import com.minekube.connect.util.ReflectionUtils;
import java.io.EOFException;
import java.lang.reflect.Field;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream;
Expand All @@ -53,8 +51,6 @@
public class WebSocketTunnelTransport implements TunnelClientTransport {

private static final String SESSION_HEADER = "Connect-Session";
private static final String FLY_INSTANCE_QUERY = "fi";
private static final String FLY_FORCE_INSTANCE_HEADER = "Fly-Force-Instance-Id";
private static final Field DATA = ReflectionUtils.getField(ByteString.class, "data");
private final OkHttpClient httpClient;

Expand All @@ -80,10 +76,6 @@ public TunnelConn tunnel(final String tunnelServiceAddr, String sessionId, Handl
Request.Builder request = new Request.Builder()
.url(tunnelServiceAddr)
.addHeader(SESSION_HEADER, sessionId);
String flyInstanceId = flyInstanceId(tunnelServiceAddr);
if (flyInstanceId != null && !flyInstanceId.isEmpty()) {
request.addHeader(FLY_FORCE_INSTANCE_HEADER, flyInstanceId);
}

AtomicBoolean closeHandlerOnce = new AtomicBoolean();
Runnable handlerOnClose = () -> {
Expand Down Expand Up @@ -170,25 +162,4 @@ public void close() {
.filter(call -> call.request().header(SESSION_HEADER) != null)
.forEach(Call::cancel);
}

private static String flyInstanceId(String tunnelServiceAddr) {
URI uri;
try {
uri = new URI(tunnelServiceAddr);
} catch (URISyntaxException e) {
return null;
}
String query = uri.getRawQuery();
if (query == null || query.isEmpty()) {
return null;
}
for (String param : query.split("&")) {
int separator = param.indexOf('=');
String name = separator >= 0 ? param.substring(0, separator) : param;
if (FLY_INSTANCE_QUERY.equals(name)) {
return separator >= 0 ? param.substring(separator + 1) : "";
}
}
return null;
}
}
5 changes: 3 additions & 2 deletions core/src/test/java/com/minekube/connect/tunnel/TunnelerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ void receivesBinaryFrameWhenByteStringDataFieldIsUnavailable() throws Exception
}

@Test
void sendsFlyForceInstanceHeaderWhenTunnelAddressTargetsFlyMachine() throws Exception {
void omitsFlyForceInstanceHeaderWhenTunnelAddressTargetsFlyMachine() throws Exception {
OkHttpClient client = new OkHttpClient();
TunnelConn conn = null;

Expand All @@ -216,7 +216,8 @@ void sendsFlyForceInstanceHeaderWhenTunnelAddressTargetsFlyMachine() throws Exce

assertNotNull(request);
assertEquals("session-123", request.getHeader("Connect-Session"));
assertEquals("machine-123", request.getHeader("Fly-Force-Instance-Id"));
assertNull(request.getHeader("Fly-Force-Instance-Id"));
assertEquals("/tunnel?fi=machine-123&cid=", request.getPath());
} finally {
if (conn != null) {
conn.close();
Expand Down
Loading