fix: use ignoreUndefined merge-options option

achingbrain · achingbrain · commit df2a7e319e77 · 2019-10-19T09:43:11.000+01:00
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "ky": "^0.15.0",
     "ky-universal": "^0.3.0",
     "lru-cache": "^5.1.1",
-    "merge-options": "^1.0.1",
+    "merge-options": "github:achingbrain/merge-options#add-ignore-undefined-config-option",
     "multiaddr": "^6.0.6",
     "multibase": "~0.6.0",
     "multicodec": "~0.5.1",
diff --git a/src/add/index.js b/src/add/index.js
@@ -31,7 +31,7 @@ module.exports = configure(({ ky }) => {
     if (options.preload !== null) searchParams.set('preload', options.preload)
 
     const res = await ky.post('add', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams,
diff --git a/src/block/rm-async-iterator.js b/src/block/rm-async-iterator.js
@@ -24,7 +24,7 @@ module.exports = configure(({ ky }) => {
     })
 
     const res = await ky.post('block/rm', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams
diff --git a/src/cat.js b/src/cat.js
@@ -21,7 +21,7 @@ module.exports = configure(({ ky }) => {
     if (options.length) searchParams.set('length', options.length)
 
     const res = await ky.get('cat', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams
diff --git a/src/config/profiles/apply.js b/src/config/profiles/apply.js
@@ -8,7 +8,7 @@ module.exports = configure(({ ky }) => {
     options = options || {}
 
     const res = await ky.post('config/profile/apply', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams: {
diff --git a/src/config/profiles/list.js b/src/config/profiles/list.js
@@ -9,7 +9,7 @@ module.exports = configure(({ ky }) => {
     options = options || {}
 
     const res = await ky.get('config/profile/list', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers
     })
diff --git a/src/files-regular/get.js b/src/files-regular/get.js
@@ -37,7 +37,7 @@ module.exports = configure(({ ky }) => {
     }
 
     const res = await ky.get('get', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams
diff --git a/src/files-regular/ls.js b/src/files-regular/ls.js
@@ -32,7 +32,7 @@ module.exports = configure(({ ky }) => {
     }
 
     const res = await ky.get('ls', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams
diff --git a/src/files-regular/refs-local.js b/src/files-regular/refs-local.js
@@ -10,7 +10,7 @@ module.exports = configure(({ ky }) => {
     options = options || {}
 
     const res = await ky.get('refs/local', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers
     })
diff --git a/src/files-regular/refs.js b/src/files-regular/refs.js
@@ -50,7 +50,7 @@ module.exports = configure(({ ky }) => {
     }
 
     const res = await ky.get('refs', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams
diff --git a/src/lib/configure.js b/src/lib/configure.js
@@ -5,6 +5,7 @@ const ky = require('ky-universal').default
 const { isBrowser, isWebWorker } = require('ipfs-utils/src/env')
 const { toUri } = require('./multiaddr')
 const errorHandler = require('./error-handler')
+const mergeOptions = require('merge-options')
 
 // Set default configuration and call create function with them
 module.exports = create => config => {
@@ -22,17 +23,26 @@ module.exports = create => config => {
   config.apiAddr = config.apiAddr.startsWith('/') ? toUri(config.apiAddr) : config.apiAddr
   config.apiPath = config.apiPath || config['api-path'] || '/api/v0'
 
+  // TODO configure ky to use config.fetch when this is released:
+  // https://github.com/sindresorhus/ky/pull/153
+  const defaults = {
+    prefixUrl: config.apiAddr + config.apiPath,
+    timeout: config.timeout || 60000 * 20,
+    headers: config.headers,
+    hooks: {
+      afterResponse: [errorHandler]
+    }
+  }
+  const k = ky.extend(defaults)
+  const client = ['get', 'post', 'put', 'delete', 'patch', 'head']
+    .reduce((client, key) => {
+      client[key] = wrap(k[key], defaults)
+
+      return client
+    }, wrap(k, defaults))
+
   return create({
-    // TODO configure ky to use config.fetch when this is released:
-    // https://github.com/sindresorhus/ky/pull/153
-    ky: ky.extend({
-      prefixUrl: config.apiAddr + config.apiPath,
-      timeout: config.timeout || false,
-      headers: config.headers,
-      hooks: {
-        afterResponse: [errorHandler]
-      }
-    }),
+    ky: client,
     ...config
   })
 }
diff --git a/src/pubsub/ls.js b/src/pubsub/ls.js
@@ -7,7 +7,7 @@ module.exports = configure(({ ky }) => {
     options = options || {}
 
     const { Strings } = await ky.get('pubsub/ls', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams: options.searchParams
diff --git a/src/pubsub/peers.js b/src/pubsub/peers.js
@@ -15,7 +15,7 @@ module.exports = configure(({ ky }) => {
     searchParams.set('arg', topic)
 
     const { Strings } = await ky.get('pubsub/peers', {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers,
       searchParams
diff --git a/src/pubsub/publish.js b/src/pubsub/publish.js
@@ -12,7 +12,7 @@ module.exports = configure(({ ky }) => {
     searchParams.set('arg', topic)
 
     const res = await ky.post(`pubsub/pub?${searchParams}&arg=${encodeBuffer(data)}`, {
-      timeout: options.timeout || false,
+      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers
     }).text()
diff --git a/src/pubsub/subscribe.js b/src/pubsub/subscribe.js
@@ -38,7 +38,7 @@ module.exports = configure((config) => {
 
     try {
       res = await ky.post('pubsub/sub', {
-        timeout: options.timeout || false,
+        timeout: options.timeout,
         signal: options.signal,
         headers: options.headers,
         searchParams

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ module.exports = configure(({ ky }) => {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`const res = await ky.get('get', {`
`40`		`- timeout: options.timeout \|\| false,`
	`40`	`+ timeout: options.timeout,`
`41`	`41`	`signal: options.signal,`
`42`	`42`	`headers: options.headers,`
`43`	`43`	`searchParams`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ module.exports = configure(({ ky }) => {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`const res = await ky.get('ls', {`
`35`		`- timeout: options.timeout \|\| false,`
	`35`	`+ timeout: options.timeout,`
`36`	`36`	`signal: options.signal,`
`37`	`37`	`headers: options.headers,`
`38`	`38`	`searchParams`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ module.exports = configure(({ ky }) => {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`const res = await ky.get('refs', {`
`53`		`- timeout: options.timeout \|\| false,`
	`53`	`+ timeout: options.timeout,`
`54`	`54`	`signal: options.signal,`
`55`	`55`	`headers: options.headers,`
`56`	`56`	`searchParams`