refactor(callbacks): remove the cb argument

BREAKING CHANGE: Registered callbacks now return values rather than sending them as a callback.

Previously the cb needed to be called to return to the client, now it will happen once the function closes. i.e.

cb(string, string, false) -> return string, string, false
This commit is contained in:
Linden
2022-01-01 20:43:06 +11:00
parent 2084897785
commit 72575c90ee
3 changed files with 14 additions and 17 deletions

View File

@@ -29,8 +29,8 @@ local ServerCallback = table.create(0, 2)
ServerCallback.Await = function(resource, event, delay, ...)
if callbackTimer(event, delay) then
local promise = promise.new()
event = RegisterNetEvent(startCallback(resource, event, ...), function(...)
promise:resolve({...})
event = RegisterNetEvent(startCallback(resource, event, ...), function(response)
promise:resolve(response)
RemoveEventHandler(event)
end)
return table.unpack(Citizen.Await(promise))
@@ -44,8 +44,8 @@ end
--- Sends an event to the server and triggers a callback function once the response is returned.
ServerCallback.Async = function(resource, event, delay, cb, ...)
if callbackTimer(event, delay) then
event = RegisterNetEvent(startCallback(resource, event, ...), function(...)
cb(...)
event = RegisterNetEvent(startCallback(resource, event, ...), function(response)
cb(table.unpack(response))
RemoveEventHandler(event)
end)
end