feat: add ability to start js-ipfs nodes

Author: dryajov

package.json

@@ -4,14 +4,14 @@
   "description": "simple controls for an ipfs node",
   "main": "src/index.js",
   "scripts": {
-    "lint": "aegir-lint",
-    "coverage": "aegir-coverage",
-    "test": "aegir-test --env node",
-    "docs": "aegir-docs",
-    "release": "aegir-release --env node --docs",
-    "release-minor": "aegir-release --type minor --env node --docs",
-    "release-major": "aegir-release --type major --env node --docs",
-    "coverage-publish": "aegir-coverage publish"
+    "lint": "aegir lint",
+    "coverage": "aegir coverage",
+    "test": "aegir test --target node",
+    "docs": "aegir docs",
+    "release": "aegir release -t node",
+    "release-minor": "aegir release --type minor -t node",
+    "release-major": "aegir release --type major -t node",
+    "coverage-publish": "aegir coverage -u"
   },
   "engines": {
     "node": ">=6.0.0",
@@ -50,6 +50,8 @@
   "license": "MIT",
   "dependencies": {
     "async": "^2.5.0",
+    "detect-node": "^2.0.3",
+    "eslint-config-standard-jsx": "^4.0.2",
     "go-ipfs-dep": "0.4.11",
     "ipfs-api": "^14.3.5",
     "multiaddr": "^3.0.1",
@@ -59,9 +61,10 @@
     "subcomandante": "^1.0.5"
   },
   "devDependencies": {
-    "aegir": "^11.0.2",
+    "aegir": "^12.1.3",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
+    "ipfs": "^0.26.0",
     "is-running": "1.0.5",
     "mkdirp": "^0.5.1",
     "multihashes": "~0.4.10",
@@ -80,4 +83,4 @@
     "example": "examples",
     "test": "test"
   }
-}
+}

src/daemon.js

@@ -14,13 +14,9 @@ const isWindows = os.platform() === 'win32'
 
 const exec = require('./exec')
 
-const ipfsDefaultPath = findIpfsExecutable()
-
 const GRACE_PERIOD = 7500 // amount of ms to wait before sigkill
 
-function findIpfsExecutable () {
-  const rootPath = process.env.testpath ? process.env.testpath : __dirname
-
+function findIpfsExecutable (isJs, rootPath) {
   let appRoot = path.join(rootPath, '..')
   // If inside <appname>.asar try to load from .asar.unpacked
   // this only works if asar was built with
@@ -31,7 +27,9 @@ function findIpfsExecutable () {
     appRoot = appRoot.replace(`.asar${path.sep}`, `.asar.unpacked${path.sep}`)
   }
   const appName = isWindows ? 'ipfs.exe' : 'ipfs'
-  const depPath = path.join('go-ipfs-dep', 'go-ipfs', appName)
+  const depPath = isJs
+    ? path.join('ipfs', 'src', 'cli', 'bin.js')
+    : path.join('go-ipfs-dep', 'go-ipfs', appName)
   const npm3Path = path.join(appRoot, '../', depPath)
   const npm2Path = path.join(appRoot, 'node_modules', depPath)
 
@@ -49,7 +47,7 @@ function setConfigValue (node, key, value, callback) {
   exec(
     node.exec,
     ['config', key, value, '--json'],
-    {env: node.env},
+    { env: node.env },
     callback
   )
 }
@@ -92,13 +90,17 @@ class Node {
    * @returns {Node}
    */
   constructor (path, opts, disposable) {
-    this.path = path
-    this.opts = opts || {}
-    this.exec = process.env.IPFS_EXEC || ipfsDefaultPath
+    const rootPath = process.env.testpath ? process.env.testpath : __dirname
+    const isJS = process.env.IPFS_JS && process.env.IPFS_JS === 'true'
+
+    this.path = path || null
+    this.opts = opts || { isJs: false }
+    this.isJs = this.opts.isJs || isJS || false
+    this.exec = process.env.IPFS_EXEC || findIpfsExecutable(this.isJs, rootPath)
     this.subprocess = null
     this.initialized = fs.existsSync(path)
     this.clean = true
-    this.env = Object.assign({}, process.env, {IPFS_PATH: path})
+    this.env = path ? Object.assign({}, process.env, { IPFS_PATH: path }) : process.env
     this.disposable = disposable
     this._apiAddr = null
     this._gatewayAddr = null
@@ -152,7 +154,7 @@ class Node {
       this.env.IPFS_PATH = this.path
     }
 
-    this._run(['init', '-b', keySize], {env: this.env}, (err, result) => {
+    this._run(['init', '-b', keySize], { env: this.env }, (err, result) => {
       if (err) {
         return callback(err)
       }
@@ -226,14 +228,14 @@ class Node {
       let output = ''
       let returned = false
 
-      this.subprocess = this._run(args, {env: this.env}, {
+      this.subprocess = this._run(args, { env: this.env }, {
         error: (err) => {
           // Only look at the last error
           const input = String(err)
-                .split('\n')
-                .map((l) => l.trim())
-                .filter(Boolean)
-                .slice(-1)[0] || ''
+            .split('\n')
+            .map((l) => l.trim())
+            .filter(Boolean)
+            .slice(-1)[0] || ''
 
           if (input.match('daemon is running')) {
             // we're good
@@ -248,11 +250,11 @@ class Node {
           output += String(data)
 
           const apiMatch = want.api
-            ? output.trim().match(/API server listening on (.*)/)
+            ? output.trim().match(/API (?:server|is) listening on[:]? (.*)/)
             : true
 
           const gwMatch = want.gateway
-            ? output.trim().match(/Gateway (.*) listening on (.*)/)
+            ? output.trim().match(/Gateway (?:.*)? 27listening on[:]?(.*)/)
             : true
 
           if (apiMatch && gwMatch && !returned) {
@@ -348,7 +350,7 @@ class Node {
     async.waterfall([
       (cb) => this._run(
         ['config', key],
-        {env: this.env},
+        { env: this.env },
         cb
       ),
       (config, cb) => {
@@ -371,7 +373,7 @@ class Node {
   setConfig (key, value, callback) {
     this._run(
       ['config', key, value, '--json'],
-      {env: this.env},
+      { env: this.env },
       callback
     )
   }
@@ -386,18 +388,19 @@ class Node {
   replaceConf (file, callback) {
     this._run(
       ['config', 'replace', file],
-      {env: this.env},
+      { env: this.env },
       callback
     )
   }
+
   /**
    * Get the version of ipfs
    *
    * @param {function(Error, string)} callback
    * @returns {undefined}
    */
   version (callback) {
-    this._run(['version'], {env: this.env}, callback)
+    this._run(['version'], { env: this.env }, callback)
   }
 }
 

src/index.js

@@ -54,7 +54,7 @@ const IpfsDaemonController = {
       callback = path
       path = process.env.IPFS_PATH ||
         join(process.env.HOME ||
-             process.env.USERPROFILE, '.ipfs')
+          process.env.USERPROFILE, '.ipfs')
     }
 
     process.nextTick(() => callback(null, new Node(path, opts)))

test/spawning-daemons.spec.js renamed to test/spawning-go-daemons.spec.js

@@ -160,7 +160,7 @@ describe('daemon spawning', () => {
 
           // actually running?
           done = once(done)
-          exec('kill', ['-0', pid], {cleanup: true}, () => done())
+          exec('kill', ['-0', pid], { cleanup: true }, () => done())
         })
       })
 
@@ -180,7 +180,7 @@ describe('daemon spawning', () => {
 
         // make sure it's not still running
         const poll = setInterval(() => {
-          exec('kill', ['-0', pid], {cleanup: true}, {
+          exec('kill', ['-0', pid], { cleanup: true }, {
             error () {
               clearInterval(poll)
               done()
@@ -335,7 +335,9 @@ describe('daemon spawning', () => {
     // skip on windows for now
     // https://github.com/ipfs/js-ipfsd-ctl/pull/155#issuecomment-326970190
     // fails on windows see https://github.com/ipfs/js-ipfs-api/issues/408
-    if (isWindows) { return it.skip('uses the correct ipfs-api') }
+    if (isWindows) {
+      return it.skip('uses the correct ipfs-api')
+    }
 
     it('uses the correct ipfs-api', (done) => {
       ipfs.util.addFromFs(path.join(__dirname, 'fixtures/'), {