Merge pull request #603 from Quenty/users/quenty/secrets

feat: Support Roblox secrets in secrets service

Author: Quenty

src/coreguienabler/src/Client/CoreGuiEnabler.lua

@@ -97,8 +97,9 @@ function CoreGuiEnabler.new(): CoreGuiEnabler
 		UserInputService.ModalEnabled = not isEnabled
 	end)
 
+	local wasEnabled = StarterPlayer.EnableMouseLockOption
 	self:AddState("EnableMouseLockOption", function(isEnabled)
-		StarterPlayer.EnableMouseLockOption = isEnabled
+		StarterPlayer.EnableMouseLockOption = wasEnabled and isEnabled
 	end)
 
 	self:AddState("MouseIconEnabled", function(isEnabled)

src/playerutils/package.json

@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "@quenty/brio": "file:../brio",
+    "@quenty/characterutils": "file:../characterutils",
     "@quenty/instanceutils": "file:../instanceutils",
     "@quenty/loader": "file:../loader",
     "@quenty/maid": "file:../maid",

src/playerutils/src/Shared/RxPlayerUtils.lua

@@ -12,6 +12,8 @@ local Brio = require("Brio")
 local Maid = require("Maid")
 local Observable = require("Observable")
 local Rx = require("Rx")
+local RxBrioUtils = require("RxBrioUtils")
+local RxCharacterUtils = require("RxCharacterUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
 
 local RxPlayerUtils = {}
@@ -52,6 +54,28 @@ function RxPlayerUtils.observePlayersBrio(predicate: Rx.Predicate<Player>?): Obs
 	end) :: any
 end
 
+--[=[
+	Observes the character model for the player
+]=]
+function RxPlayerUtils.observeCharactersBrio(): Observable.Observable<Brio.Brio<Model>>
+	return RxPlayerUtils.observePlayersBrio():Pipe({
+		RxBrioUtils.flatMapBrio(function(player)
+			return RxCharacterUtils.observeLastCharacterBrio(player)
+		end) :: any,
+	}) :: any
+end
+
+--[=[
+	Observes the character model for the player
+]=]
+function RxPlayerUtils.observeHumanoidsBrio(): Observable.Observable<Brio.Brio<Humanoid>>
+	return RxPlayerUtils.observePlayersBrio():Pipe({
+		RxBrioUtils.flatMapBrio(function(player)
+			return RxCharacterUtils.observeLastHumanoidBrio(player)
+		end) :: any,
+	}) :: any
+end
+
 --[=[
 	Observes the current local player
 

src/secrets/src/Server/Cmdr/SecretsCommandService.lua

@@ -103,7 +103,7 @@ function SecretsCommandService:_registerCommands()
 		local secret = self._secretsService:PromiseSecret(secretKey):Wait()
 
 		if secret then
-			return secret
+			return tostring(secret)
 		else
 			return "<no value>"
 		end

src/secrets/src/Server/SecretsService.lua

@@ -4,6 +4,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local HttpService = game:GetService("HttpService")
+
 local EllipticCurveCryptography = require("EllipticCurveCryptography")
 local GetRemoteFunction = require("GetRemoteFunction")
 local Maid = require("Maid")
@@ -65,9 +67,17 @@ end
 	@param secretKey string
 	@return Promise<string>
 ]=]
-function SecretsService:PromiseSecret(secretKey: string): Promise.Promise<string>
+function SecretsService:PromiseSecret(secretKey: string): Promise.Promise<string | Secret>
 	assert(type(secretKey) == "string", "Bad secretKey")
 
+	local found
+	local loadOk, _err = pcall(function()
+		found = HttpService:GetSecret(secretKey)
+	end)
+	if loadOk and found then
+		return Promise.resolved(found)
+	end
+
 	return self:_promiseSubstore():Then(function(substore)
 		return self._maid:GivePromise(substore:Load(secretKey)):Then(function(data)
 			if type(data) ~= "table" then