fed-sx-m1: Step 8d-dispatch-get — format-aware actor/artifact/projection/list responses + dispatch/3 refactor + 17 tests

next/kernel/http_server.erl

@@ -13,7 +13,9 @@
          accept_format/1, accept_format_from/1,
          capabilities_body_for/1,
          content_type_for/1, ok_response/2,
-         cid_response_for/2, post_activity_response_for/1]).
+         cid_response_for/2, post_activity_response_for/1,
+         actor_doc_response_for/2, artifact_response_for/2,
+         projection_response_for/2, projections_list_response_for/1]).
 
 %% HTTP request router per design §16.1.
 %%
@@ -43,49 +45,56 @@ route(Req) ->
 route(Req, Cfg) ->
     M = field(method, Req),
     P = field(path, Req),
+    F = accept_format_from(Req),
     case {M, P} of
         {<<80,79,83,84>>, <<47,97,99,116,105,118,105,116,121>>} ->
             handle_post_activity(Req, Cfg);
         {<<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>>} ->
-            F = accept_format_from(Req),
             ok_response(capabilities_body_for(F));
         _ ->
-            dispatch(M, P)
+            dispatch(M, P, F)
     end.
 
+%% Backward-compat /2 wrapper — defaults to text format. Route
+%% computes Format from the Accept header and calls dispatch/3
+%% directly; dispatch/2 is kept for callers that don't have a
+%% format in scope.
+dispatch(M, P) ->
+    dispatch(M, P, text).
+
 %% 71 69 84 = "GET"  | 47 = "/"
-dispatch(<<71, 69, 84>>, <<47>>) ->
+dispatch(<<71, 69, 84>>, <<47>>, _F) ->
     ok_response(welcome_body());
-%% GET /.well-known/sx-capabilities
+%% GET /.well-known/sx-capabilities — Format threaded through
 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());
+           47,115,120,45,99,97,112,97,98,105,108,105,116,105,101,115>>, F) ->
+    ok_response(capabilities_body_for(F));
 %% GET /projections — list stub. Comes before the /projections/{name}
 %% prefix clause because the bare path has no trailing slash.
-dispatch(<<71, 69, 84>>, <<47,112,114,111,106,101,99,116,105,111,110,115>>) ->
-    projections_list_response();
+dispatch(<<71, 69, 84>>, <<47,112,114,111,106,101,99,116,105,111,110,115>>, F) ->
+    projections_list_response_for(F);
 %% GET /actors/{id} or /artifacts/{cid} or /projections/{name}
-dispatch(<<71, 69, 84>>, Path) ->
+dispatch(<<71, 69, 84>>, Path, F) ->
     case match_prefix(actors_prefix(), Path) of
         {ok, Id} when byte_size(Id) > 0 ->
-            actor_doc_response(Id);
+            actor_doc_response_for(Id, F);
         _ ->
             case match_prefix(artifacts_prefix(), Path) of
                 {ok, Cid} when byte_size(Cid) > 0 ->
-                    artifact_response(Cid);
+                    artifact_response_for(Cid, F);
                 _ ->
                     case match_prefix(projections_prefix(), Path) of
                         {ok, Name} when byte_size(Name) > 0 ->
-                            projection_response(Name);
+                            projection_response_for(Name, F);
                         _ ->
                             not_found_response()
                     end
             end
     end;
-dispatch(_, _) ->
+dispatch(_, _, _) ->
     not_found_response().
 
 %% "fed-sx kernel m1\n" — 17 bytes, hand-spelled.
@@ -482,3 +491,96 @@ post_activity_response_for(cbor) ->
     ok_response(Body, cbor);
 post_activity_response_for(_) ->
     post_activity_response().
+
+%% ── 8d-dispatch-get: format-aware GET responses ─────────────────
+%%
+%% Each builder mirrors its text-only counterpart but emits a
+%% format-tagged body and Content-Type. json/activity_json share
+%% the body shape but differ in CT; sx uses parenthesized form;
+%% cbor returns the raw payload bytes (encoder follow-up).
+
+%% actor_doc_response — text body `actor: <id>\n`.
+
+actor_doc_response_for(Id, text) ->
+    actor_doc_response(Id);
+actor_doc_response_for(Id, json) ->
+    Pre = <<123,34,97,99,116,111,114,34,58,34>>,  % '{"actor":"'
+    Suf = <<34,125,10>>,                           % '"}\n'
+    ok_response(<<Pre/binary, Id/binary, Suf/binary>>, json);
+actor_doc_response_for(Id, activity_json) ->
+    Pre = <<123,34,97,99,116,111,114,34,58,34>>,
+    Suf = <<34,125,10>>,
+    ok_response(<<Pre/binary, Id/binary, Suf/binary>>, activity_json);
+actor_doc_response_for(Id, sx) ->
+    Pre = <<40,97,99,116,111,114,32,34>>,          % '(actor "'
+    Suf = <<34,41,10>>,                             % '")\n'
+    ok_response(<<Pre/binary, Id/binary, Suf/binary>>, sx);
+actor_doc_response_for(Id, cbor) ->
+    ok_response(Id, cbor);
+actor_doc_response_for(Id, _) ->
+    actor_doc_response(Id).
+
+%% artifact_response — text body `artifact: <cid>\n`.
+
+artifact_response_for(Cid, text) ->
+    artifact_response(Cid);
+artifact_response_for(Cid, json) ->
+    Pre = <<123,34,97,114,116,105,102,97,99,116,34,58,34>>,
+    Suf = <<34,125,10>>,
+    ok_response(<<Pre/binary, Cid/binary, Suf/binary>>, json);
+artifact_response_for(Cid, activity_json) ->
+    Pre = <<123,34,97,114,116,105,102,97,99,116,34,58,34>>,
+    Suf = <<34,125,10>>,
+    ok_response(<<Pre/binary, Cid/binary, Suf/binary>>, activity_json);
+artifact_response_for(Cid, sx) ->
+    Pre = <<40,97,114,116,105,102,97,99,116,32,34>>,
+    Suf = <<34,41,10>>,
+    ok_response(<<Pre/binary, Cid/binary, Suf/binary>>, sx);
+artifact_response_for(Cid, cbor) ->
+    ok_response(Cid, cbor);
+artifact_response_for(Cid, _) ->
+    artifact_response(Cid).
+
+%% projection_response (singular) — text body `projection: <name>\n`.
+
+projection_response_for(Name, text) ->
+    projection_response(Name);
+projection_response_for(Name, json) ->
+    Pre = <<123,34,112,114,111,106,101,99,116,105,111,110,34,58,34>>,
+    Suf = <<34,125,10>>,
+    ok_response(<<Pre/binary, Name/binary, Suf/binary>>, json);
+projection_response_for(Name, activity_json) ->
+    Pre = <<123,34,112,114,111,106,101,99,116,105,111,110,34,58,34>>,
+    Suf = <<34,125,10>>,
+    ok_response(<<Pre/binary, Name/binary, Suf/binary>>, activity_json);
+projection_response_for(Name, sx) ->
+    Pre = <<40,112,114,111,106,101,99,116,105,111,110,32,34>>,
+    Suf = <<34,41,10>>,
+    ok_response(<<Pre/binary, Name/binary, Suf/binary>>, sx);
+projection_response_for(Name, cbor) ->
+    ok_response(Name, cbor);
+projection_response_for(Name, _) ->
+    projection_response(Name).
+
+%% projections_list_response — empty-list stub.
+
+projections_list_response_for(text) ->
+    projections_list_response();
+%% `{"projections":[]}\n`
+projections_list_response_for(json) ->
+    Body = <<123,34,112,114,111,106,101,99,116,105,111,110,115,
+             34,58,91,93,125,10>>,
+    ok_response(Body, json);
+projections_list_response_for(activity_json) ->
+    Body = <<123,34,112,114,111,106,101,99,116,105,111,110,115,
+             34,58,91,93,125,10>>,
+    ok_response(Body, activity_json);
+%% `(projections)\n`
+projections_list_response_for(sx) ->
+    Body = <<40,112,114,111,106,101,99,116,105,111,110,115,41,10>>,
+    ok_response(Body, sx);
+projections_list_response_for(cbor) ->
+    [_, _, {body, Body}] = projections_list_response(),
+    ok_response(Body, cbor);
+projections_list_response_for(_) ->
+    projections_list_response().