fix: use fetch in electron renderer and electron-fetch in main (#3251)

Lets us run test on Linux which roughly halves the amount of time Electron CI tasks take.

Author: achingbrain

package.json

@@ -40,14 +40,13 @@
     "dep-check": "aegir dep-check"
   },
   "dependencies": {
-    "abort-controller": "^3.0.0",
     "any-signal": "^2.0.0",
     "bignumber.js": "^9.0.0",
     "cids": "^1.0.0",
     "debug": "^4.1.1",
     "form-data": "^3.0.0",
     "ipfs-core-utils": "^0.4.0",
-    "ipfs-utils": "^3.0.0",
+    "ipfs-utils": "^4.0.0",
     "ipld-block": "^0.10.1",
     "ipld-dag-cbor": "^0.17.0",
     "ipld-dag-pb": "^0.20.0",
@@ -65,7 +64,7 @@
     "multicodec": "^2.0.1",
     "multihashes": "^3.0.1",
     "nanoid": "^3.1.12",
-    "node-fetch": "^2.6.0",
+    "native-abort-controller": "~0.0.3",
     "parse-duration": "^0.4.4",
     "stream-to-it": "^0.2.2",
     "uint8arrays": "^1.1.0"
@@ -75,7 +74,7 @@
     "cross-env": "^7.0.0",
     "go-ipfs": "^0.7.0",
     "interface-ipfs-core": "^0.140.0",
-    "ipfsd-ctl": "^7.0.0",
+    "ipfsd-ctl": "^7.0.2",
     "it-all": "^1.0.4",
     "it-concat": "^1.0.1",
     "it-pipe": "^1.1.0",

src/add-all.js

@@ -6,7 +6,7 @@ const configure = require('./lib/configure')
 const multipartRequest = require('./lib/multipart-request')
 const toUrlSearchParams = require('./lib/to-url-search-params')
 const anySignal = require('any-signal')
-const AbortController = require('abort-controller').default
+const AbortController = require('native-abort-controller')
 
 module.exports = configure((api) => {
   /**

src/block/put.js

@@ -7,7 +7,7 @@ const multipartRequest = require('../lib/multipart-request')
 const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const AbortController = require('abort-controller').default
+const AbortController = require('native-abort-controller')
 
 module.exports = configure(api => {
   /**

src/config/replace.js

@@ -5,7 +5,7 @@ const multipartRequest = require('../lib/multipart-request')
 const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const AbortController = require('abort-controller').default
+const AbortController = require('native-abort-controller')
 
 module.exports = configure(api => {
   return async (config, options = {}) => {

src/dag/put.js

@@ -9,7 +9,7 @@ const configure = require('../lib/configure')
 const multipartRequest = require('../lib/multipart-request')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const AbortController = require('abort-controller').default
+const AbortController = require('native-abort-controller')
 const multicodec = require('multicodec')
 
 module.exports = configure((api, opts) => {

src/files/write.js

@@ -6,7 +6,7 @@ const configure = require('../lib/configure')
 const multipartRequest = require('../lib/multipart-request')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const AbortController = require('abort-controller').default
+const AbortController = require('native-abort-controller')
 
 module.exports = configure(api => {
   return async (path, input, options = {}) => {

src/lib/multipart-request.browser.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const normaliseInput = require('ipfs-core-utils/src/files/normalise-input')
+const normaliseInput = require('ipfs-core-utils/src/files/normalise-input/index.browser')
 const modeToString = require('./mode-to-string')
 const mtimeToObject = require('./mtime-to-object')
 const { File, FormData } = require('ipfs-utils/src/globalthis')

src/lib/multipart-request.js

@@ -6,6 +6,7 @@ const modeToString = require('../lib/mode-to-string')
 const mtimeToObject = require('../lib/mtime-to-object')
 const merge = require('merge-options').bind({ ignoreUndefined: true })
 const toStream = require('it-to-stream')
+const { isElectronRenderer } = require('ipfs-utils/src/env')
 
 async function multipartRequest (source = '', abortController, headers = {}, boundary = `-----------------------------${nanoid()}`) {
   async function * streamFiles (source) {
@@ -73,3 +74,7 @@ async function multipartRequest (source = '', abortController, headers = {}, bou
 }
 
 module.exports = multipartRequest
+
+if (isElectronRenderer) {
+  module.exports = require('./multipart-request.browser')
+}

src/object/patch/append-data.js

@@ -5,7 +5,7 @@ const multipartRequest = require('../../lib/multipart-request')
 const configure = require('../../lib/configure')
 const toUrlSearchParams = require('../../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const AbortController = require('abort-controller').default
+const AbortController = require('native-abort-controller')
 
 module.exports = configure(api => {
   return async (cid, data, options = {}) => {

src/object/patch/set-data.js

@@ -5,7 +5,7 @@ const multipartRequest = require('../../lib/multipart-request')
 const configure = require('../../lib/configure')
 const toUrlSearchParams = require('../../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const AbortController = require('abort-controller').default
+const AbortController = require('native-abort-controller')
 
 module.exports = configure(api => {
   return async (cid, data, options = {}) => {