@quenty/cooldown 1.3.1 → 1.4.1-canary.8533eea.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.1-canary.8533eea.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@1.4.0...@quenty/cooldown@1.4.1-canary.8533eea.0) (2021-12-18)
+
+
+### Features
+
+* Allow CooldownTracker to be initialized without the cooldown binders being initialized. ([4633d7c](https://github.com/Quenty/NevermoreEngine/commit/4633d7c0e11530d827e39994d5f84d0280652d96))
+
+
+
+
+
+# [1.4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@1.3.1...@quenty/cooldown@1.4.0) (2021-12-14)
+
+
+### Bug Fixes
+
+* Cooldown package uses RxBinderUtils to observe bound class changing properly ([c005479](https://github.com/Quenty/NevermoreEngine/commit/c0054792dc12ccb03000bbbc3acb27ac24858f48))
+
+
+
+
+
 ## [1.3.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@1.3.0...@quenty/cooldown@1.3.1) (2021-12-04)
 
 

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014 Quenty
+Copyright (c) 2014-2021 Quenty
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/cooldown",
-  "version": "1.3.1",
+  "version": "1.4.1-canary.8533eea.0",
   "description": "Generalized networked cooldown system for Roblox",
   "keywords": [
     "Roblox",
@@ -25,20 +25,21 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^3.2.0",
-    "@quenty/binder": "^4.3.1",
-    "@quenty/loader": "^3.1.1",
-    "@quenty/maid": "^2.0.1",
-    "@quenty/promise": "^3.2.0",
-    "@quenty/remoting": "^3.2.0",
-    "@quenty/servicebag": "^3.2.1",
-    "@quenty/signal": "^2.0.0",
-    "@quenty/table": "^2.1.0",
-    "@quenty/timesyncservice": "^3.2.0",
-    "@quenty/valueobject": "^3.3.0"
+    "@quenty/baseobject": "3.2.0",
+    "@quenty/binder": "4.4.1-canary.8533eea.0",
+    "@quenty/loader": "3.1.1",
+    "@quenty/maid": "2.0.1",
+    "@quenty/promise": "3.2.1-canary.8533eea.0",
+    "@quenty/remoting": "3.2.1-canary.8533eea.0",
+    "@quenty/rxbinderutils": "4.5.1-canary.8533eea.0",
+    "@quenty/servicebag": "3.2.1",
+    "@quenty/signal": "2.0.0",
+    "@quenty/table": "2.1.0",
+    "@quenty/timesyncservice": "3.2.1-canary.8533eea.0",
+    "@quenty/valueobject": "3.4.1-canary.8533eea.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a0583027b100d718bce1603ec6c525ad99adeeac"
+  "gitHead": "8533eeade3bf6835c0295785c1c326b9abee3222"
 }

package/src/Client/CooldownTracker.lua

@@ -6,8 +6,8 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local CooldownBindersClient = require("CooldownBindersClient")
-local CooldownConstants = require("CooldownConstants")
 local ValueObject = require("ValueObject")
+local RxBinderUtils = require("RxBinderUtils")
 
 local CooldownTracker = setmetatable({}, BaseObject)
 CooldownTracker.ClassName = "CooldownTracker"
@@ -16,9 +16,11 @@ CooldownTracker.__index = CooldownTracker
 function CooldownTracker.new(serviceBag, parent)
 	local self = setmetatable(BaseObject.new(parent), CooldownTracker)
 
-	self._serviceBag = assert(serviceBag, "No serviceBag")
 	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)
 
@@ -26,17 +28,27 @@ function CooldownTracker.new(serviceBag, parent)
 		self:_handleNewCooldown(...)
 	end))
 
-	self._maid:GiveTask(self._obj.ChildAdded:Connect(function(child)
-		self:_handleChild(child)
-	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
 
-	-- Do initial loading
-	do
-		local child = self._obj:FindFirstChild(CooldownConstants.COOLDOWN_NAME)
-		if child then
-			self:_handleChild(child)
-		end
-	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
@@ -51,10 +63,4 @@ function CooldownTracker:_handleNewCooldown(new, _old, maid)
 	end
 end
 
-function CooldownTracker:_handleChild(child)
-	if child.Name == CooldownConstants.COOLDOWN_NAME then
-		self.CurrentCooldown.Value = self._serviceBag:GetService(CooldownBindersClient).Cooldown:Get(child)
-	end
-end
-
 return CooldownTracker

package/src/Server/Cooldown.lua

@@ -23,7 +23,7 @@ function Cooldown.new(obj, serviceBag)
 	self._startTime.Parent = self._obj
 
 	-- Delay for cooldown time
-	delay(self._obj.Value, function()
+	task.delay(self._obj.Value, function()
 		if self.Destroy then
 			self._obj:Destroy()
 		end

package/src/Shared/CooldownBase.lua

@@ -48,7 +48,7 @@ function CooldownBase:GetTimeRemaining()
 		return nil
 	end
 
-	return endTime - self._syncedClock:GetTime()
+	return math.max(0, endTime - self._syncedClock:GetTime())
 end
 
 function CooldownBase:GetEndTime()