StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix parse of errors

Browse Source
This commit is contained in:
a10zn8
2024-02-28 18:03:50 +03:00
parent 8d171e83e7
commit b9d34a39cf
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/kotlin/io/emeraldpay/dshackle/upstream/rpcclient/ResponseParser.kt
View File

@@ -156,15 +156,31 @@ abstract class ResponseParser<T> {
var message = ""
var details: Any? = null
while (parser.nextToken() != JsonToken.END_OBJECT) {
if (parser.currentToken() == JsonToken.VALUE_NULL) {
var count = 0
var inited = false
while (true) {
if (count == 0 && inited) {
break
}
val token = parser.nextToken()
if (token == JsonToken.START_OBJECT) {
inited = true
count++
continue
}
if (token == JsonToken.END_OBJECT) {
count--
continue
}
if (token == JsonToken.VALUE_NULL) {
// error is just null
return null
}
val field = parser.currentName()
if (field == "code" && parser.currentToken == JsonToken.VALUE_NUMBER_INT) {
if (field == "code" && token == JsonToken.VALUE_NUMBER_INT) {
code = parser.intValue
} else if ((field == "message" || field == "error") && parser.currentToken == JsonToken.VALUE_STRING) {
} else if ((field == "message" || field == "error") && token == JsonToken.VALUE_STRING) {
message = parser.valueAsString
} else if (field == "data") {
when (val value = parser.nextToken()) {