fed-sx-m1: Step 8c-actors-doc — match_prefix + GET /actors/{id} route + 13 tests
Some checks failed
Test, Build, and Deploy / test-build-deploy (push) Failing after 32s
Some checks failed
Test, Build, and Deploy / test-build-deploy (push) Failing after 32s
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
-module(http_server).
|
||||
-export([route/1, ok_response/1, not_found_response/0,
|
||||
welcome_body/0, capabilities_body/0,
|
||||
capabilities_path/0]).
|
||||
capabilities_path/0,
|
||||
match_prefix/2, actors_prefix/0, actor_doc_response/1]).
|
||||
|
||||
%% HTTP request router per design §16.1.
|
||||
%%
|
||||
@@ -34,6 +35,17 @@ dispatch(<<71, 69, 84>>,
|
||||
<<47,46,119,101,108,108,45,107,110,111,119,110,
|
||||
47,115,120,45,99,97,112,97,98,105,108,105,116,105,101,115>>) ->
|
||||
ok_response(capabilities_body());
|
||||
%% GET /actors/{id}
|
||||
dispatch(<<71, 69, 84>>, Path) ->
|
||||
case match_prefix(actors_prefix(), Path) of
|
||||
{ok, Id} ->
|
||||
case byte_size(Id) of
|
||||
0 -> not_found_response();
|
||||
_ -> actor_doc_response(Id)
|
||||
end;
|
||||
nomatch ->
|
||||
not_found_response()
|
||||
end;
|
||||
dispatch(_, _) ->
|
||||
not_found_response().
|
||||
|
||||
@@ -73,3 +85,30 @@ not_found_response() ->
|
||||
field(K, [{K, V} | _]) -> V;
|
||||
field(K, [_ | Rest]) -> field(K, Rest);
|
||||
field(_, []) -> nil.
|
||||
|
||||
%% ── Dynamic-segment routing ─────────────────────────────────────
|
||||
%%
|
||||
%% match_prefix(Prefix, Path) — if Path starts with the entire
|
||||
%% Prefix binary, return {ok, Rest} where Rest is the remaining
|
||||
%% bytes; else return nomatch. Pure byte-level pattern match,
|
||||
%% no regex / no parsing. Path-segment splitting comes in later
|
||||
%% sub-deliverables (8c-art, 8c-proj) where it's needed.
|
||||
|
||||
match_prefix(<<>>, Rest) -> {ok, Rest};
|
||||
match_prefix(<<B, PRest/binary>>, <<B, PathRest/binary>>) ->
|
||||
match_prefix(PRest, PathRest);
|
||||
match_prefix(_, _) -> nomatch.
|
||||
|
||||
%% "/actors/" — 8 bytes: 47 97 99 116 111 114 115 47
|
||||
actors_prefix() ->
|
||||
<<47,97,99,116,111,114,115,47>>.
|
||||
|
||||
%% Actor doc stub. Real implementation (Step 8c continuation) will
|
||||
%% fetch the actor-state projection entry and serialise it; v1
|
||||
%% returns the id as the body so route resolution can be exercised
|
||||
%% end-to-end without the projection wiring.
|
||||
actor_doc_response(Id) ->
|
||||
%% "actor: " — 7 bytes
|
||||
Pre = <<97,99,116,111,114,58,32>>,
|
||||
Body = <<Pre/binary, Id/binary, 10>>,
|
||||
ok_response(Body).
|
||||
|
||||
129
next/tests/http_actors.sh
Executable file
129
next/tests/http_actors.sh
Executable file
@@ -0,0 +1,129 @@
|
||||
#!/usr/bin/env bash
|
||||
# next/tests/http_actors.sh — Step 8c-actors acceptance test.
|
||||
#
|
||||
# Exercises match_prefix/2 + GET /actors/{id} route. The id is
|
||||
# carried back in the response body so callers can confirm the
|
||||
# right segment was extracted. 12 cases.
|
||||
|
||||
set -uo pipefail
|
||||
cd "$(git rev-parse --show-toplevel)"
|
||||
|
||||
SX_SERVER="${SX_SERVER:-hosts/ocaml/_build/default/bin/sx_server.exe}"
|
||||
if [ ! -x "$SX_SERVER" ]; then
|
||||
SX_SERVER="/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe"
|
||||
fi
|
||||
if [ ! -x "$SX_SERVER" ]; then
|
||||
echo "ERROR: sx_server.exe not found." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VERBOSE="${1:-}"
|
||||
PASS=0; FAIL=0; ERRORS=""
|
||||
TMPFILE=$(mktemp); trap "rm -f $TMPFILE" EXIT
|
||||
|
||||
cat > "$TMPFILE" <<'EPOCHS'
|
||||
(epoch 1)
|
||||
(load "lib/erlang/tokenizer.sx")
|
||||
(load "lib/erlang/parser.sx")
|
||||
(load "lib/erlang/parser-core.sx")
|
||||
(load "lib/erlang/parser-expr.sx")
|
||||
(load "lib/erlang/parser-module.sx")
|
||||
(load "lib/erlang/transpile.sx")
|
||||
(load "lib/erlang/runtime.sx")
|
||||
(load "lib/erlang/vm/dispatcher.sx")
|
||||
|
||||
(epoch 2)
|
||||
(eval "(get (erlang-load-module (file-read \"next/kernel/http_server.erl\")) :name)")
|
||||
|
||||
;; match_prefix on a clean match returns the rest
|
||||
(epoch 10)
|
||||
(eval "(get (erlang-eval-ast \"http_server:match_prefix(<<97,98>>, <<97,98,99,100>>) =:= {ok, <<99,100>>}\") :name)")
|
||||
|
||||
;; Empty prefix matches everything
|
||||
(epoch 11)
|
||||
(eval "(get (erlang-eval-ast \"http_server:match_prefix(<<>>, <<97,98,99>>) =:= {ok, <<97,98,99>>}\") :name)")
|
||||
|
||||
;; No common bytes -> nomatch
|
||||
(epoch 12)
|
||||
(eval "(get (erlang-eval-ast \"http_server:match_prefix(<<97,98>>, <<120,121>>) =:= nomatch\") :name)")
|
||||
|
||||
;; Prefix longer than path -> nomatch
|
||||
(epoch 13)
|
||||
(eval "(get (erlang-eval-ast \"http_server:match_prefix(<<97,98,99,100>>, <<97,98>>) =:= nomatch\") :name)")
|
||||
|
||||
;; Exact match yields empty rest
|
||||
(epoch 14)
|
||||
(eval "(get (erlang-eval-ast \"http_server:match_prefix(<<97,98>>, <<97,98>>) =:= {ok, <<>>}\") :name)")
|
||||
|
||||
;; actors_prefix is "/actors/" — 8 bytes
|
||||
(epoch 15)
|
||||
(eval "(erlang-eval-ast \"byte_size(http_server:actors_prefix())\")")
|
||||
|
||||
;; GET /actors/alice -> 200
|
||||
(epoch 16)
|
||||
(eval "(get (erlang-eval-ast \"Req = [{method, <<71,69,84>>}, {path, <<47,97,99,116,111,114,115,47,97,108,105,99,101>>}], case http_server:route(Req) of [{status, 200} | _] -> ok; _ -> bad end\") :name)")
|
||||
|
||||
;; The id appears in the body
|
||||
(epoch 17)
|
||||
(eval "(get (erlang-eval-ast \"Req = [{method, <<71,69,84>>}, {path, <<47,97,99,116,111,114,115,47,97,108,105,99,101>>}], R = http_server:route(Req), case R of [_, _, {body, B}] -> http_server:match_prefix(<<97,99,116,111,114,58,32>>, B) =/= nomatch; _ -> false end\") :name)")
|
||||
|
||||
;; GET /actors/ (empty id) -> 404
|
||||
(epoch 18)
|
||||
(eval "(get (erlang-eval-ast \"Req = [{method, <<71,69,84>>}, {path, <<47,97,99,116,111,114,115,47>>}], case http_server:route(Req) of [{status, 404} | _] -> ok; _ -> bad end\") :name)")
|
||||
|
||||
;; POST /actors/alice -> 404 (only GET)
|
||||
(epoch 19)
|
||||
(eval "(get (erlang-eval-ast \"Req = [{method, <<80,79,83,84>>}, {path, <<47,97,99,116,111,114,115,47,97,108,105,99,101>>}], case http_server:route(Req) of [{status, 404} | _] -> ok; _ -> bad end\") :name)")
|
||||
|
||||
;; GET /unrelated still 404
|
||||
(epoch 20)
|
||||
(eval "(get (erlang-eval-ast \"Req = [{method, <<71,69,84>>}, {path, <<47,102,111,111>>}], case http_server:route(Req) of [{status, 404} | _] -> ok; _ -> bad end\") :name)")
|
||||
|
||||
;; Existing routes (GET /, capabilities) still work
|
||||
(epoch 21)
|
||||
(eval "(get (erlang-eval-ast \"Req1 = [{method, <<71,69,84>>}, {path, <<47>>}], Req2 = [{method, <<71,69,84>>}, {path, http_server:capabilities_path()}], R1 = case http_server:route(Req1) of [{status, 200} | _] -> ok; _ -> bad end, R2 = case http_server:route(Req2) of [{status, 200} | _] -> ok; _ -> bad end, {R1, R2} =:= {ok, ok}\") :name)")
|
||||
EPOCHS
|
||||
|
||||
OUTPUT=$(timeout 60 "$SX_SERVER" < "$TMPFILE" 2>/dev/null)
|
||||
|
||||
check() {
|
||||
local epoch="$1" desc="$2" expected="$3"
|
||||
local actual
|
||||
actual=$(echo "$OUTPUT" | awk -v e="$epoch" '
|
||||
$0 ~ "^\\(ok-len " e " " { getline; print; exit }
|
||||
$0 ~ "^\\(ok " e " " { print; exit }
|
||||
$0 ~ "^\\(error " e " " { print; exit }
|
||||
')
|
||||
[ -z "$actual" ] && actual="<no output for epoch $epoch>"
|
||||
if echo "$actual" | grep -qF -- "$expected"; then
|
||||
PASS=$((PASS+1))
|
||||
[ "$VERBOSE" = "-v" ] && echo " ok $desc"
|
||||
else
|
||||
FAIL=$((FAIL+1))
|
||||
ERRORS+=" FAIL [$desc] (epoch $epoch) expected: $expected | actual: $actual
|
||||
"
|
||||
fi
|
||||
}
|
||||
|
||||
check 2 "module load name" "http_server"
|
||||
check 10 "match_prefix clean match" "true"
|
||||
check 11 "empty prefix matches all" "true"
|
||||
check 12 "no common bytes -> nomatch" "true"
|
||||
check 13 "prefix > path -> nomatch" "true"
|
||||
check 14 "exact match -> empty rest" "true"
|
||||
check 15 "actors_prefix size = 8" "8"
|
||||
check 16 "GET /actors/alice -> 200" "ok"
|
||||
check 17 "body carries 'actor: ' prefix" "true"
|
||||
check 18 "GET /actors/ (empty id) -> 404" "ok"
|
||||
check 19 "POST /actors/alice -> 404" "ok"
|
||||
check 20 "GET /unrelated still 404" "ok"
|
||||
check 21 "existing routes intact" "true"
|
||||
|
||||
TOTAL=$((PASS+FAIL))
|
||||
if [ $FAIL -eq 0 ]; then
|
||||
echo "ok $PASS/$TOTAL next/tests/http_actors.sh passed"
|
||||
else
|
||||
echo "FAIL $PASS/$TOTAL passed, $FAIL failed:"
|
||||
echo "$ERRORS"
|
||||
fi
|
||||
[ $FAIL -eq 0 ]
|
||||
Reference in New Issue
Block a user