Update v1.9.6

* Fixed the new Callbacks

Author: Musiker15

VERSION

@@ -1 +1 @@
-1.9.5
+1.9.6

client/cl_callback.lua

@@ -1,31 +1,41 @@
 local callbackRequest = {}
+local CallbackHandler = {}
+
+AddEventHandler('onResourceStop', function(resource)
+	if CallbackHandler[resource] then
+        RemoveEventHandler(CallbackHandler[resource])
+    end
+end)
 
 -- NEW Method for Client Callbacks
-MSK.RegisterClientCallback = function(name, cb)
-    RegisterNetEvent(('events-request-%s'):format(name), function (ticket, ...)
-        TriggerServerEvent(('events-resolve-%s-%s'):format(name, ticket), cb(...))
+MSK.RegisterClientCallback = function(eventName, cb)
+    local handler = RegisterNetEvent(('events-request-%s'):format(eventName), function (ticket, ...)
+        TriggerServerEvent(('events-resolve-%s-%s'):format(eventName, ticket), cb(...))
     end)
+
+    local script = GetInvokingResource()
+    if script then CallbackHandler[script] = handler end
 end
 exports('RegisterClientCallback', MSK.RegisterClientCallback)
 
 -- NEW Method for Server Callbacks
-MSK.Trigger = function(name, ...)
+MSK.Trigger = function(eventName, ...)
     local p = promise.new()
     local ticket = GetGameTimer() .. GetPlayerServerId(PlayerId())
 
     SetTimeout(5000, function()
-        p:reject({err="Request Timed Out (408)"})
+        p:reject("Request Timed Out (408)")
     end)
 
-    local handler = RegisterNetEvent(('events-resolve-%s-%s'):format(name, ticket), function(data)
-        p:resolve(data)
+    local handler = RegisterNetEvent(('events-resolve-%s-%s'):format(eventName, ticket), function(...)
+        p:resolve({...})
     end)
 
-    TriggerServerEvent(('events-request-%s'):format(name), ticket, ...)
+    TriggerServerEvent(('events-request-%s'):format(eventName), ticket, ...)
 
     local result = Citizen.Await(p)
     RemoveEventHandler(handler)
-    return result
+    return table.unpack(result)
 end
 
 -- OLD Method for Server Callbacks

client/main.lua

@@ -74,7 +74,7 @@ MSK.HasItem = function(item)
         return logging('error', ('Function %s can not used without Framework!'):format('MSK.HasItem'))
     end
 
-    local hasItem = MSK.TriggerCallback('msk_core:hasItem', item)
+    local hasItem = MSK.Trigger('msk_core:hasItem', item)
     return hasItem
 end
 exports('HasItem', MSK.HasItem)

common/common.lua

@@ -137,5 +137,5 @@ end)
 
 logging = function(code, ...)
     if not Config.Debug then return end
-    print(script, Config.LoggingTypes[code], ...)
+    print(Config.LoggingTypes[code], ...)
 end

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_core'
 description 'Core functions for MSK Scripts'
-version '1.9.5'
+version '1.9.6'
 
 lua54 'yes'
 

server/sv_callback.lua

@@ -1,30 +1,41 @@
 local Callbacks = {}
+local CallbackHandler = {}
+
+AddEventHandler('onResourceStop', function(resource)
+	if CallbackHandler[resource] then
+        RemoveEventHandler(CallbackHandler[resource])
+    end
+end)
 
 -- NEW Method for Server Callbacks
-MSK.Register = function(name, cb)
-    RegisterNetEvent(('events-request-%s'):format(name), function (ticket, ...)
-        TriggerClientEvent(('events-resolve-%s-%s'):format(name, ticket), source, cb(source, ...))
-    end) 
+MSK.Register = function(eventName, cb)
+    local handler = RegisterNetEvent(('events-request-%s'):format(eventName), function (ticket, ...)
+        print(('events-request-%s'):format(eventName), ticket, ...)
+        TriggerClientEvent(('events-resolve-%s-%s'):format(eventName, ticket), source, cb(source, ...))
+    end)
+
+    local script = GetInvokingResource()
+    if script then CallbackHandler[script] = handler end
 end
 
 -- NEW Method for Client Callbacks
-MSK.TriggerClientCallback = function(name, playerId, ...)
+MSK.TriggerClientCallback = function(eventName, playerId, ...)
     local p = promise.new()
     local ticket = GetGameTimer() .. playerId
 
     SetTimeout(5000, function()
-        p:reject({err="Request Timed Out (408)"})
+        p:reject("Request Timed Out (408)")
     end)
 
-    local handler = RegisterNetEvent(('events-resolve-%s-%s'):format(name, ticket), function(data)
-        p:resolve(data)
+    local handler = RegisterNetEvent(('events-resolve-%s-%s'):format(eventName, ticket), function(...)
+        p:resolve({...})
     end)
 
-    TriggerClientEvent(('events-request-%s'):format(name), playerId, ticket, ...)
+    TriggerClientEvent(('events-request-%s'):format(eventName), playerId, ticket, ...)
 
     local result = Citizen.Await(p)
     RemoveEventHandler(handler)
-    return result
+    return table.unpack(result)
 end
 exports('TriggerClientCallback', MSK.TriggerClientCallback)