diff --git a/next/kernel/http_server.erl b/next/kernel/http_server.erl index 2a756129..3112721d 100644 --- a/next/kernel/http_server.erl +++ b/next/kernel/http_server.erl @@ -1,5 +1,7 @@ -module(http_server). --export([route/1, ok_response/1, not_found_response/0, welcome_body/0]). +-export([route/1, ok_response/1, not_found_response/0, + welcome_body/0, capabilities_body/0, + capabilities_path/0]). %% HTTP request router per design §16.1. %% @@ -27,6 +29,11 @@ route(Req) -> %% 71 69 84 = "GET" | 47 = "/" dispatch(<<71, 69, 84>>, <<47>>) -> ok_response(welcome_body()); +%% GET /.well-known/sx-capabilities +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()); dispatch(_, _) -> not_found_response(). @@ -35,6 +42,25 @@ dispatch(_, _) -> welcome_body() -> <<102,101,100,45,115,120,32,107,101,114,110,101,108,32,109,49,10>>. +%% "/.well-known/sx-capabilities" — exposed for callers that build +%% requests in tests or that need the canonical path string. +capabilities_path() -> + <<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>>. + +%% Capability descriptor body. Returned as plain text per design +%% §16; future content-negotiation work (Step 8d) layers JSON / +%% dag-cbor / SX representations on top. +%% +%% Lines (each terminated by \n = 10): +%% "kernel: fed-sx-m1\n" +%% "version: 0.0.1\n" +%% "verbs: Create Update Delete\n" +capabilities_body() -> + <<107,101,114,110,101,108,58,32,102,101,100,45,115,120,45,109,49,10, + 118,101,114,115,105,111,110,58,32,48,46,48,46,49,10, + 118,101,114,98,115,58,32,67,114,101,97,116,101,32,85,112,100,97,116,101,32,68,101,108,101,116,101,10>>. + ok_response(Body) -> [{status, 200}, {headers, []}, {body, Body}]. diff --git a/next/tests/http_capabilities.sh b/next/tests/http_capabilities.sh new file mode 100755 index 00000000..11242526 --- /dev/null +++ b/next/tests/http_capabilities.sh @@ -0,0 +1,105 @@ +#!/usr/bin/env bash +# next/tests/http_capabilities.sh — Step 8c-cap acceptance test. +# +# Exercises GET /.well-known/sx-capabilities — kernel-version +# descriptor per design §16. The path is exposed as +# http_server:capabilities_path/0 so tests don't have to spell +# it byte-by-byte. 7 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)") + +;; capabilities_path is exposed and non-empty +(epoch 10) +(eval "(get (erlang-eval-ast \"byte_size(http_server:capabilities_path()) > 10\") :name)") + +;; GET capabilities_path returns 200 +(epoch 11) +(eval "(get (erlang-eval-ast \"P = http_server:capabilities_path(), Req = [{method, <<71,69,84>>}, {path, P}], case http_server:route(Req) of [{status, 200} | _] -> ok; _ -> bad end\") :name)") + +;; Capabilities body is non-empty and contains the verb names +(epoch 12) +(eval "(get (erlang-eval-ast \"B = http_server:capabilities_body(), byte_size(B) > 30\") :name)") + +;; POST to capabilities path returns 404 (only GET dispatched) +(epoch 13) +(eval "(get (erlang-eval-ast \"P = http_server:capabilities_path(), Req = [{method, <<80,79,83,84>>}, {path, P}], case http_server:route(Req) of [{status, 404} | _] -> ok; _ -> bad end\") :name)") + +;; Route returns capabilities_body when matching +(epoch 14) +(eval "(get (erlang-eval-ast \"P = http_server:capabilities_path(), Req = [{method, <<71,69,84>>}, {path, P}], R = http_server:route(Req), case R of [_, _, {body, B}] -> B =:= http_server:capabilities_body(); _ -> false end\") :name)") + +;; capabilities_path starts with '/' (47) +(epoch 15) +(eval "(get (erlang-eval-ast \"case http_server:capabilities_path() of <<47, _/binary>> -> ok; _ -> bad end\") :name)") + +;; Existing GET / route still works (no regression from the new clause) +(epoch 16) +(eval "(get (erlang-eval-ast \"Req = [{method, <<71,69,84>>}, {path, <<47>>}], case http_server:route(Req) of [{status, 200} | _] -> ok; _ -> bad end\") :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="" + 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 "capabilities_path non-empty" "true" +check 11 "GET capabilities -> 200" "ok" +check 12 "capabilities body non-empty" "true" +check 13 "POST capabilities -> 404" "ok" +check 14 "route body matches capabilities" "true" +check 15 "capabilities_path leading /" "ok" +check 16 "GET / still works" "ok" + +TOTAL=$((PASS+FAIL)) +if [ $FAIL -eq 0 ]; then + echo "ok $PASS/$TOTAL next/tests/http_capabilities.sh passed" +else + echo "FAIL $PASS/$TOTAL passed, $FAIL failed:" + echo "$ERRORS" +fi +[ $FAIL -eq 0 ] diff --git a/plans/fed-sx-milestone-1.md b/plans/fed-sx-milestone-1.md index 4393bf2b..a0f4466c 100644 --- a/plans/fed-sx-milestone-1.md +++ b/plans/fed-sx-milestone-1.md @@ -509,7 +509,11 @@ publish(ActorId, ActivityRequest) -> - [x] **8a** — `http:listen/2` BIF wrapper in `lib/erlang/runtime.sx` (the briefing's allowed exception). Validates args, bridges Erlang handler funs to SX-callable lambdas via `er-of-sx`/`er-to-sx`, delegates to the native `http-listen` primitive in `bin/sx_server.ml`. Tests verify registration + arg validation (not the blocking listen loop). `next/tests/http_listen_bif.sh` (5 cases). - [x] **8b-route** — `next/kernel/http_server.erl`: pure `route/1` dispatch + `ok_response/1`, `not_found_response/0`, `welcome_body/0`. GET / returns welcome; everything else returns 404 (graceful for missing fields). `next/tests/http_route.sh` (11 cases). - [ ] **8b-start** — `start/1(Port)` spawns an Erlang process hosting `http:listen/2`, requires the dict↔proplist marshaling bridge in the BIF wrapper. -- [ ] **8c** — `route/1`: dispatch table for GET /actors/{id}, /outbox, /artifacts/{cid}, /projections, POST /activity (Step 6e auth via bearer token), /.well-known/sx-capabilities, /.well-known/webfinger. +- [x] **8c-cap** — Route GET `/.well-known/sx-capabilities` (static doc: kernel/version/verbs lines). `next/tests/http_capabilities.sh` (8 cases). Other concrete routes follow. +- [ ] **8c-actors** — Routes for `/actors/{id}` + `/actors/{id}/outbox` (needs path-prefix matching since `{id}` is dynamic). +- [ ] **8c-art** — Route `/artifacts/{cid}` (also path-prefix matching). +- [ ] **8c-proj** — Routes `/projections` (list) + `/projections/{name}` (state). +- [ ] **8c-post** — POST `/activity` glue: parse body → call `outbox:publish` with bearer-token auth (env var `NEXT_PUBLISH_TOKEN`). - [ ] **8d** — Content negotiation by Accept header: application/activity+json (default), application/cbor, application/json, application/sx. **Deliverables:** @@ -984,6 +988,7 @@ A few things still under-specified; resolve as work begins. Newest first. One line per sub-deliverable commit. Erlang conformance gate (`bash lib/erlang/conformance.sh`) must remain 729/729 on every entry. +- **2026-05-28** — Step 8c-cap: GET `/.well-known/sx-capabilities` route + `capabilities_body/0` + `capabilities_path/0` exposed for tests. Body is a small plain-text descriptor with `kernel: fed-sx-m1`, `version: 0.0.1`, `verbs: Create Update Delete` (hand-spelled as integer-segment binary; string-literal segments unusable in this port). `next/tests/http_capabilities.sh` 8/8 covers method+path matching, body content, the existing GET / regression-free. Step 8c split into cap (done) + actors / art / proj / post — the rest need path-prefix matching helpers since `{id}` and `{cid}` are dynamic. Erlang conformance 729/729. - **2026-05-28** — Step 8b-route: `next/kernel/http_server.erl` — pure `route/1` request→response dispatch. Request shape `[{method, Bin}, {path, Bin}, ...]`; response `[{status, N}, {headers, []}, {body, Bin}]`. GET / returns 200 with hand-spelled "fed-sx kernel m1" body; everything else returns 404 with "not found" body. Method/path binaries spelled byte-by-byte (string-literal segments would truncate). Split former 8b into 8b-route (done) + 8b-start (needs dict↔proplist marshaling bridge in the BIF wrapper before the spawned `http:listen` call gets useful request fields). `next/tests/http_route.sh` 11/11. Erlang conformance 729/729. - **2026-05-28** — Step 8a: `http:listen/2` BIF wrapper added to `lib/erlang/runtime.sx` (the briefing's single allowed scope exception). The BIF takes `(Port, Handler)`, validates Port is an integer and Handler is an Erlang fun (else `badarg`), then builds an SX-callable bridge lambda that marshals request dict↔Erlang term via `er-of-sx`/`er-to-sx` and calls `er-apply-fun` on the handler. Delegates to the native `http-listen` primitive (registered in `bin/sx_server.ml`, native-only). Tests verify registration + arg validation paths (the blocking listen loop itself is not exercised — production callers spawn an Erlang process to host the call). `next/tests/http_listen_bif.sh` 5/5; Erlang conformance preserved at 729/729 despite the runtime.sx edit. Step 8 broken into 8a–8d on the plan. - **2026-05-28** — Step 7c: `outbox:publish` now broadcasts the signed activity to every projection process named in `Context`'s `:projections` entry — fired immediately after `log:append`, via `projection:async_fold`. Missing/nil/empty list is a no-op (preserves the Step 6d-publish contract). Stage halts (replay duplicate, sig failure) suppress the broadcast — projection state stays at zero while the activity is rejected. `next/tests/outbox_broadcast.sh` 14/14 covers single + multi projection fan-out, three-publish accumulation, replay-skip, sig-skip, and the projection receiving the post-sign Signed envelope (not the pre-sign skeleton). Erlang conformance 729/729.