fix: swap ky for ipfs-utils http

Author: hugomrdias

Diff for: src/factory.js

@@ -1,8 +1,8 @@
 'use strict'
 const merge = require('merge-options').bind({ ignoreUndefined: true })
-const kyOriginal = require('ky-universal').default
 const { tmpDir } = require('./utils')
 const { isNode } = require('ipfs-utils/src/env')
+const http = require('ipfs-utils/src/http')
 const ControllerDaemon = require('./ipfsd-daemon')
 const ControllerRemote = require('./ipfsd-client')
 const ControllerProc = require('./ipfsd-in-proc')
@@ -12,7 +12,6 @@ const testsConfig = require('./config')
 /** @typedef {import("./index").ControllerOptionsOverrides} ControllerOptionsOverrides */
 /** @typedef {import("./index").IpfsOptions} IpfsOptions */
 
-const ky = kyOriginal.extend({ timeout: false })
 const defaults = {
   remote: !isNode,
   endpoint: 'http://localhost:43134',
@@ -62,12 +61,13 @@ class Factory {
   async tmpDir (options) {
     options = merge(this.opts, options)
     if (options.remote) {
-      const res = await ky.get(
+      const res = await http.get(
         `${options.endpoint}/util/tmp-dir`,
         { searchParams: { type: options.type } }
-      ).json()
+      )
+      const out = await res.json()
 
-      return res.tmpDir
+      return out.tmpDir
     }
 
     return Promise.resolve(tmpDir(options.type))
@@ -78,17 +78,20 @@ class Factory {
       json: {
         ...options,
         // avoid recursive spawning
-        remote: false
+        remote: false,
+        ipfsBin: undefined,
+        ipfsModule: undefined,
+        ipfsHttpModule: undefined
       }
     }
 
-    const res = await ky.post(
+    const res = await http.post(
       `${options.endpoint}/spawn`,
       opts
-    ).json()
+    )
     return new ControllerRemote(
       options.endpoint,
-      res,
+      await res.json(),
       options
     )
   }

Diff for: src/ipfsd-client.js

@@ -1,11 +1,10 @@
 'use strict'
 
 const multiaddr = require('multiaddr')
+const http = require('ipfs-utils/src/http')
 const merge = require('merge-options').bind({ ignoreUndefined: true })
 const debug = require('debug')
-const kyOriginal = require('ky-universal').default
 
-const ky = kyOriginal.extend({ timeout: false })
 const daemonLog = {
   info: debug('ipfsd-ctl:client:stdout'),
   err: debug('ipfsd-ctl:client:stderr')
@@ -86,11 +85,15 @@ class Client {
       typeof initOptions === 'boolean' ? {} : initOptions
     )
 
-    const res = await ky.post(
+    const req = await http.post(
         `${this.baseUrl}/init`,
-        { searchParams: { id: this.id }, json: opts }
-    ).json()
-    this.initialized = res.initialized
+        {
+          searchParams: { id: this.id },
+          json: opts
+        }
+    )
+    const rsp = await req.json()
+    this.initialized = rsp.initialized
     this.clean = false
     return this
   }
@@ -107,7 +110,7 @@ class Client {
       return this
     }
 
-    await ky.post(
+    await http.post(
         `${this.baseUrl}/cleanup`,
         { searchParams: { id: this.id } }
     )
@@ -122,10 +125,11 @@ class Client {
    */
   async start () {
     if (!this.started) {
-      const res = await ky.post(
+      const req = await http.post(
               `${this.baseUrl}/start`,
               { searchParams: { id: this.id } }
-      ).json()
+      )
+      const res = await req.json()
 
       this._setApi(res.apiAddr)
       this._setGateway(res.gatewayAddr)
@@ -150,7 +154,7 @@ class Client {
       return this
     }
 
-    await ky.post(
+    await http.post(
       `${this.baseUrl}/stop`,
       { searchParams: { id: this.id } }
     )
@@ -169,10 +173,11 @@ class Client {
    * @returns {Promise<number>}
    */
   async pid () {
-    const res = await ky.get(
+    const req = await http.get(
         `${this.baseUrl}/pid`,
         { searchParams: { id: this.id } }
-    ).json()
+    )
+    const res = await req.json()
 
     return res.pid
   }
@@ -183,10 +188,11 @@ class Client {
    * @returns {Promise<String>}
    */
   async version () {
-    const res = await ky.get(
+    const req = await http.get(
         `${this.baseUrl}/version`,
         { searchParams: { id: this.id } }
-    ).json()
+    )
+    const res = await req.json()
     return res.version
   }
 }