-
-
Notifications
You must be signed in to change notification settings - Fork 170
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reduce session server lookups (#509)
* fix: add default skin to gameprofiles * fix: add signatures by default to prevent issues * cleanup * no longer apply empty textures * revert formatting change * fix(spigot): linked player textures * fix(velocity): linked player textures * fix(bungeecord): apply linked textures * Made the MojangUtils class instance based, removed some unneeded code * Don't block Velocity event threads, made the Bungee variant work * Add some comments --------- Co-authored-by: bridge <[email protected]> Co-authored-by: Tim203 <[email protected]>
- Loading branch information
3 people
authored
May 18, 2024
1 parent
f8c8418
commit 00b8b1b
Showing
8 changed files
with
214 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
core/src/main/java/org/geysermc/floodgate/util/MojangUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| * | ||
| * @author GeyserMC | ||
| * @link https://github.com/GeyserMC/Floodgate | ||
| */ | ||
|
|
||
| package org.geysermc.floodgate.util; | ||
|
|
||
| import com.google.common.cache.Cache; | ||
| import com.google.common.cache.CacheBuilder; | ||
| import com.google.gson.JsonArray; | ||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.JsonObject; | ||
| import com.google.inject.Inject; | ||
| import com.google.inject.Singleton; | ||
| import com.google.inject.name.Named; | ||
| import java.util.UUID; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.TimeUnit; | ||
| import lombok.NonNull; | ||
| import org.geysermc.floodgate.api.event.skin.SkinApplyEvent.SkinData; | ||
| import org.geysermc.floodgate.skin.SkinDataImpl; | ||
| import org.geysermc.floodgate.util.HttpClient.HttpResponse; | ||
|
|
||
| @Singleton | ||
| public class MojangUtils { | ||
| private final Cache<UUID, SkinData> SKIN_CACHE = CacheBuilder.newBuilder() | ||
| .expireAfterWrite(5, TimeUnit.MINUTES) | ||
| .maximumSize(500) | ||
| .build(); | ||
|
|
||
| @Inject private HttpClient httpClient; | ||
| @Inject | ||
| @Named("commonPool") | ||
| private ExecutorService commonPool; | ||
|
|
||
| public CompletableFuture<@NonNull SkinData> skinFor(UUID playerId) { | ||
| return CompletableFuture.supplyAsync(() -> { | ||
| try { | ||
| return SKIN_CACHE.get(playerId, () -> fetchSkinFor(playerId)); | ||
| } catch (ExecutionException exception) { | ||
| throw new RuntimeException(exception.getCause()); | ||
| } | ||
| }, commonPool); | ||
| } | ||
|
|
||
| private @NonNull SkinData fetchSkinFor(UUID playerId) { | ||
| HttpResponse<JsonObject> httpResponse = httpClient.get( | ||
| String.format(Constants.PROFILE_WITH_PROPERTIES_URL, playerId.toString())); | ||
|
|
||
| if (httpResponse.getHttpCode() != 200) { | ||
| return SkinDataImpl.DEFAULT_SKIN; | ||
| } | ||
|
|
||
| JsonObject response = httpResponse.getResponse(); | ||
|
|
||
| if (response == null) { | ||
| return SkinDataImpl.DEFAULT_SKIN; | ||
| } | ||
|
|
||
| JsonArray properties = response.getAsJsonArray("properties"); | ||
|
|
||
| if (properties.size() == 0) { | ||
| return SkinDataImpl.DEFAULT_SKIN; | ||
| } | ||
|
|
||
| for (JsonElement property : properties) { | ||
| if (!property.isJsonObject()) { | ||
| continue; | ||
| } | ||
|
|
||
| JsonObject propertyObject = property.getAsJsonObject(); | ||
|
|
||
| if (!propertyObject.has("name") | ||
| || !propertyObject.has("value") | ||
| || !propertyObject.has("signature") | ||
| || !propertyObject.get("name").getAsString().equals("textures")) { | ||
| continue; | ||
| } | ||
|
|
||
| return new SkinDataImpl( | ||
| propertyObject.get("value").getAsString(), | ||
| propertyObject.get("signature").getAsString() | ||
| ); | ||
| } | ||
|
|
||
| return SkinDataImpl.DEFAULT_SKIN; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.