fixup

lib/api/util.js

@@ -2,6 +2,7 @@ const assert = require('assert')
 const {
   ResponseStatusCodeError
 } = require('../core/errors')
+const { toUSVString } = require('../core/util')
 
 async function dump (body) {
   let limit = 0
@@ -16,35 +17,39 @@ async function dump (body) {
 async function getResolveErrorBodyCallback ({ callback, body, contentType, statusCode, statusMessage, headers }) {
   assert(body)
 
-  if (statusCode === 204 || !contentType) {
-    await dump(body)
+  let chunks = []
+  let limit = 0
+
+  for await (const chunk of body) {
+    chunks.push(chunk)
+    limit += chunk.length
+    if (limit > 128 * 1024) {
+      chunks = null
+      break
+    }
+  }
+
+  if (statusCode === 204 || !contentType || !chunks) {
     process.nextTick(callback, new ResponseStatusCodeError(`Response status code ${statusCode}${statusMessage ? `: ${statusMessage}` : ''}`, statusCode, headers))
     return
   }
 
   try {
     if (contentType.startsWith('application/json')) {
-      let payload = await body.text()
-      try {
-        payload = JSON.parse(payload)
-      } catch {
-        // Ignore
-      }
+      const payload = JSON.parse(toUSVString(Buffer.concat(chunks)))
       process.nextTick(callback, new ResponseStatusCodeError(`Response status code ${statusCode}${statusMessage ? `: ${statusMessage}` : ''}`, statusCode, headers, payload))
       return
     }
 
     if (contentType.startsWith('text/')) {
-      const payload = await body.text()
+      const payload = toUSVString(Buffer.concat(chunks))
       process.nextTick(callback, new ResponseStatusCodeError(`Response status code ${statusCode}${statusMessage ? `: ${statusMessage}` : ''}`, statusCode, headers, payload))
       return
     }
   } catch (err) {
     // Process in a fallback if error
   }
 
-  await dump(body)
-
   process.nextTick(callback, new ResponseStatusCodeError(`Response status code ${statusCode}${statusMessage ? `: ${statusMessage}` : ''}`, statusCode, headers))
 }
 

test/client.js

@@ -366,7 +366,7 @@ test('basic get returns 400 when configured to throw on errors and correctly han
       t.equal(err.status, 400)
       t.equal(err.statusCode, 400)
       t.equal(err.headers.connection, 'keep-alive')
-      t.same(err.body, 'Invalid params')
+      t.same(err.body, null)
     })
     t.equal(signal.listenerCount('abort'), 1)
   })