@quenty/datastore 7.4.0 → 7.4.1

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.4.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@7.4.0...@quenty/datastore@7.4.1) (2023-01-03)
+
+
+### Bug Fixes
+
+* Add PrivateServerDataStoreService ([32c9921](https://github.com/Quenty/NevermoreEngine/commit/32c9921358f5728d9502b89c391ff761a0e454e7))
+* Better error message if key is an empty string ([dd2528d](https://github.com/Quenty/NevermoreEngine/commit/dd2528dfe99d272aa53790d883896f7523b5cb47))
+
+
+
+
+
 # [7.4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@7.3.0...@quenty/datastore@7.4.0) (2022-11-12)
 
 **Note:** Version bump only for package @quenty/datastore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/datastore",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "Quenty's Datastore implementation for Roblox",
   "keywords": [
     "Roblox",
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "24d3b85c01f0ce732d4290b62af8cc1b5c47f07a"
+  "gitHead": "8f4aef032ba8bb0e3b3e576df73d921cc1ac545b"
 }

package/src/Server/DataStore.lua

@@ -96,6 +96,10 @@ function DataStore.new(robloxDataStore, key)
 	self._robloxDataStore = robloxDataStore or error("No robloxDataStore")
 	self._cacheTimeSeconds = DEFAULT_CACHE_TIME_SECONDS
 
+	if self._key == "" then
+		error("[DataStore] - Key cannot be an empty string")
+	end
+
 --[=[
 	Prop that fires when saving. Promise will resolve once saving is complete.
 	@prop Saving Signal<Promise>

package/src/Server/PrivateServerDataStoreService.lua

@@ -0,0 +1,69 @@
+--[=[
+	Service which manages central access to datastore. This datastore is per a private server
+	or reserved server. The main server will also get one, with an empty key.
+
+	@class PrivateServerDataStoreService
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local DataStore = require("DataStore")
+local DataStorePromises = require("DataStorePromises")
+local Maid = require("Maid")
+
+local PrivateServerDataStoreService = {}
+PrivateServerDataStoreService.ServiceName = "PrivateServerDataStoreService"
+
+function PrivateServerDataStoreService:Init(serviceBag)
+	assert(not self._serviceBag, "Already initialized")
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+
+	self._bindToCloseService = self._serviceBag:GetService(require("BindToCloseService"))
+
+	self._maid = Maid.new()
+end
+
+function PrivateServerDataStoreService:PromiseDataStore()
+	if self._dataStorePromise then
+		return self._dataStorePromise
+	end
+
+	self._dataStorePromise = self:_promiseRobloxDataStore()
+		:Then(function(robloxDataStore)
+			local dataStore = DataStore.new(robloxDataStore, self:_getKey())
+			self._maid:GiveTask(dataStore)
+
+			self._maid:GiveTask(self._bindToCloseService:RegisterPromiseOnCloseCallback(function()
+				return dataStore:Save()
+			end))
+
+			return dataStore
+		end)
+
+	return self._dataStorePromise
+end
+
+function PrivateServerDataStoreService:_promiseRobloxDataStore()
+	if self._robloxDataStorePromise then
+		return self._robloxDataStorePromise
+	end
+
+	-- This could potentially
+	self._robloxDataStorePromise = self._maid:GivePromise(DataStorePromises.promiseDataStore("PrivateServerDataStores", "Version1"))
+
+	return self._robloxDataStorePromise
+end
+
+function PrivateServerDataStoreService:_getKey()
+	if game.PrivateServerId ~= "" then
+		return game.PrivateServerId
+	else
+		return "main"
+	end
+end
+
+function PrivateServerDataStoreService:Destroy()
+	self._maid:DoCleaning()
+end
+
+return PrivateServerDataStoreService