From b05594e77fdb6c129bf65f132fa66930c7af52b4 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Sat, 8 Oct 2022 22:20:46 +1100
Subject: [PATCH] fix(callback): pack nil values

See #117
---
 imports/callback/client.lua | 6 +++---
 imports/callback/server.lua | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/imports/callback/client.lua b/imports/callback/client.lua
index d16fff1..188e0ed 100644
--- a/imports/callback/client.lua
+++ b/imports/callback/client.lua
@@ -47,10 +47,10 @@ local function triggerServerCallback(_, event, delay, cb, ...)
 		events[key] = nil
 
 		if promise then
-			return promise:resolve(response or {})
+			return promise:resolve(response and { msgpack.unpack(response) } or {})
 		end
 
-		return cb and cb(table.unpack(response or {}))
+		return cb and cb(msgpack.unpack(response))
 	end
 
 	if promise then
@@ -79,7 +79,7 @@ local function callbackResponse(success, result, ...)
 		return false
 	end
 
-	return { result, ... }
+	return msgpack.pack(result, ...)
 end
 
 local pcall = pcall
diff --git a/imports/callback/server.lua b/imports/callback/server.lua
index dfb345c..dfc559a 100644
--- a/imports/callback/server.lua
+++ b/imports/callback/server.lua
@@ -28,10 +28,10 @@ local function triggerClientCallback(_, event, playerId, cb, ...)
 		events[key] = nil
 
 		if promise then
-			return promise:resolve(response or {})
+			return promise:resolve(response and { msgpack.unpack(response) } or {})
 		end
 
-		return cb and cb(table.unpack(response or {}))
+		return cb and cb(msgpack.unpack(response))
 	end
 
 	if promise then
@@ -60,7 +60,7 @@ local function callbackResponse(success, result, ...)
 		return false
 	end
 
-	return { result, ... }
+	return msgpack.pack(result, ...)
 end
 
 local pcall = pcall