fix

Author: tanmaykm

src/OpenAPI.jl

@@ -8,10 +8,10 @@ import Base: getindex, keys, length, iterate, hasproperty
 import JSON: lower
 
 
-const _JSON_PARSE_ALLOW_TRAILING = try; JSON.parse("1 "; allowtrailing=true); true; catch; false; end
+const _JSON_PARSE_ISROOT_SUPPORTED = try; JSON.parse("1 "; isroot=false); true; catch; false; end
 
-if _JSON_PARSE_ALLOW_TRAILING
-    _json_parse(io_or_str) = JSON.parse(io_or_str; allowtrailing=true)
+if _JSON_PARSE_ISROOT_SUPPORTED
+    _json_parse(io_or_str) = JSON.parse(io_or_str; isroot=false)
 else
     _json_parse(io_or_str) = JSON.parse(io_or_str)
 end

src/client/chunk_readers.jl

@@ -20,6 +20,71 @@ struct JSONChunkReader <: AbstractChunkReader
     buffered_input::Base.BufferStream
 end
 
+function _read_json_chunk(io::IO)
+    out = IOBuffer()
+    first_byte = peek(io, UInt8)
+
+    if first_byte == UInt8('{') || first_byte == UInt8('[')
+        close_byte = first_byte == UInt8('{') ? UInt8('}') : UInt8(']')
+        depth = 0
+        in_string = false
+        escaped = false
+
+        while !eof(io)
+            byte = read(io, UInt8)
+            write(out, byte)
+
+            if escaped
+                escaped = false
+                continue
+            end
+
+            if in_string
+                if byte == UInt8('\\')
+                    escaped = true
+                elseif byte == UInt8('"')
+                    in_string = false
+                end
+            else
+                if byte == UInt8('"')
+                    in_string = true
+                elseif byte == first_byte
+                    depth += 1
+                elseif byte == close_byte
+                    depth -= 1
+                    depth == 0 && break
+                end
+            end
+        end
+    elseif first_byte == UInt8('"')
+        escaped = false
+        read(io, UInt8)  # consume opening quote
+        write(out, UInt8('"'))
+        while !eof(io)
+            byte = read(io, UInt8)
+            write(out, byte)
+            if escaped
+                escaped = false
+            elseif byte == UInt8('\\')
+                escaped = true
+            elseif byte == UInt8('"')
+                break
+            end
+        end
+    else
+        # number / true / false / null: read until delimiter
+        while !eof(io)
+            byte = peek(io, UInt8)
+            if isspace(Char(byte)) || byte == UInt8(',') || byte == UInt8(']') || byte == UInt8('}')
+                break
+            end
+            write(out, read(io, UInt8))
+        end
+    end
+
+    take!(out)
+end
+
 function Base.iterate(iter::JSONChunkReader, _state=nothing)
     if eof(iter.buffered_input)
         return nothing
@@ -34,7 +99,9 @@ function Base.iterate(iter::JSONChunkReader, _state=nothing)
             end
         end
         eof(iter.buffered_input) && return nothing
-        valid_json = _json_parse(iter.buffered_input)
+        chunk_bytes = _read_json_chunk(iter.buffered_input)
+        isempty(chunk_bytes) && return nothing
+        valid_json = _json_parse(String(chunk_bytes))
         bytes = convert(Vector{UInt8}, codeunits(JSON.json(valid_json)))
         return (bytes, iter)
     end