Make vote-shop debits atomic before granting rewards

VotingPlugin/pom.xml

@@ -339,6 +339,12 @@
             <version>3.8.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.14.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

VotingPlugin/src/main/java/com/bencodez/votingplugin/VotingPluginMain.java

@@ -609,6 +609,7 @@ public void onPostLoad() {
 		voteTester = new VoteTester(plugin);
 
 		loadVoteTimer();
+		getVotingPluginUserManager().startSharedPointTransferRecovery();
 
 		if (bungeeSettings.isUseBungeecoord()) {
 			loadBungeeHandler();
@@ -1539,6 +1540,9 @@ private void reloadPlugin(boolean userStorage, boolean reconcileHostedControl) {
 		updateAdvancedCoreHook();
 
 		reloadAdvancedCore(userStorage);
+		// PerServerPoints can switch shared point storage on during a live reload.
+		// Re-evaluate after storage has reloaded; UserManager keeps this lifecycle task unique.
+		getVotingPluginUserManager().startSharedPointTransferRecovery();
 
 		if (bungeeSettings.isUseBungeecoord()) {
 			BackendProxyHandler handler = getBackendProxyHandler();

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteShop.java

@@ -125,9 +125,8 @@ protected void addItemButton(BInventory inv, final Player player, final VotingPl
 			@Override
 			public void onClick(ClickEvent event) {
 				VotingPluginUser clickedUser = getUser(event.getPlayer());
-				if (plugin.getConfigFile().isExtraVoteShopCheck()) {
-					clickedUser.cache();
-				}
+				plugin.getVoteShopManager().getPurchaseService().refreshUserForPurchaseValidation(clickedUser,
+						plugin.getConfigFile().isExtraVoteShopCheck());
 
 				if (item.isNotBuyable()) {
 					clickedUser.sendMessage(plugin.getConfigFile().getFormatShopNotPurchasable());
@@ -224,20 +223,21 @@ public void onClick(ClickEvent clickEvent) {
 	 */
 	protected void handlePurchase(Player player, VotingPluginUser currentUser, VoteShopItem item,
 			VoteShopCategory category) {
-		VoteShopPurchaseResult result = plugin.getVoteShopManager().purchase(player, currentUser, item);
-		if (result != VoteShopPurchaseResult.SUCCESS) {
-			plugin.getVoteShopManager().getPurchaseService().sendFailureMessage(player, currentUser, item, result);
-			return;
-		}
+		plugin.getVoteShopManager().purchase(player, currentUser, item, result -> {
+			if (result != VoteShopPurchaseResult.SUCCESS) {
+				plugin.getVoteShopManager().getPurchaseService().sendFailureMessage(player, currentUser, item, result);
+				return;
+			}
 
-		plugin.getCommandLoader().processSlotClick(player, currentUser, item.getIdentifier());
-		if (plugin.getVoteShopManager().getDefinition().isReopenGuiOnPurchase()) {
-			if (category != null) {
-				new VoteShopCategoryMenu(plugin, player, currentUser, category).open(GUIMethod.CHEST);
-			} else {
-				plugin.getCommandLoader().processSlotClick(player, currentUser, "shop");
+			plugin.getCommandLoader().processSlotClick(player, currentUser, item.getIdentifier());
+			if (plugin.getVoteShopManager().getDefinition().isReopenGuiOnPurchase()) {
+				if (category != null) {
+					new VoteShopCategoryMenu(plugin, player, currentUser, category).open(GUIMethod.CHEST);
+				} else {
+					plugin.getCommandLoader().processSlotClick(player, currentUser, "shop");
+				}
 			}
-		}
+		});
 	}
 
 	/**
@@ -257,4 +257,4 @@ protected VotingPluginUser getUser(Player player) {
 	public void open() {
 		open(GUIMethod.CHEST);
 	}
-}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteShopConfirm.java

@@ -1,6 +1,7 @@
 package com.bencodez.votingplugin.commands.gui.player;
 
 import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -31,6 +32,8 @@ public class VoteShopConfirm extends GUIHandler {
 
 	private VotingPluginUser user;
 
+	private final AtomicBoolean purchaseSubmitted = new AtomicBoolean();
+
 	/**
 	 * Creates the GUI.
 	 *
@@ -71,20 +74,23 @@ public void onChest(final Player player) {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				user.cache();
-				VoteShopPurchaseResult result = plugin.getVoteShopManager().purchase(player, user, item);
-				if (result != VoteShopPurchaseResult.SUCCESS) {
-					plugin.getVoteShopManager().getPurchaseService().sendFailureMessage(player, user, item, result);
-					returnToPrevious(event.getPlayer());
-					return;
-				}
+				if (!beginPurchase()) return;
+				event.closeInventory();
+				plugin.getVoteShopManager().getPurchaseService().refreshUserForPurchaseValidation(user, true);
+				plugin.getVoteShopManager().purchase(player, user, item, result -> {
+					if (result != VoteShopPurchaseResult.SUCCESS) {
+						plugin.getVoteShopManager().getPurchaseService().sendFailureMessage(player, user, item, result);
+						returnToPrevious(event.getPlayer());
+						return;
+					}
 
-				plugin.getCommandLoader().processSlotClick(player, user, item.getIdentifier());
-				if (item.isCloseGUI()) {
-					event.closeInventory();
-				} else {
-					returnToPrevious(event.getPlayer());
-				}
+					plugin.getCommandLoader().processSlotClick(player, user, item.getIdentifier());
+					if (item.isCloseGUI()) {
+						event.closeInventory();
+					} else {
+						returnToPrevious(event.getPlayer());
+					}
+				});
 			}
 		});
 		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopConfirmPurchaseNoItem())) {
@@ -101,6 +107,10 @@ public void onClick(ClickEvent event) {
 		inv.openInventory(player);
 	}
 
+	boolean beginPurchase() {
+		return purchaseSubmitted.compareAndSet(false, true);
+	}
+
 	@Override
 	public void onDialog(Player player) {
 		PlayerUtils.setPlayerMeta(plugin, player, "ident", item.getIdentifier());
@@ -113,23 +123,24 @@ public void onDialog(Player player) {
 				.noText(new ItemBuilder(plugin.getShopFile().getShopConfirmPurchaseNoItem()).getName())
 				.onYes(payload -> {
 					Player clicked = player.getServer().getPlayer(payload.owner());
-					if (clicked == null) {
-						return;
-					}
-
-					user.cache();
-					VoteShopPurchaseResult result = plugin.getVoteShopManager().purchase(clicked, user, item);
-					if (result != VoteShopPurchaseResult.SUCCESS) {
-						plugin.getVoteShopManager().getPurchaseService().sendFailureMessage(clicked, user, item,
-								result);
-						returnToPrevious(clicked);
+					if (clicked == null || !beginPurchase()) {
 						return;
 					}
 
-					plugin.getCommandLoader().processSlotClick(clicked, user, item.getIdentifier());
-					if (!item.isCloseGUI()) {
-						returnToPrevious(clicked);
-					}
+					plugin.getVoteShopManager().getPurchaseService().refreshUserForPurchaseValidation(user, true);
+					plugin.getVoteShopManager().purchase(clicked, user, item, result -> {
+						if (result != VoteShopPurchaseResult.SUCCESS) {
+							plugin.getVoteShopManager().getPurchaseService().sendFailureMessage(clicked, user, item,
+									result);
+							returnToPrevious(clicked);
+							return;
+						}
+
+						plugin.getCommandLoader().processSlotClick(clicked, user, item.getIdentifier());
+						if (!item.isCloseGUI()) {
+							returnToPrevious(clicked);
+						}
+					});
 				}).onNo(payload -> {
 					Player clicked = player.getServer().getPlayer(payload.owner());
 					if (clicked != null) {
@@ -155,4 +166,4 @@ protected void returnToPrevious(Player player) {
 	public void open() {
 		open(GUIMethod.CHEST);
 	}
-}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/config/Config.java

@@ -385,7 +385,16 @@ public String getDiscordSRVTopVoterRankDisplay(TopVoter topVoter) {
 
 	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.NotEnoughPoints")
 	@Getter
-	private String formatCommandsVoteGivePointsNotEnoughPoints = "&cNot enough points";
+	private String formatCommandsVoteGivePointsNotEnoughPoints = "&cNot enough points";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.Unavailable")
+	@Getter
+	private String formatCommandsVoteGivePointsUnavailable = "&cUnable to transfer points right now, please try again";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.PendingConfirmation")
+	@Getter
+	private String formatCommandsVoteGivePointsPendingConfirmation =
+				"&eTransfer pending confirmation; do not retry it";
 
 	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.NotJoinedServer")
 	@Getter

VotingPlugin/src/main/java/com/bencodez/votingplugin/rewards/builtin/RewardPoints.java

@@ -1,6 +1,11 @@
 package com.bencodez.votingplugin.rewards.builtin;
 
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
+import java.util.concurrent.CompletionStage;
 
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
@@ -46,8 +51,79 @@ public void onValidate(Reward reward, RewardInject inject, ConfigurationSection
 	public String onRewardRequest(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user, int num,
 			HashMap<String, String> placeholders) {
 		VotingPluginUser vpUser = plugin.getVotingPluginUserManager().getVotingPluginUser(user);
-		String result = "" + vpUser.addPoints(num);
+		// Reward injection is a synchronous chain, so publish the storage-aware
+		// predicted total immediately while shared-MySQL persistence stays off the
+		// Bukkit/Folia entity lane. Ordinary storage retains its synchronous path.
+		String result = "" + vpUser.addPointsStorageAware(num);
 		plugin.debug("Setting points to " + result);
 		return result;
 	}
+
+	@Override
+	public boolean supportsAsyncRequest() {
+		return true;
+	}
+
+	@Override
+	public CompletionStage<String> onRewardRequestAsync(Reward reward,
+			com.bencodez.advancedcore.api.user.AdvancedCoreUser user, int num,
+			HashMap<String, String> placeholders) {
+		VotingPluginUser vpUser = plugin.getVotingPluginUserManager().getVotingPluginUser(user);
+		String operationId = replayOperationId(vpUser);
+		CompletionStage<Integer> addition = operationId == null ? vpUser.addPointsStorageAwareAsync(num)
+				: vpUser.addPointsStorageAwareAsync(num, operationId);
+		return addition.thenApply(total -> {
+			String result = String.valueOf(total);
+			plugin.debug("Setting points to " + result);
+			return result;
+		});
+	}
+
+	@Override
+	public CompletionStage<Void> onReplayCheckpointPersisted(Reward reward,
+			com.bencodez.advancedcore.api.user.AdvancedCoreUser user, String occurrenceId, String injectionKey) {
+		VotingPluginUser vpUser = plugin.getVotingPluginUserManager().getVotingPluginUser(user);
+		String operationId = replayOperationId(vpUser, occurrenceId, injectionKey);
+		return operationId == null ? java.util.concurrent.CompletableFuture.completedFuture(null)
+				: vpUser.acknowledgeStorageAwarePointOperation(operationId);
+	}
+
+	/**
+	 * AdvancedCore #317 exposes a durable occurrence identity for a queued replay
+	 * plus its active stage path. Use both when present, but retain compatibility
+	 * with releases that cannot distinguish a retry from a new reward occurrence.
+	 */
+	private static String replayOperationId(VotingPluginUser user) {
+		try {
+			Method currentReplayOccurrenceId = Reward.class.getMethod("currentReplayOccurrenceId");
+			Method currentReplayKey = Reward.class.getMethod("currentReplayKey");
+			Object occurrence = currentReplayOccurrenceId.invoke(null);
+			Object value = currentReplayKey.invoke(null);
+			if (!(occurrence instanceof String) || ((String) occurrence).isEmpty()
+					|| !(value instanceof String) || ((String) value).isEmpty()) return null;
+			return replayOperationId(user, (String) occurrence, (String) value);
+		} catch (ReflectiveOperationException | SecurityException ignored) {
+			return null;
+		}
+	}
+
+	private static String replayOperationId(VotingPluginUser user, String occurrenceId, String injectionKey) {
+		if (occurrenceId == null || occurrenceId.isEmpty() || injectionKey == null || injectionKey.isEmpty()) return null;
+		return sha256("VotingPlugin:shared-points-reward:v1\0" + user.getUUID() + '\0' + occurrenceId + '\0'
+				+ injectionKey);
+	}
+
+	private static String sha256(String value) {
+		try {
+			byte[] digest = MessageDigest.getInstance("SHA-256").digest(value.getBytes(StandardCharsets.UTF_8));
+			StringBuilder result = new StringBuilder(digest.length * 2);
+			for (byte element : digest) {
+				result.append(Character.forDigit((element >>> 4) & 0xf, 16));
+				result.append(Character.forDigit(element & 0xf, 16));
+			}
+			return result.toString();
+		} catch (NoSuchAlgorithmException failure) {
+			throw new IllegalStateException("SHA-256 is unavailable", failure);
+		}
+	}
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/topvoter/TopVoterHandler.java

@@ -38,6 +38,7 @@
 import com.bencodez.simpleapi.sql.DataType;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
+import com.bencodez.votingplugin.voteshop.service.VoteShopPurchaseService;
 
 /**
  * Handles top voter rankings and statistics.
@@ -235,7 +236,8 @@ public void onDayChange(DayChangeEvent event) {
 
 			for (String shopIdent : plugin.getShopFile().getShopIdentifiers()) {
 				if (plugin.getShopFile().getVoteShopResetDaily(shopIdent)) {
-					resetVoteShopLimit(shopIdent);
+					resetVoteShopLimit(shopIdent,
+							VoteShopPurchaseService.currentLimitGenerationId(plugin, shopIdent));
 				}
 			}
 
@@ -357,7 +359,8 @@ public void onMonthChange(MonthChangeEvent event) {
 
 			for (String shopIdent : plugin.getShopFile().getShopIdentifiers()) {
 				if (plugin.getShopFile().getVoteShopResetMonthly(shopIdent)) {
-					resetVoteShopLimit(shopIdent);
+					resetVoteShopLimit(shopIdent,
+							VoteShopPurchaseService.currentLimitGenerationId(plugin, shopIdent));
 				}
 			}
 
@@ -480,7 +483,8 @@ public void onWeekChange(WeekChangeEvent event) {
 
 			for (String shopIdent : plugin.getShopFile().getShopIdentifiers()) {
 				if (plugin.getShopFile().getVoteShopResetWeekly(shopIdent)) {
-					resetVoteShopLimit(shopIdent);
+					resetVoteShopLimit(shopIdent,
+							VoteShopPurchaseService.currentLimitGenerationId(plugin, shopIdent));
 				}
 			}
 
@@ -526,7 +530,17 @@ public void resetTotals(TopVoter topVoter) {
 	 * @param shopIdent the shop identifier
 	 */
 	public void resetVoteShopLimit(String shopIdent) {
-		plugin.getUserManager().removeAllKeyValues("VoteShopLimit" + shopIdent, DataType.INTEGER);
+		resetVoteShopLimit(shopIdent, null);
+	}
+
+	private void resetVoteShopLimit(String shopIdent, String resetGeneration) {
+		String limitColumn = "VoteShopLimit" + shopIdent;
+		if (UserStorage.MYSQL.equals(plugin.getStorageType()) && !plugin.getBungeeSettings().isPerServerPoints()) {
+			if (resetGeneration == null) VoteShopPurchaseService.resetSharedMysqlLimit(plugin, limitColumn);
+			else VoteShopPurchaseService.resetSharedMysqlLimit(plugin, limitColumn, resetGeneration);
+			return;
+		}
+		plugin.getUserManager().removeAllKeyValues(limitColumn, DataType.INTEGER);
 	}
 
 	/**

VotingPlugin/src/main/java/com/bencodez/votingplugin/user/PointTransferResult.java

@@ -0,0 +1,10 @@
+package com.bencodez.votingplugin.user;
+
+/** The externally observable outcome of a point transfer. */
+public enum PointTransferResult {
+	SUCCESS,
+	INSUFFICIENT_POINTS,
+	CANCELLED,
+	PENDING_CONFIRMATION,
+	UNAVAILABLE
+}