diff --git a/examples/dune b/examples/dune index d01f32db..4cafb199 100644 --- a/examples/dune +++ b/examples/dune @@ -19,7 +19,7 @@ (flags :standard -warn-error -a+8) (modules echo_eio) (libraries tiny_httpd tiny_httpd_camlzip - tiny_httpd_eio eio eio_main)) + tiny_httpd_eio eio eio_posix)) (rule (targets test_output.txt) diff --git a/examples/echo.ml b/examples/echo.ml index 6956f4d0..d00d468d 100644 --- a/examples/echo.ml +++ b/examples/echo.ml @@ -2,6 +2,36 @@ module S = Tiny_httpd let now_ = Unix.gettimeofday +let alice_text = + "CHAPTER I. Down the Rabbit-Hole Alice was beginning to get very tired of \ + sitting by her sister on the bank, and of having nothing to do: once or \ + twice she had peeped into the book her sister was reading, but it had no \ + pictures or conversations in it, thought \ + Alice So she was considering in her \ + own mind (as well as she could, for the hot day made her feel very sleepy \ + and stupid), whether the pleasure of making a daisy-chain would be worth \ + the trouble of getting up and picking the daisies, when suddenly a White \ + Rabbit with pink eyes ran close by her. There was nothing so very \ + remarkable in that; nor did Alice think it so very much out of the way to \ + hear the Rabbit say to itself, (when \ + she thought it over afterwards, it occurred to her that she ought to have \ + wondered at this, but at the time it all seemed quite natural); but when \ + the Rabbit actually took a watch out of its waistcoat-pocket, and looked at \ + it, and then hurried on, Alice started to her feet, for it flashed across \ + her mind that she had never before seen a rabbit with either a \ + waistcoat-pocket, or a watch to take out of it, and burning with curiosity, \ + she ran across the field after it, and fortunately was just in time to see \ + it pop down a large rabbit-hole under the hedge. In another moment down \ + went Alice after it, never once considering how in the world she was to get \ + out again. The rabbit-hole went straight on like a tunnel for some way, and \ + then dipped suddenly down, so suddenly that Alice had not a moment to think \ + about stopping herself before she found herself falling down a very deep \ + well. Either the well was very deep, or she fell very slowly, for she had \ + plenty of time as she went down to look about her and to wonder what was \ + going to happen next. First, she tried to look down and make out what she \ + was coming to, but it was too dark to see anything; then she looked at the \ + sides of the well, and noticed that they were filled with cupboards......" + (* util: a little middleware collecting statistics *) let middleware_stat () : S.Middleware.t * (unit -> string) = let n_req = ref 0 in @@ -152,6 +182,10 @@ let () = let stats = get_stats () in S.Response.make_string @@ Ok stats); + S.add_route_handler server + S.Route.(exact "alice" @/ return) + (fun _req -> S.Response.make_string (Ok alice_text)); + (* VFS *) Tiny_httpd_dir.add_vfs server ~config: diff --git a/examples/echo_eio.ml b/examples/echo_eio.ml index 93deb1e9..39244a93 100644 --- a/examples/echo_eio.ml +++ b/examples/echo_eio.ml @@ -35,6 +35,36 @@ let middleware_stat () : S.Middleware.t * (unit -> string) = in m, get_stat +let alice_text = + "CHAPTER I. Down the Rabbit-Hole Alice was beginning to get very tired of \ + sitting by her sister on the bank, and of having nothing to do: once or \ + twice she had peeped into the book her sister was reading, but it had no \ + pictures or conversations in it, thought \ + Alice So she was considering in her \ + own mind (as well as she could, for the hot day made her feel very sleepy \ + and stupid), whether the pleasure of making a daisy-chain would be worth \ + the trouble of getting up and picking the daisies, when suddenly a White \ + Rabbit with pink eyes ran close by her. There was nothing so very \ + remarkable in that; nor did Alice think it so very much out of the way to \ + hear the Rabbit say to itself, (when \ + she thought it over afterwards, it occurred to her that she ought to have \ + wondered at this, but at the time it all seemed quite natural); but when \ + the Rabbit actually took a watch out of its waistcoat-pocket, and looked at \ + it, and then hurried on, Alice started to her feet, for it flashed across \ + her mind that she had never before seen a rabbit with either a \ + waistcoat-pocket, or a watch to take out of it, and burning with curiosity, \ + she ran across the field after it, and fortunately was just in time to see \ + it pop down a large rabbit-hole under the hedge. In another moment down \ + went Alice after it, never once considering how in the world she was to get \ + out again. The rabbit-hole went straight on like a tunnel for some way, and \ + then dipped suddenly down, so suddenly that Alice had not a moment to think \ + about stopping herself before she found herself falling down a very deep \ + well. Either the well was very deep, or she fell very slowly, for she had \ + plenty of time as she went down to look about her and to wonder what was \ + going to happen next. First, she tried to look down and make out what she \ + was coming to, but it was too dark to see anything; then she looked at the \ + sides of the well, and noticed that they were filled with cupboards......" + let () = let port_ = ref 8080 in let j = ref 32 in @@ -50,7 +80,7 @@ let () = "echo [option]*"; (* use eio *) - let@ stdenv = Eio_main.run in + let@ stdenv = Eio_posix.run in let@ sw = Eio.Switch.run in (* create server *) @@ -130,6 +160,10 @@ let () = S.stop server; S.Response.make_string (Ok "quitting")); + S.add_route_handler server + S.Route.(exact "alice" @/ return) + (fun _req -> S.Response.make_string (Ok alice_text)); + (* main page *) S.add_route_handler server S.Route.(return)