Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import io.nats.client.Connection;
Expand All@@ -18,35 +18,35 @@
import java.util.logging.Logger;

/**
* Responds to controller presence-compare requests for a single proxy.
* Responds to controller presence-compare requests for a single proxy or game server.
*/
public final class ProxyPresenceResponder {
public final class PresenceResponder {

private static final Logger LOGGER = Logger.getLogger(ProxyPresenceResponder.class.getName());
private static final Logger LOGGER = Logger.getLogger(PresenceResponder.class.getName());
private static final int FNV_32A_OFFSET_BASIS = 0x811c9dc5;
private static final int FNV_32A_PRIME = 0x01000193;

private final Connection natsConnection;
private final String serverId;
private final String subject;
private final AtomicBoolean running = new AtomicBoolean(false);
private volatile ProxyPresencePlayerProvider playerProvider;
private volatile PresencePlayerProvider playerProvider;

private Dispatcher dispatcher;

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId,
ProxyPresencePlayerProvider playerProvider
PresencePlayerProvider playerProvider
) {
this.natsConnection = Objects.requireNonNull(natsConnection, "natsConnection");
this.serverId = serverId == null ? "" : serverId;
this.subject = Objects.requireNonNull(networkId, "networkId") + ".server." + this.serverId + ".presence.compare";
this.playerProvider = playerProvider;
}

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId
Expand All@@ -67,7 +67,7 @@ public void start() {
dispatcher.subscribe(subject, this::handleCompareRequest);
}

public void registerPlayerProvider(ProxyPresencePlayerProvider playerProvider) {
public void registerPlayerProvider(PresencePlayerProvider playerProvider) {
this.playerProvider = Objects.requireNonNull(playerProvider, "playerProvider");
}

Expand All@@ -92,52 +92,65 @@ private void handleCompareRequest(Message message) {

try {
PresenceCompareRequest request = PresenceCompareRequest.parseFrom(message.getData());
List<ProxyPresencePlayer> players = currentPlayers();
int localHash = computeHash(players);
boolean match = localHash == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);

if (!match) {
response.addAllPlayers(players.stream().map(ProxyPresencePlayer::toProto).toList());
}

natsConnection.publish(replyTo, response.build().toByteArray());
List<PresencePlayer> players = currentPlayers();
natsConnection.publish(replyTo, buildResponse(request, players).toByteArray());
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Failed to process presence compare request for " + subject, e);
}
}

private List<ProxyPresencePlayer> currentPlayers() {
ProxyPresencePlayerProvider currentProvider = playerProvider;
private List<PresencePlayer> currentPlayers() {
PresencePlayerProvider currentProvider = playerProvider;
if (currentProvider == null) {
return List.of();
}

Collection<ProxyPresencePlayer> suppliedPlayers = currentProvider.getProxyPresencePlayers();
Collection<PresencePlayer> suppliedPlayers = currentProvider.getPresencePlayers();
if (suppliedPlayers == null || suppliedPlayers.isEmpty()) {
return List.of();
}

return suppliedPlayers.stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(ProxyPresencePlayer::hashRecord))
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
}

static int computeHash(Collection<ProxyPresencePlayer> players) {
static ProxyPresenceCompareResponse buildResponse(
PresenceCompareRequest request,
Collection<PresencePlayer> players
) {
Objects.requireNonNull(request, "request");
List<PresencePlayer> currentPlayers = (players == null ? List.<PresencePlayer>of() : players).stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
boolean match = computeHash(currentPlayers) == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);
if (!match) {
response.addAllPlayers(currentPlayers.stream().map(PresencePlayer::toProto).toList());
}
return response.build();
}

static int computeHash(Collection<PresencePlayer> players) {
if (players == null || players.isEmpty()) {
return 0;
}

List<String> records = players.stream()
.filter(Objects::nonNull)
.map(PresencePlayer::hashRecord)
.sorted()
.toList();
String payload = records.size() + "\u001e" + String.join("\u001e", records);

int hash = FNV_32A_OFFSET_BASIS;
for (ProxyPresencePlayer player : players) {
byte[] bytes = player.hashRecord().getBytes(StandardCharsets.UTF_8);
for (byte currentByte : bytes) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
for (byte currentByte : payload.getBytes(StandardCharsets.UTF_8)) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
return hash;
}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.PresencePlayer;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand DownExpand Up@@ -32,7 +32,7 @@ public void remove(String playerId) {
players.remove(normalize(playerId));
}

public ProxyPresencePlayer createSnapshot(
public PresencePlayer createSnapshot(
String playerId,
String name,
String displayName,
Expand All@@ -44,7 +44,7 @@ public ProxyPresencePlayer createSnapshot(
String normalizedPlayerId = normalize(playerId);
TrackedPlayerMetadata metadata = players.get(normalizedPlayerId);

return new ProxyPresencePlayer(
return new PresencePlayer(
normalizedPlayerId,
name,
displayName,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
import build.buf.gen.simplecloud.controller.v2.ProxyPresencePlayerSnapshot;

/**
* Immutable player snapshot used for proxy presence reconciliation.
* Immutable player snapshot used for proxy and game-server presence reconciliation.
*/
public final class ProxyPresencePlayer {
public final class PresencePlayer {

private final String playerId;
private final String name;
Expand All@@ -18,7 +18,7 @@ public final class ProxyPresencePlayer {
private final boolean onlineMode;
private final String sessionId;

public ProxyPresencePlayer(
public PresencePlayer(
String playerId,
String name,
String displayName,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package app.simplecloud.api.presence;

import java.util.Collection;

/**
* Supplies the current set of players visible to this proxy or game server.
*/
public interface PresencePlayerProvider {

Collection<PresencePlayer> getPresencePlayers();
}

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.PresencePlayer;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import org.junit.jupiter.api.Test;

import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

class PresenceResponderTest {

@Test
void returnsMatchWithoutSnapshotWhenSummaryMatches() {
ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of()
);

assertTrue(response.getMatch());
assertTrue(response.getPlayersList().isEmpty());
}

@Test
void returnsEveryLivePlayerWhenSummaryDiffers() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);

ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of(player)
);

assertFalse(response.getMatch());
assertTrue(response.getPlayersList().stream().anyMatch(snapshot -> snapshot.getPlayerId().equals("player-1")));
}

@Test
void equalCountsWithDifferentPlayersProduceDifferentHashes() {
PresencePlayer first = player("player-1");
PresencePlayer second = player("player-2");

assertNotEquals(
PresenceResponder.computeHash(List.of(first)),
PresenceResponder.computeHash(List.of(second))
);
assertEquals(0, PresenceResponder.computeHash(List.of()));
}

@Test
void hashMatchesControllerWireContract() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"Lobby-1",
"",
0L,
"",
0,
true,
""
);

assertEquals(1745198624, PresenceResponder.computeHash(List.of(player)));
}

private static PresencePlayer player(String playerId) {
return new PresencePlayer(
playerId,
playerId,
playerId,
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@
import app.simplecloud.api.CloudApi;
import app.simplecloud.api.internal.CloudApiImpl;
import app.simplecloud.api.internal.integration.player.PlayerIntegration;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceResponder;
import app.simplecloud.api.internal.integration.presence.PresenceResponder;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceTracker;
import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import app.simplecloud.api.player.CloudPlayer;
import app.simplecloud.api.runtime.SimpleCloudRuntime;
import app.simplecloud.api.platform.shared.LuckPermsPlayerPropertySynchronizer;
Expand All@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayerProvider {
public class BungeeCordApiProvider extends Plugin implements PresencePlayerProvider {

private final BungeeContext fastStatsContext = new BungeeContext.Factory(
this,
Expand All@@ -37,7 +37,7 @@ public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayer
private PlayerSynchronizer playerSynchronizer;
private PlayerIntegration playerIntegration;
private ProxyPresenceTracker proxyPresenceTracker;
private ProxyPresenceResponder proxyPresenceResponder;
private PresenceResponder presenceResponder;
private LuckPermsPlayerPropertySynchronizer luckPermsSynchronizer;

private BungeeAudiences bungeeAudiences;
Expand All@@ -55,7 +55,7 @@ public void onEnable() {
);
this.playerIntegration = new PlayerIntegration(cloudApi);
this.proxyPresenceTracker = new ProxyPresenceTracker(proxyName);
this.proxyPresenceResponder = new ProxyPresenceResponder(
this.presenceResponder = new PresenceResponder(
cloudApi.getNatsConnection(),
cloudApi.getNetworkId(),
SimpleCloudRuntime.serverId(),
Expand All@@ -81,14 +81,14 @@ public void onEnable() {

playerSynchronizer.start();
playerIntegration.start();
proxyPresenceResponder.start();
presenceResponder.start();
fastStatsContext.ready();
}

@Override
public void onDisable() {
getLogger().info("SimpleCloud v3 API provider uninitialized!");
proxyPresenceResponder.stop();
presenceResponder.stop();
if (luckPermsSynchronizer != null) {
luckPermsSynchronizer.stop();
}
Expand DownExpand Up@@ -135,13 +135,13 @@ private void forgetLuckPermsProperties(UUID uniqueId) {
}

@Override
public List<ProxyPresencePlayer> getProxyPresencePlayers() {
public List<PresencePlayer> getPresencePlayers() {
return getProxy().getPlayers().stream()
.map(this::toPresencePlayer)
.toList();
}

private ProxyPresencePlayer toPresencePlayer(ProxiedPlayer player) {
private PresencePlayer toPresencePlayer(ProxiedPlayer player) {
String connectedServerName = player.getServer() != null ? player.getServer().getInfo().getName() : "";
Locale locale = player.getLocale();
var pendingConnection = player.getPendingConnection();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import io.nats.client.Connection;
Expand All@@ -18,35 +18,35 @@
import java.util.logging.Logger;

/**
* Responds to controller presence-compare requests for a single proxy.
* Responds to controller presence-compare requests for a single proxy or game server.
*/
public final class ProxyPresenceResponder {
public final class PresenceResponder {

private static final Logger LOGGER = Logger.getLogger(ProxyPresenceResponder.class.getName());
private static final Logger LOGGER = Logger.getLogger(PresenceResponder.class.getName());
private static final int FNV_32A_OFFSET_BASIS = 0x811c9dc5;
private static final int FNV_32A_PRIME = 0x01000193;

private final Connection natsConnection;
private final String serverId;
private final String subject;
private final AtomicBoolean running = new AtomicBoolean(false);
private volatile ProxyPresencePlayerProvider playerProvider;
private volatile PresencePlayerProvider playerProvider;

private Dispatcher dispatcher;

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId,
ProxyPresencePlayerProvider playerProvider
PresencePlayerProvider playerProvider
) {
this.natsConnection = Objects.requireNonNull(natsConnection, "natsConnection");
this.serverId = serverId == null ? "" : serverId;
this.subject = Objects.requireNonNull(networkId, "networkId") + ".server." + this.serverId + ".presence.compare";
this.playerProvider = playerProvider;
}

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId
Expand All@@ -67,7 +67,7 @@ public void start() {
dispatcher.subscribe(subject, this::handleCompareRequest);
}

public void registerPlayerProvider(ProxyPresencePlayerProvider playerProvider) {
public void registerPlayerProvider(PresencePlayerProvider playerProvider) {
this.playerProvider = Objects.requireNonNull(playerProvider, "playerProvider");
}

Expand All@@ -92,52 +92,65 @@ private void handleCompareRequest(Message message) {

try {
PresenceCompareRequest request = PresenceCompareRequest.parseFrom(message.getData());
List<ProxyPresencePlayer> players = currentPlayers();
int localHash = computeHash(players);
boolean match = localHash == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);

if (!match) {
response.addAllPlayers(players.stream().map(ProxyPresencePlayer::toProto).toList());
}

natsConnection.publish(replyTo, response.build().toByteArray());
List<PresencePlayer> players = currentPlayers();
natsConnection.publish(replyTo, buildResponse(request, players).toByteArray());
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Failed to process presence compare request for " + subject, e);
}
}

private List<ProxyPresencePlayer> currentPlayers() {
ProxyPresencePlayerProvider currentProvider = playerProvider;
private List<PresencePlayer> currentPlayers() {
PresencePlayerProvider currentProvider = playerProvider;
if (currentProvider == null) {
return List.of();
}

Collection<ProxyPresencePlayer> suppliedPlayers = currentProvider.getProxyPresencePlayers();
Collection<PresencePlayer> suppliedPlayers = currentProvider.getPresencePlayers();
if (suppliedPlayers == null || suppliedPlayers.isEmpty()) {
return List.of();
}

return suppliedPlayers.stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(ProxyPresencePlayer::hashRecord))
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
}

static int computeHash(Collection<ProxyPresencePlayer> players) {
static ProxyPresenceCompareResponse buildResponse(
PresenceCompareRequest request,
Collection<PresencePlayer> players
) {
Objects.requireNonNull(request, "request");
List<PresencePlayer> currentPlayers = (players == null ? List.<PresencePlayer>of() : players).stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
boolean match = computeHash(currentPlayers) == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);
if (!match) {
response.addAllPlayers(currentPlayers.stream().map(PresencePlayer::toProto).toList());
}
return response.build();
}

static int computeHash(Collection<PresencePlayer> players) {
if (players == null || players.isEmpty()) {
return 0;
}

List<String> records = players.stream()
.filter(Objects::nonNull)
.map(PresencePlayer::hashRecord)
.sorted()
.toList();
String payload = records.size() + "\u001e" + String.join("\u001e", records);

int hash = FNV_32A_OFFSET_BASIS;
for (ProxyPresencePlayer player : players) {
byte[] bytes = player.hashRecord().getBytes(StandardCharsets.UTF_8);
for (byte currentByte : bytes) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
for (byte currentByte : payload.getBytes(StandardCharsets.UTF_8)) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
return hash;
}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.PresencePlayer;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand DownExpand Up@@ -32,7 +32,7 @@ public void remove(String playerId) {
players.remove(normalize(playerId));
}

public ProxyPresencePlayer createSnapshot(
public PresencePlayer createSnapshot(
String playerId,
String name,
String displayName,
Expand All@@ -44,7 +44,7 @@ public ProxyPresencePlayer createSnapshot(
String normalizedPlayerId = normalize(playerId);
TrackedPlayerMetadata metadata = players.get(normalizedPlayerId);

return new ProxyPresencePlayer(
return new PresencePlayer(
normalizedPlayerId,
name,
displayName,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
import build.buf.gen.simplecloud.controller.v2.ProxyPresencePlayerSnapshot;

/**
* Immutable player snapshot used for proxy presence reconciliation.
* Immutable player snapshot used for proxy and game-server presence reconciliation.
*/
public final class ProxyPresencePlayer {
public final class PresencePlayer {

private final String playerId;
private final String name;
Expand All@@ -18,7 +18,7 @@ public final class ProxyPresencePlayer {
private final boolean onlineMode;
private final String sessionId;

public ProxyPresencePlayer(
public PresencePlayer(
String playerId,
String name,
String displayName,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package app.simplecloud.api.presence;

import java.util.Collection;

/**
* Supplies the current set of players visible to this proxy or game server.
*/
public interface PresencePlayerProvider {

Collection<PresencePlayer> getPresencePlayers();
}

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.PresencePlayer;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import org.junit.jupiter.api.Test;

import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

class PresenceResponderTest {

@Test
void returnsMatchWithoutSnapshotWhenSummaryMatches() {
ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of()
);

assertTrue(response.getMatch());
assertTrue(response.getPlayersList().isEmpty());
}

@Test
void returnsEveryLivePlayerWhenSummaryDiffers() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);

ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of(player)
);

assertFalse(response.getMatch());
assertTrue(response.getPlayersList().stream().anyMatch(snapshot -> snapshot.getPlayerId().equals("player-1")));
}

@Test
void equalCountsWithDifferentPlayersProduceDifferentHashes() {
PresencePlayer first = player("player-1");
PresencePlayer second = player("player-2");

assertNotEquals(
PresenceResponder.computeHash(List.of(first)),
PresenceResponder.computeHash(List.of(second))
);
assertEquals(0, PresenceResponder.computeHash(List.of()));
}

@Test
void hashMatchesControllerWireContract() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"Lobby-1",
"",
0L,
"",
0,
true,
""
);

assertEquals(1745198624, PresenceResponder.computeHash(List.of(player)));
}

private static PresencePlayer player(String playerId) {
return new PresencePlayer(
playerId,
playerId,
playerId,
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@
import app.simplecloud.api.CloudApi;
import app.simplecloud.api.internal.CloudApiImpl;
import app.simplecloud.api.internal.integration.player.PlayerIntegration;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceResponder;
import app.simplecloud.api.internal.integration.presence.PresenceResponder;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceTracker;
import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import app.simplecloud.api.player.CloudPlayer;
import app.simplecloud.api.runtime.SimpleCloudRuntime;
import app.simplecloud.api.platform.shared.LuckPermsPlayerPropertySynchronizer;
Expand All@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayerProvider {
public class BungeeCordApiProvider extends Plugin implements PresencePlayerProvider {

private final BungeeContext fastStatsContext = new BungeeContext.Factory(
this,
Expand All@@ -37,7 +37,7 @@ public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayer
private PlayerSynchronizer playerSynchronizer;
private PlayerIntegration playerIntegration;
private ProxyPresenceTracker proxyPresenceTracker;
private ProxyPresenceResponder proxyPresenceResponder;
private PresenceResponder presenceResponder;
private LuckPermsPlayerPropertySynchronizer luckPermsSynchronizer;

private BungeeAudiences bungeeAudiences;
Expand All@@ -55,7 +55,7 @@ public void onEnable() {
);
this.playerIntegration = new PlayerIntegration(cloudApi);
this.proxyPresenceTracker = new ProxyPresenceTracker(proxyName);
this.proxyPresenceResponder = new ProxyPresenceResponder(
this.presenceResponder = new PresenceResponder(
cloudApi.getNatsConnection(),
cloudApi.getNetworkId(),
SimpleCloudRuntime.serverId(),
Expand All@@ -81,14 +81,14 @@ public void onEnable() {

playerSynchronizer.start();
playerIntegration.start();
proxyPresenceResponder.start();
presenceResponder.start();
fastStatsContext.ready();
}

@Override
public void onDisable() {
getLogger().info("SimpleCloud v3 API provider uninitialized!");
proxyPresenceResponder.stop();
presenceResponder.stop();
if (luckPermsSynchronizer != null) {
luckPermsSynchronizer.stop();
}
Expand DownExpand Up@@ -135,13 +135,13 @@ private void forgetLuckPermsProperties(UUID uniqueId) {
}

@Override
public List<ProxyPresencePlayer> getProxyPresencePlayers() {
public List<PresencePlayer> getPresencePlayers() {
return getProxy().getPlayers().stream()
.map(this::toPresencePlayer)
.toList();
}

private ProxyPresencePlayer toPresencePlayer(ProxiedPlayer player) {
private PresencePlayer toPresencePlayer(ProxiedPlayer player) {
String connectedServerName = player.getServer() != null ? player.getServer().getInfo().getName() : "";
Locale locale = player.getLocale();
var pendingConnection = player.getPendingConnection();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import io.nats.client.Connection;
Expand All@@ -18,35 +18,35 @@
import java.util.logging.Logger;

/**
* Responds to controller presence-compare requests for a single proxy.
* Responds to controller presence-compare requests for a single proxy or game server.
*/
public final class ProxyPresenceResponder {
public final class PresenceResponder {

private static final Logger LOGGER = Logger.getLogger(ProxyPresenceResponder.class.getName());
private static final Logger LOGGER = Logger.getLogger(PresenceResponder.class.getName());
private static final int FNV_32A_OFFSET_BASIS = 0x811c9dc5;
private static final int FNV_32A_PRIME = 0x01000193;

private final Connection natsConnection;
private final String serverId;
private final String subject;
private final AtomicBoolean running = new AtomicBoolean(false);
private volatile ProxyPresencePlayerProvider playerProvider;
private volatile PresencePlayerProvider playerProvider;

private Dispatcher dispatcher;

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId,
ProxyPresencePlayerProvider playerProvider
PresencePlayerProvider playerProvider
) {
this.natsConnection = Objects.requireNonNull(natsConnection, "natsConnection");
this.serverId = serverId == null ? "" : serverId;
this.subject = Objects.requireNonNull(networkId, "networkId") + ".server." + this.serverId + ".presence.compare";
this.playerProvider = playerProvider;
}

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId
Expand All@@ -67,7 +67,7 @@ public void start() {
dispatcher.subscribe(subject, this::handleCompareRequest);
}

public void registerPlayerProvider(ProxyPresencePlayerProvider playerProvider) {
public void registerPlayerProvider(PresencePlayerProvider playerProvider) {
this.playerProvider = Objects.requireNonNull(playerProvider, "playerProvider");
}

Expand All@@ -92,52 +92,65 @@ private void handleCompareRequest(Message message) {

try {
PresenceCompareRequest request = PresenceCompareRequest.parseFrom(message.getData());
List<ProxyPresencePlayer> players = currentPlayers();
int localHash = computeHash(players);
boolean match = localHash == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);

if (!match) {
response.addAllPlayers(players.stream().map(ProxyPresencePlayer::toProto).toList());
}

natsConnection.publish(replyTo, response.build().toByteArray());
List<PresencePlayer> players = currentPlayers();
natsConnection.publish(replyTo, buildResponse(request, players).toByteArray());
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Failed to process presence compare request for " + subject, e);
}
}

private List<ProxyPresencePlayer> currentPlayers() {
ProxyPresencePlayerProvider currentProvider = playerProvider;
private List<PresencePlayer> currentPlayers() {
PresencePlayerProvider currentProvider = playerProvider;
if (currentProvider == null) {
return List.of();
}

Collection<ProxyPresencePlayer> suppliedPlayers = currentProvider.getProxyPresencePlayers();
Collection<PresencePlayer> suppliedPlayers = currentProvider.getPresencePlayers();
if (suppliedPlayers == null || suppliedPlayers.isEmpty()) {
return List.of();
}

return suppliedPlayers.stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(ProxyPresencePlayer::hashRecord))
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
}

static int computeHash(Collection<ProxyPresencePlayer> players) {
static ProxyPresenceCompareResponse buildResponse(
PresenceCompareRequest request,
Collection<PresencePlayer> players
) {
Objects.requireNonNull(request, "request");
List<PresencePlayer> currentPlayers = (players == null ? List.<PresencePlayer>of() : players).stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
boolean match = computeHash(currentPlayers) == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);
if (!match) {
response.addAllPlayers(currentPlayers.stream().map(PresencePlayer::toProto).toList());
}
return response.build();
}

static int computeHash(Collection<PresencePlayer> players) {
if (players == null || players.isEmpty()) {
return 0;
}

List<String> records = players.stream()
.filter(Objects::nonNull)
.map(PresencePlayer::hashRecord)
.sorted()
.toList();
String payload = records.size() + "\u001e" + String.join("\u001e", records);

int hash = FNV_32A_OFFSET_BASIS;
for (ProxyPresencePlayer player : players) {
byte[] bytes = player.hashRecord().getBytes(StandardCharsets.UTF_8);
for (byte currentByte : bytes) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
for (byte currentByte : payload.getBytes(StandardCharsets.UTF_8)) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
return hash;
}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.PresencePlayer;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand DownExpand Up@@ -32,7 +32,7 @@ public void remove(String playerId) {
players.remove(normalize(playerId));
}

public ProxyPresencePlayer createSnapshot(
public PresencePlayer createSnapshot(
String playerId,
String name,
String displayName,
Expand All@@ -44,7 +44,7 @@ public ProxyPresencePlayer createSnapshot(
String normalizedPlayerId = normalize(playerId);
TrackedPlayerMetadata metadata = players.get(normalizedPlayerId);

return new ProxyPresencePlayer(
return new PresencePlayer(
normalizedPlayerId,
name,
displayName,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
import build.buf.gen.simplecloud.controller.v2.ProxyPresencePlayerSnapshot;

/**
* Immutable player snapshot used for proxy presence reconciliation.
* Immutable player snapshot used for proxy and game-server presence reconciliation.
*/
public final class ProxyPresencePlayer {
public final class PresencePlayer {

private final String playerId;
private final String name;
Expand All@@ -18,7 +18,7 @@ public final class ProxyPresencePlayer {
private final boolean onlineMode;
private final String sessionId;

public ProxyPresencePlayer(
public PresencePlayer(
String playerId,
String name,
String displayName,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package app.simplecloud.api.presence;

import java.util.Collection;

/**
* Supplies the current set of players visible to this proxy or game server.
*/
public interface PresencePlayerProvider {

Collection<PresencePlayer> getPresencePlayers();
}

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.PresencePlayer;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import org.junit.jupiter.api.Test;

import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

class PresenceResponderTest {

@Test
void returnsMatchWithoutSnapshotWhenSummaryMatches() {
ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of()
);

assertTrue(response.getMatch());
assertTrue(response.getPlayersList().isEmpty());
}

@Test
void returnsEveryLivePlayerWhenSummaryDiffers() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);

ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of(player)
);

assertFalse(response.getMatch());
assertTrue(response.getPlayersList().stream().anyMatch(snapshot -> snapshot.getPlayerId().equals("player-1")));
}

@Test
void equalCountsWithDifferentPlayersProduceDifferentHashes() {
PresencePlayer first = player("player-1");
PresencePlayer second = player("player-2");

assertNotEquals(
PresenceResponder.computeHash(List.of(first)),
PresenceResponder.computeHash(List.of(second))
);
assertEquals(0, PresenceResponder.computeHash(List.of()));
}

@Test
void hashMatchesControllerWireContract() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"Lobby-1",
"",
0L,
"",
0,
true,
""
);

assertEquals(1745198624, PresenceResponder.computeHash(List.of(player)));
}

private static PresencePlayer player(String playerId) {
return new PresencePlayer(
playerId,
playerId,
playerId,
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@
import app.simplecloud.api.CloudApi;
import app.simplecloud.api.internal.CloudApiImpl;
import app.simplecloud.api.internal.integration.player.PlayerIntegration;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceResponder;
import app.simplecloud.api.internal.integration.presence.PresenceResponder;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceTracker;
import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import app.simplecloud.api.player.CloudPlayer;
import app.simplecloud.api.runtime.SimpleCloudRuntime;
import app.simplecloud.api.platform.shared.LuckPermsPlayerPropertySynchronizer;
Expand All@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayerProvider {
public class BungeeCordApiProvider extends Plugin implements PresencePlayerProvider {

private final BungeeContext fastStatsContext = new BungeeContext.Factory(
this,
Expand All@@ -37,7 +37,7 @@ public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayer
private PlayerSynchronizer playerSynchronizer;
private PlayerIntegration playerIntegration;
private ProxyPresenceTracker proxyPresenceTracker;
private ProxyPresenceResponder proxyPresenceResponder;
private PresenceResponder presenceResponder;
private LuckPermsPlayerPropertySynchronizer luckPermsSynchronizer;

private BungeeAudiences bungeeAudiences;
Expand All@@ -55,7 +55,7 @@ public void onEnable() {
);
this.playerIntegration = new PlayerIntegration(cloudApi);
this.proxyPresenceTracker = new ProxyPresenceTracker(proxyName);
this.proxyPresenceResponder = new ProxyPresenceResponder(
this.presenceResponder = new PresenceResponder(
cloudApi.getNatsConnection(),
cloudApi.getNetworkId(),
SimpleCloudRuntime.serverId(),
Expand All@@ -81,14 +81,14 @@ public void onEnable() {

playerSynchronizer.start();
playerIntegration.start();
proxyPresenceResponder.start();
presenceResponder.start();
fastStatsContext.ready();
}

@Override
public void onDisable() {
getLogger().info("SimpleCloud v3 API provider uninitialized!");
proxyPresenceResponder.stop();
presenceResponder.stop();
if (luckPermsSynchronizer != null) {
luckPermsSynchronizer.stop();
}
Expand DownExpand Up@@ -135,13 +135,13 @@ private void forgetLuckPermsProperties(UUID uniqueId) {
}

@Override
public List<ProxyPresencePlayer> getProxyPresencePlayers() {
public List<PresencePlayer> getPresencePlayers() {
return getProxy().getPlayers().stream()
.map(this::toPresencePlayer)
.toList();
}

private ProxyPresencePlayer toPresencePlayer(ProxiedPlayer player) {
private PresencePlayer toPresencePlayer(ProxiedPlayer player) {
String connectedServerName = player.getServer() != null ? player.getServer().getInfo().getName() : "";
Locale locale = player.getLocale();
var pendingConnection = player.getPendingConnection();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import io.nats.client.Connection;
Expand All@@ -18,35 +18,35 @@
import java.util.logging.Logger;

/**
* Responds to controller presence-compare requests for a single proxy.
* Responds to controller presence-compare requests for a single proxy or game server.
*/
public final class ProxyPresenceResponder {
public final class PresenceResponder {

private static final Logger LOGGER = Logger.getLogger(ProxyPresenceResponder.class.getName());
private static final Logger LOGGER = Logger.getLogger(PresenceResponder.class.getName());
private static final int FNV_32A_OFFSET_BASIS = 0x811c9dc5;
private static final int FNV_32A_PRIME = 0x01000193;

private final Connection natsConnection;
private final String serverId;
private final String subject;
private final AtomicBoolean running = new AtomicBoolean(false);
private volatile ProxyPresencePlayerProvider playerProvider;
private volatile PresencePlayerProvider playerProvider;

private Dispatcher dispatcher;

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId,
ProxyPresencePlayerProvider playerProvider
PresencePlayerProvider playerProvider
) {
this.natsConnection = Objects.requireNonNull(natsConnection, "natsConnection");
this.serverId = serverId == null ? "" : serverId;
this.subject = Objects.requireNonNull(networkId, "networkId") + ".server." + this.serverId + ".presence.compare";
this.playerProvider = playerProvider;
}

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId
Expand All@@ -67,7 +67,7 @@ public void start() {
dispatcher.subscribe(subject, this::handleCompareRequest);
}

public void registerPlayerProvider(ProxyPresencePlayerProvider playerProvider) {
public void registerPlayerProvider(PresencePlayerProvider playerProvider) {
this.playerProvider = Objects.requireNonNull(playerProvider, "playerProvider");
}

Expand All@@ -92,52 +92,65 @@ private void handleCompareRequest(Message message) {

try {
PresenceCompareRequest request = PresenceCompareRequest.parseFrom(message.getData());
List<ProxyPresencePlayer> players = currentPlayers();
int localHash = computeHash(players);
boolean match = localHash == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);

if (!match) {
response.addAllPlayers(players.stream().map(ProxyPresencePlayer::toProto).toList());
}

natsConnection.publish(replyTo, response.build().toByteArray());
List<PresencePlayer> players = currentPlayers();
natsConnection.publish(replyTo, buildResponse(request, players).toByteArray());
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Failed to process presence compare request for " + subject, e);
}
}

private List<ProxyPresencePlayer> currentPlayers() {
ProxyPresencePlayerProvider currentProvider = playerProvider;
private List<PresencePlayer> currentPlayers() {
PresencePlayerProvider currentProvider = playerProvider;
if (currentProvider == null) {
return List.of();
}

Collection<ProxyPresencePlayer> suppliedPlayers = currentProvider.getProxyPresencePlayers();
Collection<PresencePlayer> suppliedPlayers = currentProvider.getPresencePlayers();
if (suppliedPlayers == null || suppliedPlayers.isEmpty()) {
return List.of();
}

return suppliedPlayers.stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(ProxyPresencePlayer::hashRecord))
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
}

static int computeHash(Collection<ProxyPresencePlayer> players) {
static ProxyPresenceCompareResponse buildResponse(
PresenceCompareRequest request,
Collection<PresencePlayer> players
) {
Objects.requireNonNull(request, "request");
List<PresencePlayer> currentPlayers = (players == null ? List.<PresencePlayer>of() : players).stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
boolean match = computeHash(currentPlayers) == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);
if (!match) {
response.addAllPlayers(currentPlayers.stream().map(PresencePlayer::toProto).toList());
}
return response.build();
}

static int computeHash(Collection<PresencePlayer> players) {
if (players == null || players.isEmpty()) {
return 0;
}

List<String> records = players.stream()
.filter(Objects::nonNull)
.map(PresencePlayer::hashRecord)
.sorted()
.toList();
String payload = records.size() + "\u001e" + String.join("\u001e", records);

int hash = FNV_32A_OFFSET_BASIS;
for (ProxyPresencePlayer player : players) {
byte[] bytes = player.hashRecord().getBytes(StandardCharsets.UTF_8);
for (byte currentByte : bytes) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
for (byte currentByte : payload.getBytes(StandardCharsets.UTF_8)) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
return hash;
}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.PresencePlayer;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand DownExpand Up@@ -32,7 +32,7 @@ public void remove(String playerId) {
players.remove(normalize(playerId));
}

public ProxyPresencePlayer createSnapshot(
public PresencePlayer createSnapshot(
String playerId,
String name,
String displayName,
Expand All@@ -44,7 +44,7 @@ public ProxyPresencePlayer createSnapshot(
String normalizedPlayerId = normalize(playerId);
TrackedPlayerMetadata metadata = players.get(normalizedPlayerId);

return new ProxyPresencePlayer(
return new PresencePlayer(
normalizedPlayerId,
name,
displayName,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
import build.buf.gen.simplecloud.controller.v2.ProxyPresencePlayerSnapshot;

/**
* Immutable player snapshot used for proxy presence reconciliation.
* Immutable player snapshot used for proxy and game-server presence reconciliation.
*/
public final class ProxyPresencePlayer {
public final class PresencePlayer {

private final String playerId;
private final String name;
Expand All@@ -18,7 +18,7 @@ public final class ProxyPresencePlayer {
private final boolean onlineMode;
private final String sessionId;

public ProxyPresencePlayer(
public PresencePlayer(
String playerId,
String name,
String displayName,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package app.simplecloud.api.presence;

import java.util.Collection;

/**
* Supplies the current set of players visible to this proxy or game server.
*/
public interface PresencePlayerProvider {

Collection<PresencePlayer> getPresencePlayers();
}

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.PresencePlayer;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import org.junit.jupiter.api.Test;

import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

class PresenceResponderTest {

@Test
void returnsMatchWithoutSnapshotWhenSummaryMatches() {
ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of()
);

assertTrue(response.getMatch());
assertTrue(response.getPlayersList().isEmpty());
}

@Test
void returnsEveryLivePlayerWhenSummaryDiffers() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);

ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of(player)
);

assertFalse(response.getMatch());
assertTrue(response.getPlayersList().stream().anyMatch(snapshot -> snapshot.getPlayerId().equals("player-1")));
}

@Test
void equalCountsWithDifferentPlayersProduceDifferentHashes() {
PresencePlayer first = player("player-1");
PresencePlayer second = player("player-2");

assertNotEquals(
PresenceResponder.computeHash(List.of(first)),
PresenceResponder.computeHash(List.of(second))
);
assertEquals(0, PresenceResponder.computeHash(List.of()));
}

@Test
void hashMatchesControllerWireContract() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"Lobby-1",
"",
0L,
"",
0,
true,
""
);

assertEquals(1745198624, PresenceResponder.computeHash(List.of(player)));
}

private static PresencePlayer player(String playerId) {
return new PresencePlayer(
playerId,
playerId,
playerId,
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@
import app.simplecloud.api.CloudApi;
import app.simplecloud.api.internal.CloudApiImpl;
import app.simplecloud.api.internal.integration.player.PlayerIntegration;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceResponder;
import app.simplecloud.api.internal.integration.presence.PresenceResponder;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceTracker;
import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import app.simplecloud.api.player.CloudPlayer;
import app.simplecloud.api.runtime.SimpleCloudRuntime;
import app.simplecloud.api.platform.shared.LuckPermsPlayerPropertySynchronizer;
Expand All@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayerProvider {
public class BungeeCordApiProvider extends Plugin implements PresencePlayerProvider {

private final BungeeContext fastStatsContext = new BungeeContext.Factory(
this,
Expand All@@ -37,7 +37,7 @@ public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayer
private PlayerSynchronizer playerSynchronizer;
private PlayerIntegration playerIntegration;
private ProxyPresenceTracker proxyPresenceTracker;
private ProxyPresenceResponder proxyPresenceResponder;
private PresenceResponder presenceResponder;
private LuckPermsPlayerPropertySynchronizer luckPermsSynchronizer;

private BungeeAudiences bungeeAudiences;
Expand All@@ -55,7 +55,7 @@ public void onEnable() {
);
this.playerIntegration = new PlayerIntegration(cloudApi);
this.proxyPresenceTracker = new ProxyPresenceTracker(proxyName);
this.proxyPresenceResponder = new ProxyPresenceResponder(
this.presenceResponder = new PresenceResponder(
cloudApi.getNatsConnection(),
cloudApi.getNetworkId(),
SimpleCloudRuntime.serverId(),
Expand All@@ -81,14 +81,14 @@ public void onEnable() {

playerSynchronizer.start();
playerIntegration.start();
proxyPresenceResponder.start();
presenceResponder.start();
fastStatsContext.ready();
}

@Override
public void onDisable() {
getLogger().info("SimpleCloud v3 API provider uninitialized!");
proxyPresenceResponder.stop();
presenceResponder.stop();
if (luckPermsSynchronizer != null) {
luckPermsSynchronizer.stop();
}
Expand DownExpand Up@@ -135,13 +135,13 @@ private void forgetLuckPermsProperties(UUID uniqueId) {
}

@Override
public List<ProxyPresencePlayer> getProxyPresencePlayers() {
public List<PresencePlayer> getPresencePlayers() {
return getProxy().getPlayers().stream()
.map(this::toPresencePlayer)
.toList();
}

private ProxyPresencePlayer toPresencePlayer(ProxiedPlayer player) {
private PresencePlayer toPresencePlayer(ProxiedPlayer player) {
String connectedServerName = player.getServer() != null ? player.getServer().getInfo().getName() : "";
Locale locale = player.getLocale();
var pendingConnection = player.getPendingConnection();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import io.nats.client.Connection;
Expand All@@ -18,35 +18,35 @@
import java.util.logging.Logger;

/**
* Responds to controller presence-compare requests for a single proxy.
* Responds to controller presence-compare requests for a single proxy or game server.
*/
public final class ProxyPresenceResponder {
public final class PresenceResponder {

private static final Logger LOGGER = Logger.getLogger(ProxyPresenceResponder.class.getName());
private static final Logger LOGGER = Logger.getLogger(PresenceResponder.class.getName());
private static final int FNV_32A_OFFSET_BASIS = 0x811c9dc5;
private static final int FNV_32A_PRIME = 0x01000193;

private final Connection natsConnection;
private final String serverId;
private final String subject;
private final AtomicBoolean running = new AtomicBoolean(false);
private volatile ProxyPresencePlayerProvider playerProvider;
private volatile PresencePlayerProvider playerProvider;

private Dispatcher dispatcher;

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId,
ProxyPresencePlayerProvider playerProvider
PresencePlayerProvider playerProvider
) {
this.natsConnection = Objects.requireNonNull(natsConnection, "natsConnection");
this.serverId = serverId == null ? "" : serverId;
this.subject = Objects.requireNonNull(networkId, "networkId") + ".server." + this.serverId + ".presence.compare";
this.playerProvider = playerProvider;
}

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId
Expand All@@ -67,7 +67,7 @@ public void start() {
dispatcher.subscribe(subject, this::handleCompareRequest);
}

public void registerPlayerProvider(ProxyPresencePlayerProvider playerProvider) {
public void registerPlayerProvider(PresencePlayerProvider playerProvider) {
this.playerProvider = Objects.requireNonNull(playerProvider, "playerProvider");
}

Expand All@@ -92,52 +92,65 @@ private void handleCompareRequest(Message message) {

try {
PresenceCompareRequest request = PresenceCompareRequest.parseFrom(message.getData());
List<ProxyPresencePlayer> players = currentPlayers();
int localHash = computeHash(players);
boolean match = localHash == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);

if (!match) {
response.addAllPlayers(players.stream().map(ProxyPresencePlayer::toProto).toList());
}

natsConnection.publish(replyTo, response.build().toByteArray());
List<PresencePlayer> players = currentPlayers();
natsConnection.publish(replyTo, buildResponse(request, players).toByteArray());
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Failed to process presence compare request for " + subject, e);
}
}

private List<ProxyPresencePlayer> currentPlayers() {
ProxyPresencePlayerProvider currentProvider = playerProvider;
private List<PresencePlayer> currentPlayers() {
PresencePlayerProvider currentProvider = playerProvider;
if (currentProvider == null) {
return List.of();
}

Collection<ProxyPresencePlayer> suppliedPlayers = currentProvider.getProxyPresencePlayers();
Collection<PresencePlayer> suppliedPlayers = currentProvider.getPresencePlayers();
if (suppliedPlayers == null || suppliedPlayers.isEmpty()) {
return List.of();
}

return suppliedPlayers.stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(ProxyPresencePlayer::hashRecord))
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
}

static int computeHash(Collection<ProxyPresencePlayer> players) {
static ProxyPresenceCompareResponse buildResponse(
PresenceCompareRequest request,
Collection<PresencePlayer> players
) {
Objects.requireNonNull(request, "request");
List<PresencePlayer> currentPlayers = (players == null ? List.<PresencePlayer>of() : players).stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
boolean match = computeHash(currentPlayers) == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);
if (!match) {
response.addAllPlayers(currentPlayers.stream().map(PresencePlayer::toProto).toList());
}
return response.build();
}

static int computeHash(Collection<PresencePlayer> players) {
if (players == null || players.isEmpty()) {
return 0;
}

List<String> records = players.stream()
.filter(Objects::nonNull)
.map(PresencePlayer::hashRecord)
.sorted()
.toList();
String payload = records.size() + "\u001e" + String.join("\u001e", records);

int hash = FNV_32A_OFFSET_BASIS;
for (ProxyPresencePlayer player : players) {
byte[] bytes = player.hashRecord().getBytes(StandardCharsets.UTF_8);
for (byte currentByte : bytes) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
for (byte currentByte : payload.getBytes(StandardCharsets.UTF_8)) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
return hash;
}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.PresencePlayer;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand DownExpand Up@@ -32,7 +32,7 @@ public void remove(String playerId) {
players.remove(normalize(playerId));
}

public ProxyPresencePlayer createSnapshot(
public PresencePlayer createSnapshot(
String playerId,
String name,
String displayName,
Expand All@@ -44,7 +44,7 @@ public ProxyPresencePlayer createSnapshot(
String normalizedPlayerId = normalize(playerId);
TrackedPlayerMetadata metadata = players.get(normalizedPlayerId);

return new ProxyPresencePlayer(
return new PresencePlayer(
normalizedPlayerId,
name,
displayName,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
import build.buf.gen.simplecloud.controller.v2.ProxyPresencePlayerSnapshot;

/**
* Immutable player snapshot used for proxy presence reconciliation.
* Immutable player snapshot used for proxy and game-server presence reconciliation.
*/
public final class ProxyPresencePlayer {
public final class PresencePlayer {

private final String playerId;
private final String name;
Expand All@@ -18,7 +18,7 @@ public final class ProxyPresencePlayer {
private final boolean onlineMode;
private final String sessionId;

public ProxyPresencePlayer(
public PresencePlayer(
String playerId,
String name,
String displayName,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package app.simplecloud.api.presence;

import java.util.Collection;

/**
* Supplies the current set of players visible to this proxy or game server.
*/
public interface PresencePlayerProvider {

Collection<PresencePlayer> getPresencePlayers();
}

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.PresencePlayer;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import org.junit.jupiter.api.Test;

import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

class PresenceResponderTest {

@Test
void returnsMatchWithoutSnapshotWhenSummaryMatches() {
ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of()
);

assertTrue(response.getMatch());
assertTrue(response.getPlayersList().isEmpty());
}

@Test
void returnsEveryLivePlayerWhenSummaryDiffers() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);

ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of(player)
);

assertFalse(response.getMatch());
assertTrue(response.getPlayersList().stream().anyMatch(snapshot -> snapshot.getPlayerId().equals("player-1")));
}

@Test
void equalCountsWithDifferentPlayersProduceDifferentHashes() {
PresencePlayer first = player("player-1");
PresencePlayer second = player("player-2");

assertNotEquals(
PresenceResponder.computeHash(List.of(first)),
PresenceResponder.computeHash(List.of(second))
);
assertEquals(0, PresenceResponder.computeHash(List.of()));
}

@Test
void hashMatchesControllerWireContract() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"Lobby-1",
"",
0L,
"",
0,
true,
""
);

assertEquals(1745198624, PresenceResponder.computeHash(List.of(player)));
}

private static PresencePlayer player(String playerId) {
return new PresencePlayer(
playerId,
playerId,
playerId,
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@
import app.simplecloud.api.CloudApi;
import app.simplecloud.api.internal.CloudApiImpl;
import app.simplecloud.api.internal.integration.player.PlayerIntegration;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceResponder;
import app.simplecloud.api.internal.integration.presence.PresenceResponder;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceTracker;
import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import app.simplecloud.api.player.CloudPlayer;
import app.simplecloud.api.runtime.SimpleCloudRuntime;
import app.simplecloud.api.platform.shared.LuckPermsPlayerPropertySynchronizer;
Expand All@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayerProvider {
public class BungeeCordApiProvider extends Plugin implements PresencePlayerProvider {

private final BungeeContext fastStatsContext = new BungeeContext.Factory(
this,
Expand All@@ -37,7 +37,7 @@ public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayer
private PlayerSynchronizer playerSynchronizer;
private PlayerIntegration playerIntegration;
private ProxyPresenceTracker proxyPresenceTracker;
private ProxyPresenceResponder proxyPresenceResponder;
private PresenceResponder presenceResponder;
private LuckPermsPlayerPropertySynchronizer luckPermsSynchronizer;

private BungeeAudiences bungeeAudiences;
Expand All@@ -55,7 +55,7 @@ public void onEnable() {
);
this.playerIntegration = new PlayerIntegration(cloudApi);
this.proxyPresenceTracker = new ProxyPresenceTracker(proxyName);
this.proxyPresenceResponder = new ProxyPresenceResponder(
this.presenceResponder = new PresenceResponder(
cloudApi.getNatsConnection(),
cloudApi.getNetworkId(),
SimpleCloudRuntime.serverId(),
Expand All@@ -81,14 +81,14 @@ public void onEnable() {

playerSynchronizer.start();
playerIntegration.start();
proxyPresenceResponder.start();
presenceResponder.start();
fastStatsContext.ready();
}

@Override
public void onDisable() {
getLogger().info("SimpleCloud v3 API provider uninitialized!");
proxyPresenceResponder.stop();
presenceResponder.stop();
if (luckPermsSynchronizer != null) {
luckPermsSynchronizer.stop();
}
Expand DownExpand Up@@ -135,13 +135,13 @@ private void forgetLuckPermsProperties(UUID uniqueId) {
}

@Override
public List<ProxyPresencePlayer> getProxyPresencePlayers() {
public List<PresencePlayer> getPresencePlayers() {
return getProxy().getPlayers().stream()
.map(this::toPresencePlayer)
.toList();
}

private ProxyPresencePlayer toPresencePlayer(ProxiedPlayer player) {
private PresencePlayer toPresencePlayer(ProxiedPlayer player) {
String connectedServerName = player.getServer() != null ? player.getServer().getInfo().getName() : "";
Locale locale = player.getLocale();
var pendingConnection = player.getPendingConnection();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import io.nats.client.Connection;
Expand All@@ -18,35 +18,35 @@
import java.util.logging.Logger;

/**
* Responds to controller presence-compare requests for a single proxy.
* Responds to controller presence-compare requests for a single proxy or game server.
*/
public final class ProxyPresenceResponder {
public final class PresenceResponder {

private static final Logger LOGGER = Logger.getLogger(ProxyPresenceResponder.class.getName());
private static final Logger LOGGER = Logger.getLogger(PresenceResponder.class.getName());
private static final int FNV_32A_OFFSET_BASIS = 0x811c9dc5;
private static final int FNV_32A_PRIME = 0x01000193;

private final Connection natsConnection;
private final String serverId;
private final String subject;
private final AtomicBoolean running = new AtomicBoolean(false);
private volatile ProxyPresencePlayerProvider playerProvider;
private volatile PresencePlayerProvider playerProvider;

private Dispatcher dispatcher;

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId,
ProxyPresencePlayerProvider playerProvider
PresencePlayerProvider playerProvider
) {
this.natsConnection = Objects.requireNonNull(natsConnection, "natsConnection");
this.serverId = serverId == null ? "" : serverId;
this.subject = Objects.requireNonNull(networkId, "networkId") + ".server." + this.serverId + ".presence.compare";
this.playerProvider = playerProvider;
}

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId
Expand All@@ -67,7 +67,7 @@ public void start() {
dispatcher.subscribe(subject, this::handleCompareRequest);
}

public void registerPlayerProvider(ProxyPresencePlayerProvider playerProvider) {
public void registerPlayerProvider(PresencePlayerProvider playerProvider) {
this.playerProvider = Objects.requireNonNull(playerProvider, "playerProvider");
}

Expand All@@ -92,52 +92,65 @@ private void handleCompareRequest(Message message) {

try {
PresenceCompareRequest request = PresenceCompareRequest.parseFrom(message.getData());
List<ProxyPresencePlayer> players = currentPlayers();
int localHash = computeHash(players);
boolean match = localHash == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);

if (!match) {
response.addAllPlayers(players.stream().map(ProxyPresencePlayer::toProto).toList());
}

natsConnection.publish(replyTo, response.build().toByteArray());
List<PresencePlayer> players = currentPlayers();
natsConnection.publish(replyTo, buildResponse(request, players).toByteArray());
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Failed to process presence compare request for " + subject, e);
}
}

private List<ProxyPresencePlayer> currentPlayers() {
ProxyPresencePlayerProvider currentProvider = playerProvider;
private List<PresencePlayer> currentPlayers() {
PresencePlayerProvider currentProvider = playerProvider;
if (currentProvider == null) {
return List.of();
}

Collection<ProxyPresencePlayer> suppliedPlayers = currentProvider.getProxyPresencePlayers();
Collection<PresencePlayer> suppliedPlayers = currentProvider.getPresencePlayers();
if (suppliedPlayers == null || suppliedPlayers.isEmpty()) {
return List.of();
}

return suppliedPlayers.stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(ProxyPresencePlayer::hashRecord))
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
}

static int computeHash(Collection<ProxyPresencePlayer> players) {
static ProxyPresenceCompareResponse buildResponse(
PresenceCompareRequest request,
Collection<PresencePlayer> players
) {
Objects.requireNonNull(request, "request");
List<PresencePlayer> currentPlayers = (players == null ? List.<PresencePlayer>of() : players).stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
boolean match = computeHash(currentPlayers) == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);
if (!match) {
response.addAllPlayers(currentPlayers.stream().map(PresencePlayer::toProto).toList());
}
return response.build();
}

static int computeHash(Collection<PresencePlayer> players) {
if (players == null || players.isEmpty()) {
return 0;
}

List<String> records = players.stream()
.filter(Objects::nonNull)
.map(PresencePlayer::hashRecord)
.sorted()
.toList();
String payload = records.size() + "\u001e" + String.join("\u001e", records);

int hash = FNV_32A_OFFSET_BASIS;
for (ProxyPresencePlayer player : players) {
byte[] bytes = player.hashRecord().getBytes(StandardCharsets.UTF_8);
for (byte currentByte : bytes) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
for (byte currentByte : payload.getBytes(StandardCharsets.UTF_8)) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
return hash;
}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.PresencePlayer;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand DownExpand Up@@ -32,7 +32,7 @@ public void remove(String playerId) {
players.remove(normalize(playerId));
}

public ProxyPresencePlayer createSnapshot(
public PresencePlayer createSnapshot(
String playerId,
String name,
String displayName,
Expand All@@ -44,7 +44,7 @@ public ProxyPresencePlayer createSnapshot(
String normalizedPlayerId = normalize(playerId);
TrackedPlayerMetadata metadata = players.get(normalizedPlayerId);

return new ProxyPresencePlayer(
return new PresencePlayer(
normalizedPlayerId,
name,
displayName,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
import build.buf.gen.simplecloud.controller.v2.ProxyPresencePlayerSnapshot;

/**
* Immutable player snapshot used for proxy presence reconciliation.
* Immutable player snapshot used for proxy and game-server presence reconciliation.
*/
public final class ProxyPresencePlayer {
public final class PresencePlayer {

private final String playerId;
private final String name;
Expand All@@ -18,7 +18,7 @@ public final class ProxyPresencePlayer {
private final boolean onlineMode;
private final String sessionId;

public ProxyPresencePlayer(
public PresencePlayer(
String playerId,
String name,
String displayName,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package app.simplecloud.api.presence;

import java.util.Collection;

/**
* Supplies the current set of players visible to this proxy or game server.
*/
public interface PresencePlayerProvider {

Collection<PresencePlayer> getPresencePlayers();
}

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.PresencePlayer;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import org.junit.jupiter.api.Test;

import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

class PresenceResponderTest {

@Test
void returnsMatchWithoutSnapshotWhenSummaryMatches() {
ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of()
);

assertTrue(response.getMatch());
assertTrue(response.getPlayersList().isEmpty());
}

@Test
void returnsEveryLivePlayerWhenSummaryDiffers() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);

ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of(player)
);

assertFalse(response.getMatch());
assertTrue(response.getPlayersList().stream().anyMatch(snapshot -> snapshot.getPlayerId().equals("player-1")));
}

@Test
void equalCountsWithDifferentPlayersProduceDifferentHashes() {
PresencePlayer first = player("player-1");
PresencePlayer second = player("player-2");

assertNotEquals(
PresenceResponder.computeHash(List.of(first)),
PresenceResponder.computeHash(List.of(second))
);
assertEquals(0, PresenceResponder.computeHash(List.of()));
}

@Test
void hashMatchesControllerWireContract() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"Lobby-1",
"",
0L,
"",
0,
true,
""
);

assertEquals(1745198624, PresenceResponder.computeHash(List.of(player)));
}

private static PresencePlayer player(String playerId) {
return new PresencePlayer(
playerId,
playerId,
playerId,
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@
import app.simplecloud.api.CloudApi;
import app.simplecloud.api.internal.CloudApiImpl;
import app.simplecloud.api.internal.integration.player.PlayerIntegration;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceResponder;
import app.simplecloud.api.internal.integration.presence.PresenceResponder;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceTracker;
import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import app.simplecloud.api.player.CloudPlayer;
import app.simplecloud.api.runtime.SimpleCloudRuntime;
import app.simplecloud.api.platform.shared.LuckPermsPlayerPropertySynchronizer;
Expand All@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayerProvider {
public class BungeeCordApiProvider extends Plugin implements PresencePlayerProvider {

private final BungeeContext fastStatsContext = new BungeeContext.Factory(
this,
Expand All@@ -37,7 +37,7 @@ public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayer
private PlayerSynchronizer playerSynchronizer;
private PlayerIntegration playerIntegration;
private ProxyPresenceTracker proxyPresenceTracker;
private ProxyPresenceResponder proxyPresenceResponder;
private PresenceResponder presenceResponder;
private LuckPermsPlayerPropertySynchronizer luckPermsSynchronizer;

private BungeeAudiences bungeeAudiences;
Expand All@@ -55,7 +55,7 @@ public void onEnable() {
);
this.playerIntegration = new PlayerIntegration(cloudApi);
this.proxyPresenceTracker = new ProxyPresenceTracker(proxyName);
this.proxyPresenceResponder = new ProxyPresenceResponder(
this.presenceResponder = new PresenceResponder(
cloudApi.getNatsConnection(),
cloudApi.getNetworkId(),
SimpleCloudRuntime.serverId(),
Expand All@@ -81,14 +81,14 @@ public void onEnable() {

playerSynchronizer.start();
playerIntegration.start();
proxyPresenceResponder.start();
presenceResponder.start();
fastStatsContext.ready();
}

@Override
public void onDisable() {
getLogger().info("SimpleCloud v3 API provider uninitialized!");
proxyPresenceResponder.stop();
presenceResponder.stop();
if (luckPermsSynchronizer != null) {
luckPermsSynchronizer.stop();
}
Expand DownExpand Up@@ -135,13 +135,13 @@ private void forgetLuckPermsProperties(UUID uniqueId) {
}

@Override
public List<ProxyPresencePlayer> getProxyPresencePlayers() {
public List<PresencePlayer> getPresencePlayers() {
return getProxy().getPlayers().stream()
.map(this::toPresencePlayer)
.toList();
}

private ProxyPresencePlayer toPresencePlayer(ProxiedPlayer player) {
private PresencePlayer toPresencePlayer(ProxiedPlayer player) {
String connectedServerName = player.getServer() != null ? player.getServer().getInfo().getName() : "";
Locale locale = player.getLocale();
var pendingConnection = player.getPendingConnection();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import io.nats.client.Connection;
Expand All@@ -18,35 +18,35 @@
import java.util.logging.Logger;

/**
* Responds to controller presence-compare requests for a single proxy.
* Responds to controller presence-compare requests for a single proxy or game server.
*/
public final class ProxyPresenceResponder {
public final class PresenceResponder {

private static final Logger LOGGER = Logger.getLogger(ProxyPresenceResponder.class.getName());
private static final Logger LOGGER = Logger.getLogger(PresenceResponder.class.getName());
private static final int FNV_32A_OFFSET_BASIS = 0x811c9dc5;
private static final int FNV_32A_PRIME = 0x01000193;

private final Connection natsConnection;
private final String serverId;
private final String subject;
private final AtomicBoolean running = new AtomicBoolean(false);
private volatile ProxyPresencePlayerProvider playerProvider;
private volatile PresencePlayerProvider playerProvider;

private Dispatcher dispatcher;

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId,
ProxyPresencePlayerProvider playerProvider
PresencePlayerProvider playerProvider
) {
this.natsConnection = Objects.requireNonNull(natsConnection, "natsConnection");
this.serverId = serverId == null ? "" : serverId;
this.subject = Objects.requireNonNull(networkId, "networkId") + ".server." + this.serverId + ".presence.compare";
this.playerProvider = playerProvider;
}

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId
Expand All@@ -67,7 +67,7 @@ public void start() {
dispatcher.subscribe(subject, this::handleCompareRequest);
}

public void registerPlayerProvider(ProxyPresencePlayerProvider playerProvider) {
public void registerPlayerProvider(PresencePlayerProvider playerProvider) {
this.playerProvider = Objects.requireNonNull(playerProvider, "playerProvider");
}

Expand All@@ -92,52 +92,65 @@ private void handleCompareRequest(Message message) {

try {
PresenceCompareRequest request = PresenceCompareRequest.parseFrom(message.getData());
List<ProxyPresencePlayer> players = currentPlayers();
int localHash = computeHash(players);
boolean match = localHash == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);

if (!match) {
response.addAllPlayers(players.stream().map(ProxyPresencePlayer::toProto).toList());
}

natsConnection.publish(replyTo, response.build().toByteArray());
List<PresencePlayer> players = currentPlayers();
natsConnection.publish(replyTo, buildResponse(request, players).toByteArray());
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Failed to process presence compare request for " + subject, e);
}
}

private List<ProxyPresencePlayer> currentPlayers() {
ProxyPresencePlayerProvider currentProvider = playerProvider;
private List<PresencePlayer> currentPlayers() {
PresencePlayerProvider currentProvider = playerProvider;
if (currentProvider == null) {
return List.of();
}

Collection<ProxyPresencePlayer> suppliedPlayers = currentProvider.getProxyPresencePlayers();
Collection<PresencePlayer> suppliedPlayers = currentProvider.getPresencePlayers();
if (suppliedPlayers == null || suppliedPlayers.isEmpty()) {
return List.of();
}

return suppliedPlayers.stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(ProxyPresencePlayer::hashRecord))
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
}

static int computeHash(Collection<ProxyPresencePlayer> players) {
static ProxyPresenceCompareResponse buildResponse(
PresenceCompareRequest request,
Collection<PresencePlayer> players
) {
Objects.requireNonNull(request, "request");
List<PresencePlayer> currentPlayers = (players == null ? List.<PresencePlayer>of() : players).stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
boolean match = computeHash(currentPlayers) == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);
if (!match) {
response.addAllPlayers(currentPlayers.stream().map(PresencePlayer::toProto).toList());
}
return response.build();
}

static int computeHash(Collection<PresencePlayer> players) {
if (players == null || players.isEmpty()) {
return 0;
}

List<String> records = players.stream()
.filter(Objects::nonNull)
.map(PresencePlayer::hashRecord)
.sorted()
.toList();
String payload = records.size() + "\u001e" + String.join("\u001e", records);

int hash = FNV_32A_OFFSET_BASIS;
for (ProxyPresencePlayer player : players) {
byte[] bytes = player.hashRecord().getBytes(StandardCharsets.UTF_8);
for (byte currentByte : bytes) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
for (byte currentByte : payload.getBytes(StandardCharsets.UTF_8)) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
return hash;
}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.PresencePlayer;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand DownExpand Up@@ -32,7 +32,7 @@ public void remove(String playerId) {
players.remove(normalize(playerId));
}

public ProxyPresencePlayer createSnapshot(
public PresencePlayer createSnapshot(
String playerId,
String name,
String displayName,
Expand All@@ -44,7 +44,7 @@ public ProxyPresencePlayer createSnapshot(
String normalizedPlayerId = normalize(playerId);
TrackedPlayerMetadata metadata = players.get(normalizedPlayerId);

return new ProxyPresencePlayer(
return new PresencePlayer(
normalizedPlayerId,
name,
displayName,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
import build.buf.gen.simplecloud.controller.v2.ProxyPresencePlayerSnapshot;

/**
* Immutable player snapshot used for proxy presence reconciliation.
* Immutable player snapshot used for proxy and game-server presence reconciliation.
*/
public final class ProxyPresencePlayer {
public final class PresencePlayer {

private final String playerId;
private final String name;
Expand All@@ -18,7 +18,7 @@ public final class ProxyPresencePlayer {
private final boolean onlineMode;
private final String sessionId;

public ProxyPresencePlayer(
public PresencePlayer(
String playerId,
String name,
String displayName,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package app.simplecloud.api.presence;

import java.util.Collection;

/**
* Supplies the current set of players visible to this proxy or game server.
*/
public interface PresencePlayerProvider {

Collection<PresencePlayer> getPresencePlayers();
}

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.PresencePlayer;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import org.junit.jupiter.api.Test;

import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

class PresenceResponderTest {

@Test
void returnsMatchWithoutSnapshotWhenSummaryMatches() {
ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of()
);

assertTrue(response.getMatch());
assertTrue(response.getPlayersList().isEmpty());
}

@Test
void returnsEveryLivePlayerWhenSummaryDiffers() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);

ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of(player)
);

assertFalse(response.getMatch());
assertTrue(response.getPlayersList().stream().anyMatch(snapshot -> snapshot.getPlayerId().equals("player-1")));
}

@Test
void equalCountsWithDifferentPlayersProduceDifferentHashes() {
PresencePlayer first = player("player-1");
PresencePlayer second = player("player-2");

assertNotEquals(
PresenceResponder.computeHash(List.of(first)),
PresenceResponder.computeHash(List.of(second))
);
assertEquals(0, PresenceResponder.computeHash(List.of()));
}

@Test
void hashMatchesControllerWireContract() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"Lobby-1",
"",
0L,
"",
0,
true,
""
);

assertEquals(1745198624, PresenceResponder.computeHash(List.of(player)));
}

private static PresencePlayer player(String playerId) {
return new PresencePlayer(
playerId,
playerId,
playerId,
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@
import app.simplecloud.api.CloudApi;
import app.simplecloud.api.internal.CloudApiImpl;
import app.simplecloud.api.internal.integration.player.PlayerIntegration;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceResponder;
import app.simplecloud.api.internal.integration.presence.PresenceResponder;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceTracker;
import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import app.simplecloud.api.player.CloudPlayer;
import app.simplecloud.api.runtime.SimpleCloudRuntime;
import app.simplecloud.api.platform.shared.LuckPermsPlayerPropertySynchronizer;
Expand All@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayerProvider {
public class BungeeCordApiProvider extends Plugin implements PresencePlayerProvider {

private final BungeeContext fastStatsContext = new BungeeContext.Factory(
this,
Expand All@@ -37,7 +37,7 @@ public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayer
private PlayerSynchronizer playerSynchronizer;
private PlayerIntegration playerIntegration;
private ProxyPresenceTracker proxyPresenceTracker;
private ProxyPresenceResponder proxyPresenceResponder;
private PresenceResponder presenceResponder;
private LuckPermsPlayerPropertySynchronizer luckPermsSynchronizer;

private BungeeAudiences bungeeAudiences;
Expand All@@ -55,7 +55,7 @@ public void onEnable() {
);
this.playerIntegration = new PlayerIntegration(cloudApi);
this.proxyPresenceTracker = new ProxyPresenceTracker(proxyName);
this.proxyPresenceResponder = new ProxyPresenceResponder(
this.presenceResponder = new PresenceResponder(
cloudApi.getNatsConnection(),
cloudApi.getNetworkId(),
SimpleCloudRuntime.serverId(),
Expand All@@ -81,14 +81,14 @@ public void onEnable() {

playerSynchronizer.start();
playerIntegration.start();
proxyPresenceResponder.start();
presenceResponder.start();
fastStatsContext.ready();
}

@Override
public void onDisable() {
getLogger().info("SimpleCloud v3 API provider uninitialized!");
proxyPresenceResponder.stop();
presenceResponder.stop();
if (luckPermsSynchronizer != null) {
luckPermsSynchronizer.stop();
}
Expand DownExpand Up@@ -135,13 +135,13 @@ private void forgetLuckPermsProperties(UUID uniqueId) {
}

@Override
public List<ProxyPresencePlayer> getProxyPresencePlayers() {
public List<PresencePlayer> getPresencePlayers() {
return getProxy().getPlayers().stream()
.map(this::toPresencePlayer)
.toList();
}

private ProxyPresencePlayer toPresencePlayer(ProxiedPlayer player) {
private PresencePlayer toPresencePlayer(ProxiedPlayer player) {
String connectedServerName = player.getServer() != null ? player.getServer().getInfo().getName() : "";
Locale locale = player.getLocale();
var pendingConnection = player.getPendingConnection();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import io.nats.client.Connection;
Expand All@@ -18,35 +18,35 @@
import java.util.logging.Logger;

/**
* Responds to controller presence-compare requests for a single proxy.
* Responds to controller presence-compare requests for a single proxy or game server.
*/
public final class ProxyPresenceResponder {
public final class PresenceResponder {

private static final Logger LOGGER = Logger.getLogger(ProxyPresenceResponder.class.getName());
private static final Logger LOGGER = Logger.getLogger(PresenceResponder.class.getName());
private static final int FNV_32A_OFFSET_BASIS = 0x811c9dc5;
private static final int FNV_32A_PRIME = 0x01000193;

private final Connection natsConnection;
private final String serverId;
private final String subject;
private final AtomicBoolean running = new AtomicBoolean(false);
private volatile ProxyPresencePlayerProvider playerProvider;
private volatile PresencePlayerProvider playerProvider;

private Dispatcher dispatcher;

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId,
ProxyPresencePlayerProvider playerProvider
PresencePlayerProvider playerProvider
) {
this.natsConnection = Objects.requireNonNull(natsConnection, "natsConnection");
this.serverId = serverId == null ? "" : serverId;
this.subject = Objects.requireNonNull(networkId, "networkId") + ".server." + this.serverId + ".presence.compare";
this.playerProvider = playerProvider;
}

public ProxyPresenceResponder(
public PresenceResponder(
Connection natsConnection,
String networkId,
String serverId
Expand All@@ -67,7 +67,7 @@ public void start() {
dispatcher.subscribe(subject, this::handleCompareRequest);
}

public void registerPlayerProvider(ProxyPresencePlayerProvider playerProvider) {
public void registerPlayerProvider(PresencePlayerProvider playerProvider) {
this.playerProvider = Objects.requireNonNull(playerProvider, "playerProvider");
}

Expand All@@ -92,52 +92,65 @@ private void handleCompareRequest(Message message) {

try {
PresenceCompareRequest request = PresenceCompareRequest.parseFrom(message.getData());
List<ProxyPresencePlayer> players = currentPlayers();
int localHash = computeHash(players);
boolean match = localHash == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);

if (!match) {
response.addAllPlayers(players.stream().map(ProxyPresencePlayer::toProto).toList());
}

natsConnection.publish(replyTo, response.build().toByteArray());
List<PresencePlayer> players = currentPlayers();
natsConnection.publish(replyTo, buildResponse(request, players).toByteArray());
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Failed to process presence compare request for " + subject, e);
}
}

private List<ProxyPresencePlayer> currentPlayers() {
ProxyPresencePlayerProvider currentProvider = playerProvider;
private List<PresencePlayer> currentPlayers() {
PresencePlayerProvider currentProvider = playerProvider;
if (currentProvider == null) {
return List.of();
}

Collection<ProxyPresencePlayer> suppliedPlayers = currentProvider.getProxyPresencePlayers();
Collection<PresencePlayer> suppliedPlayers = currentProvider.getPresencePlayers();
if (suppliedPlayers == null || suppliedPlayers.isEmpty()) {
return List.of();
}

return suppliedPlayers.stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(ProxyPresencePlayer::hashRecord))
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
}

static int computeHash(Collection<ProxyPresencePlayer> players) {
static ProxyPresenceCompareResponse buildResponse(
PresenceCompareRequest request,
Collection<PresencePlayer> players
) {
Objects.requireNonNull(request, "request");
List<PresencePlayer> currentPlayers = (players == null ? List.<PresencePlayer>of() : players).stream()
.filter(Objects::nonNull)
.sorted(Comparator.comparing(PresencePlayer::hashRecord))
.toList();
boolean match = computeHash(currentPlayers) == request.getHash();

ProxyPresenceCompareResponse.Builder response = ProxyPresenceCompareResponse.newBuilder()
.setMatch(match);
if (!match) {
response.addAllPlayers(currentPlayers.stream().map(PresencePlayer::toProto).toList());
}
return response.build();
}

static int computeHash(Collection<PresencePlayer> players) {
if (players == null || players.isEmpty()) {
return 0;
}

List<String> records = players.stream()
.filter(Objects::nonNull)
.map(PresencePlayer::hashRecord)
.sorted()
.toList();
String payload = records.size() + "\u001e" + String.join("\u001e", records);

int hash = FNV_32A_OFFSET_BASIS;
for (ProxyPresencePlayer player : players) {
byte[] bytes = player.hashRecord().getBytes(StandardCharsets.UTF_8);
for (byte currentByte : bytes) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
for (byte currentByte : payload.getBytes(StandardCharsets.UTF_8)) {
hash ^= currentByte & 0xff;
hash *= FNV_32A_PRIME;
}
return hash;
}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.PresencePlayer;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand DownExpand Up@@ -32,7 +32,7 @@ public void remove(String playerId) {
players.remove(normalize(playerId));
}

public ProxyPresencePlayer createSnapshot(
public PresencePlayer createSnapshot(
String playerId,
String name,
String displayName,
Expand All@@ -44,7 +44,7 @@ public ProxyPresencePlayer createSnapshot(
String normalizedPlayerId = normalize(playerId);
TrackedPlayerMetadata metadata = players.get(normalizedPlayerId);

return new ProxyPresencePlayer(
return new PresencePlayer(
normalizedPlayerId,
name,
displayName,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
import build.buf.gen.simplecloud.controller.v2.ProxyPresencePlayerSnapshot;

/**
* Immutable player snapshot used for proxy presence reconciliation.
* Immutable player snapshot used for proxy and game-server presence reconciliation.
*/
public final class ProxyPresencePlayer {
public final class PresencePlayer {

private final String playerId;
private final String name;
Expand All@@ -18,7 +18,7 @@ public final class ProxyPresencePlayer {
private final boolean onlineMode;
private final String sessionId;

public ProxyPresencePlayer(
public PresencePlayer(
String playerId,
String name,
String displayName,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package app.simplecloud.api.presence;

import java.util.Collection;

/**
* Supplies the current set of players visible to this proxy or game server.
*/
public interface PresencePlayerProvider {

Collection<PresencePlayer> getPresencePlayers();
}

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
package app.simplecloud.api.internal.integration.presence;

import app.simplecloud.api.presence.PresencePlayer;
import build.buf.gen.simplecloud.controller.v2.PresenceCompareRequest;
import build.buf.gen.simplecloud.controller.v2.ProxyPresenceCompareResponse;
import org.junit.jupiter.api.Test;

import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

class PresenceResponderTest {

@Test
void returnsMatchWithoutSnapshotWhenSummaryMatches() {
ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of()
);

assertTrue(response.getMatch());
assertTrue(response.getPlayersList().isEmpty());
}

@Test
void returnsEveryLivePlayerWhenSummaryDiffers() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);

ProxyPresenceCompareResponse response = PresenceResponder.buildResponse(
PresenceCompareRequest.newBuilder().setHash(0).build(),
List.of(player)
);

assertFalse(response.getMatch());
assertTrue(response.getPlayersList().stream().anyMatch(snapshot -> snapshot.getPlayerId().equals("player-1")));
}

@Test
void equalCountsWithDifferentPlayersProduceDifferentHashes() {
PresencePlayer first = player("player-1");
PresencePlayer second = player("player-2");

assertNotEquals(
PresenceResponder.computeHash(List.of(first)),
PresenceResponder.computeHash(List.of(second))
);
assertEquals(0, PresenceResponder.computeHash(List.of()));
}

@Test
void hashMatchesControllerWireContract() {
PresencePlayer player = new PresencePlayer(
"player-1",
"PlayerOne",
"PlayerOne",
"Lobby-1",
"",
0L,
"",
0,
true,
""
);

assertEquals(1745198624, PresenceResponder.computeHash(List.of(player)));
}

private static PresencePlayer player(String playerId) {
return new PresencePlayer(
playerId,
playerId,
playerId,
"",
"Proxy-1",
1L,
"en_US",
765,
true,
"session-1"
);
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@
import app.simplecloud.api.CloudApi;
import app.simplecloud.api.internal.CloudApiImpl;
import app.simplecloud.api.internal.integration.player.PlayerIntegration;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceResponder;
import app.simplecloud.api.internal.integration.presence.PresenceResponder;
import app.simplecloud.api.internal.integration.presence.ProxyPresenceTracker;
import app.simplecloud.api.presence.ProxyPresencePlayer;
import app.simplecloud.api.presence.ProxyPresencePlayerProvider;
import app.simplecloud.api.presence.PresencePlayer;
import app.simplecloud.api.presence.PresencePlayerProvider;
import app.simplecloud.api.player.CloudPlayer;
import app.simplecloud.api.runtime.SimpleCloudRuntime;
import app.simplecloud.api.platform.shared.LuckPermsPlayerPropertySynchronizer;
Expand All@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayerProvider {
public class BungeeCordApiProvider extends Plugin implements PresencePlayerProvider {

private final BungeeContext fastStatsContext = new BungeeContext.Factory(
this,
Expand All@@ -37,7 +37,7 @@ public class BungeeCordApiProvider extends Plugin implements ProxyPresencePlayer
private PlayerSynchronizer playerSynchronizer;
private PlayerIntegration playerIntegration;
private ProxyPresenceTracker proxyPresenceTracker;
private ProxyPresenceResponder proxyPresenceResponder;
private PresenceResponder presenceResponder;
private LuckPermsPlayerPropertySynchronizer luckPermsSynchronizer;

private BungeeAudiences bungeeAudiences;
Expand All@@ -55,7 +55,7 @@ public void onEnable() {
);
this.playerIntegration = new PlayerIntegration(cloudApi);
this.proxyPresenceTracker = new ProxyPresenceTracker(proxyName);
this.proxyPresenceResponder = new ProxyPresenceResponder(
this.presenceResponder = new PresenceResponder(
cloudApi.getNatsConnection(),
cloudApi.getNetworkId(),
SimpleCloudRuntime.serverId(),
Expand All@@ -81,14 +81,14 @@ public void onEnable() {

playerSynchronizer.start();
playerIntegration.start();
proxyPresenceResponder.start();
presenceResponder.start();
fastStatsContext.ready();
}

@Override
public void onDisable() {
getLogger().info("SimpleCloud v3 API provider uninitialized!");
proxyPresenceResponder.stop();
presenceResponder.stop();
if (luckPermsSynchronizer != null) {
luckPermsSynchronizer.stop();
}
Expand DownExpand Up@@ -135,13 +135,13 @@ private void forgetLuckPermsProperties(UUID uniqueId) {
}

@Override
public List<ProxyPresencePlayer> getProxyPresencePlayers() {
public List<PresencePlayer> getPresencePlayers() {
return getProxy().getPlayers().stream()
.map(this::toPresencePlayer)
.toList();
}

private ProxyPresencePlayer toPresencePlayer(ProxiedPlayer player) {
private PresencePlayer toPresencePlayer(ProxiedPlayer player) {
String connectedServerName = player.getServer() != null ? player.getServer().getInfo().getName() : "";
Locale locale = player.getLocale();
var pendingConnection = player.getPendingConnection();
Expand Down
Loading