use Lurl for http queries

EmileTrotignon · EmileTrotignon · commit 218eb41d7ba9 · 2025-11-24T19:01:05.000+01:00
diff --git a/devkit.opam b/devkit.opam
@@ -27,7 +27,6 @@ depends: [
   "base-unix"
   "base-threads"
   "stdlib-shims"
-  "uri"
   "yojson" {>= "1.6.0"}
   "odoc" {with-doc}
   "ppx_expect" {with-test}
diff --git a/lurl.ml b/lurl.ml
@@ -3,6 +3,8 @@
 
 open Printf
 open ExtLib
+open Ocamlnet_lite
+
 let ( let* ) = Result.bind
 
 (* sync urlparse_stubs.c *)
@@ -80,9 +82,11 @@ let string_of_scheme = function
   | Http -> "http"
   | Https -> "https"
 
-let decode = Web.rawurldecode
+(* TODO: this taken from Web, but its quite fishy. It should be investigated. *)
+
+let decode s = try Netencoding.Url.decode ~plus:false s with _ -> s
 
-let decode_plus = Web.urldecode
+let decode_plus s = try Netencoding.Url.decode ~plus:true s with _ -> s
 
 module Re = struct
 
@@ -183,9 +187,8 @@ let rec push_concat ~push ~sep f li =
     push sep;
     push_concat ~push ~sep f li
 
-let encode_plus = Web.urlencode
-
-let encode = Web.rawurlencode
+let encode_plus = Netencoding.Url.encode ~plus:true
+let encode = Netencoding.Url.encode ~plus:false
 
 let push_path ~push path =
   push "/";
diff --git a/web.ml b/web.ml
@@ -129,7 +129,7 @@ type ('body,'ret) http_request_ =
   ?http_1_0:bool ->
   ?headers:string list ->
   ?body:'body ->
-  http_action -> Uri.t -> 'ret
+  http_action -> Lurl.t -> 'ret
 
 type 'ret http_request = ([ `Form of (string * string) list | `Raw of string * string ], 'ret)  http_request_
 
@@ -154,7 +154,7 @@ module type HTTP = sig
     ?http_1_0:bool ->
     ?headers:string list ->
     ?action:http_action ->
-    Uri.t ->
+    Lurl.t ->
     (string * string) list -> [> `Error of string | `Ok of string ] IO.t
 end
 
@@ -253,8 +253,8 @@ module Http (IO : IO_TYPE) (Curl_IO : CURL with type 'a t = 'a IO.t) : HTTP with
 
   (* NOTE don't forget to set http_1_0=true when sending requests to a Httpev-based server *)
   (* Don't use curl_setheaders when using ?headers option *)
-  let http_request' ?ua ?timeout ?(verbose=false) ?(setup=ignore) ?timer ?max_size ?(http_1_0=false) ?headers ?body (action:http_action) (url:Uri.t) =
-    let url = Uri.to_string url in
+  let http_request' ?ua ?timeout ?(verbose=false) ?(setup=ignore) ?timer ?max_size ?(http_1_0=false) ?headers ?body (action:http_action) (url:Lurl.t) =
+    let url = Lurl.to_string url in
     let open Curl in
     let action_name = string_of_http_action action in
 
@@ -436,7 +436,7 @@ let string_of_http_code = function
 | 411 -> "Length Required"
 | 412 -> "Precondition Failed"
 | 413 -> "Request Entity Too Large"
-| 414 -> "Request-URI Too Long"
+| 414 -> "Request-Lurl Too Long"
 | 415 -> "Unsupported Media Type"
 | 416 -> "Requested Range Not Satisfiable"
 | 417 -> "Expectation Failed"
