chore: stricter types

- Add eqwalizer_support and gradualizer plugins
- Fix curlmopt() type to include max_total_connections and max_concurrent_streams
- Fix encode_body/1 error return type
- Fix #req record field types for headers and body
- Use unicode:characters_to_binary in error_map/2

Author: puzza007

.github/workflows/ci.yml

@@ -8,8 +8,8 @@ jobs:
     name: Erlang/OTP ${{matrix.otp}} / rebar3 ${{matrix.rebar3}}
     strategy:
       matrix:
-        otp: ['26']
-        rebar3: ['3.18.0']
+        otp: ['27']
+        rebar3: ['3.24.0']
 
     steps:
       - uses: actions/checkout@v4
@@ -150,8 +150,8 @@ jobs:
 
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: '26'
-          rebar3-version: '3.18.0'
+          otp-version: '27'
+          rebar3-version: '3.24.0'
 
       - name: Install dependencies
         run: |

.tool-versions

@@ -1 +1 @@
-erlang 26.0.2
+erlang 27.3.4.6

rebar.config

@@ -2,12 +2,17 @@
 
 {erl_opts, [debug_info]}.
 
-{minimum_otp_vsn, "23.0"}.
+{minimum_otp_vsn, "27"}.
 
 {deps, [
         {worker_pool, "6.0.1"},
         {opentelemetry_api, "1.4.0"},
-        {opentelemetry_api_experimental, "0.5.1"}
+        {opentelemetry_api_experimental, "0.5.1"},
+        {eqwalizer_support,
+          {git_subdir,
+            "https://github.com/whatsapp/eqwalizer.git",
+            {tag, "v0.25.3"},
+            "eqwalizer_support"}}
        ]}.
 
 {profiles,
@@ -32,7 +37,12 @@
               {"freebsd", clean, "gmake -C c_src clean"}]}.
 
 {dialyzer, [
-    {warnings, [no_return, unmatched_returns, error_handling]},
+    {warnings, [
+        no_return,
+        unmatched_returns,
+        error_handling,
+        unknown
+    ]},
     {plt_extra_apps, [worker_pool]}
 ]}.
 
@@ -44,7 +54,9 @@
 
 {plugins, [rebar3_hex,
            rebar3_lint,
-           {covertool, "2.0.6"}]}.
+           {covertool, "2.0.6"},
+           {gradualizer, {git, "https://github.com/josefs/Gradualizer.git", {tag, "0.3.0"}}}
+]}.
 {cover_enabled, true}.
 {cover_export_enabled, true}.
 {covertool, [{coverdata_files, ["ct.coverdata"]}]}.

rebar.lock

@@ -1,18 +1,20 @@
 {"1.2.0",
-[{<<"metrics">>,{pkg,<<"metrics">>,<<"2.5.0">>},0},
+[{<<"eqwalizer_support">>,
+  {git_subdir,"https://github.com/whatsapp/eqwalizer.git",
+              {ref,"0f514eb3893fa7070835c83ecb49fbea31b0426d"},
+              "eqwalizer_support"},
+  0},
  {<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.4.0">>},0},
  {<<"opentelemetry_api_experimental">>,
   {pkg,<<"opentelemetry_api_experimental">>,<<"0.5.1">>},
   0},
  {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.0.1">>},0}]}.
 [
 {pkg_hash,[
- {<<"metrics">>, <<"268D218D56529CB5F070D74BBFC3AF64C668379B5B18FAFDA88959442F790C57">>},
  {<<"opentelemetry_api">>, <<"63CA1742F92F00059298F478048DFB826F4B20D49534493D6919A0DB39B6DB04">>},
  {<<"opentelemetry_api_experimental">>, <<"1B5AFACFCBD0834390336C845BC8AE08C8CF0D69BBED72EE53D178798B93E074">>},
  {<<"worker_pool">>, <<"CA262C2DFB3B4AF661B206C82065D86F83922B7227508AA6E0BC34D3E5AE5135">>}]},
 {pkg_hash_ext,[
- {<<"metrics">>, <<"AE061938C8C3BDE97D17BE9A792B63E15C1E1EFFE16598AB87A62384F5F3714B">>},
  {<<"opentelemetry_api">>, <<"3DFBBFAA2C2ED3121C5C483162836C4F9027DEF469C41578AF5EF32589FCFC58">>},
  {<<"opentelemetry_api_experimental">>, <<"10297057EADA47267D4F832011BECEF07D25690E6BF91FEBCCFC4E740DBA1A6F">>},
  {<<"worker_pool">>, <<"772E12CCB26909EA7F804B52E86E733DF66BB8150F683B591B0A762196494C74">>}]}

src/katipo.erl

@@ -268,7 +268,8 @@
         %% curlmopt_content_length_penalty_size |
         %% curlmopt_max_host_connections |
         max_pipeline_length |
-        curlmopt_max_total_connections |
+        max_total_connections |
+        max_concurrent_streams |
         %% curlmopt_maxconnects |
         pipelining.
         %% curlmopt_pipelining_site_bl |
@@ -441,9 +442,9 @@
 -record(req, {
           method = ?GET :: method_int(),
           url :: undefined | binary(),
-          headers = [] :: headers(),
+          headers = [] :: [binary()],
           cookiejar = [] :: cookiejar(),
-          body = <<>> :: body(),
+          body = <<>> :: iodata(),
           connecttimeout_ms = ?DEFAULT_REQ_TIMEOUT :: pos_integer(),
           followlocation = ?FOLLOWLOCATION_FALSE :: integer(),
           ssl_verifyhost = ?SSL_VERIFYHOST_TRUE :: integer(),
@@ -830,7 +831,7 @@ encode_body([{_, _} | _] = KVs) ->
 encode_body(Body) when is_binary(Body) orelse is_list(Body) ->
     {ok, Body};
 encode_body(Body) ->
-    {error, Body}.
+    {error, {invalid_body, Body}}.
 
 get_mopts(Opts) ->
     L = lists:filtermap(fun mopt_supported/1, Opts),
@@ -1028,5 +1029,6 @@ check_opts(Opts) when is_map(Opts) ->
 error_map(Code, Message) when is_atom(Code) andalso is_binary(Message) ->
     #{code => Code, message => Message};
 error_map(Code, Message) when is_atom(Code) ->
-    BinaryMessage = iolist_to_binary(io_lib:format("~p", [Message])),
+    Chars = io_lib:format("~p", [Message]),
+    BinaryMessage = unicode:characters_to_binary(Chars),
     error_map(Code, BinaryMessage).

test/katipo_SUITE.erl

@@ -284,7 +284,7 @@ post_body_qs_vals(Config) ->
     ?assertEqual(<<"!@#$%^&*()">>, maps:get(<<"data">>, Json)).
 
 post_body_bad(_) ->
-    Message = [{body, should_not_be_an_atom}],
+    Message = [{body, {invalid_body, should_not_be_an_atom}}],
     BinaryMessage = iolist_to_binary(io_lib:format("~p", [Message])),
     %% URL doesn't matter - request fails during option validation
     {error, #{code := bad_opts, message := BinaryMessage}} =
@@ -800,13 +800,13 @@ port_death(Config) ->
     {ok, _} = katipo_pool:start(PoolName, PoolSize),
     WorkerName = wpool_pool:best_worker(PoolName),
     WorkerPid = whereis(WorkerName),
-    {state, _, katipo, {state, Port, _}, _} = sys:get_state(WorkerPid),
+    {state, _, _, {state, Port, _}, _} = sys:get_state(WorkerPid),
     true = port_command(Port, <<"hdfjkshkjsdfgjsgafdjgsdjgfj">>),
     Fun = fun() ->
                   WorkerName2 = wpool_pool:best_worker(PoolName),
                   WorkerPid2 = whereis(WorkerName2),
                   case sys:get_state(WorkerPid2) of
-                      {state, _, katipo, {state, Port2, _}, _} when Port =/= Port2 ->
+                      {state, _, _, {state, Port2, _}, _} when Port =/= Port2 ->
                           {ok, #{status := 200}} =
                               katipo:get(PoolName, Url, BaseOpts),
                           true