refactor(imports/callback): new syntax

BREAKING!
This commit is contained in:
Linden
2022-02-28 17:14:18 +11:00
parent aeccbece09
commit 4ae20d4dad
2 changed files with 25 additions and 25 deletions

View File

@@ -13,23 +13,28 @@ local function callbackTimer(event, delay)
return true return true
end end
local function startCallback(resource, event, ...) local function triggerCallback(event, ...)
local id = math.random(0, 100000) local id = math.random(0, 100000)
event = ('__cb_%s:%s'):format(resource, event) event = ('__cb_%s'):format(event)
TriggerServerEvent(event, id, ...) TriggerServerEvent(event, id, ...)
return event..id return event..id
end end
local ServerCallback = table.create(0, 2) ---Sends an event to the server and triggers a callback function once the response is returned.
---```
---callback(event: string, delay: number, function(...)
--- print(...)
---end)
---```
local callback = {}
---@param resource string
---@param event string ---@param event string
---@param delay number prevent the event from being called for the given time ---@param delay number prevent the event from being called for the given time
--- Sends an event to the server and halts the current thread until a response is returned. --- Sends an event to the server and halts the current thread until a response is returned.
ServerCallback.Await = function(resource, event, delay, ...) function callback.await(event, delay, ...)
if callbackTimer(event, delay) then if callbackTimer(event, delay) then
local promise = promise.new() local promise = promise.new()
event = RegisterNetEvent(startCallback(resource, event, ...), function(response) event = RegisterNetEvent(triggerCallback(event, ...), function(response)
promise:resolve(response) promise:resolve(response)
RemoveEventHandler(event) RemoveEventHandler(event)
end) end)
@@ -37,18 +42,13 @@ ServerCallback.Await = function(resource, event, delay, ...)
end end
end end
---@param resource string return setmetatable(callback, {
---@param event string __call = function(event, delay, cb, ...)
---@param delay number if callbackTimer(event, delay) then
---@param cb function event = RegisterNetEvent(triggerCallback(event, ...), function(response)
--- Sends an event to the server and triggers a callback function once the response is returned. cb(table.unpack(response))
ServerCallback.Async = function(resource, event, delay, cb, ...) RemoveEventHandler(event)
if callbackTimer(event, delay) then end)
event = RegisterNetEvent(startCallback(resource, event, ...), function(response) end
cb(table.unpack(response))
RemoveEventHandler(event)
end)
end end
end })
return ServerCallback

View File

@@ -1,14 +1,14 @@
local ServerCallback = {} local callback = {}
---@param name string ---@param name string
---@param callback function ---@param callback function
--- Registers an event handler and callback function to respond to client requests. --- Registers an event handler and callback function to respond to client requests.
ServerCallback.Register = function(name, callback) function callback.register(name, cb)
name = ('__cb_%s:%s'):format(GetCurrentResourceName(), name) name = ('__cb_%s'):format(name)
RegisterServerEvent(name, function(id, ...) RegisterServerEvent(name, function(id, ...)
TriggerClientEvent(name..id, source, {callback(source, ...)}) TriggerClientEvent(name..id, source, {cb(source, ...)})
end) end)
end end
return ServerCallback return callback