Skip to content

fix: catch throw instead of error #850

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
charmful0x wants to merge 3 commits into
base: neo/edge
Choose a base branch
from
+54 −39
Open

fix: catch throw instead of error #850

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
139a3d5
fix: catch throw instead of error
charmful0x Apr 14, 2026
1181647
chore: error on invalid from/to non-numeric slot
charmful0x Apr 14, 2026
932bf45
chore: remove stale branch
charmful0x Apr 14, 2026
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
93 changes: 54 additions & 39 deletions src/dev_scheduler.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ post_schedule(Base, Req, Opts) ->
ToSched ->
do_post_schedule(Base, Req, ToSched, Opts)
catch
error:{necessary_message_not_found, _, _} ->
throw:{necessary_message_not_found, _, _} ->
{error,
#{
<<"status">> => 404,
Expand Down Expand Up @@ -811,50 +811,65 @@ get_schedule(Base, Req, Opts) ->
From =
case hb_ao:get(<<"from">>, Req, not_found, Opts) of
not_found -> 0;
X when X < 0 -> 0;
FromRes -> hb_util:int(FromRes)
FromRes ->
case hb_util:safe_int(FromRes) of
{ok, FromInt} when FromInt < 0 -> 0;
{ok, FromInt} -> FromInt;
{error, _} -> {error, invalid_from}
end
end,
To =
case hb_ao:get(<<"to">>, Req, not_found, Opts) of
not_found -> undefined;
ToRes -> hb_util:int(ToRes)
ToRes ->
case hb_util:safe_int(ToRes) of
{ok, ToInt} -> ToInt;
{error, _} -> {error, invalid_to}
end
end,
Format = hb_ao:get(<<"accept">>, Req, <<"application/http">>, Opts),
?event(
{parsed_get_schedule,
{process, ProcID},
{from, From},
{to, To},
{format, Format}
}
),
case find_server(ProcID, Base, Opts) of
{local, _PID} ->
generate_local_schedule(Format, ProcID, From, To, Opts);
{redirect, Redirect} ->
?event({redirect_received, {redirect, Redirect}}),
case hb_opts:get(scheduler_follow_redirects, true, Opts) of
true ->
case get_remote_schedule(ProcID, From, To, Redirect, Opts) of
{ok, Res} ->
case uri_string:percent_decode(Format) of
<<"application/aos-2">> ->
dev_scheduler_formats:assignments_to_aos2(
ProcID,
hb_ao:get(
<<"assignments">>, Res, [], Opts),
hb_util:atom(hb_ao:get(
<<"continues">>, Res, false, Opts)),
Opts
);
_ ->
{ok, Res}
case {From, To} of
{{error, invalid_from}, _} ->
{error, #{ <<"status">> => 400, <<"body">> => <<"invalid_from">> }};
{_, {error, invalid_to}} ->
{error, #{ <<"status">> => 400, <<"body">> => <<"invalid_to">> }};
_ ->
Format = hb_ao:get(<<"accept">>, Req, <<"application/http">>, Opts),
?event(
{parsed_get_schedule,
{process, ProcID},
{from, From},
{to, To},
{format, Format}
}
),
case find_server(ProcID, Base, Opts) of
{local, _PID} ->
generate_local_schedule(Format, ProcID, From, To, Opts);
{redirect, Redirect} ->
?event({redirect_received, {redirect, Redirect}}),
case hb_opts:get(scheduler_follow_redirects, true, Opts) of
true ->
case get_remote_schedule(ProcID, From, To, Redirect, Opts) of
{ok, Res} ->
case uri_string:percent_decode(Format) of
<<"application/aos-2">> ->
dev_scheduler_formats:assignments_to_aos2(
ProcID,
hb_ao:get(
<<"assignments">>, Res, [], Opts),
hb_util:atom(hb_ao:get(
<<"continues">>, Res, false, Opts)),
Opts
);
_ ->
{ok, Res}
end;
{error, Res} ->
{error, Res}
end;
{error, Res} ->
{error, Res}
end;
false ->
{ok, Redirect}
false ->
{ok, Redirect}
end
end
end.

Expand Down