fix: update ipfs-http-client to v60.0.0

Author: galargh

package-lock.json

@@ -81,7 +81,7 @@
     "i18next-fs-backend": "1.1.4",
     "i18next-icu": "^2.0.3",
     "intl-messageformat": "^9.13.0",
-    "ipfs-http-client": "56.0.2",
+    "ipfs-http-client": "^60.0.0",
     "ipfsd-ctl": "10.0.6",
     "it-last": "^1.0.6",
     "multiaddr": "10.0.1",

package.json

@@ -1,6 +1,5 @@
 const { extname, basename } = require('path')
 const { clipboard } = require('electron')
-const { globSource } = require('ipfs-http-client')
 const i18n = require('i18next')
 const last = require('it-last')
 const fs = require('fs-extra')
@@ -88,6 +87,7 @@ async function addFileOrDirectory (ipfs, filepath) {
   let cid = null
 
   if (stat.isDirectory()) {
+    const { globSource } = await import('ipfs-http-client')
     const files = globSource(filepath, '**/*', { recursive: true })
     const res = await last(ipfs.addAll(files, { pin: false, wrapWithDirectory: true }))
     cid = res.cid

src/add-to-ipfs.js

@@ -31,8 +31,9 @@ function getIpfsBinPath () {
 async function getIpfsd (flags, path) {
   const ipfsBin = getIpfsBinPath()
 
+  const ipfsHttpModule = await import('ipfs-http-client')
   const ipfsd = await Ctl.createController({
-    ipfsHttpModule: require('ipfs-http-client'),
+    ipfsHttpModule,
     ipfsBin,
     ipfsOptions: {
       repo: path

src/daemon/daemon.js

@@ -5,19 +5,27 @@ const Ctl = require('ipfsd-ctl')
 
 const { join } = require('path')
 
-const factory = Ctl.createFactory({
-  type: 'go',
-  ipfsHttpModule: require('ipfs-http-client'),
-  ipfsBin: require('go-ipfs').path(),
-  remote: false,
-  disposable: true,
-  test: true // run on random ports
-})
+let factory
+async function getFactory () {
+  if (factory === undefined) {
+    const ipfsHttpModule = await import('ipfs-http-client')
+    factory = Ctl.createFactory({
+      type: 'go',
+      ipfsHttpModule,
+      ipfsBin: require('go-ipfs').path(),
+      remote: false,
+      disposable: true,
+      test: true // run on random ports
+    })
+  }
+  return factory
+}
 
 async function makeRepository ({ start = false }) {
   const { name: repoPath } = tmp.dirSync({ prefix: 'tmp_IPFS_PATH_', unsafeCleanup: true })
   const configPath = join(repoPath, 'config')
 
+  const factory = await getFactory()
   const ipfsd = await factory.spawn({
     ipfsOptions: { repo: repoPath },
     init: false,

test/e2e/utils/ipfsd.js

@@ -7,8 +7,6 @@ const mockNotify = require('./mocks/notify')
 
 const proxyquire = require('proxyquire').noCallThru()
 
-const { makeRepository } = require('./../e2e/utils/ipfsd')
-
 const getFixtures = (...files) => files.map(f => path.join(__dirname, 'fixtures', f))
 
 if (process.env.CI === 'true') test.setTimeout(120000) // slow ci
@@ -17,6 +15,7 @@ test.describe('Add To Ipfs', function () {
   let electron, notify, addToIpfs, ipfsd, ctx
 
   test.beforeAll(async () => {
+    const { makeRepository } = require('./../e2e/utils/ipfsd')
     const repo = await makeRepository({ start: true })
     ipfsd = repo.ipfsd
     ctx = {