Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions native/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ crate-type = ["cdylib"]
[dependencies]
rustler = "0.22.0"
rustler_codegen = "0.22.0"
bytes = "1.0.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_rustler = { git = "https://github.com/satoren/serde_rustler", branch = "rustler_0.22" }
serde-transcode = "1.1"
lazy_static = "1.0.0"
reqwest = { version = "0.11", features = ["native-tls", "cookies"] }
tokio = { version = "1", features = ["rt-multi-thread", "sync"] }
Expand Down
11 changes: 10 additions & 1 deletion native/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use std::sync::RwLock;
use std::thread;
use std::time::Duration;
use tokio::runtime::{Handle, Runtime};
use bytes::BufMut;

mod atoms {
rustler::atoms! {
Expand All @@ -26,6 +27,7 @@ mod atoms {
headers,
https_only,
identity,
json,
method,
ok,
pool_idle_timeout,
Expand Down Expand Up @@ -333,7 +335,14 @@ fn req_async_internal(
};
if let Ok(term) = req.map_get(atoms::body().encode(env)) {
req_builder = req_builder.body(term.decode::<Binary>()?.as_slice().to_owned());
};
} else if let Ok(term) = req.map_get(atoms::json().encode(env)) {
let mut buf = vec![].writer();
serde_transcode::transcode(
serde_rustler::Deserializer::from(term),
&mut serde_json::Serializer::new(&mut buf)
).or(Err(rustler::Error::RaiseAtom("json_encode_error")))?;
req_builder = req_builder.body(buf.into_inner());
}
if let Ok(term) = req.map_get(atoms::timeout().encode(env)) {
if let Some(timeout) = maybe_timeout(term.decode()?) {
req_builder = req_builder.timeout(timeout);
Expand Down
2 changes: 2 additions & 0 deletions src/erqwest.erl
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@
, method := method()
, headers => [header()]
, body => binary()
, json => term()
, timeout => timeout_ms()
}.
-type req_opts() :: #{ headers => [header()]
, body => binary()
, json => term()
, timeout => timeout_ms()
}.
-type resp() :: #{ status := 100..599
Expand Down
10 changes: 10 additions & 0 deletions test/erqwest_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ groups() ->
, get_http
, https_only
, post
, json
, timeout
, timeout_default
, timeout_infinity
Expand Down Expand Up @@ -143,6 +144,15 @@ post(_Config) ->
, body => <<"!@#$%^&*()">>}),
#{<<"data">> := <<"!@#$%^&*()">>} = jsx:decode(Body).

json(_Config) ->
Json = #{<<"data">> => <<"!@#$%^&*()">>},
{ok, #{status := 200, body := Body, headers := Headers}} =
erqwest:post(default, <<"https://httpbin.org/post">>,
#{json => Json}),
#{<<"data">> := JsonData} = jsx:decode(Body),
{<<"content-type">>, <<"application/json">>} = proplists:lookup(<<"content-type">>, Headers),
Json = jsx:decode(JsonData).

timeout(_Config) ->
{error, #{code := timeout}} =
erqwest:get(default, <<"https://httpbin.org/delay/1">>, #{timeout => 500}).
Expand Down