@quenty/cooldown 6.0.0-canary.367.e9fdcbc.0 → 6.0.0

package/CHANGELOG.md

@@ -3,7 +3,138 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [6.0.0-canary.367.e9fdcbc.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.21.0...@quenty/cooldown@6.0.0-canary.367.e9fdcbc.0) (2023-06-05)
+# [6.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.32.0...@quenty/cooldown@6.0.0) (2023-10-11)
+
+
+### Features
+
+* Add CooldownTrackerModel.isCooldownTrackerModel(value) ([8f0ade2](https://github.com/Quenty/NevermoreEngine/commit/8f0ade2ce96e70090ebab6085cf3f24696a7cca6))
+
+
+
+
+
+# [5.32.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.31.0...@quenty/cooldown@5.32.0) (2023-09-21)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.31.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.30.0...@quenty/cooldown@5.31.0) (2023-09-04)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.30.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.29.0...@quenty/cooldown@5.30.0) (2023-08-23)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.29.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.28.0...@quenty/cooldown@5.29.0) (2023-08-01)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.28.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.27.0...@quenty/cooldown@5.28.0) (2023-07-28)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.27.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.26.1...@quenty/cooldown@5.27.0) (2023-07-23)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+## [5.26.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.26.0...@quenty/cooldown@5.26.1) (2023-07-18)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.26.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.25.1...@quenty/cooldown@5.26.0) (2023-07-15)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+## [5.25.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.25.0...@quenty/cooldown@5.25.1) (2023-07-11)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.25.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.24.2...@quenty/cooldown@5.25.0) (2023-07-10)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+## [5.24.2](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.24.1...@quenty/cooldown@5.24.2) (2023-07-03)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+## [5.24.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.24.0...@quenty/cooldown@5.24.1) (2023-06-24)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.24.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.23.1...@quenty/cooldown@5.24.0) (2023-06-24)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+## [5.23.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.23.0...@quenty/cooldown@5.23.1) (2023-06-23)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.23.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.22.0...@quenty/cooldown@5.23.0) (2023-06-17)
+
+**Note:** Version bump only for package @quenty/cooldown
+
+
+
+
+
+# [5.22.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@5.21.0...@quenty/cooldown@5.22.0) (2023-06-05)
 
 **Note:** Version bump only for package @quenty/cooldown
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/cooldown",
-  "version": "6.0.0-canary.367.e9fdcbc.0",
+  "version": "6.0.0",
   "description": "Generalized networked cooldown system for Roblox",
   "keywords": [
     "Roblox",
@@ -25,22 +25,26 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/attributeutils": "8.15.0",
-    "@quenty/baseobject": "6.2.1",
-    "@quenty/binder": "9.0.0-canary.367.e9fdcbc.0",
-    "@quenty/loader": "6.2.1",
-    "@quenty/maid": "2.5.0",
-    "@quenty/promise": "6.5.0",
-    "@quenty/remoting": "6.5.0",
-    "@quenty/rxbinderutils": "9.0.0-canary.367.e9fdcbc.0",
-    "@quenty/servicebag": "6.7.0",
-    "@quenty/signal": "2.4.0",
-    "@quenty/table": "3.2.0",
-    "@quenty/timesyncservice": "7.7.0",
-    "@quenty/valueobject": "8.0.0-canary.367.e9fdcbc.0"
+    "@quenty/attributeutils": "^9.0.0",
+    "@quenty/baseobject": "^7.0.0",
+    "@quenty/binder": "^9.0.0",
+    "@quenty/ducktype": "^2.0.0",
+    "@quenty/instanceutils": "^8.0.0",
+    "@quenty/loader": "^7.0.0",
+    "@quenty/maid": "^2.6.0",
+    "@quenty/promise": "^7.0.0",
+    "@quenty/propertyvalue": "^2.0.0",
+    "@quenty/remoting": "^7.0.0",
+    "@quenty/rx": "^8.0.0",
+    "@quenty/rxbinderutils": "^9.0.0",
+    "@quenty/servicebag": "^7.0.0",
+    "@quenty/signal": "^3.0.0",
+    "@quenty/table": "^3.3.0",
+    "@quenty/timesyncservice": "^8.0.0",
+    "@quenty/valueobject": "^8.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e9fdcbc6ea1d46e068bf42a08b833099e9005259"
+  "gitHead": "fdeae46099587019ec5fc15317dc673aed379400"
 }

package/src/Client/{CooldownClient.lua → Binders/CooldownClient.lua}

@@ -8,6 +8,7 @@
 local require = require(script.Parent.loader).load(script)
 
 local CooldownBase = require("CooldownBase")
+local Binder = require("Binder")
 
 local CooldownClient = setmetatable({}, CooldownBase)
 CooldownClient.ClassName = "CooldownClient"
@@ -17,14 +18,18 @@ CooldownClient.__index = CooldownClient
 	Constructs a new cooldown. Should be done via [CooldownBindersClient]. To create an
 	instance of this in Roblox, see [CooldownUtils.create].
 
-	@param obj NumberValue
+	@param numberValue NumberValue
 	@param serviceBag ServiceBag
 	@return Cooldown
 ]=]
-function CooldownClient.new(obj, serviceBag)
-	local self = setmetatable(CooldownBase.new(obj, serviceBag), CooldownClient)
+function CooldownClient.new(numberValue, serviceBag)
+	local self = setmetatable(CooldownBase.new(numberValue, serviceBag), CooldownClient)
+
+	self._maid:GiveTask(self.Done:Connect(function()
+		self._obj:Remove()
+	end))
 
 	return self
 end
 
-return CooldownClient
+return Binder.new("Cooldown", CooldownClient)

package/src/Client/CooldownServiceClient.lua

@@ -0,0 +1,22 @@
+--[=[
+	@class CooldownServiceClient
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local CooldownServiceClient = {}
+CooldownServiceClient.ServiceName = "CooldownServiceClient"
+
+function CooldownServiceClient:Init(serviceBag)
+	assert(not self._serviceBag, "Already initialized")
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+
+	-- External
+	self._serviceBag:GetService(require("TimeSyncService"))
+
+	-- Internal
+	self._serviceBag:GetService(require("CooldownClient"))
+	self._serviceBag:GetService(require("CooldownShared"))
+end
+
+return CooldownServiceClient

package/src/Server/Binders/Cooldown.lua

@@ -0,0 +1,44 @@
+--[=[
+	Represents a cooldown state with a time limit. See [CooldownBase] for more API.
+
+	@server
+	@class Cooldown
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local CooldownBase = require("CooldownBase")
+local TimeSyncService = require("TimeSyncService")
+local CooldownConstants = require("CooldownConstants")
+local AttributeValue = require("AttributeValue")
+local Binder = require("Binder")
+local PropertyValue = require("PropertyValue")
+
+local Cooldown = setmetatable({}, CooldownBase)
+Cooldown.ClassName = "Cooldown"
+Cooldown.__index = Cooldown
+
+--[=[
+	Constructs a new cooldown. Should be done via [Binder].
+
+	@param numberValue NumberValue
+	@param serviceBag ServiceBag
+	@return Cooldown
+]=]
+function Cooldown.new(numberValue, serviceBag)
+	local self = setmetatable(CooldownBase.new(numberValue, serviceBag), Cooldown)
+
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+	self._syncedClock = self._serviceBag:GetService(TimeSyncService):GetSyncedClock()
+
+	self._finishTime = PropertyValue.new(self._obj, "Value")
+	self._startTime = AttributeValue.new(self._obj, CooldownConstants.COOLDOWN_START_TIME_ATTRIBUTE, self._syncedClock:GetTime())
+
+	self._maid:GiveTask(self.Done:Connect(function()
+		self._obj:Remove()
+	end))
+
+	return self
+end
+
+return Binder.new("Cooldown", Cooldown)

package/src/Server/CooldownService.lua

@@ -0,0 +1,22 @@
+--[=[
+	@class CooldownService
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local CooldownService = {}
+CooldownService.ServiceName = "CooldownService"
+
+function CooldownService:Init(serviceBag)
+	assert(not self._serviceBag, "Already initialized")
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+
+	-- External
+	self._serviceBag:GetService(require("TimeSyncService"))
+
+	-- Internal
+	self._serviceBag:GetService(require("Cooldown"))
+	self._serviceBag:GetService(require("CooldownShared"))
+end
+
+return CooldownService

package/src/Shared/{CooldownBase.lua → Binders/CooldownBase.lua}

@@ -8,7 +8,9 @@ local require = require(script.Parent.loader).load(script)
 local BaseObject = require("BaseObject")
 local TimeSyncService = require("TimeSyncService")
 local CooldownConstants = require("CooldownConstants")
-local Signal = require("Signal")
+local CooldownModel = require("CooldownModel")
+local RxAttributeUtils = require("RxAttributeUtils")
+local RxInstanceUtils = require("RxInstanceUtils")
 
 local CooldownBase = setmetatable({}, BaseObject)
 CooldownBase.ClassName = "CooldownBase"
@@ -17,35 +19,44 @@ CooldownBase.__index = CooldownBase
 --[=[
 	Constructs a new Cooldown.
 
-	@param obj NumberValue
+	@param numberValue NumberValue
 	@param serviceBag ServiceBag
 	@return CooldownBase
 ]=]
-function CooldownBase.new(obj, serviceBag)
-	local self = setmetatable(BaseObject.new(obj), CooldownBase)
+function CooldownBase.new(numberValue, serviceBag)
+	local self = setmetatable(BaseObject.new(numberValue), CooldownBase)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._timeSyncService = self._serviceBag:GetService(TimeSyncService)
 
+	self._cooldownModel = self._maid:Add(CooldownModel.new())
 	self._maid:GivePromise(self._timeSyncService:PromiseSyncedClock())
 		:Then(function(syncedClock)
 			self._syncedClock = syncedClock
+
+			-- Setup
+			self._cooldownModel:SetStartTime(RxAttributeUtils.observeAttribute(self._obj, CooldownConstants.COOLDOWN_START_TIME_ATTRIBUTE, syncedClock:GetTime()))
+			self._cooldownModel:SetLength(RxInstanceUtils.observeProperty(self._obj, "Value"))
+
+			self._cooldownModel:SetClock(function()
+				return self._syncedClock:GetTime()
+			end)
 		end)
 
 --[=[
 	Event that fires when the cooldown is done.
 	@prop Done Signal<()>
-	@within CooldownClient
+	@within CooldownBase
 ]=]
-	self.Done = Signal.new()
-	self._maid:GiveTask(function()
-		self.Done:Fire()
-		self.Done:Destroy()
-	end)
+	self.Done = assert(self._cooldownModel.Done, "No done signal")
 
 	return self
 end
 
+function CooldownBase:GetCooldownModel()
+	return self._cooldownModel
+end
+
 --[=[
 	Gets the Roblox instance of the cooldown.
 	@return Instance
@@ -59,16 +70,7 @@ end
 	@return number?
 ]=]
 function CooldownBase:GetTimePassed()
-	local startTime = self:GetStartTime()
-	if not startTime then
-		return nil
-	end
-
-	if not self._syncedClock then
-		return nil
-	end
-
-	return self._syncedClock:GetTime() - startTime
+	return self._cooldownModel:GetTimePassed()
 end
 
 --[=[
@@ -76,16 +78,7 @@ end
 	@return number?
 ]=]
 function CooldownBase:GetTimeRemaining()
-	local endTime = self:GetEndTime()
-	if not endTime then
-		return nil
-	end
-
-	if not self._syncedClock then
-		return nil
-	end
-
-	return math.max(0, endTime - self._syncedClock:GetTime())
+	return self._cooldownModel:GetTimeRemaining()
 end
 
 --[=[
@@ -93,11 +86,7 @@ end
 	@return number?
 ]=]
 function CooldownBase:GetEndTime()
-	local startTime = self:GetStartTime()
-	if not startTime then
-		return nil
-	end
-	return startTime + self:GetLength()
+	return self._cooldownModel:GetEndTime()
 end
 
 --[=[
@@ -105,12 +94,7 @@ end
 	@return number?
 ]=]
 function CooldownBase:GetStartTime()
-	local startTime = self._obj:GetAttribute(CooldownConstants.COOLDOWN_START_TIME_ATTRIBUTE)
-	if type(startTime) == "number" then
-		return startTime
-	else
-		return nil
-	end
+	return self._cooldownModel:GetStartTime()
 end
 
 --[=[
@@ -118,7 +102,7 @@ end
 	@return number
 ]=]
 function CooldownBase:GetLength()
-	return self._obj.Value
+	return self._cooldownModel:GetLength()
 end
 
 return CooldownBase

package/src/Shared/Binders/CooldownShared.lua

@@ -0,0 +1,22 @@
+--[=[
+	@class CooldownShared
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local CooldownBase = require("CooldownBase")
+local Binder = require("Binder")
+
+local CooldownShared = setmetatable({}, CooldownBase)
+CooldownShared.ClassName = "CooldownShared"
+CooldownShared.__index = CooldownShared
+
+function CooldownShared.new(numberValue, serviceBag)
+	local self = setmetatable(CooldownBase.new(numberValue, serviceBag), CooldownShared)
+
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+
+	return self
+end
+
+return Binder.new("Cooldown", CooldownShared)

package/src/Shared/CooldownUtils.lua

@@ -5,19 +5,19 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local CollectionService = game:GetService("CollectionService")
+
 local BinderUtils = require("BinderUtils")
 
 local CooldownUtils = {}
 
 --[=[
 	Creates a new Roblox instance representing a cooldown.
-	@param cooldownBinder Binder<Cooldown | CooldownClient>
 	@param parent Instance
 	@param length number
 	@return Instance
 ]=]
-function CooldownUtils.create(cooldownBinder, parent, length)
-	assert(cooldownBinder, "Bad cooldownBinder")
+function CooldownUtils.create(parent, length)
 	assert(typeof(parent) == "Instance", "Bad parent")
 	assert(type(length) == "number", "Bad length")
 	assert(length > 0, "Bad length")
@@ -26,7 +26,7 @@ function CooldownUtils.create(cooldownBinder, parent, length)
 	cooldown.Value = length
 	cooldown.Name = "Cooldown"
 
-	cooldownBinder:Bind(cooldown)
+	CollectionService:AddTag(cooldown, "Cooldown")
 
 	cooldown.Parent = parent
 

package/src/Shared/Model/CooldownModel.lua

@@ -0,0 +1,125 @@
+--[=[
+	@class CooldownModel
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local BaseObject = require("BaseObject")
+local ValueObject = require("ValueObject")
+local Signal = require("Signal")
+local Rx = require("Rx")
+local DuckTypeUtils = require("DuckTypeUtils")
+
+local CooldownModel = setmetatable({}, BaseObject)
+CooldownModel.ClassName = "CooldownModel"
+CooldownModel.__index = CooldownModel
+
+function CooldownModel.new()
+	local self = setmetatable(BaseObject.new(), CooldownModel)
+
+	self._length = self._maid:Add(ValueObject.new(0, "number"))
+	self._startTime = self._maid:Add(ValueObject.new(os.clock(), "number"))
+	self._clock = self._maid:Add(ValueObject.new(os.clock, "function"))
+
+	do
+		self._doneFired = false
+		self.Done = Signal.new()
+
+		self._maid:GiveTask(function()
+			if not self._doneFired then
+				self._doneFired = true
+				self.Done:Fire()
+			end
+
+			self.Done:Destroy()
+		end)
+	end
+
+	self._maid:GiveTask(Rx.combineLatest({
+		length = self._length:Observe();
+		clock = self._clock:Observe();
+		startTime = self._startTime:Observe();
+	}):Pipe({
+		Rx.throttleDefer();
+	}):Subscribe(function(state)
+		local now = state.clock()
+		local waitTime = state.length + state.startTime - now
+
+		if self._doneFired then
+			self._maid._cleanup = nil
+		else
+			self._maid._cleanup = task.delay(waitTime, function()
+				self._doneFired = true
+				self.Done:Fire()
+			end)
+		end
+	end))
+
+	return self
+end
+
+function CooldownModel.isCooldownModel(value)
+	return DuckTypeUtils.isImplementation(CooldownModel, value)
+end
+
+function CooldownModel:SetClock(clock)
+	if self._doneFired then
+		warn("[CooldownModel] - Done already fired")
+	end
+
+	self._clock:Mount(clock)
+end
+
+function CooldownModel:SetStartTime(startTime)
+	if self._doneFired then
+		warn("[CooldownModel] - Done already fired")
+	end
+
+	self._startTime:Mount(startTime)
+end
+
+function CooldownModel:SetLength(length)
+	if self._doneFired then
+		warn("[CooldownModel] - Done already fired")
+	end
+
+	self._length:Mount(length)
+end
+
+--[=[
+	Gets the syncronized time stamp the cooldown is starting at
+	@return number
+]=]
+function CooldownModel:GetStartTime()
+	return self._startTime.Value
+end
+
+--[=[
+	Gets the time remaining
+	@return number
+]=]
+function CooldownModel:GetTimeRemaining()
+	local endTime = self:GetEndTime()
+
+	return math.max(0, endTime - self._clock.Value())
+end
+
+function CooldownModel:GetTimePassed()
+	local startTime = self._startTime.Value
+	return self._clock.Value() - startTime
+end
+
+--[=[
+	Gets the syncronized time stamp the cooldown is ending at
+	@return number?
+]=]
+function CooldownModel:GetEndTime()
+	return self._startTime.Value + self:GetLength()
+end
+
+function CooldownModel:GetLength()
+	return self._length.Value
+end
+
+
+return CooldownModel

package/src/Shared/Model/CooldownTrackerModel.lua

@@ -0,0 +1,70 @@
+--[=[
+	@class CooldownTrackerModel
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local BaseObject = require("BaseObject")
+local ValueObject = require("ValueObject")
+local DuckTypeUtils = require("DuckTypeUtils")
+
+local CooldownTrackerModel = setmetatable({}, BaseObject)
+CooldownTrackerModel.ClassName = "CooldownTrackerModel"
+CooldownTrackerModel.__index = CooldownTrackerModel
+
+function CooldownTrackerModel.new()
+	local self = setmetatable(BaseObject.new(), CooldownTrackerModel)
+
+	self._currentCooldownModel = self._maid:Add(ValueObject.new(nil))
+
+	self._maid:GiveTask(self._currentCooldownModel:ObserveBrio(function(value)
+		return value ~= nil
+	end):Subscribe(function(brio)
+		if brio:IsDead() then
+			return
+		end
+
+		local maid, cooldown = brio:ToMaidAndValue()
+		maid:GiveTask(cooldown.Done:Connect(function()
+			if self._currentCooldownModel.Value == cooldown then
+				self._currentCooldownModel.Value = nil
+			end
+		end))
+	end))
+
+	return self
+end
+
+function CooldownTrackerModel.isCooldownTrackerModel(value)
+	return DuckTypeUtils.isImplementation(CooldownTrackerModel, value)
+end
+
+function CooldownTrackerModel:IsCoolingDown()
+	return self._currentCooldownModel.Value ~= nil
+end
+
+function CooldownTrackerModel:ObserveActiveCooldownModel()
+	return self._currentCooldownModel:Observe()
+end
+
+function CooldownTrackerModel:ObserveActiveCooldownModelBrio()
+	return self._currentCooldownModel:ObserveBrio(function(value)
+		return value ~= nil
+	end)
+end
+
+function CooldownTrackerModel:SetCooldownModel(cooldownModel)
+	self._currentCooldownModel:Mount(cooldownModel)
+
+	return function()
+		if not self.Destroy then
+			return
+		end
+
+		if self._currentCooldownModel.Value == cooldownModel then
+			self._currentCooldownModel.Value = nil
+		end
+	end
+end
+
+return CooldownTrackerModel

package/src/Shared/Tracker/CooldownTracker.lua

@@ -0,0 +1,81 @@
+--[=[
+	Tracks current cooldown on an object
+	@class CooldownTracker
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local BaseObject = require("BaseObject")
+local CooldownShared = require("CooldownShared")
+local ValueObject = require("ValueObject")
+local RxBinderUtils = require("RxBinderUtils")
+local CooldownTrackerModel = require("CooldownTrackerModel")
+
+local CooldownTracker = setmetatable({}, BaseObject)
+CooldownTracker.ClassName = "CooldownTracker"
+CooldownTracker.__index = CooldownTracker
+
+function CooldownTracker.new(serviceBag, parent)
+	assert(typeof(parent) == "Instance", "Bad parent")
+
+	local self = setmetatable(BaseObject.new(parent), CooldownTracker)
+
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+	self._cooldownBinder = self._serviceBag:GetService(CooldownShared)
+
+	self.CurrentCooldown = self._maid:Add(ValueObject.new(nil))
+	self._cooldownTrackModel = self._maid:Add(CooldownTrackerModel.new())
+
+	self._maid:GiveTask(self.CurrentCooldown.Changed:Connect(function(...)
+		self:_handleNewCooldown(...)
+	end))
+
+	-- Handle not running
+	self._maid:GiveTask(RxBinderUtils.observeBoundChildClassBrio(self._cooldownBinder, self._obj)
+		:Subscribe(function(brio)
+			if brio:IsDead() then
+				return
+			end
+
+			-- TODO: Use stack (with multiple cooldowns)
+			local cooldown = brio:GetValue()
+			local maid = brio:ToMaid()
+
+			maid:GiveTask(self._cooldownTrackModel:SetCooldownModel(cooldown:GetCooldownModel()))
+
+			self.CurrentCooldown.Value = cooldown
+
+			maid:GiveTask(function()
+				if not self.Destroy then
+					return
+				end
+
+				if self.CurrentCooldown.Value == cooldown then
+					self._cooldownTrackModel:SetCooldownModel(nil)
+					self.CurrentCooldown.Value = nil
+				end
+			end)
+		end))
+
+	return self
+end
+
+function CooldownTracker:GetCooldownTrackerModel()
+	return self._cooldownTrackModel
+end
+
+function CooldownTracker:IsCoolingDown()
+	return self._cooldownTrackModel:IsCoolingDown()
+end
+
+function CooldownTracker:_handleNewCooldown(new, _old, maid)
+	if new then
+		maid:GiveTask(new.Done:Connect(function()
+			if self.CurrentCooldown.Value == new then
+				self.CurrentCooldown.Value = nil
+			end
+		end))
+	end
+end
+
+return CooldownTracker

package/src/Client/CooldownBindersClient.lua

@@ -1,20 +0,0 @@
---[=[
-	Holds binders for [Cooldown].
-	@class CooldownBindersClient
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local BinderProvider = require("BinderProvider")
-local Binder = require("Binder")
-local TimeSyncService = require("TimeSyncService")
-
-return BinderProvider.new(script.Name, function(self, serviceBag)
-	serviceBag:GetService(TimeSyncService)
-
---[=[
-	@prop Cooldown Binder<CooldownClient>
-	@within CooldownBindersClient
-]=]
-	self:Add(Binder.new("Cooldown", require("CooldownClient"), serviceBag))
-end)

package/src/Client/CooldownTracker.lua

@@ -1,67 +0,0 @@
---[=[
-	Tracks current cooldown on an object
-	@class CooldownTracker
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local BaseObject = require("BaseObject")
-local CooldownBindersClient = require("CooldownBindersClient")
-local ValueObject = require("ValueObject")
-local RxBinderUtils = require("RxBinderUtils")
-
-local CooldownTracker = setmetatable({}, BaseObject)
-CooldownTracker.ClassName = "CooldownTracker"
-CooldownTracker.__index = CooldownTracker
-
-function CooldownTracker.new(serviceBag, parent)
-	local self = setmetatable(BaseObject.new(parent), CooldownTracker)
-
-	assert(parent, "No parent")
-
-	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._cooldownBinders = self._serviceBag:GetService(CooldownBindersClient)
-
-	self.CurrentCooldown = ValueObject.new()
-	self._maid:GiveTask(self.CurrentCooldown)
-
-	self._maid:GiveTask(self.CurrentCooldown.Changed:Connect(function(...)
-		self:_handleNewCooldown(...)
-	end))
-
-	-- Handle not running
-	self._maid:GivePromise(self._cooldownBinders:PromiseBinder("Cooldown"))
-		:Then(function(cooldownBinder)
-			self._maid:GiveTask(RxBinderUtils.observeBoundChildClassBrio(cooldownBinder, self._obj)
-				:Subscribe(function(brio)
-					if brio:IsDead() then
-						return
-					end
-
-					-- TODO: Use stack (with multiple cooldowns)
-					local cooldown = brio:GetValue()
-					local maid = brio:ToMaid()
-					self.CurrentCooldown.Value = cooldown
-
-					maid:GiveTask(function()
-						if self.CurrentCooldown.Value == cooldown then
-							self.CurrentCooldown.Value = nil
-						end
-					end)
-				end))
-		end)
-
-	return self
-end
-
-function CooldownTracker:_handleNewCooldown(new, _old, maid)
-	if new then
-		maid:GiveTask(new.Done:Connect(function()
-			if self.CurrentCooldown.Value == new then
-				self.CurrentCooldown.Value = nil
-			end
-		end))
-	end
-end
-
-return CooldownTracker

package/src/Server/Cooldown.lua

@@ -1,46 +0,0 @@
---[=[
-	Represents a cooldown state with a time limit. See [CooldownBase] for more API.
-
-	@server
-	@class Cooldown
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local CooldownBase = require("CooldownBase")
-local TimeSyncService = require("TimeSyncService")
-local CooldownConstants = require("CooldownConstants")
-local AttributeUtils = require("AttributeUtils")
-
-local Cooldown = setmetatable({}, CooldownBase)
-Cooldown.ClassName = "Cooldown"
-Cooldown.__index = Cooldown
-
---[=[
-	Constructs a new cooldown. Should be done via [CooldownBindersServer]. To create an
-	instance of this in Roblox, see [CooldownUtils.create].
-
-	@param obj NumberValue
-	@param serviceBag ServiceBag
-	@return Cooldown
-]=]
-function Cooldown.new(obj, serviceBag)
-	local self = setmetatable(CooldownBase.new(obj, serviceBag), Cooldown)
-
-	self._serviceBag = assert(serviceBag, "No serviceBag")
-
-	local now = self._serviceBag:GetService(TimeSyncService):GetSyncedClock():GetTime()
-	local startTime = AttributeUtils.initAttribute(self._obj, CooldownConstants.COOLDOWN_START_TIME_ATTRIBUTE, now)
-
-	-- Delay for cooldown time
-	-- TODO: Handle start tme changing
-	task.delay(self._obj.Value + startTime - now, function()
-		if self.Destroy then
-			self._obj:Destroy()
-		end
-	end)
-
-	return self
-end
-
-return Cooldown

package/src/Server/CooldownBindersServer.lua

@@ -1,20 +0,0 @@
---[=[
-	Holds binders for [Cooldown].
-	@class CooldownBindersServer
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local BinderProvider = require("BinderProvider")
-local Binder = require("Binder")
-local TimeSyncService = require("TimeSyncService")
-
-return BinderProvider.new(script.Name, function(self, serviceBag)
-	serviceBag:GetService(TimeSyncService)
-
---[=[
-	@prop Cooldown Binder<Cooldown>
-	@within CooldownBindersServer
-]=]
-	self:Add(Binder.new("Cooldown", require("Cooldown"), serviceBag))
-end)