@quenty/datastore 13.22.1-canary.39d0eda.0 → 13.22.1

package/CHANGELOG.md

@@ -3,12 +3,9 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [13.22.1-canary.39d0eda.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@13.22.0...@quenty/datastore@13.22.1-canary.39d0eda.0) (2025-08-29)
+## [13.22.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@13.22.0...@quenty/datastore@13.22.1) (2025-08-12)
 
-
-### Features
-
-* Add datastore session locking system ([cf6e9b7](https://github.com/Quenty/NevermoreEngine/commit/cf6e9b712f45efa34b8957fbad96aaf289b28b3e))
+**Note:** Version bump only for package @quenty/datastore
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/datastore",
-  "version": "13.22.1-canary.39d0eda.0",
+  "version": "13.22.1",
   "description": "Quenty's Datastore implementation for Roblox",
   "keywords": [
     "Roblox",
@@ -26,23 +26,22 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "10.9.0",
-    "@quenty/bindtocloseservice": "8.18.1-canary.39d0eda.0",
-    "@quenty/loader": "10.9.0",
-    "@quenty/maid": "3.5.0",
-    "@quenty/math": "2.7.3",
-    "@quenty/pagesutils": "5.12.1-canary.39d0eda.0",
-    "@quenty/promise": "10.11.1-canary.39d0eda.0",
-    "@quenty/promisemaid": "5.11.1-canary.39d0eda.0",
-    "@quenty/rx": "13.18.1-canary.39d0eda.0",
-    "@quenty/servicebag": "11.13.1-canary.39d0eda.0",
-    "@quenty/signal": "7.11.1-canary.39d0eda.0",
-    "@quenty/symbol": "3.5.0",
-    "@quenty/table": "3.8.0",
-    "@quenty/valueobject": "13.18.1-canary.39d0eda.0"
+    "@quenty/baseobject": "^10.9.0",
+    "@quenty/bindtocloseservice": "^8.18.1",
+    "@quenty/loader": "^10.9.0",
+    "@quenty/maid": "^3.5.0",
+    "@quenty/math": "^2.7.3",
+    "@quenty/pagesutils": "^5.12.0",
+    "@quenty/promise": "^10.11.0",
+    "@quenty/rx": "^13.18.1",
+    "@quenty/servicebag": "^11.13.1",
+    "@quenty/signal": "^7.11.1",
+    "@quenty/symbol": "^3.5.0",
+    "@quenty/table": "^3.8.0",
+    "@quenty/valueobject": "^13.18.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "39d0edaa45d0c4812b43f2a64ad543fac3f79423"
+  "gitHead": "847e9e65e518392c1e2f30669ee2589ed3d7e870"
 }

package/src/Server/DataStore.lua

@@ -66,16 +66,12 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local RunService = game:GetService("RunService")
-
 local DataStoreDeleteToken = require("DataStoreDeleteToken")
 local DataStorePromises = require("DataStorePromises")
 local DataStoreStage = require("DataStoreStage")
 local Maid = require("Maid")
 local Math = require("Math")
 local Promise = require("Promise")
-local PromiseMaidUtils = require("PromiseMaidUtils")
-local PromiseRetryUtils = require("PromiseRetryUtils")
 local Rx = require("Rx")
 local Signal = require("Signal")
 local Symbol = require("Symbol")
@@ -85,7 +81,6 @@ local DEFAULT_DEBUG_WRITING = false
 
 local DEFAULT_AUTO_SAVE_TIME_SECONDS = 60 * 5
 local DEFAULT_JITTER_PROPORTION = 0.1 -- Randomly assign jitter so if a ton of players join at once we don't hit the datastore at once
-local UNLOCK_BY_DEFAULT_TIME_MULTIPLIER = 2.1
 
 local DataStore = setmetatable({}, DataStoreStage)
 DataStore.ClassName = "DataStore"
@@ -97,13 +92,11 @@ export type DataStore = typeof(setmetatable(
 		_userIdList: { number }?,
 		_robloxDataStore: DataStorePromises.RobloxDataStore,
 		_debugWriting: boolean,
-		_sessionLockingEnabled: boolean,
 		_autoSaveTimeSeconds: ValueObject.ValueObject<number?>,
 		_jitterProportion: ValueObject.ValueObject<number>,
 		_syncOnSave: ValueObject.ValueObject<boolean>,
 		_loadedOk: ValueObject.ValueObject<boolean>,
 		_firstLoadPromise: Promise.Promise<()>,
-		_promiseSessionLockingFailed: Promise.Promise<()>,
 		Saving: Signal.Signal<Promise.Promise<()>>,
 	},
 	{} :: typeof({ __index = DataStore })
@@ -131,7 +124,6 @@ function DataStore.new(robloxDataStore: DataStorePromises.RobloxDataStore, key:
 	self._jitterProportion = self._maid:Add(ValueObject.new(DEFAULT_JITTER_PROPORTION, "number"))
 	self._syncOnSave = self._maid:Add(ValueObject.new(false, "boolean"))
 	self._loadedOk = self._maid:Add(ValueObject.new(false, "boolean"))
-	self._promiseSessionLockingFailed = self._maid:Add(Promise.new())
 
 	self._userIdList = nil
 
@@ -151,27 +143,6 @@ function DataStore.new(robloxDataStore: DataStorePromises.RobloxDataStore, key:
 	return self
 end
 
---[=[
-	Sets session locking enabled
-
-	@param sessionLockingEnabled boolean
-]=]
-function DataStore.SetSessionLockingEnabled(self: DataStore, sessionLockingEnabled: boolean)
-	assert(not self._firstLoadPromise, "Must set session locking before datastore is loaded")
-
-	self._sessionLockingEnabled = sessionLockingEnabled
-end
-
---[=[
-	Returns a promise that rejects on datastore cleanup, and resolves only when the session locking
-	code completely fails
-
-	@return Promise<>
-]=]
-function DataStore.PromiseSessionLockingFailed(self: DataStore)
-	return self._promiseSessionLockingFailed
-end
-
 --[=[
 	Set to true to debug writing this data store
 
@@ -251,16 +222,6 @@ function DataStore.Save(self: DataStore): Promise.Promise<()>
 	return self:_syncData(false)
 end
 
---[=[
-	Saves all stored data.
-	@return Promise
-]=]
-function DataStore.SaveAndCloseSession(self: DataStore): Promise.Promise<()>
-	assert(self._sessionLockingEnabled, "Cannot invoke unless session locking is enabled")
-
-	return self:_syncData(false, true)
-end
-
 --[=[
 	Same as saving the data but it also loads fresh data from the datastore, which may consume
 	additional data-store query calls.
@@ -362,7 +323,7 @@ function DataStore._setupAutoSaving(self: DataStore)
 	end))
 end
 
-function DataStore._syncData(self: DataStore, doMergeNewData: boolean, doCloseSession: boolean?)
+function DataStore._syncData(self: DataStore, doMergeNewData: boolean)
 	if self:DidLoadFail() then
 		warn("[DataStore] - Not syncing, failed to load")
 		return Promise.rejected("Load not successful, not syncing")
@@ -374,7 +335,7 @@ function DataStore._syncData(self: DataStore, doMergeNewData: boolean, doCloseSe
 			return self._maid:GivePromise(self:PromiseInvokeSavingCallbacks())
 		end)
 		:Then(function(): Promise.Promise<()>?
-			if not self:HasWritableData() and not doCloseSession then
+			if not self:HasWritableData() then
 				if doMergeNewData then
 					-- Reads are cheaper than update async calls
 					return self:_promiseGetAsyncNoCache()
@@ -387,17 +348,12 @@ function DataStore._syncData(self: DataStore, doMergeNewData: boolean, doCloseSe
 
 				return nil
 			else
-				return self:_doDataSync(self:GetNewWriter(), doMergeNewData, doCloseSession)
+				return self:_doDataSync(self:GetNewWriter(), doMergeNewData)
 			end
 		end)
 end
 
-function DataStore._doDataSync(
-	self: DataStore,
-	writer,
-	doMergeNewData: boolean,
-	doCloseSession: boolean?
-): Promise.Promise<()>
+function DataStore._doDataSync(self: DataStore, writer, doMergeNewData: boolean): Promise.Promise<()>
 	assert(type(doMergeNewData) == "boolean", "Bad doMergeNewData")
 
 	-- Cache user id list
@@ -440,11 +396,6 @@ function DataStore._doDataSync(
 		promise:Resolve(
 			maid:GivePromise(
 				DataStorePromises.updateAsync(self._robloxDataStore, self._key, function(original, datastoreKeyInfo)
-					if self._sessionLockingEnabled then
-						original = table.clone(original)
-						original.lock = nil
-					end
-
 					if promise:IsRejected() then
 						-- Cancel if we have another request
 						return nil
@@ -483,17 +434,6 @@ function DataStore._doDataSync(
 						metadata = datastoreKeyInfo:GetMetadata()
 					end
 
-					if doCloseSession then
-						result = table.clone(result)
-						result.lock = nil
-					elseif self._sessionLockingEnabled then
-						-- Maintain the lock with the latest time
-						result = table.clone(result)
-						if result.lock then
-							result.lock = os.time()
-						end
-					end
-
 					return result, userIdList, metadata
 				end)
 			)
@@ -515,128 +455,36 @@ function DataStore._doDataSync(
 end
 
 function DataStore._promiseGetAsyncNoCache(self: DataStore): Promise.Promise<()>
-	local promise
-	if self._sessionLockingEnabled then
-		local function promiseLoadUnlockedProfile()
-			local loadPromise = Promise.new()
-			self._maid[loadPromise] = loadPromise
-
-			PromiseMaidUtils.whilePromise(loadPromise, function(maid)
-				maid:GivePromise(
-					DataStorePromises.updateAsync(self._robloxDataStore, self._key, function(data, datastoreKeyInfo)
-						local userIdList = self._userIdList
-						if datastoreKeyInfo then
-							userIdList = datastoreKeyInfo:GetUserIds()
-						end
-
-						local metadata = nil
-						if datastoreKeyInfo then
-							metadata = datastoreKeyInfo:GetMetadata()
-						end
-
-						if self._debugWriting then
-							print(string.format("DataStorePromises.updateAsync(%q) -> Got ", tostring(self._key)), data)
-						end
-
-						if data.lock then
-							local isInvalidLock = false
-							if type(data.lock) == "number" then
-								local timeElapsed = os.time() - data.lock
-								local autoSaveSeconds = self._autoSaveTimeSeconds.Value
-								if
-									autoSaveSeconds
-									and timeElapsed > (autoSaveSeconds * UNLOCK_BY_DEFAULT_TIME_MULTIPLIER)
-								then
-									isInvalidLock = true
-								end
-							end
-
-							-- Allow data locked to load in studio because otherwise testing gets really messy
-							if RunService:IsStudio() then
-								isInvalidLock = true
-							end
-
-							if not isInvalidLock then
-								loadPromise:Reject(string.format("Profile is locked (%s)", tostring(data.lock)))
-
-								-- Cancel write to avoid maintaining lock
-								return nil
-							end
-
-							-- Be sure to cleanup stuff
-							data.lock = nil :: number?
-						end
-
-						-- TODO: Retry
-						loadPromise:Resolve(data)
-
-						data.lock = os.time()
-
-						return data, userIdList, metadata
-					end)
+	return self._maid
+		:GivePromise(DataStorePromises.getAsync(self._robloxDataStore, self._key))
+		:Catch(function(err)
+			warn(
+				string.format(
+					"DataStorePromises.getAsync(%q) -> warning - %s",
+					tostring(self._key),
+					tostring(err or "empty error")
 				)
-			end)
-
-			loadPromise:Finally(function()
-				self._maid[loadPromise] = nil
-			end)
+			)
+			return Promise.rejected(err)
+		end)
+		:Then(function(data)
+			local writer = self:GetNewWriter()
+			local diffSnapshot = writer:ComputeDiffSnapshot(data)
 
-			return loadPromise
-		end
+			self:MergeDiffSnapshot(diffSnapshot)
 
-		promise = self._maid
-			:Add(PromiseRetryUtils.retry(promiseLoadUnlockedProfile, {
-				-- https://exponentialbackoffcalculator.com/
-				-- ~10 minutes
-				exponential = 1.5,
-				initialWaitTime = 1,
-				maxAttempts = 15,
-				printWarning = true,
-			}))
-			:Catch(function(err)
-				warn(
-					string.format(
-						"DataStorePromises.updateAsync(%q) -> warning - %s",
-						tostring(self._key),
-						tostring(err or "empty error")
-					)
-				)
-				self._promiseSessionLockingFailed:Resolve()
-				return Promise.rejected(err)
-			end)
-	else
-		promise = self._maid
-			:GivePromise(DataStorePromises.getAsync(self._robloxDataStore, self._key))
-			:Catch(function(err)
-				warn(
-					string.format(
-						"DataStorePromises.getAsync(%q) -> warning - %s",
-						tostring(self._key),
-						tostring(err or "empty error")
-					)
+			if self._debugWriting then
+				print(
+					string.format("DataStorePromises.getAsync(%q) -> Got ", tostring(self._key)),
+					data,
+					"with diff snapshot",
+					diffSnapshot,
+					"to view",
+					self._viewSnapshot
 				)
-				return Promise.rejected(err)
-			end)
-	end
-
-	return promise:Then(function(data)
-		local writer = self:GetNewWriter()
-		local diffSnapshot = writer:ComputeDiffSnapshot(data)
-
-		self:MergeDiffSnapshot(diffSnapshot)
-
-		if self._debugWriting then
-			print(
-				string.format("DataStorePromises.getAsync(%q) -> Got ", tostring(self._key)),
-				data,
-				"with diff snapshot",
-				diffSnapshot,
-				"to view",
-				self._viewSnapshot
-			)
-			-- print(string.format("DataStorePromises.getAsync(%q) -> Got ", self._key), data)
-		end
-	end)
+				-- print(string.format("DataStorePromises.getAsync(%q) -> Got ", self._key), data)
+			end
+		end)
 end
 
 return DataStore

package/src/Server/PlayerDataStoreManager.lua

@@ -131,7 +131,7 @@ end
 	For if you want to disable saving in studio for faster close time!
 ]=]
 function PlayerDataStoreManager.DisableSaveOnCloseStudio(self: PlayerDataStoreManager): ()
-	assert(RunService:IsStudio(), "Must invoke in studio")
+	assert(RunService:IsStudio())
 
 	self._disableSavingInStudio = true
 end
@@ -196,13 +196,8 @@ function PlayerDataStoreManager._createDataStore(self: PlayerDataStoreManager, p
 	assert(not self._datastores[player], "Bad player")
 
 	local datastore = DataStore.new(self._robloxDataStore, self:_getKey(player))
-	datastore:SetSessionLockingEnabled(true)
 	datastore:SetUserIdList({ player.UserId })
 
-	datastore:PromiseSessionLockingFailed():Then(function()
-		player:Kick("DataStore session lock failed to load. Please message developers.")
-	end)
-
 	self._maid._savingConns[player] = datastore.Saving:Connect(function(promise)
 		self._pendingSaves:Add(promise)
 	end)
@@ -233,7 +228,7 @@ function PlayerDataStoreManager._removePlayerDataStore(self: PlayerDataStoreMana
 
 	PromiseUtils.all(removingPromises)
 		:Then(function()
-			return datastore:SaveAndCloseSession()
+			return datastore:Save()
 		end)
 		:Finally(function()
 			datastore:Destroy()