fix: use once to call cb once

Author: dryajov

package.json

@@ -100,7 +100,8 @@
     "stream-http": "^2.8.1",
     "subcomandante": "^1.0.5",
     "superagent": "^3.8.2",
-    "truthy": "0.0.1"
+    "truthy": "0.0.1",
+    "once": "^1.4.0"
   },
   "devDependencies": {
     "aegir": "^13.0.6",
@@ -112,7 +113,6 @@
     "ipfs": "~0.28.2",
     "is-running": "1.0.5",
     "mkdirp": "^0.5.1",
-    "once": "^1.4.0",
     "proxyquire": "^2.0.1",
     "sinon": "^4.5.0",
     "superagent-mocker": "~0.5.2",

src/factory-in-proc.js

@@ -5,6 +5,7 @@ const clone = require('lodash.clone')
 const series = require('async/series')
 const path = require('path')
 const tmpDir = require('./utils/tmp-dir')
+const once = require('once')
 
 const Node = require('./ipfsd-in-proc')
 const defaultConfig = require('./defaults/config')
@@ -130,12 +131,13 @@ class FactoryInProc {
     }
 
     const node = new Node(options)
-    let called = false
-    const errHandler = (err) => {
-      called = true
-      callback(err, node)
-    }
-    node.once('error', errHandler)
+    const callbackOnce = once((err) => {
+      if (err) {
+        return callback(err)
+      }
+      callback(null, node)
+    })
+    node.once('error', callbackOnce)
 
     series([
       (cb) => node.once('ready', cb),
@@ -151,10 +153,7 @@ class FactoryInProc {
       (cb) => options.start
         ? node.start(options.args, cb)
         : cb()
-    ], (err) => {
-      node.removeListener('error', errHandler)
-      if (!called) { callback(err, node) }
-    })
+    ], callbackOnce)
   }
 }
 

test/spawn-options.spec.js

@@ -8,6 +8,7 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
+
 const fs = require('fs')
 const isNode = require('detect-node')
 const hat = require('hat')
@@ -442,7 +443,7 @@ describe('Spawn options', function () {
     })
 
     describe(`don't callback twice on error`, () => {
-      if (!isNode && fOpts.type !== 'proc') { return }
+      if (fOpts.type !== 'proc') { return }
       it('spawn with error', (done) => {
         this.timeout(20 * 1000)
         // `once.strict` should throw if its called more than once