chore(xo-server/callProxyMethod): use parse.result to handle errors

This commit is contained in:
Julien Fontanet
2020-06-30 12:09:02 +02:00
parent 98a1ab3033
commit b8bd6ea820
3 changed files with 19 additions and 6 deletions

View File

@@ -83,7 +83,7 @@
"iterable-backoff": "^0.1.0",
"jest-worker": "^24.0.0",
"js-yaml": "^3.10.0",
"json-rpc-peer": "^0.15.3",
"json-rpc-peer": "^0.16.0",
"json5": "^2.0.1",
"kindof": "^2.0.0",
"level-party": "^4.0.0",

View File

@@ -361,10 +361,7 @@ export default class Proxy {
const lines = pumpify.obj(response, split2(JSON.parse))
const firstLine = await readChunk(lines)
const { result, error } = parse(firstLine)
if (error !== undefined) {
throw error
}
const result = parse.result(firstLine)
const isStream = result.$responseType === 'ndjson'
if (isStream !== expectStream) {
lines.destroy()

View File

@@ -943,6 +943,13 @@
dependencies:
regenerator-runtime "^0.13.4"
"@babel/runtime@^7.3.4":
version "7.10.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.3.tgz#670d002655a7c366540c67f6fd3342cd09500364"
integrity sha512-RzGO0RLSdokm9Ipe/YD+7ww8X2Ro79qiXZF3HU9ljrM+qnJmH1Vqth+hbiQZy761LnMJTMitHDuKVYTk3k4dLw==
dependencies:
regenerator-runtime "^0.13.4"
"@babel/template@^7.10.1", "@babel/template@^7.3.3", "@babel/template@^7.4.0":
version "7.10.1"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
@@ -10976,7 +10983,7 @@ json-rpc-peer@^0.13.1:
lodash "^4.17.4"
readable-stream "^2.2.9"
json-rpc-peer@^0.15.0, json-rpc-peer@^0.15.3:
json-rpc-peer@^0.15.0:
version "0.15.5"
resolved "https://registry.yarnpkg.com/json-rpc-peer/-/json-rpc-peer-0.15.5.tgz#51bc04cd4ff1c71694d9d903ce3c250d34f2d97e"
integrity sha512-jZUNbRmcMXTpAnp1WGY9o85IfdGLKp75lBFYOIgpKOT9ZwKDHQOc3UmxOJUUg1bBfI7D1dltR3FSA6D0ZpPMpw==
@@ -10985,6 +10992,15 @@ json-rpc-peer@^0.15.0, json-rpc-peer@^0.15.3:
json-rpc-protocol "^0.12.0"
lodash "^4.17.4"
json-rpc-peer@^0.16.0:
version "0.16.0"
resolved "https://registry.yarnpkg.com/json-rpc-peer/-/json-rpc-peer-0.16.0.tgz#44ce9924cab354c3f263b315b8feb9ed644a06c2"
integrity sha512-7T112z5S5xKpWBk1MRmYao6PDPXPFct9cWJbZBVGyg4Zle8EOdvd6y09n+dWFZNdh5qZShHlYQModXU+gHyWcQ==
dependencies:
"@babel/runtime" "^7.3.4"
json-rpc-protocol "^0.13.1"
lodash "^4.17.4"
json-rpc-protocol@^0.11.3:
version "0.11.4"
resolved "https://registry.yarnpkg.com/json-rpc-protocol/-/json-rpc-protocol-0.11.4.tgz#d1adbfa8e28e548f48d83c5d5c1bde3d2e406cac"