callbacks update

Restructured callbacks to follow ox' return pattern
This commit is contained in:
gononono64 committed 2025-03-31 03:43:08 -05:00
1 parent 48476e319b
commit 3e936d2c1c
3 files changed
+31 -41

No files matched your search

+13 -19
View File
@@ -42,12 +42,8 @@ RegisterNetEvent(clientToServerName, function(name, cbId, ...)
local toAll = data.toAll and -1 or src
-- Create response handler
local cb = function(...)
TriggerClientEvent(clientToServerBackToClientName, toAll, name, cbId, ...)
end
-- Call the callback
func(src, cb, ...)
local packed = table.pack(func(src, ...))
TriggerClientEvent(clientToServerBackToClientName, toAll, name, cbId, table.unpack(packed))
end)
-- Server to client trigger function - supports both callback and direct return
@@ -79,12 +75,15 @@ function Callback.Trigger(name, src, callbackOrArg, ...)
end
-- If no callback was provided, wait for the promise and return directly
if not hasCallback then
return Citizen.Await(p)
local result = Citizen.Await(p)
-- If there's only one value, return it directly
if #result == 1 then
return result[1]
else
return table.unpack(result or {})
end
-- Otherwise, return nothing (callback will handle it)
return nil
end
-- Handle responses to server requests
@@ -93,10 +92,10 @@ RegisterNetEvent(serverToClientBackToServerName, function(name, cbId, ...)
if not data then return end
-- Process callback if provided
if data.cb then
data.cb(...)
data.cb({...})
end
-- Always resolve the promise with all args for direct returns
data.p:resolve({...})
cbData[cbId] = nil
@@ -188,12 +187,7 @@ RegisterNetEvent(serverToClientName, function(name, cbId, ...)
if not func then return end
-- Create response handler
local cb = function(...)
TriggerServerEvent(serverToClientBackToServerName, name, cbId, ...)
end
-- Execute the callback
func(cb, ...)
TriggerServerEvent(serverToClientBackToServerName, name, cbId, func(...))
end)
exports('RegisterCallback', Callback.Register)