Skip to content
Merged
Changes from all commits
Commits
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
63 changes: 62 additions & 1 deletion deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ defmodule RabbitMQ.CLI.Formatters.Json do
end

def format_output(output, _opts) do
{:ok, json} = JSON.encode(keys_to_atoms(output))
{:ok, json} = JSON.encode(keys_to_atoms(convert_erlang_strings(output)))
json
end

Expand Down Expand Up @@ -72,4 +72,65 @@ defmodule RabbitMQ.CLI.Formatters.Json do
end

def machine_readable?, do: true

# Convert Erlang strings (lists of integers) to binaries for proper JSON encoding
# Also convert other Erlang-specific terms to readable strings
defp convert_erlang_strings(data) when is_function(data) do
"Fun()"
end

defp convert_erlang_strings(data) when is_pid(data) do
"Pid(#{inspect(data)})"
end

defp convert_erlang_strings(data) when is_port(data) do
"Port(#{inspect(data)})"
end

defp convert_erlang_strings(data) when is_reference(data) do
"Ref(#{inspect(data)})"
end

defp convert_erlang_strings(data) when is_list(data) do
# Only attempt Unicode conversion on proper lists of integers
if is_proper_list_of_integers?(data) do
case :unicode.characters_to_binary(data, :utf8) do
binary when is_binary(binary) ->
# Successfully converted - it was a valid Unicode string
binary
_ ->
# Conversion failed - not a Unicode string, process as regular list
Enum.map(data, &convert_erlang_strings/1)
end
else
# Not a proper list of integers, process as regular list
Enum.map(data, &convert_erlang_strings/1)
end
end

defp convert_erlang_strings(data) when is_tuple(data) do
data
|> Tuple.to_list()
|> Enum.map(&convert_erlang_strings/1)
|> List.to_tuple()
end

defp convert_erlang_strings(data) when is_map(data) do
Enum.into(data, %{}, fn {k, v} ->
{convert_erlang_strings(k), convert_erlang_strings(v)}
end)
end

defp convert_erlang_strings(data), do: data

# Check if data is a proper list containing only integers
defp is_proper_list_of_integers?([]), do: false # Empty lists are not strings
defp is_proper_list_of_integers?(data) when is_list(data) do
try do
Enum.all?(data, &is_integer/1)
rescue
_ -> false # Not a proper list or contains non-integers
end
end
defp is_proper_list_of_integers?(_), do: false
end
Loading