WIP: Modify response to add body in React Native and logging daemon requests

.gitignore

@@ -1,3 +1,8 @@
+.DS_Store
+.connect-deps-cache/
+.connect-deps.json
+prettier.config.js
+
 # Dependency tools
 package-lock.json
 yarn.lock

packages/ipfs-http-client/src/add/index.js

@@ -3,7 +3,7 @@
 const ndjson = require('iterable-ndjson')
 const CID = require('cids')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 const { toFormData } = require('./form-data')
 const toCamel = require('../lib/object-to-camel')
 
@@ -32,16 +32,18 @@ module.exports = configure(({ ky }) => {
     if (options.preload != null) searchParams.set('preload', options.preload)
     if (options.fileImportConcurrency != null) searchParams.set('file-import-concurrency', options.fileImportConcurrency)
     if (options.blockWriteConcurrency != null) searchParams.set('block-write-concurrency', options.blockWriteConcurrency)
-
+
+    const formData = await toFormData(input)
+
     const res = await ky.post('add', {
       timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams,
-      body: await toFormData(input)
+      body: formData
     })
 
-    for await (let file of ndjson(toIterable(res.body))) {
+    for await (let file of ndjson(toAsyncIterable(res))) {
       file = toCamel(file)
 
       if (options.progress && file.bytes) {

packages/ipfs-http-client/src/block/rm.js

@@ -3,7 +3,7 @@
 const CID = require('cids')
 const ndjson = require('iterable-ndjson')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 
 module.exports = configure(({ ky }) => {
   return async function * rm (cid, options) {
@@ -29,7 +29,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const removed of ndjson(toIterable(res.body))) {
+    for await (const removed of ndjson(toAsyncIterable(res))) {
       yield toCoreInterface(removed)
     }
   }

packages/ipfs-http-client/src/cat.js

@@ -3,7 +3,7 @@
 const CID = require('cids')
 const { Buffer } = require('buffer')
 const configure = require('./lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('./lib/stream-to-async-iterable')
 
 module.exports = configure(({ ky }) => {
   return async function * cat (path, options) {
@@ -27,7 +27,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const chunk of toIterable(res.body)) {
+    for await (const chunk of toAsyncIterable(res)) {
       yield Buffer.from(chunk)
     }
   }

packages/ipfs-http-client/src/dht/find-peer.js

@@ -5,7 +5,7 @@ const CID = require('cids')
 const multiaddr = require('multiaddr')
 const ndjson = require('iterable-ndjson')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 
 module.exports = configure(({ ky }) => {
   return async function findPeer (peerId, options) {
@@ -22,7 +22,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const message of ndjson(toIterable(res.body))) {
+    for await (const message of ndjson(toAsyncIterable(res))) {
       // 3 = QueryError
       // https://github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L18
       // https://github.com/ipfs/go-ipfs/blob/eb11f569b064b960d1aba4b5b8ca155a3bd2cb21/core/commands/dht.go#L388-L389

packages/ipfs-http-client/src/dht/find-provs.js

@@ -4,7 +4,7 @@ const CID = require('cids')
 const multiaddr = require('multiaddr')
 const ndjson = require('iterable-ndjson')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 
 module.exports = configure(({ ky }) => {
   return async function * findProvs (cid, options) {
@@ -22,7 +22,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const message of ndjson(toIterable(res.body))) {
+    for await (const message of ndjson(toAsyncIterable(res))) {
       // 3 = QueryError
       // https://github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L18
       // https://github.com/libp2p/go-libp2p-kad-dht/blob/master/routing.go#L525-L526

packages/ipfs-http-client/src/dht/get.js

@@ -2,7 +2,7 @@
 
 const { Buffer } = require('buffer')
 const ndjson = require('iterable-ndjson')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 const encodeBufferURIComponent = require('../lib/encode-buffer-uri-component')
 const configure = require('../lib/configure')
 
@@ -23,7 +23,7 @@ module.exports = configure(({ ky }) => {
       headers: options.headers
     })
 
-    for await (const message of ndjson(toIterable(res.body))) {
+    for await (const message of ndjson(toAsyncIterable(res))) {
       // 3 = QueryError
       // https://github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L18
       // https://github.com/ipfs/go-ipfs/blob/eb11f569b064b960d1aba4b5b8ca155a3bd2cb21/core/commands/dht.go#L472-L473

packages/ipfs-http-client/src/dht/provide.js

@@ -4,7 +4,7 @@ const CID = require('cids')
 const multiaddr = require('multiaddr')
 const ndjson = require('iterable-ndjson')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 const toCamel = require('../lib/object-to-camel')
 
 module.exports = configure(({ ky }) => {
@@ -24,7 +24,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (let message of ndjson(toIterable(res.body))) {
+    for await (let message of ndjson(toAsyncIterable(res))) {
       // 3 = QueryError
       // https://github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L18
       // https://github.com/ipfs/go-ipfs/blob/eb11f569b064b960d1aba4b5b8ca155a3bd2cb21/core/commands/dht.go#L283-L284

packages/ipfs-http-client/src/dht/put.js

@@ -5,7 +5,7 @@ const CID = require('cids')
 const multiaddr = require('multiaddr')
 const ndjson = require('iterable-ndjson')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 const encodeBufferURIComponent = require('../lib/encode-buffer-uri-component')
 const toCamel = require('../lib/object-to-camel')
 
@@ -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(toAsyncIterable(res))) {
       // 3 = QueryError
       // https://github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L18
       // https://github.com/ipfs/go-ipfs/blob/eb11f569b064b960d1aba4b5b8ca155a3bd2cb21/core/commands/dht.go#L472-L473

packages/ipfs-http-client/src/dht/query.js

@@ -3,7 +3,7 @@
 const CID = require('cids')
 const ndjson = require('iterable-ndjson')
 const multiaddr = require('multiaddr')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 const configure = require('../lib/configure')
 const toCamel = require('../lib/object-to-camel')
 
@@ -22,7 +22,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (let message of ndjson(toIterable(res.body))) {
+    for await (let message of ndjson(toAsyncIterable(res))) {
       message = toCamel(message)
       message.id = new CID(message.id)
       message.responses = (message.responses || []).map(({ ID, Addrs }) => ({

packages/ipfs-http-client/src/files/ls.js

@@ -2,7 +2,7 @@
 
 const CID = require('cids')
 const ndjson = require('iterable-ndjson')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 const configure = require('../lib/configure')
 const toCamelWithMetadata = require('../lib/object-to-camel-with-metadata')
 
@@ -30,7 +30,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const result of ndjson(toIterable(res.body))) {
+    for await (const result of ndjson(toAsyncIterable(res))) {
       // go-ipfs does not yet support the "stream" option
       if ('Entries' in result) {
         for (const entry of result.Entries || []) {

packages/ipfs-http-client/src/files/read.js

@@ -2,7 +2,7 @@
 
 const { Buffer } = require('buffer')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 
 module.exports = configure(({ ky }) => {
   return async function * read (path, options) {
@@ -20,7 +20,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const chunk of toIterable(res.body)) {
+    for await (const chunk of toAsyncIterable(res)) {
       yield Buffer.from(chunk)
     }
   }

packages/ipfs-http-client/src/get.js

@@ -4,7 +4,7 @@ const configure = require('./lib/configure')
 const Tar = require('it-tar')
 const { Buffer } = require('buffer')
 const CID = require('cids')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('./lib/stream-to-async-iterable')
 
 module.exports = configure(({ ky }) => {
   return async function * get (path, options) {
@@ -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(toAsyncIterable(res))) {
       if (header.type === 'directory') {
         yield {
           path: header.name

packages/ipfs-http-client/src/lib/stream-to-async-iterable.js

@@ -0,0 +1,27 @@
+'use strict'
+
+const toAsyncIterableOriginal = require('stream-to-it/source')
+
+// Note: Turned this into a helper that wraps `stream-to-it/source`
+// to handle the body undefined case without requiring that other libs
+// that consume that package such as `js-ipfs` and `js-ipfs-utils` modify
+// how they use it
+
+module.exports = function toAsyncIterable (res) {
+  const { body } = res
+
+  // An env where res.body getter for ReadableStream with getReader
+  // is not supported, for example in React Native
+  if (!body) {
+    if (res.arrayBuffer) {
+      return (async function * () {
+        const arrayBuffer = await res.arrayBuffer()
+        yield arrayBuffer
+      })()
+    } else {
+      throw new Error('Neither Response.body nor Response.arrayBuffer is defined')
+    }
+  }
+
+  return toAsyncIterableOriginal(body)
+}

packages/ipfs-http-client/src/log/tail.js

@@ -2,7 +2,7 @@
 
 const ndjson = require('iterable-ndjson')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 
 module.exports = configure(({ ky }) => {
   return async function * tail (options) {
@@ -15,6 +15,6 @@ module.exports = configure(({ ky }) => {
       searchParams: options.searchParams
     })
 
-    yield * ndjson(toIterable(res.body))
+    yield * ndjson(toAsyncIterable(res))
   }
 })

packages/ipfs-http-client/src/ls.js

@@ -3,7 +3,7 @@
 const { Buffer } = require('buffer')
 const CID = require('cids')
 const ndjson = require('iterable-ndjson')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('./lib/stream-to-async-iterable')
 const configure = require('./lib/configure')
 
 module.exports = configure(({ ky }) => {
@@ -25,7 +25,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (let result of ndjson(toIterable(res.body))) {
+    for await (let result of ndjson(toAsyncIterable(res))) {
       result = result.Objects
 
       if (!result) {

packages/ipfs-http-client/src/name/resolve.js

@@ -2,7 +2,7 @@
 
 const ndjson = require('iterable-ndjson')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 
 module.exports = configure(({ ky }) => {
   return async function * (path, options) {
@@ -23,7 +23,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const result of ndjson(toIterable(res.body))) {
+    for await (const result of ndjson(toAsyncIterable(res))) {
       yield result.Path
     }
   }

packages/ipfs-http-client/src/pin/ls.js

@@ -3,7 +3,7 @@
 const ndjson = require('iterable-ndjson')
 const CID = require('cids')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 
 module.exports = configure(({ ky }) => {
   return async function * ls (path, options) {
@@ -28,7 +28,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const pin of ndjson(toIterable(res.body))) {
+    for await (const pin of ndjson(toAsyncIterable(res))) {
       if (pin.Keys) { // non-streaming response
         for (const cid of Object.keys(pin.Keys)) {
           yield { cid: new CID(cid), type: pin.Keys[cid].Type }

packages/ipfs-http-client/src/ping.js

@@ -2,7 +2,7 @@
 
 const ndjson = require('iterable-ndjson')
 const configure = require('./lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('./lib/stream-to-async-iterable')
 const toCamel = require('./lib/object-to-camel')
 
 module.exports = configure(({ ky }) => {
@@ -20,7 +20,7 @@ module.exports = configure(({ ky }) => {
       searchParams
     })
 
-    for await (const chunk of ndjson(toIterable(res.body))) {
+    for await (const chunk of ndjson(toAsyncIterable(res))) {
       yield toCamel(chunk)
     }
   }

packages/ipfs-http-client/src/pubsub/subscribe.js

@@ -5,7 +5,7 @@ const bs58 = require('bs58')
 const { Buffer } = require('buffer')
 const log = require('debug')('ipfs-http-client:pubsub:subscribe')
 const configure = require('../lib/configure')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 const SubscriptionTracker = require('./subscription-tracker')
 
 module.exports = configure((config) => {
@@ -49,7 +49,7 @@ module.exports = configure((config) => {
 
     clearTimeout(ffWorkaround)
 
-    readMessages(ndjson(toIterable(res.body)), {
+    readMessages(ndjson(toAsyncIterable(res)), {
       onMessage: handler,
       onEnd: () => subsTracker.unsubscribe(topic, handler),
       onError: options.onError

packages/ipfs-http-client/src/refs/index.js

@@ -4,7 +4,7 @@ const configure = require('../lib/configure')
 const { Buffer } = require('buffer')
 const CID = require('cids')
 const ndjson = require('iterable-ndjson')
-const toIterable = require('stream-to-it/source')
+const toAsyncIterable = require('../lib/stream-to-async-iterable')
 const toCamel = require('../lib/object-to-camel')
 
 module.exports = config => {
@@ -49,7 +49,7 @@ module.exports = config => {
         searchParams
       })
 
-      for await (const file of ndjson(toIterable(res.body))) {
+      for await (const file of ndjson(toAsyncIterable(res))) {
         yield toCamel(file)
       }
     }