@quenty/textserviceutils 7.8.0 → 7.9.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.9.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/textserviceutils@7.8.0...@quenty/textserviceutils@7.9.0) (2023-01-17)
+
+
+### Bug Fixes
+
+* Fix issue where TextServiceUtils.promiseTextBounds(params) may stack overflow while processing text bounds workaround ([2c887fc](https://github.com/Quenty/NevermoreEngine/commit/2c887fce4b5a4b4a19ad2f68c84c591778b0e349))
+
+
+
+
+
 # [7.8.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/textserviceutils@7.7.0...@quenty/textserviceutils@7.8.0) (2023-01-11)
 
 **Note:** Version bump only for package @quenty/textserviceutils

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/textserviceutils",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "description": "Holds utilities involving the Roblox TextService and text fitting to size.",
   "keywords": [
     "Roblox",
@@ -35,5 +35,5 @@
     "@quenty/promise": "^6.0.1",
     "@quenty/rx": "^7.4.0"
   },
-  "gitHead": "db2db00ab4e24a3eab0449b77a00bee6d91f2755"
+  "gitHead": "a89a3f27cad25767cd645b91cdc2a2881afeecd5"
 }

package/src/Shared/TextServiceUtils.lua

@@ -34,7 +34,62 @@ function TextServiceUtils.getSizeForLabel(textLabel, text, maxWidth)
 	return TextService:GetTextSize(text, textLabel.TextSize, textLabel.Font, Vector2.new(maxWidth, 1e6))
 end
 
-local lastPromise = nil
+local queue = {}
+local queueRunning = false
+
+local function startQueueProcess()
+	if queueRunning then
+		return
+	end
+
+	queueRunning = true
+
+	task.spawn(function()
+		while #queue > 0 do
+			local data = table.remove(queue)
+			local startTime = os.clock()
+
+			local result = TextServiceUtils._promiseTextBounds(data.params)
+			local promiseTimeoutOrDone = Promise.new()
+
+			result:Then(function(v2)
+				task.spawn(function()
+					data.promise:Resolve(v2)
+				end)
+
+				promiseTimeoutOrDone:Resolve()
+			end)
+
+			local pendingTask = task.delay(5, function()
+				if data.promise:IsPending() then
+					warn("[TextServiceUtils] - Timed out promise while processing queue")
+					promiseTimeoutOrDone:Reject()
+				end
+			end)
+
+			local ok = promiseTimeoutOrDone:Yield()
+
+			-- Cancel our delayed task
+			task.cancel(pendingTask)
+
+			if not ok then
+				warn("[TextServiceUtils] - Requeuing entry")
+				table.insert(queue, data)
+
+				local timeElapsed = os.clock() - startTime
+				local remainingTime = 0.05 - timeElapsed
+
+				-- Yield incase we requeue very quickly
+				if remainingTime > 0 then
+					task.wait(remainingTime)
+				end
+			end
+
+		end
+
+		queueRunning = false
+	end)
+end
 
 --[=[
 	Promises the text bounds for the given parameters
@@ -47,39 +102,14 @@ function TextServiceUtils.promiseTextBounds(params)
 
 	-- https://devforum.roblox.com/t/calling-textservicegettextboundsasync-multiple-times-leads-to-requests-never-completing-thread-leaks/2083178
 	-- This is a hack to work around a Roblox bug.
-	local promise
-	if lastPromise then
-		promise = lastPromise:Finally(function()
-			return Promise.defer(function(resolve, reject)
-				resolve(TextServiceUtils._promiseTextBounds(params))
-
-				-- We don't want everything breaking
-				task.delay(5, function()
-					reject("Timed out")
-				end)
-			end)
-		end)
-	else
-		promise = TextServiceUtils._promiseTextBounds(params)
 
-		-- We don't want everything breaking
-		task.delay(5, function()
-			promise:Reject("Timed out")
-		end)
-	end
-
-
-	-- Store this so we act as a queue :)
-	lastPromise = promise
+	local promise = Promise.new()
+	table.insert(queue, {
+		params = params;
+		promise = promise;
+	})
 
-	-- Clean up
-	promise:Finally(function()
-		task.defer(function()
-			if lastPromise == promise then
-				lastPromise = nil
-			end
-		end)
-	end)
+	startQueueProcess();
 
 	return promise
 end
@@ -156,7 +186,7 @@ function TextServiceUtils.observeSizeForLabelProps(props)
 				local params = Instance.new("GetTextBoundsParams")
 				params.Text = state.Text
 				params.Size = state.TextSize
-				params.Font = state.Font
+				params.Font = state.FontFace
 				params.Width = state.MaxSize.x
 
 				return Rx.fromPromise(TextServiceUtils.promiseTextBounds(params))
@@ -164,6 +194,9 @@ function TextServiceUtils.observeSizeForLabelProps(props)
 				local size = TextService:GetTextSize(state.Text, state.TextSize, state.Font, state.MaxSize)
 
 				return Rx.of(Vector2.new(size.x, state.LineHeight*size.y))
+			else
+				warn("[TextServiceUtils.observeSizeForLabelProps] - Got neither FontFace or Font")
+				return Rx.of(Vector2.new(0, 0))
 			end
 		end)
 	})