iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor error handling for API endpoints

This commit is contained in:
Omar Roth 2019-09-05 14:12:14 -04:00
parent 7b53b6bfef
commit 7c75111c41
No known key found for this signature in database
GPG Key ID: B8254FB7EC3D37F2
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/invidious/helpers/handlers.cr
View File

@ -21,7 +21,7 @@ end
class Kemal::RouteHandler class Kemal::RouteHandler
{% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %} {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
exclude ["/api/v1/*"], {{method}} exclude ["/api/v1/*"], {{method}}
{% end %} {% end %}
# Processes the route if it's a match. Otherwise renders 404. # Processes the route if it's a match. Otherwise renders 404.
@ -33,8 +33,7 @@ class Kemal::RouteHandler
raise Kemal::Exceptions::CustomException.new(context) raise Kemal::Exceptions::CustomException.new(context)
end end
if context.request.method == "HEAD" && if context.request.method == "HEAD" && context.request.path.ends_with? ".jpg"
context.request.path.ends_with? ".jpg"
context.response.headers["Content-Type"] = "image/jpeg" context.response.headers["Content-Type"] = "image/jpeg"
end end
@ -45,7 +44,7 @@ end
class Kemal::ExceptionHandler class Kemal::ExceptionHandler
{% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %} {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
exclude ["/api/v1/*"], {{method}} exclude ["/api/v1/*"], {{method}}
{% end %} {% end %}
private def call_exception_with_status_code(context : HTTP::Server::Context, exception : Exception, status_code : Int32) private def call_exception_with_status_code(context : HTTP::Server::Context, exception : Exception, status_code : Int32)
@ -172,7 +171,7 @@ class APIHandler < Kemal::Handler
end end
end end
if env.params.query["pretty"]? && env.params.query["pretty"] == "1" if env.params.query["pretty"]?.try &.== "1"
response = response.to_pretty_json response = response.to_pretty_json
else else
response = response.to_json response = response.to_json
@ -181,6 +180,18 @@ class APIHandler < Kemal::Handler
response = env.response.output.gets_to_end response = env.response.output.gets_to_end
end end
rescue ex rescue ex
env.response.content_type = "application/json" if env.response.headers.includes_word?("Content-Type", "text/html")
env.response.status_code = 500
if env.response.headers.includes_word?("Content-Type", "application/json")
response = {"error" => ex.message || "Unspecified error"}
if env.params.query["pretty"]?.try &.== "1"
response = response.to_pretty_json
else
response = response.to_json
end
end
ensure ensure
env.response.output = output env.response.output = output
env.response.puts response env.response.puts response