mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
remove _http_error_callbacks
This commit is contained in:
parent
dad67db835
commit
a773dfbd0e
1 changed files with 20 additions and 27 deletions
|
|
@ -98,7 +98,6 @@ local _udp_server_callbacks = {}
|
||||||
local _udp_client_datagram_callbacks = {}
|
local _udp_client_datagram_callbacks = {}
|
||||||
local _udp_client_open_callbacks = {}
|
local _udp_client_open_callbacks = {}
|
||||||
local _http_response_callbacks = {}
|
local _http_response_callbacks = {}
|
||||||
local _http_error_callbacks = {}
|
|
||||||
|
|
||||||
local http_request = network.__request
|
local http_request = network.__request
|
||||||
local open_tcp = network.__open_tcp
|
local open_tcp = network.__open_tcp
|
||||||
|
|
@ -116,9 +115,6 @@ local function request(url, params)
|
||||||
if params.on_response then
|
if params.on_response then
|
||||||
_http_response_callbacks[id] = params.on_response
|
_http_response_callbacks[id] = params.on_response
|
||||||
end
|
end
|
||||||
if params.on_error then
|
|
||||||
_http_error_callbacks[id] = params.on_error
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
network.request = request
|
network.request = request
|
||||||
|
|
@ -128,7 +124,11 @@ network.get = function(url, callback, errorCallback, headers)
|
||||||
method = "GET",
|
method = "GET",
|
||||||
headers = headers,
|
headers = headers,
|
||||||
on_response = function(response)
|
on_response = function(response)
|
||||||
callback(response.body)
|
if response.status / 100 == 2 then
|
||||||
|
return callback(response.body)
|
||||||
|
else
|
||||||
|
return errorCallback(response.status, response.body)
|
||||||
|
end
|
||||||
end,
|
end,
|
||||||
on_error = function(response)
|
on_error = function(response)
|
||||||
errorCallback(response.status, response.body)
|
errorCallback(response.status, response.body)
|
||||||
|
|
@ -142,11 +142,12 @@ network.get_binary = function(url, callback, errorCallback, headers)
|
||||||
method = "GET",
|
method = "GET",
|
||||||
headers = headers,
|
headers = headers,
|
||||||
on_response = callback and (function (response)
|
on_response = callback and (function (response)
|
||||||
return callback(Bytearray(response.body))
|
if response.code / 100 == 2 then
|
||||||
|
return callback(Bytearray(response.body))
|
||||||
|
else
|
||||||
|
return errorCallback(response.status, response.body)
|
||||||
|
end
|
||||||
end),
|
end),
|
||||||
on_error = function(response)
|
|
||||||
errorCallback(response.status, response.body)
|
|
||||||
end,
|
|
||||||
follow_location = true,
|
follow_location = true,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
@ -159,11 +160,13 @@ network.post = function(url, body, callback, errorCallback, headers)
|
||||||
}, headers),
|
}, headers),
|
||||||
body = body,
|
body = body,
|
||||||
on_response = function(response)
|
on_response = function(response)
|
||||||
callback(response.body)
|
if response.code / 100 == 2 then
|
||||||
end,
|
return callback(Bytearray(response.body))
|
||||||
on_error = function(response)
|
else
|
||||||
errorCallback(response.status, response.body)
|
return errorCallback(response.status, response.body)
|
||||||
|
end
|
||||||
end,
|
end,
|
||||||
|
follow_location = true,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -276,20 +279,10 @@ network.__process_events = function()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif etype == RESPONSE then
|
elseif etype == RESPONSE then
|
||||||
if event[2] / 100 == 2 then
|
local callback = _http_response_callbacks[event[3]]
|
||||||
local callback = _http_response_callbacks[event[3]]
|
_http_response_callbacks[event[3]] = nil
|
||||||
_http_response_callbacks[event[3]] = nil
|
if callback then
|
||||||
_http_error_callbacks[event[3]] = nil
|
callback(event[4])
|
||||||
if callback then
|
|
||||||
callback(event[4])
|
|
||||||
end
|
|
||||||
else
|
|
||||||
local callback = _http_error_callbacks[event[3]]
|
|
||||||
_http_response_callbacks[event[3]] = nil
|
|
||||||
_http_error_callbacks[event[3]] = nil
|
|
||||||
if callback then
|
|
||||||
callback(event[4])
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue