Skip to content

fix: use RedisURI instead of redisUri string for Redis connection #7

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
IhToN wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use RedisURI instead of redisUri string for Redis connection #7

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/main/java/dev/hytaleone/query/config/NetworkConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.hypixel.hytale.codec.Codec;
import com.hypixel.hytale.codec.KeyedCodec;
import com.hypixel.hytale.codec.builder.BuilderCodec;
import io.lettuce.core.RedisURI;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
Expand Down Expand Up @@ -283,6 +284,7 @@ public void setUseTLS(boolean useTLS) {
/**
* Build a Redis URI string for Lettuce.
*/
@Deprecated
@Nonnull
public String toRedisUri() {
StringBuilder sb = new StringBuilder();
Expand All @@ -298,6 +300,26 @@ public String toRedisUri() {
}
return sb.toString();
}

/**
* Build a Redis URI for Lettuce connection.
*/
@Nonnull
public RedisURI toRedisURI() {
RedisURI.Builder builder = RedisURI.builder()
.withHost(getHost())
.withPort(getPort())
.withDatabase(getDatabase());
if (getUsername() != null && !getUsername().isEmpty()) {
builder.withAuthentication(getUsername(), getPassword() != null ? getPassword().toCharArray() : new char[0]);
} else if (getPassword() != null && !getPassword().isEmpty()) {
builder.withPassword(getPassword().toCharArray());
}
if (isUseTLS()) {
builder.withSsl(true);
}
return builder.build();
}
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/dev/hytaleone/query/network/NetworkModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import dev.hytaleone.query.network.store.NetworkStateStore;
import dev.hytaleone.query.network.store.RedisStateStore;
import dev.hytaleone.query.protocol.ServerDataProvider;
import io.lettuce.core.RedisURI;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
Expand Down Expand Up @@ -235,7 +236,7 @@ private NetworkStateStore createStore() {
if (!config.getStore().isRedis()) {
throw new IllegalStateException("Network mode requires Redis configuration. Set Store.Type to 'redis' and configure Redis connection.");
}
String redisUri = config.getStore().getRedis().toRedisUri();
RedisURI redisUri = config.getStore().getRedis().toRedisURI();
return new RedisStateStore(
logger,
config.getNetworkId(),
Expand Down
25 changes: 17 additions & 8 deletions src/main/java/dev/hytaleone/query/network/store/RedisStateStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@
import dev.hytaleone.query.network.model.NetworkSnapshot;
import dev.hytaleone.query.network.model.PlayerInfo;
import dev.hytaleone.query.network.model.ServerState;
import io.lettuce.core.ClientOptions;
import io.lettuce.core.RedisClient;
import io.lettuce.core.RedisCommandExecutionException;
import io.lettuce.core.ScriptOutputType;
import io.lettuce.core.SocketOptions;
import io.lettuce.core.StreamMessage;
import io.lettuce.core.TimeoutOptions;
import io.lettuce.core.XReadArgs;
import io.lettuce.core.*;
import io.lettuce.core.api.StatefulRedisConnection;
import io.lettuce.core.api.async.RedisAsyncCommands;
import io.lettuce.core.resource.ClientResources;
Expand Down Expand Up @@ -229,6 +222,22 @@ public RedisStateStore(@Nonnull HytaleLogger logger,
this.cache.setServerTimeout(NetworkModule.SERVER_TIMEOUT_MILLIS);
}

public RedisStateStore(@Nonnull HytaleLogger logger,
@Nonnull String networkId,
@Nonnull String serverId,
@Nonnull RedisURI redisUri,
@Nonnull NetworkConfig.TimingConfig timing,
boolean subscribe) {
this.logger = logger;
this.networkId = networkId;
this.serverId = serverId;
this.redisUri = redisUri.toURI().toString();
this.timing = timing;
this.subscribe = subscribe;
this.cache = new LocalStateCache();
this.cache.setServerTimeout(NetworkModule.SERVER_TIMEOUT_MILLIS);
}

@Override
@Nonnull
public CompletableFuture<Void> start() {
Expand Down