Skip to content

net_c #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cryi merged 5 commits into from
Jan 21, 2026
Merged

net_c #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15139d9
net_c
cryi Jan 20, 2026
b772cf1
debug print net tests
cryi Jan 20, 2026
c947d05
restore net tests
cryi Jan 20, 2026
2f0be54
test
cryi Jan 20, 2026
9544d7c
updated lua corehttp
cryi Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,6 @@ jobs:
test-linux:
runs-on: ubuntu-latest
needs: [build-linux-x86_64, build-linux-aarch64, build-linux-riscv64]
env:
HTTPBIN_URL: http://localhost:80
services:
httpbin:
image: kennethreitz/httpbin
ports:
- 80:80
steps:
- uses: actions/checkout@v4
- uses: "./.github/template/prepare-test"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ jobs:
- name: test ami
run: |
cd ami
ls -la tests/assets/cli/
../release/eli-linux-x86_64 tests/all.lua

test-ascend:
Expand Down
2 changes: 1 addition & 1 deletion deps/lua-corehttp
Open in desktop
Submodule lua-corehttp updated 3 files
+1 −1 include/core_http_config.h
+483 −43 src/lcorehttp_response.c
+1 −1 src/lcorehttp_response.h
130 changes: 4 additions & 126 deletions lib/eli/net/http.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ local util = require"eli.util"
local hjson = require"hjson"
local table_extensions = require"eli.extensions.table"
local net_url = require"eli.net.url"
local zlib = require"zlib"
local base64 = require"base64"

local MINIMUM_BUFFER_CAPACITY = 1024
Expand Down Expand Up @@ -160,129 +159,6 @@ local function is_client_targeting_same_authority(client, url)
return scheme == client_scheme and host == client_host and port == client_port
end

-- // TODO: port to C
---@param response BaseResponse
---@param options RequestOptions
---@param progress_function (fun(total?: number, current: number))?
---@return string?, string?
local function read_content(response, options, progress_function)
local raw_response_data = ""

local response_headers = response:headers()
local content_length = response_headers["Content-Length"] and tonumber(response_headers["Content-Length"])
local content_encoding = response_headers["Content-Encoding"]

local total_bytes_read = 0
local inflate = (content_encoding == "deflate" or content_encoding == "gzip") and zlib.inflate() or false
local inflate_cache = ""

while true do
local buffer_capacity = math.min(options.buffer_capacity or DEFAULT_BUFFER_CAPACITY,
content_length - total_bytes_read)
local chunk = response:read(buffer_capacity)
if not chunk or type(chunk) ~= "string" then
if content_length > 0 and total_bytes_read ~= content_length then
local err_msg = string.interpolate(
"expected ${content_length} bytes, got ${total_bytes_read}",
{ content_length = content_length, total_bytes_read = total_bytes_read })
return nil, err_msg
end
break
end
total_bytes_read = total_bytes_read + #chunk
if type(progress_function) == "function" then
progress_function(content_length, total_bytes_read)
end
if inflate then
inflate_cache = inflate_cache .. chunk
local bytes_in
chunk, _, bytes_in = inflate(inflate_cache)
inflate_cache = inflate_cache:sub(bytes_in + 1) -- remove inflated part
end
if type(options.write_function) == "function" then
options.write_function(chunk)
else
raw_response_data = raw_response_data .. chunk
end
if total_bytes_read == content_length then break end
end
return raw_response_data
end

-- // TODO: port to C
--- comment
--- @param response any
--- @param options any
--- @return string?, string?
local function read_chunked_content(response, options)
local raw_response_data = ""

local response_headers = response:headers()
local content_encoding = response_headers["Content-Encoding"]

local inflate = (content_encoding == "deflate" or content_encoding == "gzip") and zlib.inflate() or false
local inflate_cache = ""

local data_cache = ""
---@type integer|nil
local expected_chunk_size
local available_data_size = 0

while true do
-- we always need either chunk size and 5 bytes for next chunk size or at least 3 bytes for chunk header
local bytes_needed = expected_chunk_size and (expected_chunk_size - available_data_size) + 5 or 3
if bytes_needed == 3 and available_data_size > 1 then
bytes_needed = data_cache:sub(-1) == "\r" and 1 or 2 -- we need only 1 or 2 bytes to close chunk header
end
local buffer_capacity = math.min(options.buffer_capacity or DEFAULT_BUFFER_CAPACITY, bytes_needed)

local data, data_length_or_error = response:read(buffer_capacity)
if not data or type(data) ~= "string" then
local error_msg = string.interpolate("cannot retrieve data: ${error}", { error = data_length_or_error })
return nil, error_msg
end
data_cache = data_cache .. data
available_data_size = available_data_size + data_length_or_error

while true do
if expected_chunk_size == nil then
local _, match_end = data_cache:find("\r\n", 1, true)
if match_end == 2 then
_, match_end = data_cache:find("\r\n", 3, true) -- skip \r\n
end
if not match_end then break end -- Not enough data to determine chunk size

expected_chunk_size = tonumber(data_cache:sub(1, match_end), 16)
if expected_chunk_size == 0 then return raw_response_data end -- Last chunk
data_cache = data_cache:sub(match_end + 1)
available_data_size = available_data_size - match_end
end

if available_data_size < expected_chunk_size then
break -- Not enough data to read the full chunk
end

local chunk = data_cache:sub(1, expected_chunk_size)
data_cache = data_cache:sub(expected_chunk_size + 1)
available_data_size = available_data_size - expected_chunk_size
expected_chunk_size = nil

if inflate then
inflate_cache = inflate_cache .. chunk
local bytes_in
chunk, _, bytes_in, _ = inflate(inflate_cache)
inflate_cache = inflate_cache:sub(bytes_in + 1) -- remove inflated part
end

if type(options.write_function) == "function" then
options.write_function(chunk)
else
raw_response_data = raw_response_data .. chunk
end
end
end
end

---Performs request
---@param client CorehttpClient
---@param path any
Expand Down Expand Up @@ -401,14 +277,16 @@ local function request(client, path, method, options, data)
local is_event_stream = response_headers["Content-Type"] == "text/event-stream"

if is_chunked_encoding then
raw_response_data, err = read_chunked_content(response, options)
raw_response_data, err = response:read_chunked_content(options.write_function, progress_function, options
.buffer_capacity)
if not raw_response_data then
return nil, err or "failed to read chunked content"
end
elseif is_event_stream then
return nil, "event stream not supported yet"
else
raw_response_data, err = read_content(response, options, progress_function)
raw_response_data, err = response:read_content(options.write_function, progress_function, options
.buffer_capacity)
if not raw_response_data then
return nil, err or "failed to read content"
end
Expand Down
7 changes: 6 additions & 1 deletion lib/tests/net.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ test["RestClient get"] = function ()
end
test.assert(response, "request failed - " .. tostring(err))
local data = response.data
test.assert(data.args.test[1] == "aaa" and data.args.test2[1] == "bbb", "Failed to verify result")
if data.args.test[1] ~= "aaa" or data.args.test2[1] ~= "bbb" then
print"----- raw data -----"
print(response.raw)
print"---------------------"
test.assert(false, "Failed to verify result")
end

client = RestClient:new(HTTPBIN_URL .. "get", { timeout = TIMEOUT })
for _ = 1, RETRIES do
Expand Down
Loading