@quenty/datastore 13.35.0 → 13.36.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [13.36.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@13.35.0...@quenty/datastore@13.36.0) (2026-04-15)
+
+
+### Bug Fixes
+
+* wait for data cleanup before attempting load ([#678](https://github.com/Quenty/NevermoreEngine/issues/678)) ([80adc48](https://github.com/Quenty/NevermoreEngine/commit/80adc48669603d9a30f1bb4aa8c45d09e995ada6))
+
+
+
+
+
 # [13.35.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@13.34.0...@quenty/datastore@13.35.0) (2026-04-14)
 
 **Note:** Version bump only for package @quenty/datastore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/datastore",
-  "version": "13.35.0",
+  "version": "13.36.0",
   "description": "Quenty's Datastore implementation for Roblox",
   "keywords": [
     "Roblox",
@@ -50,5 +50,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f8273b1b201921976953174e30958440e44e64cb"
+  "gitHead": "da500f4af908cef350ee386cf472a102e8e53437"
 }

package/src/Server/PlayerDataStoreManager.lua

@@ -78,6 +78,7 @@ export type PlayerDataStoreManager =
 			_keyGenerator: KeyGenerator,
 			_datastores: { [PlayerUserId]: DataStore.DataStore },
 			_removing: { [PlayerUserId]: boolean },
+			_removingPromises: { [PlayerUserId]: Promise.Promise<any> },
 			_pendingSaves: PendingPromiseTracker.PendingPromiseTracker<any>,
 			_removingCallbacks: { RemovingCallback },
 			_disableSavingInStudio: boolean?,
@@ -112,6 +113,7 @@ function PlayerDataStoreManager.new(
 
 	self._datastores = {} -- [userId] = datastore
 	self._removing = {} -- [player] = true
+	self._removingPromises = {} -- [player] = removal promise
 	self._pendingSaves = PendingPromiseTracker.new()
 	self._removingCallbacks = {} -- [func, ...]
 
@@ -194,6 +196,67 @@ function PlayerDataStoreManager.GetDataStore(
 	return self:_createDataStore(userId)
 end
 
+--[=[
+	Gets the datastore for a player, waiting for any in-progress removal/save first.
+	Use this in async flows to safely support fast leave/rejoin behavior.
+
+	@return Promise<DataStore>
+]=]
+function PlayerDataStoreManager.PromiseDataStore(
+	self: PlayerDataStoreManager,
+	playerOrUserId: Player | PlayerUserId
+): Promise.Promise<DataStore.DataStore>
+	local userId = self:_toPlayerUserIdOrError(playerOrUserId)
+
+	return self:_promiseDataStoreByUserId(userId)
+end
+
+function PlayerDataStoreManager._promiseDataStoreByUserId(
+	self: PlayerDataStoreManager,
+	userId: PlayerUserId
+): Promise.Promise<DataStore.DataStore>
+	local dataStore = self:GetDataStore(userId)
+	if dataStore then
+		return Promise.resolved(dataStore)
+	end
+
+	return self:_promiseWaitForRemoving(userId):Then(function()
+		return self:_promiseDataStoreByUserId(userId)
+	end)
+end
+
+function PlayerDataStoreManager._promiseWaitForRemoving(
+	self: PlayerDataStoreManager,
+	userId: PlayerUserId
+): Promise.Promise<()>
+	local removingPromise = self._removingPromises[userId]
+	if removingPromise then
+		return removingPromise:Then(function()
+			return nil
+		end)
+	end
+
+	if self._removing[userId] then
+		return Promise.defer(function(resolve, reject)
+			local elapsed = 0
+			while self._removing[userId] do
+				elapsed += task.wait()
+
+				if elapsed >= 15 then
+					warn(
+						`[PlayerDataStoreManager] - Last session cleanup for {userId} taking longer than 15 seconds. Rejecting.`
+					)
+					reject()
+					break
+				end
+			end
+			resolve()
+		end)
+	end
+
+	return Promise.resolved()
+end
+
 function PlayerDataStoreManager:_toPlayerUserIdOrError(playerOrUserId: Player | PlayerUserId): PlayerUserId
 	if typeof(playerOrUserId) == "Instance" and playerOrUserId:IsA("Player") then
 		return playerOrUserId.UserId
@@ -286,7 +349,7 @@ function PlayerDataStoreManager._removePlayerDataStore(self: PlayerDataStoreMana
 		end
 	end
 
-	PromiseUtils.all(removingPromises)
+	local removalPromise = PromiseUtils.all(removingPromises)
 		:Then(function()
 			return datastore:SaveAndCloseSession()
 		end)
@@ -295,6 +358,13 @@ function PlayerDataStoreManager._removePlayerDataStore(self: PlayerDataStoreMana
 			self._removing[userId] = nil
 		end)
 
+	self._removingPromises[userId] = removalPromise
+	removalPromise:Finally(function()
+		if self._removingPromises[userId] == removalPromise then
+			self._removingPromises[userId] = nil
+		end
+	end)
+
 	-- Prevent double removal or additional issues
 	self._datastores[userId] = nil
 	self._maid._savingConns[userId] = nil

package/src/Server/PlayerDataStoreService.lua

@@ -107,7 +107,7 @@ function PlayerDataStoreService.PromiseDataStore(
 	player: Player | number
 ): Promise.Promise<DataStore.DataStore>
 	return self:PromiseManager():Then(function(manager)
-		return manager:GetDataStore(player)
+		return manager:PromiseDataStore(player)
 	end)
 end