Handling case where res.body is undefined

Author: pcowgill

src/add/index.js

@@ -40,7 +40,7 @@ module.exports = configure(({ ky }) => {
       body: await toFormData(input)
     })
 
-    for await (let file of ndjson(toIterable(res.body))) {
+    for await (let file of ndjson(toIterable(res))) {
       file = toCamel(file)
       // console.log(file)
       if (options.progress && file.bytes) {

src/block/rm-async-iterator.js

@@ -30,7 +30,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const removed of ndjson(toIterable(res.body))) {
+    for await (const removed of ndjson(toIterable(res))) {
       yield toCamel(removed)
     }
   }

src/cat.js

@@ -27,7 +27,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const chunk of toIterable(res.body)) {
+    for await (const chunk of toIterable(res)) {
       yield Buffer.from(chunk)
     }
   }

src/dht/find-peer.js

@@ -22,7 +22,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const message of ndjson(toIterable(res.body))) {
+    for await (const message of ndjson(toIterable(res))) {
       // 2 = FinalPeer
       // https://github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L18
       if (message.Type === 2 && message.Responses) {

src/dht/find-provs.js

@@ -23,7 +23,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const message of ndjson(toIterable(res.body))) {
+    for await (const message of ndjson(toIterable(res))) {
       // 4 = Provider
       // https://github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L20
       if (message.Type === 4 && message.Responses) {

src/dht/get.js

@@ -19,7 +19,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const message of ndjson(toIterable(res.body))) {
+    for await (const message of ndjson(toIterable(res))) {
       // 5 = Value
       // https://github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L21
       if (message.Type === 5) {

src/dht/provide.js

@@ -25,7 +25,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (let message of ndjson(toIterable(res.body))) {
+    for await (let message of ndjson(toIterable(res))) {
       message = toCamel(message)
       if (message.responses) {
         message.responses = message.responses.map(({ ID, Addrs }) => {

src/dht/put.js

@@ -26,7 +26,7 @@ module.exports = configure(({ ky }) => {
       headers: options.headers
     })
 
-    for await (let message of ndjson(toIterable(res.body))) {
+    for await (let message of ndjson(toIterable(res))) {
       message = toCamel(message)
       if (message.responses) {
         message.responses = message.responses.map(({ ID, Addrs }) => {

src/dht/query.js

@@ -21,7 +21,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const message of ndjson(toIterable(res.body))) {
+    for await (const message of ndjson(toIterable(res))) {
       yield new PeerInfo(PeerId.createFromB58String(message.ID))
     }
   }

src/files/ls.js

@@ -28,7 +28,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const result of ndjson(toIterable(res.body))) {
+    for await (const result of ndjson(toIterable(res))) {
       // go-ipfs does not yet support the "stream" option
       if ('Entries' in result) {
         for (const entry of result.Entries || []) {

src/files/read.js

@@ -20,7 +20,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const chunk of toIterable(res.body)) {
+    for await (const chunk of toIterable(res)) {
       yield Buffer.from(chunk)
     }
   }

src/get.js

@@ -38,7 +38,7 @@ module.exports = configure(({ ky }) => {
 
     const extractor = Tar.extract()
 
-    for await (const { header, body } of extractor(toIterable(res.body))) {
+    for await (const { header, body } of extractor(toIterable(res))) {
       if (header.type === 'directory') {
         yield {
           path: header.name

src/lib/stream-to-iterable.js

@@ -1,6 +1,17 @@
 'use strict'
 
-module.exports = function toIterable (body) {
+module.exports = function toIterable (res) {
+  // An env where res.body getter for ReadableStream with getReader
+  // is not supported, for example in React Native
+  if (!res.body) {
+    return (async function * () {
+      const arrayBuffer = await res.arrayBuffer()
+      yield arrayBuffer
+    })()
+  }
+
+  const { body } = res
+
   // Node.js stream
   if (body[Symbol.asyncIterator]) return body
 

src/log/tail.js

@@ -15,6 +15,6 @@ module.exports = configure(({ ky }) => {
       searchParams: options.searchParams
     })
 
-    yield * ndjson(toIterable(res.body))
+    yield * ndjson(toIterable(res))
   }
 })

src/object/data.js

@@ -19,7 +19,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const chunk of toIterable(res.body)) {
+    for await (const chunk of toIterable(res)) {
       yield Buffer.from(chunk)
     }
   }

src/ping.js

@@ -20,7 +20,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const chunk of ndjson(toIterable(res.body))) {
+    for await (const chunk of ndjson(toIterable(res))) {
       yield toCamel(chunk)
     }
   }

src/pubsub/subscribe.js

@@ -50,7 +50,7 @@ module.exports = configure((config) => {
 
     clearTimeout(ffWorkaround)
 
-    readMessages(ndjson(toIterable(res.body)), {
+    readMessages(ndjson(toIterable(res)), {
       onMessage: handler,
       onEnd: () => subsTracker.unsubscribe(topic, handler),
       onError: options.onError

src/refs/index.js

@@ -49,7 +49,7 @@ module.exports = config => {
         searchParams
       })
 
-      for await (const file of ndjson(toIterable(res.body))) {
+      for await (const file of ndjson(toIterable(res))) {
         yield toCamel(file)
       }
     }

src/refs/local.js

@@ -15,7 +15,7 @@ module.exports = configure(({ ky }) => {
       headers: options.headers
     })
 
-    for await (const file of ndjson(toIterable(res.body))) {
+    for await (const file of ndjson(toIterable(res))) {
       yield toCamel(file)
     }
   }

src/repo/gc.js

@@ -19,7 +19,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const gcResult of ndjson(toIterable(res.body))) {
+    for await (const gcResult of ndjson(toIterable(res))) {
       yield {
         err: gcResult.Error ? new Error(gcResult.Error) : null,
         cid: (gcResult.Key || {})['/'] ? new CID(gcResult.Key['/']) : null

src/stats/bw.js

@@ -22,7 +22,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const stats of ndjson(toIterable(res.body))) {
+    for await (const stats of ndjson(toIterable(res))) {
       yield {
         totalIn: new Big(stats.TotalIn),
         totalOut: new Big(stats.TotalOut),