@quenty/resetservice 6.4.0 → 7.0.0-canary.439.eb597ee.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.
 
+# [7.0.0-canary.439.eb597ee.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/resetservice@6.4.0...@quenty/resetservice@7.0.0-canary.439.eb597ee.0) (2024-01-17)
+
+
+### Features
+
+* Add ResetService suport to provide a reset character provider ([58a9dd2](https://github.com/Quenty/NevermoreEngine/commit/58a9dd2c1fd4a0c4bbae1ba286558e42ff4c36b4))
+
+
+
+
+
 # [6.4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/resetservice@6.3.0...@quenty/resetservice@6.4.0) (2024-01-08)
 
 **Note:** Version bump only for package @quenty/resetservice

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/resetservice",
-  "version": "6.4.0",
+  "version": "7.0.0-canary.439.eb597ee.0",
   "description": "Handles reset requests since Roblox's reset system doesn't handle ragdolls correctly",
   "keywords": [
     "Roblox",
@@ -26,14 +26,16 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/coreguiutils": "^7.2.0",
-    "@quenty/loader": "^7.3.0",
-    "@quenty/maid": "^2.6.0",
-    "@quenty/remoting": "^7.4.0",
-    "@quenty/table": "^3.4.0"
+    "@quenty/coreguiutils": "8.0.0-canary.439.eb597ee.0",
+    "@quenty/loader": "8.0.0-canary.439.eb597ee.0",
+    "@quenty/maid": "2.6.0",
+    "@quenty/promise": "8.0.0-canary.439.eb597ee.0",
+    "@quenty/remoting": "8.0.0-canary.439.eb597ee.0",
+    "@quenty/statestack": "10.0.0-canary.439.eb597ee.0",
+    "@quenty/table": "3.4.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "075fb03a03f12ade8758f667767ba738204e0c4b"
+  "gitHead": "eb597ee01e62e4dd91190bb7abd1d1404652d5ff"
 }

package/src/Client/ResetServiceClient.lua

@@ -10,11 +10,11 @@
 local require = require(script.Parent.loader).load(script)
 
 local Players = game:GetService("Players")
+local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local PromiseGetRemoteEvent = require("PromiseGetRemoteEvent")
-local ResetServiceConstants = require("ResetServiceConstants")
 local CoreGuiUtils = require("CoreGuiUtils")
 local Maid = require("Maid")
+local Remoting = require("Remoting")
 
 local RETRY_ATTEMPTS = 3
 local INITIAL_WAIT_TIME = 1
@@ -27,14 +27,15 @@ ResetServiceClient.ServiceName = "ResetServiceClient"
 ]=]
 function ResetServiceClient:Init()
 	assert(not self._maid, "Already initialized")
-
 	self._maid = Maid.new()
 
-	self._resetBindable = Instance.new("BindableEvent")
+	-- Configure
+	self._remoting = self._maid:Add(Remoting.new(ReplicatedStorage, "ResetService"))
+
+	self._resetBindable = self._maid:Add(Instance.new("BindableEvent"))
 	self._resetBindable.Event:connect(function()
-		self:RequestResetCharacter()
+		self:PromiseResetCharacter()
 	end)
-	self._maid:GiveTask(self._resetBindable)
 
 	CoreGuiUtils.promiseRetrySetCore(RETRY_ATTEMPTS, INITIAL_WAIT_TIME, "ResetButtonCallback", self._resetBindable)
 		:Catch(function(err)
@@ -46,6 +47,10 @@ end
 	Requests the player's character resets
 ]=]
 function ResetServiceClient:RequestResetCharacter()
+	return self:PromiseResetCharacter()
+end
+
+function ResetServiceClient:PromiseResetCharacter()
 	local character = Players.LocalPlayer.Character
 	if character then
 		local humanoid = character:FindFirstChildWhichIsA("Humanoid")
@@ -54,13 +59,7 @@ function ResetServiceClient:RequestResetCharacter()
 		end
 	end
 
-	self:_promiseRemoteEvent():Then(function(remoteEvent)
-		remoteEvent:FireServer()
-	end)
-end
-
-function ResetServiceClient:_promiseRemoteEvent()
-	return self._maid:GivePromise(PromiseGetRemoteEvent(ResetServiceConstants.REMOTE_EVENT_NAME))
+	return self._maid:GivePromise(self._remoting.ResetCharacter:PromiseInvokeServer())
 end
 
 function ResetServiceClient:Destroy()

package/src/Server/ResetService.lua

@@ -6,9 +6,13 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local GetRemoteEvent = require("GetRemoteEvent")
-local ResetServiceConstants = require("ResetServiceConstants")
+local ReplicatedStorage = game:GetService("ReplicatedStorage")
+
+local Remoting = require("Remoting")
 local Maid = require("Maid")
+local StateStack = require("StateStack")
+local PlayerUtils = require("PlayerUtils")
+local Promise = require("Promise")
 
 local ResetService = {}
 ResetService.ServiceName = "ResetService"
@@ -18,21 +22,44 @@ ResetService.ServiceName = "ResetService"
 ]=]
 function ResetService:Init()
 	assert(not self._remoteEvent, "Already initialized")
-
 	self._maid = Maid.new()
 
-	self._remoteEvent = GetRemoteEvent(ResetServiceConstants.REMOTE_EVENT_NAME)
-	self._maid:GiveTask(self._remoteEvent.OnServerEvent:Connect(function(player)
-		self:_resetCharacterYielding(player)
+	self._remoting = self._maid:Add(Remoting.new(ReplicatedStorage, "ResetService"))
+
+	self._maid:GiveTask(self._remoting.ResetCharacter:Bind(function(player)
+		return self:PromiseResetCharacter(player)
 	end))
+
+	self._resetProviderStack = self._maid:Add(StateStack.new(function(player)
+		return PlayerUtils.promiseLoadCharacter(player)
+	end, "function"))
 end
 
-function ResetService:_resetCharacterYielding(player)
+--[=[
+	Pushes a reset provider onto the reset service
+
+	@param promiseReset function -- Reset provider
+	@return MaidTask
+]=]
+function ResetService:PushResetProvider(promiseReset)
+	assert(type(promiseReset) == "function", "Bad promiseReset")
+
+	return self._resetProviderStack:PushState(promiseReset)
+end
+
+function ResetService:PromiseResetCharacter(player)
+	assert(typeof(player) == "Instance", "Bad player")
+
 	if not player:IsDescendantOf(game) then
-		return
+		return Promise.rejected("Player is not descendant of game")
+	end
+
+	local provider = self._resetProviderStack:GetState()
+	if not provider then
+		return Promise.rejected("No reset provider")
 	end
 
-	player:LoadCharacter()
+	return provider(player)
 end
 
 function ResetService:Destroy()

package/src/Shared/ResetServiceConstants.lua

@@ -1,11 +0,0 @@
---[=[
-	@class ResetServiceConstants
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local Table = require("Table")
-
-return Table.readonly({
-	REMOTE_EVENT_NAME = "ResetServiceRemoteEvent";
-})