Merge branch 'ocamlformat'

Author: c-cube

.ocamlformat

@@ -0,0 +1,14 @@
+version = 0.24.1
+profile=conventional
+margin=80
+if-then-else=k-r
+parens-ite=true
+parens-tuple=multi-line-only
+sequence-style=terminator
+type-decl=compact
+break-cases=toplevel
+cases-exp-indent=2
+field-space=tight-decl
+leading-nested-match-parens=true
+module-item-spacing=compact
+quiet=true

examples/dune

@@ -1,53 +1,68 @@
-
 (executable
-  (name sse_server)
-  (modules sse_server)
-  (libraries tiny_httpd unix ptime ptime.clock.os))
+ (name sse_server)
+ (modules sse_server)
+ (libraries tiny_httpd unix ptime ptime.clock.os))
 
 (executable
-  (name sse_client)
-  (modules sse_client)
-  (libraries unix))
+ (name sse_client)
+ (modules sse_client)
+ (libraries unix))
 
 (executable
-  (name echo)
-  (flags :standard -warn-error -a+8)
-  (modules echo vfs)
-  (libraries tiny_httpd tiny_httpd_camlzip))
+ (name echo)
+ (flags :standard -warn-error -a+8)
+ (modules echo vfs)
+ (libraries tiny_httpd tiny_httpd_camlzip))
 
 (rule
-  (targets test_output.txt)
-  (deps (:script ./run_test.sh) ./sse_client.exe ./sse_server.exe)
-  (enabled_if (= %{system} "linux"))
-  (package tiny_httpd)
-  (action
-    (with-stdout-to %{targets} (run %{script}))))
+ (targets test_output.txt)
+ (deps
+  (:script ./run_test.sh)
+  ./sse_client.exe
+  ./sse_server.exe)
+ (enabled_if
+  (= %{system} "linux"))
+ (package tiny_httpd)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run %{script}))))
 
 (rule
-  (alias runtest)
-  (package tiny_httpd)
-  (enabled_if (= %{system} "linux"))
-  (deps test_output.txt)
-  (action
-    (diff test_output.txt.expected test_output.txt)))
+ (alias runtest)
+ (package tiny_httpd)
+ (enabled_if
+  (= %{system} "linux"))
+ (deps test_output.txt)
+ (action
+  (diff test_output.txt.expected test_output.txt)))
 
 ; produce an embedded FS
+
 (rule
-  (targets vfs.ml)
-  (deps (source_tree files) (:out test_output.txt.expected))
-  (enabled_if (= %{system} "linux"))
-  (action (run %{bin:tiny-httpd-vfs-pack} -o %{targets}
-               --mirror=files/
-               --file=test_out.txt,%{out}
-               ; --url=example_dot_com,http://example.com ; this breaks tests in opam sandbox 😢
-               )))
+ (targets vfs.ml)
+ (deps
+  (source_tree files)
+  (:out test_output.txt.expected))
+ (enabled_if
+  (= %{system} "linux"))
+ (action
+  (run
+   %{bin:tiny-httpd-vfs-pack}
+   -o
+   %{targets}
+   --mirror=files/
+   --file=test_out.txt,%{out}
+   ; --url=example_dot_com,http://example.com ; this breaks tests in opam sandbox 😢
+   )))
 
 (rule
-  (targets vfs.ml)
-  (enabled_if (<> %{system} "linux"))
-  (action
-    (with-stdout-to
-      %{targets}
-      (progn
-        (echo "let embedded_fs = Tiny_httpd_dir.Embedded_fs.create ~mtime:0. ()")
-        (echo "let vfs = Tiny_httpd_dir.Embedded_fs.to_vfs embedded_fs")))))
+ (targets vfs.ml)
+ (enabled_if
+  (<> %{system} "linux"))
+ (action
+  (with-stdout-to
+   %{targets}
+   (progn
+    (echo "let embedded_fs = Tiny_httpd_dir.Embedded_fs.create ~mtime:0. ()")
+    (echo "let vfs = Tiny_httpd_dir.Embedded_fs.to_vfs embedded_fs")))))

examples/echo.ml

@@ -1,4 +1,3 @@
-
 module S = Tiny_httpd
 
 let now_ = Unix.gettimeofday
@@ -22,118 +21,162 @@ let middleware_stat () : S.Middleware.t * (unit -> string) =
         total_time_ := !total_time_ +. (t4 -. t1);
         parse_time_ := !parse_time_ +. (t2 -. t1);
         build_time_ := !build_time_ +. (t3 -. t2);
-        write_time_ := !write_time_ +. (t4 -. t3);
-      )
+        write_time_ := !write_time_ +. (t4 -. t3))
   and get_stat () =
-    Printf.sprintf "%d requests (average response time: %.3fms = %.3fms + %.3fms + %.3fms)"
-      !n_req (!total_time_ /. float !n_req *. 1e3)
-             (!parse_time_ /. float !n_req *. 1e3)
-             (!build_time_ /. float !n_req *. 1e3)
-             (!write_time_ /. float !n_req *. 1e3)
+    Printf.sprintf
+      "%d requests (average response time: %.3fms = %.3fms + %.3fms + %.3fms)"
+      !n_req
+      (!total_time_ /. float !n_req *. 1e3)
+      (!parse_time_ /. float !n_req *. 1e3)
+      (!build_time_ /. float !n_req *. 1e3)
+      (!write_time_ /. float !n_req *. 1e3)
   in
   m, get_stat
 
-
 let () =
   let port_ = ref 8080 in
   let j = ref 32 in
-  Arg.parse (Arg.align [
-      "--port", Arg.Set_int port_, " set port";
-      "-p", Arg.Set_int port_, " set port";
-      "--debug", Arg.Unit (fun () -> S._enable_debug true), " enable debug";
-      "-j", Arg.Set_int j, " maximum number of connections";
-    ]) (fun _ -> raise (Arg.Bad "")) "echo [option]*";
+  Arg.parse
+    (Arg.align
+       [
+         "--port", Arg.Set_int port_, " set port";
+         "-p", Arg.Set_int port_, " set port";
+         "--debug", Arg.Unit (fun () -> S._enable_debug true), " enable debug";
+         "-j", Arg.Set_int j, " maximum number of connections";
+       ])
+    (fun _ -> raise (Arg.Bad ""))
+    "echo [option]*";
 
   let server = S.create ~port:!port_ ~max_connections:!j () in
-  Tiny_httpd_camlzip.setup ~compress_above:1024 ~buf_size:(16*1024) server;
+  Tiny_httpd_camlzip.setup ~compress_above:1024 ~buf_size:(16 * 1024) server;
 
   let m_stats, get_stats = middleware_stat () in
   S.add_middleware server ~stage:(`Stage 1) m_stats;
 
   (* say hello *)
   S.add_route_handler ~meth:`GET server
     S.Route.(exact "hello" @/ string @/ return)
-    (fun name _req -> S.Response.make_string (Ok ("hello " ^name ^"!\n")));
+    (fun name _req -> S.Response.make_string (Ok ("hello " ^ name ^ "!\n")));
 
   (* compressed file access *)
   S.add_route_handler ~meth:`GET server
     S.Route.(exact "zcat" @/ string_urlencoded @/ return)
     (fun path _req ->
-        let ic = open_in path in
-        let str = S.Byte_stream.of_chan ic in
-        let mime_type =
+      let ic = open_in path in
+      let str = S.Byte_stream.of_chan ic in
+      let mime_type =
+        try
+          let p = Unix.open_process_in (Printf.sprintf "file -i -b %S" path) in
           try
-            let p = Unix.open_process_in (Printf.sprintf "file -i -b %S" path) in
-            try
-              let s = ["Content-Type", String.trim (input_line p)] in
-              ignore @@ Unix.close_process_in p;
-              s
-            with _ -> ignore @@ Unix.close_process_in p; []
-          with _ -> []
-        in
-        S.Response.make_stream ~headers:mime_type (Ok str)
-      );
+            let s = [ "Content-Type", String.trim (input_line p) ] in
+            ignore @@ Unix.close_process_in p;
+            s
+          with _ ->
+            ignore @@ Unix.close_process_in p;
+            []
+        with _ -> []
+      in
+      S.Response.make_stream ~headers:mime_type (Ok str));
 
   (* echo request *)
   S.add_route_handler server
     S.Route.(exact "echo" @/ return)
     (fun req ->
-        let q =
-          S.Request.query req |> List.map (fun (k,v) -> Printf.sprintf "%S = %S" k v)
-          |> String.concat ";"
-        in
-        S.Response.make_string
-          (Ok (Format.asprintf "echo:@ %a@ (query: %s)@." S.Request.pp req q)));
+      let q =
+        S.Request.query req
+        |> List.map (fun (k, v) -> Printf.sprintf "%S = %S" k v)
+        |> String.concat ";"
+      in
+      S.Response.make_string
+        (Ok (Format.asprintf "echo:@ %a@ (query: %s)@." S.Request.pp req q)));
 
   (* file upload *)
   S.add_route_handler_stream ~meth:`PUT server
     S.Route.(exact "upload" @/ string @/ return)
     (fun path req ->
-        S._debug (fun k->k "start upload %S, headers:\n%s\n\n%!" path
-                     (Format.asprintf "%a" S.Headers.pp (S.Request.headers req)));
-        try
-          let oc = open_out @@ "/tmp/" ^ path in
-          S.Byte_stream.to_chan oc req.S.Request.body;
-          flush oc;
-          S.Response.make_string (Ok "uploaded file")
-        with e ->
-          S.Response.fail ~code:500 "couldn't upload file: %s" (Printexc.to_string e)
-      );
+      S._debug (fun k ->
+          k "start upload %S, headers:\n%s\n\n%!" path
+            (Format.asprintf "%a" S.Headers.pp (S.Request.headers req)));
+      try
+        let oc = open_out @@ "/tmp/" ^ path in
+        S.Byte_stream.to_chan oc req.S.Request.body;
+        flush oc;
+        S.Response.make_string (Ok "uploaded file")
+      with e ->
+        S.Response.fail ~code:500 "couldn't upload file: %s"
+          (Printexc.to_string e));
 
   (* stats *)
-  S.add_route_handler server S.Route.(exact "stats" @/ return)
+  S.add_route_handler server
+    S.Route.(exact "stats" @/ return)
     (fun _req ->
-       let stats = get_stats() in
-       S.Response.make_string @@ Ok stats
-    );
+      let stats = get_stats () in
+      S.Response.make_string @@ Ok stats);
 
   (* VFS *)
   Tiny_httpd_dir.add_vfs server
-    ~config:(Tiny_httpd_dir.config ~download:true
-               ~dir_behavior:Tiny_httpd_dir.Index_or_lists ())
+    ~config:
+      (Tiny_httpd_dir.config ~download:true
+         ~dir_behavior:Tiny_httpd_dir.Index_or_lists ())
     ~vfs:Vfs.vfs ~prefix:"vfs";
 
   (* main page *)
-  S.add_route_handler server S.Route.(return)
+  S.add_route_handler server
+    S.Route.(return)
     (fun _req ->
-       let open Tiny_httpd_html in
-       let h = html [] [
-           head[][title[][txt "index of echo"]];
-           body[][
-             h3[] [txt "welcome!"];
-             p[] [b[] [txt "endpoints are:"]];
-             ul[] [
-               li[][pre[][txt "/hello/:name (GET)"]];
-               li[][pre[][a[A.href "/echo/"][txt "echo"]; txt " echo back query"]];
-               li[][pre[][txt "/upload/:path (PUT) to upload a file"]];
-               li[][pre[][txt "/zcat/:path (GET) to download a file (deflate transfer-encoding)"]];
-               li[][pre[][a[A.href "/stats/"][txt"/stats/"]; txt" (GET) to access statistics"]];
-               li[][pre[][a[A.href "/vfs/"][txt"/vfs"]; txt" (GET) to access a VFS embedded in the binary"]];
-             ]
-           ]
-         ] in
-       let s = to_string_top h in
-       S.Response.make_string ~headers:["content-type", "text/html"] @@ Ok s);
+      let open Tiny_httpd_html in
+      let h =
+        html []
+          [
+            head [] [ title [] [ txt "index of echo" ] ];
+            body []
+              [
+                h3 [] [ txt "welcome!" ];
+                p [] [ b [] [ txt "endpoints are:" ] ];
+                ul []
+                  [
+                    li [] [ pre [] [ txt "/hello/:name (GET)" ] ];
+                    li []
+                      [
+                        pre []
+                          [
+                            a [ A.href "/echo/" ] [ txt "echo" ];
+                            txt " echo back query";
+                          ];
+                      ];
+                    li []
+                      [ pre [] [ txt "/upload/:path (PUT) to upload a file" ] ];
+                    li []
+                      [
+                        pre []
+                          [
+                            txt
+                              "/zcat/:path (GET) to download a file (deflate \
+                               transfer-encoding)";
+                          ];
+                      ];
+                    li []
+                      [
+                        pre []
+                          [
+                            a [ A.href "/stats/" ] [ txt "/stats/" ];
+                            txt " (GET) to access statistics";
+                          ];
+                      ];
+                    li []
+                      [
+                        pre []
+                          [
+                            a [ A.href "/vfs/" ] [ txt "/vfs" ];
+                            txt " (GET) to access a VFS embedded in the binary";
+                          ];
+                      ];
+                  ];
+              ];
+          ]
+      in
+      let s = to_string_top h in
+      S.Response.make_string ~headers:[ "content-type", "text/html" ] @@ Ok s);
 
   Printf.printf "listening on http://%s:%d\n%!" (S.addr server) (S.port server);
   match S.run server with

examples/sse_client.ml

@@ -1,15 +1,20 @@
 let addr = ref "127.0.0.1"
 let port = ref 8080
 let path = ref "/clock"
-
 let bufsize = 1024
 
 let () =
-  Arg.parse (Arg.align [
-      "-h", Arg.Set_string addr, " address to connect to";
-      "-p", Arg.Set_int port, " port to connect to";
-      "--alarm", Arg.Int (fun i->Unix.alarm i|>ignore), " set alarm (in seconds)";
-    ]) (fun s -> path := s) "sse_client [opt]* path?";
+  Arg.parse
+    (Arg.align
+       [
+         "-h", Arg.Set_string addr, " address to connect to";
+         "-p", Arg.Set_int port, " port to connect to";
+         ( "--alarm",
+           Arg.Int (fun i -> Unix.alarm i |> ignore),
+           " set alarm (in seconds)" );
+       ])
+    (fun s -> path := s)
+    "sse_client [opt]* path?";
 
   Format.printf "connect to %s:%d@." !addr !port;
   let sock = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
@@ -25,7 +30,8 @@ let () =
   let buf = Bytes.create bufsize in
   while !continue do
     let n = input ic buf 0 bufsize in
-    if n=0 then continue := false;
-    output stdout buf 0 n; flush stdout
+    if n = 0 then continue := false;
+    output stdout buf 0 n;
+    flush stdout
   done;
   Format.printf "exit!@."