From 72575c90ee17d67934d36f469aa97a5b8727f415 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Sat, 1 Jan 2022 20:43:06 +1100
Subject: [PATCH] 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
---
 fxmanifest.lua               |  2 +-
 imports/callbacks/client.lua |  8 ++++----
 imports/callbacks/server.lua | 21 +++++++++------------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/fxmanifest.lua b/fxmanifest.lua
index dcf0150..c9bec70 100644
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -23,7 +23,7 @@ game         'gta5'
 --[[ Resource Information ]]--
 name         'pe-lualib'
 author       'Linden'
-version      '1.2.1'
+version      '1.3.0'
 repository   'https://github.com/project-error/pe-lualib'
 description  'A library of shared functions to utilise in other resources.'
 
diff --git a/imports/callbacks/client.lua b/imports/callbacks/client.lua
index 93b99fa..c624c57 100644
--- a/imports/callbacks/client.lua
+++ b/imports/callbacks/client.lua
@@ -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
diff --git a/imports/callbacks/server.lua b/imports/callbacks/server.lua
index 03664d4..53a93cd 100644
--- a/imports/callbacks/server.lua
+++ b/imports/callbacks/server.lua
@@ -1,17 +1,14 @@
 local ServerCallback = {}
 
-	---@param name string
-	---@param callback function
-	--- Registers an event handler and callback function to respond to client requests.
-	ServerCallback.Register = function(name, callback)
-		name = ('__cb_%s:%s'):format(GetCurrentResourceName(), name)
+---@param name string
+---@param callback function
+--- Registers an event handler and callback function to respond to client requests.
+ServerCallback.Register = function(name, callback)
+	name = ('__cb_%s:%s'):format(GetCurrentResourceName(), name)
 
-		RegisterServerEvent(name, function(id, ...)
-			local source = source
-			callback(source, function(...)
-				TriggerClientEvent(name..id, source, ...)
-			end, ...)
-		end)
-	end
+	RegisterServerEvent(name, function(id, ...)
+		TriggerClientEvent(name..id, source, {callback(source, ...)})
+	end)
+end
 
 return ServerCallback
\ No newline at end of file