Revert "feat: let js-ipfs create a repo for itself, no need to import ipfs-repo"

This reverts commit 42597c1.

Author: dryajov

package.json

@@ -86,6 +86,7 @@
     "hapi": "^16.6.2",
     "hat": "0.0.3",
     "ipfs-api": "^21.0.0",
+    "ipfs-repo": "~0.20.0",
     "joi": "^13.1.2",
     "lodash.clone": "^4.5.0",
     "lodash.defaults": "^4.2.0",

src/ipfsd-in-proc.js

@@ -2,6 +2,7 @@
 
 const multiaddr = require('multiaddr')
 const defaultsDeep = require('lodash.defaultsdeep')
+const createRepo = require('./utils/repo/create-nodejs')
 const defaults = require('lodash.defaults')
 const waterfall = require('async/waterfall')
 const debug = require('debug')
@@ -30,6 +31,7 @@ class Node extends EventEmitter {
 
     this.opts.args = this.opts.args || []
     this.path = this.opts.repoPath
+    this.repo = createRepo(this.path)
     this.disposable = this.opts.disposable
     this.clean = true
     this._apiAddr = null
@@ -62,7 +64,7 @@ class Node extends EventEmitter {
     })
 
     this.exec = new IPFS({
-      repo: this.path,
+      repo: this.repo,
       init: false,
       start: false,
       pass: this.opts.pass,

src/utils/repo/create-browser.js

@@ -0,0 +1,28 @@
+/* global self */
+'use strict'
+
+const IPFSRepo = require('ipfs-repo')
+const hat = require('hat')
+
+const idb = self.indexedDB ||
+  self.mozIndexedDB ||
+  self.webkitIndexedDB ||
+  self.msIndexedDB
+
+function createTempRepo (repoPath) {
+  repoPath = repoPath || '/ipfs-' + hat()
+
+  const repo = new IPFSRepo(repoPath)
+
+  repo.teardown = (done) => {
+    repo.close(() => {
+      idb.deleteDatabase(repoPath)
+      idb.deleteDatabase(repoPath + '/blocks')
+      done()
+    })
+  }
+
+  return repo
+}
+
+module.exports = createTempRepo

src/utils/repo/create-nodejs.js

@@ -0,0 +1,41 @@
+'use strict'
+
+const IPFSRepo = require('ipfs-repo')
+const os = require('os')
+const path = require('path')
+const hat = require('hat')
+const series = require('async/series')
+const rimraf = require('rimraf')
+const fs = require('fs')
+
+const clean = (dir) => {
+  try {
+    fs.accessSync(dir)
+  } catch (err) {
+    // Does not exist so all good
+    return
+  }
+
+  rimraf.sync(dir)
+}
+
+function createTempRepo (repoPath) {
+  repoPath = repoPath || path.join(os.tmpdir(), '/ipfs-test-' + hat())
+
+  const repo = new IPFSRepo(repoPath)
+
+  repo.teardown = (done) => {
+    series([
+      // ignore err, might have been closed already
+      (cb) => repo.close(() => cb()),
+      (cb) => {
+        clean(repoPath)
+        cb()
+      }
+    ], done)
+  }
+
+  return repo
+}
+
+module.exports = createTempRepo

test/utils.spec.js

@@ -13,6 +13,7 @@ const path = require('path')
 const flatten = require('../src/utils/flatten')
 const tempDir = require('../src/utils/tmp-dir')
 const findIpfsExecutable = require('../src/utils/find-ipfs-executable')
+const createRepo = require('../src/utils/repo/create-nodejs')
 
 const IPFSRepo = require('ipfs-repo')
 
@@ -62,5 +63,25 @@ describe('utils', () => {
         expect(fs.existsSync(execPath)).to.be.ok()
       })
     })
+
+    describe('.createRepo', () => {
+      let repo = null
+      let repoPath = tempDir()
+
+      it('should create repo', () => {
+        repo = createRepo(repoPath)
+        expect(repo).to.exist()
+        expect(repo).to.be.instanceOf(IPFSRepo)
+        expect(fs.existsSync(repoPath)).to.be.ok()
+      })
+
+      it('should cleanup repo', (done) => {
+        repo.teardown((err) => {
+          expect(err).to.not.exist()
+          expect(!fs.existsSync(repoPath)).to.be.ok()
+          done()
+        })
+      })
+    })
   }
 })