Add TAMQPByteArray type for rabbitmq compat for character code 'x'

Author: quinnj

src/convert.jl

@@ -1,7 +1,8 @@
-convert(::Type{Any}, s::T)            where {T<:Union{TAMQPShortStr,TAMQPLongStr}} = convert(String, s)
-convert(::Type{String}, s::T)         where {T<:Union{TAMQPShortStr,TAMQPLongStr}} = String(convert(Vector{UInt8}, s.data))
-convert(::Type{T}, s::AbstractString) where {T<:Union{TAMQPShortStr,TAMQPLongStr}} = T(length(s), Vector{UInt8}(s))
+convert(::Type{Any}, s::T)            where {T<:Union{TAMQPShortStr,TAMQPLongStr,TAMQPByteArray}} = convert(String, s)
+convert(::Type{String}, s::T)         where {T<:Union{TAMQPShortStr,TAMQPLongStr,TAMQPByteArray}} = String(convert(Vector{UInt8}, s.data))
+convert(::Type{T}, s::AbstractString) where {T<:Union{TAMQPShortStr,TAMQPLongStr,TAMQPByteArray}} = T(length(s), Vector{UInt8}(s))
 convert(::Type{TAMQPLongStr}, d::Vector{UInt8}) = TAMQPLongStr(length(d), d)
+convert(::Type{TAMQPByteArray}, d::Vector{UInt8}) = TAMQPByteArray(length(d), d)
 
 convert(::Type{TAMQPFieldValue{T}}, v::T) where {T} = TAMQPFieldValue{T}(FieldIndicatorMap[T], v)
 

src/protocol.jl

@@ -40,7 +40,12 @@ function read(io::IO, ::Type{TAMQPLongStr})
     TAMQPLongStr(len, read!(io, Vector{UInt8}(uninitialized, len)))
 end
 
-write(io::IO, s::T) where {T<:Union{TAMQPShortStr,TAMQPLongStr}} = write(io, hton(s.len), s.data)
+function read(io::IO, ::Type{TAMQPByteArray})
+    len = ntoh(read(io, TAMQPLongUInt))
+    TAMQPByteArray(len, read!(io, Vector{UInt8}(uninitialized, len)))
+end
+
+write(io::IO, s::T) where {T<:Union{TAMQPShortStr,TAMQPLongStr,TAMQPByteArray}} = write(io, hton(s.len), s.data)
 
 function read(io::IO, ::Type{TAMQPFieldValue})
     c = read(io, Char)

src/types.jl

@@ -53,6 +53,11 @@ struct TAMQPLongStr <: TAMQPLengthPrefixed
     data::Vector{UInt8}
 end
 
+struct TAMQPByteArray <: TAMQPLengthPrefixed
+    len::TAMQPLongUInt
+    data::Vector{UInt8}
+end
+
 const TAMQPFieldName = TAMQPShortStr
 const TAMQPFV = Union{Real, TAMQPDecimalValue, TAMQPLengthPrefixed, Nothing}
 
@@ -93,7 +98,7 @@ const FieldValueIndicatorMap = Dict{Char,DataType}(
     'D' => TAMQPDecimalValue,
     's' => TAMQPShortUInt,
     'S' => TAMQPLongStr,
-    # 'x' => TAMQPLongStr,
+    'x' => TAMQPByteArray,
     'A' => TAMQPFieldArray,
     'T' => TAMQPTimeStamp,
     'F' => TAMQPFieldTable,