More fixes for dep updates

Author: quinnj

Project.toml

@@ -9,7 +9,7 @@ CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 LibAwsCommon = "c6e421ba-b5f8-4792-a1c4-42948de3ed9d"
-LibAwsHTTP = "ce851869-0d7a-41e7-95ef-2d4cb63876dd"
+LibAwsHTTPFork = "d3f1d20b-921e-4930-8491-471e0be3121a"
 LibAwsIO = "a5388770-19df-4151-b103-3d71de896ddf"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Mmap = "a63ad114-7e13-5084-954f-fe012c677804"
@@ -20,8 +20,8 @@ URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
 
 [compat]
 JSON = "0.21.4"
+LibAwsHTTPFork = "1.0.2"
 LibAwsIO = "1.2.0"
-LibAwsHTTP = "1.2.0"
 PrecompileTools = "1.2.1"
 julia = "1.10"
 

src/HTTP.jl

@@ -1,7 +1,7 @@
 module HTTP
 
 using CodecZlib, URIs, Mmap, Base64, Dates, Sockets
-using LibAwsCommon, LibAwsIO, LibAwsHTTP
+using LibAwsCommon, LibAwsIO, LibAwsHTTPFork
 
 export @logfmt_str, common_logfmt, combined_logfmt
 export WebSockets
@@ -82,7 +82,7 @@ end
 
 function __init__()
     allocator = default_aws_allocator()
-    LibAwsHTTP.init(allocator)
+    LibAwsHTTPFork.init(allocator)
     # intialize c functions
     on_acquired[] = @cfunction(c_on_acquired, Cvoid, (Ptr{Cvoid}, Cint, Ptr{aws_retry_token}, Ptr{Cvoid}))
     # on_shutdown[] = @cfunction(c_on_shutdown, Cvoid, (Ptr{Cvoid}, Cint, Ptr{Cvoid}))

src/client/client.jl

@@ -14,6 +14,7 @@ Base.@kwdef struct ClientSettings
     keep_alive_timeout_sec::Int = 0
     keep_alive_max_failed_probes::Int = 0
     keepalive::Bool = false
+    response_first_byte_timeout_ms::Int = 0
     ssl_cert::Union{Nothing, String} = nothing
     ssl_key::Union{Nothing, String} = nothing
     ssl_capath::Union{Nothing, String} = nothing
@@ -100,6 +101,7 @@ function Client(cs::ClientSettings)
     client.socket_options = aws_socket_options(
         AWS_SOCKET_STREAM, # socket type
         cs.socket_domain == :ipv4 ? AWS_SOCKET_IPV4 : AWS_SOCKET_IPV6, # socket domain
+        AWS_SOCKET_IMPL_PLATFORM_DEFAULT, # aws_socket_impl_type
         cs.connect_timeout_ms,
         cs.keep_alive_interval_sec,
         cs.keep_alive_timeout_sec,
@@ -178,6 +180,7 @@ function Client(cs::ClientSettings)
         cs.bootstrap,
         typemax(Csize_t), # initial_window_size::Csize_t
         pointer(FieldRef(client, :socket_options)),
+        cs.response_first_byte_timeout_ms,
         (cs.scheme == "https" || cs.scheme == "wss") ? pointer(FieldRef(client, :tls_options)) : C_NULL,
         cs.http2_prior_knowledge,
         C_NULL, # monitoring_options::Ptr{aws_http_connection_monitoring_options}

src/precompile.jl

@@ -3,39 +3,30 @@ using PrecompileTools: @setup_workload, @compile_workload
 try
     @setup_workload begin
         HTTP.__init__()
-        @info "HTTP initialized"
-        HTTP.set_log_level!(4)
+        # HTTP.set_log_level!(4)
         gzip_data(data::String) = read(GzipCompressorStream(IOBuffer(data)))
-        # random port in the dynamic/private range (49152–65535) which are are
-        # least likely to be used by well-known services
-        _port = 57813
-        server = HTTP.serve!("0.0.0.0", _port; listenany=true) do req
-            HTTP.Response(200,  ["Content-Encoding" => "gzip"], gzip_data("dummy response"))
-        end
-        # listenany allows changing port if that one is already in use, so check the actual port
-        _port = HTTP.port(server)
-        url = "http://localhost:$_port"
-        env = ["JULIA_NO_VERIFY_HOSTS" => "localhost",
-            "JULIA_SSL_NO_VERIFY_HOSTS" => nothing,
-            "JULIA_ALWAYS_VERIFY_HOSTS" => nothing]
-        @info "HTTP server started on port $_port"
-        try
-            withenv(env...) do
-                @compile_workload begin
-                    @show HTTP.get(url)
-                end
+        @compile_workload begin
+            # random port in the dynamic/private range (49152–65535) which are are
+            # least likely to be used by well-known services
+            _port = 57813
+            server = HTTP.serve!("0.0.0.0", _port; listenany=true) do req
+                HTTP.Response(200,  ["Content-Encoding" => "gzip"], gzip_data("dummy response"))
+            end
+            # listenany allows changing port if that one is already in use, so check the actual port
+            _port = HTTP.port(server)
+            url = "http://localhost:$_port"
+            try
+                HTTP.get(url)
+            finally
+                close(server)
+                yield() # needed on 1.9 to avoid some issue where it seems a task doesn't stop before serialization
+                server = nothing
+                close_all_clients!()
+                close_default_aws_server_bootstrap!()
+                close_default_aws_client_bootstrap!()
+                close_default_aws_host_resolver!()
+                close_default_aws_event_loop_group!()
             end
-        finally
-            @info "Shutting down HTTP server"
-            close(server)
-            @info "HTTP server shut down"
-            yield() # needed on 1.9 to avoid some issue where it seems a task doesn't stop before serialization
-            server = nothing
-            close_all_clients!()
-            close_default_aws_server_bootstrap!()
-            close_default_aws_client_bootstrap!()
-            close_default_aws_host_resolver!()
-            close_default_aws_event_loop_group!()
         end
     end
 catch e

src/server.jl

@@ -42,6 +42,9 @@ function http_version(c::Connection)
     return v == AWS_HTTP_VERSION_2 ? "HTTP/2" : "HTTP/1.1"
 end
 
+getinet(host::String, port::Integer) = Sockets.InetAddr(parse(IPAddr, host), port)
+getinet(host::IPAddr, port::Integer) = Sockets.InetAddr(host, port)
+
 mutable struct Server{F, C}
     const f::F
     const on_stream_complete::C
@@ -105,10 +108,11 @@ function serve!(f, host="127.0.0.1", port=8080;
     ssl_alpn_list="h2;http/1.1",
     initial_window_size=typemax(UInt64),
     )
+    addr = getinet(host, port)
     if listenany
-        port, sock = Sockets.listenany(port)
-        # don't need the socket server, so immediately close
-        # (we were just looking for an open port)
+        @show :pre port
+        port, sock = Sockets.listenany(addr.host, addr.port)
+        @show :post Int(port)
         close(sock)
     end
     server = Server{typeof(f), typeof(on_stream_complete)}(
@@ -120,6 +124,7 @@ function serve!(f, host="127.0.0.1", port=8080;
         socket_options !== nothing ? socket_options : aws_socket_options(
             AWS_SOCKET_STREAM, # socket type
             socket_domain == :ipv4 ? AWS_SOCKET_IPV4 : AWS_SOCKET_IPV6, # socket domain
+            AWS_SOCKET_IMPL_PLATFORM_DEFAULT, # aws_socket_impl_type
             connect_timeout_ms,
             keep_alive_interval_sec,
             keep_alive_timeout_sec,

src/websockets.jl

@@ -1,6 +1,6 @@
 module WebSockets
 
-using Base64, Random, LibAwsHTTP, LibAwsCommon, LibAwsIO
+using Base64, Random, LibAwsHTTPFork, LibAwsCommon, LibAwsIO
 
 import ..FieldRef, ..iswss, ..getport, ..makeuri, ..aws_throw_error, ..resource, ..Headers, ..Header, ..str, ..aws_error, ..aws_throw_error, ..Future, ..parseuri, ..with_redirect, ..with_request, ..getclient, ..ClientSettings, ..scheme, ..host, ..getport, ..userinfo, ..Client, ..Request, ..Response, ..setinputstream!, ..getresponse, ..CookieJar, ..COOKIEJAR, ..addheaders, ..Stream, ..HTTP, ..getheader