Skip to content

Handle non-JSON API responses gracefully #729

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.

Sign up for GitHub

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

Open
Sim-hu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle non-JSON API responses gracefully #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions lib/nostrum/api/helpers.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@ defmodule Nostrum.Api.Helpers do
defguard has_files(args) when is_map_key(args, :files) or is_map_key(args, :file)

def handle_request_with_decode(response)
def handle_request_with_decode({:ok, body}), do: {:ok, Jason.decode!(body, keys: :atoms)}

def handle_request_with_decode({:ok, body}) do
case Jason.decode(body, keys: :atoms) do
{:ok, parsed} ->
{:ok, parsed}

{:error, _} ->
{:error, %Nostrum.Error.ApiError{status_code: nil, response: body}}
end
end

def handle_request_with_decode({:error, _} = error), do: error

def handle_request_with_decode(response, type)
Expand All @@ -15,12 +25,13 @@ defmodule Nostrum.Api.Helpers do
def handle_request_with_decode({:error, _} = error, _type), do: error

def handle_request_with_decode({:ok, body}, type) do
convert =
body
|> Jason.decode!(keys: :atoms)
|> Util.cast(type)
case Jason.decode(body, keys: :atoms) do
{:ok, parsed} ->
{:ok, Util.cast(parsed, type)}

{:ok, convert}
{:error, _} ->
{:error, %Nostrum.Error.ApiError{status_code: nil, response: body}}
end
end

@spec maybe_add_reason(String.t() | nil, list()) :: list()
Expand Down
14 changes: 9 additions & 5 deletions lib/nostrum/util.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,17 @@ defmodule Nostrum.Util do
raise(Nostrum.Error.ApiError, status_code: code, message: message)

{:ok, body} ->
body = Jason.decode!(body)
case Jason.decode(body) do
{:ok, decoded} ->
"wss://" <> url = decoded["url"]
shards = if decoded["shards"], do: decoded["shards"], else: 1

"wss://" <> url = body["url"]
shards = if body["shards"], do: body["shards"], else: 1
:persistent_term.put(@gateway_url_key, {url, shards})
{url, shards}

:persistent_term.put(@gateway_url_key, {url, shards})
{url, shards}
{:error, _} ->
raise("Received non-JSON response from Discord gateway, Discord may be down")
end
end
end

Expand Down