GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-29 03:39:22 +00:00
Code Issues Releases Activity

Improve error handling when downloading remote resource packs

Browse Source
This commit is contained in:
onebeastchris
2025-06-09 00:46:51 +02:00
parent 726bd86d92
commit d2fb027a8a
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
core/src/main/java/org/geysermc/geyser/session/GeyserSessionAdapter.java
View File

@@ -55,12 +55,12 @@ import java.util.UUID;
public class GeyserSessionAdapter extends SessionAdapter {
private final GeyserImpl geyser;
private final GeyserSession geyserSession;
private final GeyserSession session;
private final boolean floodgate;
private final String locale;
public GeyserSessionAdapter(GeyserSession session) {
this.geyserSession = session;
this.session = session;
this.floodgate = session.remoteServer().authType() == AuthType.FLOODGATE;
this.geyser = GeyserImpl.getInstance();
this.locale = session.locale();
@@ -69,7 +69,7 @@ public class GeyserSessionAdapter extends SessionAdapter {
@Override
public void packetSending(PacketSendingEvent event) {
if (event.getPacket() instanceof ClientIntentionPacket intentionPacket) {
BedrockClientData clientData = geyserSession.getClientData();
BedrockClientData clientData = session.getClientData();
String addressSuffix;
if (floodgate) {
@@ -79,7 +79,7 @@ public class GeyserSessionAdapter extends SessionAdapter {
FloodgateSkinUploader skinUploader = geyser.getSkinUploader();
FloodgateCipher cipher = geyser.getCipher();
String bedrockAddress = geyserSession.getUpstream().getAddress().getAddress().getHostAddress();
String bedrockAddress = session.getUpstream().getAddress().getAddress().getHostAddress();
// both BungeeCord and Velocity remove the IPv6 scope (if there is one) for Spigot
int ipv6ScopeIndex = bedrockAddress.indexOf('%');
if (ipv6ScopeIndex != -1) {
@@ -88,8 +88,8 @@ public class GeyserSessionAdapter extends SessionAdapter {
encryptedData = cipher.encryptFromString(BedrockData.of(
clientData.getGameVersion(),
geyserSession.bedrockUsername(),
geyserSession.xuid(),
session.bedrockUsername(),
session.xuid(),
clientData.getDeviceOs().ordinal(),
clientData.getLanguageCode(),
clientData.getUiProfile().ordinal(),
@@ -100,7 +100,7 @@ public class GeyserSessionAdapter extends SessionAdapter {
).toString());
} catch (Exception e) {
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.auth.floodgate.encrypt_fail"), e);
geyserSession.disconnect(GeyserLocale.getPlayerLocaleString("geyser.auth.floodgate.encrypt_fail", locale));
session.disconnect(GeyserLocale.getPlayerLocaleString("geyser.auth.floodgate.encrypt_fail", locale));
return;
}
@@ -122,38 +122,38 @@ public class GeyserSessionAdapter extends SessionAdapter {
@Override
public void connected(ConnectedEvent event) {
geyserSession.loggingIn = false;
geyserSession.loggedIn = true;
session.loggingIn = false;
session.loggedIn = true;
if (geyserSession.getDownstream().getSession() instanceof LocalSession) {
if (session.getDownstream().getSession() instanceof LocalSession) {
// Connected directly to the server
geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.connect_internal",
geyserSession.bedrockUsername(), geyserSession.getProtocol().getProfile().getName()));
session.bedrockUsername(), session.getProtocol().getProfile().getName()));
} else {
// Connected to an IP address
geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.connect",
geyserSession.bedrockUsername(), geyserSession.getProtocol().getProfile().getName(), geyserSession.remoteServer().address()));
session.bedrockUsername(), session.getProtocol().getProfile().getName(), session.remoteServer().address()));
}
UUID uuid = geyserSession.getProtocol().getProfile().getId();
UUID uuid = session.getProtocol().getProfile().getId();
if (uuid == null) {
// Set what our UUID *probably* is going to be
if (geyserSession.remoteServer().authType() == AuthType.FLOODGATE) {
uuid = new UUID(0, Long.parseLong(geyserSession.xuid()));
if (session.remoteServer().authType() == AuthType.FLOODGATE) {
uuid = new UUID(0, Long.parseLong(session.xuid()));
} else {
uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + geyserSession.getProtocol().getProfile().getName()).getBytes(StandardCharsets.UTF_8));
uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + session.getProtocol().getProfile().getName()).getBytes(StandardCharsets.UTF_8));
}
}
geyserSession.getPlayerEntity().setUuid(uuid);
geyserSession.getPlayerEntity().setUsername(geyserSession.getProtocol().getProfile().getName());
session.getPlayerEntity().setUuid(uuid);
session.getPlayerEntity().setUsername(session.getProtocol().getProfile().getName());
String locale = geyserSession.getClientData().getLanguageCode();
String locale = session.getClientData().getLanguageCode();
// Let the user know there locale may take some time to download
// as it has to be extracted from a JAR
if (locale.equalsIgnoreCase("en_us") && !MinecraftLocale.LOCALE_MAPPINGS.containsKey("en_us")) {
// This should probably be left hardcoded as it will only show for en_us clients
geyserSession.sendMessage("Loading your locale (en_us); if this isn't already downloaded, this may take some time");
session.sendMessage("Loading your locale (en_us); if this isn't already downloaded, this may take some time");
}
// Download and load the language for the player
@@ -162,12 +162,12 @@ public class GeyserSessionAdapter extends SessionAdapter {
@Override
public void disconnected(DisconnectedEvent event) {
geyserSession.loggingIn = false;
session.loggingIn = false;
String disconnectMessage, customDisconnectMessage = null;
Throwable cause = event.getCause();
if (cause instanceof UnexpectedEncryptionException) {
if (geyserSession.remoteServer().authType() != AuthType.FLOODGATE) {
if (session.remoteServer().authType() != AuthType.FLOODGATE) {
// Server expects online mode
customDisconnectMessage = GeyserLocale.getPlayerLocaleString("geyser.network.remote.authentication_type_mismatch", locale);
// Explain that they may be looking for Floodgate.
@@ -192,10 +192,10 @@ public class GeyserSessionAdapter extends SessionAdapter {
// Use our helpful disconnect message whenever possible
disconnectMessage = customDisconnectMessage != null ? customDisconnectMessage : MessageTranslator.convertMessage(event.getReason());;
if (geyserSession.getDownstream().getSession() instanceof LocalSession) {
geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.disconnect_internal", geyserSession.bedrockUsername(), disconnectMessage));
if (session.getDownstream().getSession() instanceof LocalSession) {
geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.disconnect_internal", session.bedrockUsername(), disconnectMessage));
} else {
geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.disconnect", geyserSession.bedrockUsername(), geyserSession.remoteServer().address(), disconnectMessage));
geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.disconnect", session.bedrockUsername(), session.remoteServer().address(), disconnectMessage));
}
if (cause != null) {
if (cause.getMessage() != null) {
@@ -207,24 +207,24 @@ public class GeyserSessionAdapter extends SessionAdapter {
cause.printStackTrace();
}
}
if ((!geyserSession.isClosed() && geyserSession.loggedIn) || cause != null) {
if ((!session.isClosed() && session.loggedIn) || cause != null) {
// GeyserSession is disconnected via session.disconnect() called indirectly be the server
// This needs to be "initiated" here when there is an exception, but also when the Netty connection
// is closed without a disconnect packet - in this case, closed will still be false, but loggedIn
// will also be true as GeyserSession#disconnect will not have been called.
if (customDisconnectMessage != null) {
geyserSession.disconnect(customDisconnectMessage);
session.disconnect(customDisconnectMessage);
} else {
geyserSession.disconnect(event.getReason());
session.disconnect(event.getReason());
}
}
geyserSession.loggedIn = false;
session.loggedIn = false;
}
@Override
public void packetReceived(Session session, Packet packet) {
Registries.JAVA_PACKET_TRANSLATORS.translate(packet.getClass(), packet, geyserSession, true);
Registries.JAVA_PACKET_TRANSLATORS.translate(packet.getClass(), packet, this.session, true);
}
@Override

6
core/src/main/java/org/geysermc/geyser/util/WebUtils.java
View File

@@ -199,12 +199,12 @@ public class WebUtils {
downloadLocation.toFile().setLastModified(System.currentTimeMillis());
return downloadLocation;
} catch (MalformedURLException e) {
throw new IllegalArgumentException("Unable to download resource pack from malformed URL %s! ".formatted(url));
throw new IllegalArgumentException("Unable to download resource pack from malformed URL %s".formatted(url));
} catch (SocketTimeoutException | ConnectException e) {
logger.error("Unable to download pack from url %s due to network error! ( %s )".formatted(url, e.getMessage()));
logger.error("Unable to download pack from url %s due to network error ( %s )".formatted(url, e.toString()));
logger.debug(e);
} catch (IOException e) {
throw new IllegalStateException("Unable to download and save remote resource pack from: %s ( %s )!".formatted(url, e.getMessage()));
throw new IllegalStateException("Unable to download and save remote resource pack from: %s ( %s )".formatted(url, e.toString()));
}
return null;
}