-
Notifications
You must be signed in to change notification settings - Fork 170
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make server response type abstract and allow streaming in cohttp-eio #1024
Open
talex5
wants to merge
5
commits into
mirage:master
Choose a base branch
from
talex5:abstract-response
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6860464
Make server response type abstract
talex5 e48cbaf
cohttp-eio: Refactor code a bit
talex5 34f881c
cohttp-eio: Allow streaming responses from handler
talex5 fa9123e
Update CHANGES.md
talex5 eb92357
Merge branch 'master' into abstract-response
mseri File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
let () = Logs.set_reporter (Logs_fmt.reporter ()) | ||
and () = Logs.Src.set_level Cohttp_eio.src (Some Debug) | ||
|
||
let ( / ) = Eio.Path.( / ) | ||
|
||
(* To stream a file, we take the extra [writer] argument explicitly. | ||
This means that we stream the response while the function is still | ||
running and the file is still open. *) | ||
let handler dir _socket request _body writer = | ||
let path = | ||
Http.Request.resource request | ||
|> String.split_on_char '/' | ||
|> List.filter (( <> ) "") | ||
|> String.concat "/" | ||
in | ||
let path = if path = "" then "index.html" else path in | ||
Eio.Path.with_open_in (dir / path) @@ fun flow -> | ||
Cohttp_eio.Server.respond () ~status:`OK | ||
~headers:(Http.Header.of_list [ ("content-type", "text/html") ]) | ||
~body:flow writer | ||
|
||
let log_warning ex = Logs.warn (fun f -> f "%a" Eio.Exn.pp ex) | ||
|
||
let () = | ||
let port = ref 8080 in | ||
Arg.parse | ||
[ ("-p", Arg.Set_int port, " Listening port number(8080 by default)") ] | ||
ignore "An HTTP/1.1 server"; | ||
Eio_main.run @@ fun env -> | ||
Eio.Switch.run @@ fun sw -> | ||
(* Restrict to current directory: *) | ||
let htdocs = Eio.Stdenv.cwd env in | ||
let socket = | ||
Eio.Net.listen env#net ~sw ~backlog:128 ~reuse_addr:true | ||
(`Tcp (Eio.Net.Ipaddr.V4.loopback, !port)) | ||
and server = Cohttp_eio.Server.make ~callback:(handler htdocs) () in | ||
Cohttp_eio.Server.run socket server ~on_error:log_warning |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My only concern is that the change to old-style response was done to align the APIs, with this they APIs are diverging again (at least in the expectations and signatures)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, although not when using the normal response functions. So it's certainly possible to write code that works with both.