fixup! fix amqpl usage

Author: deadtrickster

deps/rabbitmq_stomp/include/rabbit_stomp_frame.hrl

@@ -5,4 +5,4 @@
 %% Copyright (c) 2007-2025 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved.
 %%
 
--record(stomp_frame, {command, headers, body_iolist}).
+-record(stomp_frame, {command, headers, body_iolist_rev}).

deps/rabbitmq_stomp/src/rabbit_stomp_frame.erl

@@ -163,8 +163,8 @@ parse_body2(Content, Frame, Chunks, {more, Left}) ->
     more(fun(Rest) -> parse_body(Rest, Frame, Chunks1, Left) end);
 parse_body2(Content, Frame, Chunks, {done, Pos}) ->
     <<Chunk:Pos/binary, 0, Rest/binary>> = Content,
-    Body = lists:reverse(finalize_chunk(Chunk, Chunks)),
-    {ok, Frame#stomp_frame{body_iolist = Body}, Rest}.
+    Body = finalize_chunk(Chunk, Chunks),
+    {ok, Frame#stomp_frame{body_iolist_rev = Body}, Rest}.
 
 finalize_chunk(<<>>,  Chunks) -> Chunks;
 finalize_chunk(Chunk, Chunks) -> [Chunk | Chunks].
@@ -249,7 +249,7 @@ serialize(Frame, true) ->
     serialize(Frame, false) ++ [?LF];
 serialize(#stomp_frame{command = Command,
                        headers = Headers,
-                       body_iolist = BodyFragments}, false) ->
+                       body_iolist_rev = BodyFragments}, false) ->
     Len = iolist_size(BodyFragments),
     [Command, ?LF,
      lists:map(fun serialize_header/1,
@@ -258,7 +258,10 @@ serialize(#stomp_frame{command = Command,
          Len > 0 -> [?HEADER_CONTENT_LENGTH ++ ":", integer_to_list(Len), ?LF];
          true    -> []
      end,
-     ?LF, BodyFragments, 0].
+     ?LF, case BodyFragments of
+              _ when is_binary(BodyFragments) -> BodyFragments;
+              _ -> lists:reverse(BodyFragments)
+          end, 0].
 
 serialize_header({K, V}) when is_integer(V) -> hdr(escape(K), integer_to_list(V));
 serialize_header({K, V}) when is_boolean(V) -> hdr(escape(K), boolean_to_list(V));

deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl

@@ -791,7 +791,7 @@ maybe_clean_up_queue(Queue, #proc_state{auth_login = Username}) ->
     ok.
 
 do_send(Destination, _DestHdr,
-        Frame = #stomp_frame{body_iolist = BodyFragments},
+        Frame = #stomp_frame{body_iolist_rev = BodyFragments},
         State0 = #proc_state{default_topic_exchange = DfltTopicEx,
                              delivery_flow = Flow,
                              user = User,
@@ -839,7 +839,7 @@ do_send(Destination, _DestHdr,
                           properties = Props,
                           properties_bin = none,
                           protocol = none,
-                          payload_fragments_rev = [BodyFragments]
+                          payload_fragments_rev = BodyFragments
                          },
 
             Message0 = mc_amqpl:message(ExchangeName, RoutingKey, Content0),
@@ -1467,7 +1467,7 @@ ok(State) ->
 ok(Command, Headers, BodyFragments, State) ->
     {ok, #stomp_frame{command     = Command,
                       headers     = Headers,
-                      body_iolist = BodyFragments}, State}.
+                      body_iolist_rev = lists:reverse(BodyFragments)}, State}.
 
 amqp_death(ErrorName, Explanation, State) when is_atom(ErrorName) ->
     ErrorDesc = rabbit_misc:format("~ts", [Explanation]),
@@ -1507,11 +1507,11 @@ log_error(Message, Detail, ServerPrivateDetail) ->
 send_frame(Command, Headers, BodyFragments, State) ->
     send_frame(#stomp_frame{command     = Command,
                             headers     = Headers,
-                            body_iolist = BodyFragments},
+                            body_iolist_rev = BodyFragments},
                State).
 
 send_frame(Frame, State = #proc_state{send_fun = SendFun,
-                                 trailing_lf = TrailingLF}) ->
+                                      trailing_lf = TrailingLF}) ->
     SendFun(rabbit_stomp_frame:serialize(Frame, TrailingLF)),
     State.
 
@@ -1524,7 +1524,7 @@ send_error_frame(Message, ExtraHeaders, Detail, State) ->
                          {"content-type", "text/plain"},
                          {"version", string:join(?SUPPORTED_VERSIONS, ",")}] ++
                         ExtraHeaders,
-                        Detail, State).
+                        iolist_to_binary(Detail), State).
 
 send_error(Message, Detail, State) ->
     send_error_frame(Message, [], Detail, State).

deps/rabbitmq_stomp/test/frame_SUITE.erl

@@ -58,7 +58,7 @@ parse_simple_frame_gen(Term) ->
     [?assertEqual({ok, Value},
                   rabbit_stomp_frame:header(Frame, Key)) ||
         {Key, Value} <- Headers],
-    #stomp_frame{body_iolist = Body} = Frame,
+    #stomp_frame{body_iolist_rev = Body} = Frame,
     ?assertEqual(<<"Body Content">>, iolist_to_binary(Body)).
 
 parse_command_only(_) ->
@@ -113,7 +113,7 @@ parse_resume_mid_body(_) ->
     First = "COMMAND\n\nABC",
     Second = "DEF\0",
     {more, Resume} = parse(First),
-    {ok, #stomp_frame{command = "COMMAND", body_iolist = Body}, _Rest} =
+    {ok, #stomp_frame{command = "COMMAND", body_iolist_rev = Body}, _Rest} =
          parse(Second, Resume),
     ?assertEqual([<<"ABC">>, <<"DEF">>], Body).
 
@@ -145,7 +145,7 @@ no_nested_escapes(_) ->
     ?assertEqual(Frame,
                  #stomp_frame{command = "COM\\\\rAND",
                               headers = [{"hdr\\rname", "hdr\\rval"}],
-                              body_iolist = []}).
+                              body_iolist_rev = []}).
 
 header_name_with_cr(_) ->
     Content = "COMMAND\nhead\rer:val\n\n\0",
@@ -161,7 +161,7 @@ header_value_with_colon(_) ->
     ?assertEqual(Frame,
                  #stomp_frame{ command     = "COMMAND",
                                headers     = [{"header", "val:ue"}],
-                               body_iolist = []}).
+                               body_iolist_rev = []}).
 
 stream_offset_header(_) ->
     TestCases = [