@quenty/userserviceutils 9.14.0 → 9.14.1-canary.522.1d2faf4.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.
 
+## [9.14.1-canary.522.1d2faf4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/userserviceutils@9.14.0...@quenty/userserviceutils@9.14.1-canary.522.1d2faf4.0) (2024-12-03)
+
+
+### Bug Fixes
+
+* Fix username query ([a605933](https://github.com/Quenty/NevermoreEngine/commit/a605933b1375e0f0fc4e55f9d1c8dbf9e5893c4b))
+
+
+
+
+
 # [9.14.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/userserviceutils@9.13.0...@quenty/userserviceutils@9.14.0) (2024-11-13)
 
 **Note:** Version bump only for package @quenty/userserviceutils

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/userserviceutils",
-  "version": "9.14.0",
+  "version": "9.14.1-canary.522.1d2faf4.0",
   "description": "Utilities involving UserService in Roblox",
   "keywords": [
     "Roblox",
@@ -25,16 +25,17 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^10.7.1",
-    "@quenty/loader": "^10.7.1",
-    "@quenty/maid": "^3.4.0",
-    "@quenty/math": "^2.7.0",
-    "@quenty/promise": "^10.8.0",
-    "@quenty/rx": "^13.13.0",
-    "@quenty/servicebag": "^11.10.0"
+    "@quenty/aggregator": "1.0.1-canary.522.1d2faf4.0",
+    "@quenty/baseobject": "10.7.1",
+    "@quenty/loader": "10.7.1",
+    "@quenty/maid": "3.4.0",
+    "@quenty/math": "2.7.0",
+    "@quenty/promise": "10.8.0",
+    "@quenty/rx": "13.13.1-canary.522.1d2faf4.0",
+    "@quenty/servicebag": "11.10.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "451334becfa36a10b55fa53cbdd88091cdf9ddbf"
+  "gitHead": "1d2faf48e778ada6f57aecb8000c7c6c76ac33cd"
 }

package/src/Shared/UserInfoAggregator.lua

@@ -6,12 +6,10 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local Aggregator = require("Aggregator")
 local BaseObject = require("BaseObject")
-local Promise = require("Promise")
-local UserServiceUtils = require("UserServiceUtils")
 local Rx = require("Rx")
-
-local MAX_USER_IDS_PER_REQUEST = 200
+local UserServiceUtils = require("UserServiceUtils")
 
 local UserInfoAggregator = setmetatable({}, BaseObject)
 UserInfoAggregator.ClassName = "UserInfoAggregator"
@@ -20,11 +18,9 @@ UserInfoAggregator.__index = UserInfoAggregator
 function UserInfoAggregator.new()
 	local self = setmetatable(BaseObject.new(), UserInfoAggregator)
 
-	-- TODO: LRU cache this? Limit to 1k or something?
-	self._promises = {}
-
-	self._unsentCount = 0
-	self._unsentPromises = {}
+	self._aggregator = self._maid:Add(Aggregator.new("UserServiceUtils.promiseUserInfosByUserIds", function(userIdList)
+		return UserServiceUtils.promiseUserInfosByUserIds(userIdList)
+	end))
 
 	return self
 end
@@ -39,19 +35,7 @@ end
 function UserInfoAggregator:PromiseUserInfo(userId)
 	assert(type(userId) == "number", "Bad userId")
 
-	if self._promises[userId] then
-		return self._promises[userId]
-	end
-
-	local promise = Promise.new()
-
-	self._unsentPromises[userId] = promise
-	self._unsentCount = self._unsentCount + 1
-	self._promises[userId] = promise
-
-	self:_queueAggregatedPromises()
-
-	return promise
+	return self._aggregator:Promise(userId)
 end
 
 --[=[
@@ -63,24 +47,24 @@ end
 function UserInfoAggregator:PromiseDisplayName(userId)
 	assert(type(userId) == "number", "Bad userId")
 
-	return self:PromiseUserInfo(userId)
+	return self._aggregator:Promise(userId)
 		:Then(function(userInfo)
 			return userInfo.DisplayName
 		end)
 end
 
 --[=[
-	Promises the user display name for the userId
+	Promises the Username for the userId
 
 	@param userId number
 	@return Promise<string>
 ]=]
-function UserInfoAggregator:PromiseDisplayName(userId)
+function UserInfoAggregator:PromiseUsername(userId)
 	assert(type(userId) == "number", "Bad userId")
 
-	return self:PromiseUserInfo(userId)
+	return self._aggregator:Promise(userId)
 		:Then(function(userInfo)
-			return userInfo.DisplayName
+			return userInfo.Username
 		end)
 end
 
@@ -93,7 +77,7 @@ end
 function UserInfoAggregator:PromiseHasVerifiedBadge(userId)
 	assert(type(userId) == "number", "Bad userId")
 
-	return self:PromiseUserInfo(userId)
+	return self._aggregator:Promise(userId)
 		:Then(function(userInfo)
 			return userInfo.HasVerifiedBadge
 		end)
@@ -108,7 +92,7 @@ end
 function UserInfoAggregator:ObserveUserInfo(userId)
 	assert(type(userId) == "number", "Bad userId")
 
-	return Rx.fromPromise(self:PromiseUserInfo(userId))
+	return self._aggregator:Observe(userId)
 end
 
 --[=[
@@ -120,78 +104,43 @@ end
 function UserInfoAggregator:ObserveDisplayName(userId)
 	assert(type(userId) == "number", "Bad userId")
 
-	return self:ObserveUserInfo():Pipe({
+	return self._aggregator:Observe(userId):Pipe({
 		Rx.map(function(userInfo)
 			return userInfo.DisplayName
 		end)
 	})
 end
 
-function UserInfoAggregator:_sendAggregatedPromises(promiseMap)
-	assert(promiseMap, "No promiseMap")
-
-	local userIds = {}
-	local unresolvedMap = {}
-	for userId, promise in pairs(promiseMap) do
-		table.insert(userIds, userId)
-		unresolvedMap[userId] = promise
-	end
-
-	if #userIds == 0 then
-		return
-	end
-
-	assert(#userIds <= MAX_USER_IDS_PER_REQUEST, "Too many userIds sent")
-
-	self._maid:GivePromise(UserServiceUtils.promiseUserInfosByUserIds(userIds))
-		:Then(function(result)
-			assert(type(result) == "table", "Bad result")
-
-			for _, data in pairs(result) do
-				assert(type(data.Id) == "number", "Bad result[?].Id")
-
-				if unresolvedMap[data.Id] then
-					unresolvedMap[data.Id]:Resolve(data)
-					unresolvedMap[data.Id] = nil
-				end
-			end
-
-			-- Reject other ones
-			for userId, promise in pairs(unresolvedMap) do
-				promise:Reject(string.format("Failed to get result for userId %d", userId))
-			end
-		end, function(...)
-			for _, item in pairs(unresolvedMap) do
-				item:Reject(...)
-			end
-		end)
-end
-
-function UserInfoAggregator:_resetQueue()
-	local promiseMap = self._unsentPromises
+--[=[
+	Observes the Username for the userId
 
-	self._maid._queue = nil
-	self._unsentCount = 0
-	self._unsentPromises = {}
+	@param userId number
+	@return Observable<string>
+]=]
+function UserInfoAggregator:ObserveUsername(userId)
+	assert(type(userId) == "number", "Bad userId")
 
-	return promiseMap
+	return self._aggregator:Observe(userId):Pipe({
+		Rx.map(function(userInfo)
+			return userInfo.Username
+		end)
+	})
 end
 
-function UserInfoAggregator:_queueAggregatedPromises()
-	if self._unsentCount >= MAX_USER_IDS_PER_REQUEST then
-		self:_sendAggregatedPromises(self:_resetQueue())
-		return
-	end
+--[=[
+	Observes the user display name for the userId
 
-	if self._maid._queue then
-		return
-	end
+	@param userId number
+	@return Observable<boolean>
+]=]
+function UserInfoAggregator:ObserveHasVerifiedBadge(userId)
+	assert(type(userId) == "number", "Bad userId")
 
-	self._maid._queue = task.delay(0.1, function()
-		task.spawn(function()
-			self:_sendAggregatedPromises(self:_resetQueue())
+	return self._aggregator:Observe(userId):Pipe({
+		Rx.map(function(userInfo)
+			return userInfo.HasVerifiedBadge
 		end)
-	end)
+	})
 end
 
 return UserInfoAggregator

package/src/Shared/UserInfoService.lua

@@ -42,7 +42,7 @@ end
 function UserInfoService:ObserveUserInfo(userId)
 	assert(type(userId) == "number", "Bad userId")
 
-	return self._aggregator:ObserveDisplayName(userId)
+	return self._aggregator:ObserveUserInfo(userId)
 end
 
 --[=[
@@ -57,6 +57,18 @@ function UserInfoService:PromiseDisplayName(userId)
 	return self._aggregator:PromiseDisplayName(userId)
 end
 
+--[=[
+	Promises the Username for the userId
+
+	@param userId number
+	@return Promise<string>
+]=]
+function UserInfoService:PromiseUsername(userId)
+	assert(type(userId) == "number", "Bad userId")
+
+	return self._aggregator:PromiseUsername(userId)
+end
+
 --[=[
 	Observes the user display name for the userId