feat: add keysize through an option to spawn

package.json

@@ -7,13 +7,13 @@
     "lint": "aegir lint",
     "docs": "aegir docs",
     "build": "aegir build",
-    "test": "aegir test -t node -t browser --no-cors",
-    "test:node": "aegir test -t node",
-    "test:browser": "aegir test -t browser --no-cors",
+    "test": "IPFS_KEYSIZE=1024 aegir test -t node -t browser --no-cors",
+    "test:node": "IPFS_KEYSIZE=1024 aegir test -t node",
+    "test:browser": "IPFS_KEYSIZE=1024 aegir test -t browser --no-cors",
     "release": "aegir release",
     "release-minor": "aegir release --type minor",
     "release-major": "aegir release --type major",
-    "coverage": "COVERAGE=true aegir coverage --timeout 50000",
+    "coverage": "IPFS_KEYSIZE=1024 COVERAGE=true aegir coverage --timeout 50000",
     "coverage-publish": "aegir coverage -u"
   },
   "browser": {

src/factory-daemon.js

@@ -74,8 +74,8 @@ class FactoryDaemon {
    * Spawn an IPFS node, either js-ipfs or go-ipfs
    *
    * Options are:
-   * - `init` {bool|Object} - should the node be initialized
-   *  - if `init` is an Object, it is expected to be of the form `{keySize: <bits>}`
+   * - `init` bool - should the node be initialized
+   * - `initOpts` Object, it is expected to be of the form `{bits: <size>}`, which sets the desired key size
    * - `start` bool - should the node be started
    * - `repoPath` string - the repository path to use for this node, ignored if node is disposable
    * - `disposable` bool - a new repo is created and initialized for each invocation

src/factory-in-proc.js

@@ -77,7 +77,7 @@ class FactoryInProc {
    *
    * Options are:
    * - `init` {bool|Object} - should the node be initialized
-   *  - if `init` is an Object, it is expected to be of the form `{keySize: <bits>}`
+   * - `initOpts` Object, it is expected to be of the form `{bits: <size>}`, which sets the desired key size
    * - `start` bool - should the node be started
    * - `repoPath` string - the repository path to use for this node, ignored if node is disposable
    * - `disposable` bool - a new repo is created and initialized for each invocation

src/ipfsd-daemon.js

@@ -57,14 +57,9 @@ class Daemon {
     this._gatewayAddr = null
     this._started = false
     this.api = null
-    this.keySize = null
+    this.bits = null
 
-    this.keySize = process.env.IPFS_KEYSIZE
-
-    // option takes precedence over env variable
-    if (typeof this.opts.init === 'object') {
-      this.keySize = this.opts.init.keySize
-    }
+    this.bits = this.opts.initOpts ? this.opts.initOpts.bits : process.env.IPFS_KEYSIZE
 
     if (this.opts.env) {
       Object.assign(this.env, this.opts.env)
@@ -120,7 +115,7 @@ class Daemon {
    * Initialize a repo.
    *
    * @param {Object} [initOpts={}]
-   * @param {number} [initOpts.keysize=2048] - The bit size of the identiy key.
+   * @param {number} [initOpts.bits=2048] - The bit size of the identiy key.
    * @param {string} [initOpts.directory=IPFS_PATH] - The location of the repo.
    * @param {string} [initOpts.pass] - The passphrase of the keychain.
    * @param {function (Error, Node)} callback
@@ -136,19 +131,19 @@ class Daemon {
       this.path = initOpts.directory
     }
 
-    const keySize = initOpts.keysize ? initOpts.keysize : this.keySize
+    const bits = initOpts.bits ? initOpts.bits : this.bits
     const args = ['init']
     // do not just set a default keysize,
     // in case we decide to change it at
     // the daemon level in the future
-    if (keySize) {
-      args.concat(['-b', keySize])
+    if (bits) {
+      args.concat(['-b', bits])
     }
     if (initOpts.pass) {
       args.push('--pass')
       args.push('"' + initOpts.pass + '"')
     }
-    log(`initializing with keysize: ${keySize}`)
+    log(`initializing with keysize: ${bits}`)
     run(this, args, { env: this.env }, (err, result) => {
       if (err) {
         return callback(err)

src/ipfsd-in-proc.js

@@ -32,7 +32,7 @@ class Node {
     this._started = false
     this.initialized = false
     this.api = null
-    this.keySize = null
+    this.bits = null
 
     this.opts.EXPERIMENTAL = defaults({}, opts.EXPERIMENTAL, {
       pubsub: false,
@@ -57,12 +57,7 @@ class Node {
       }
     })
 
-    // option takes precedence over env variable
-    if (typeof this.opts.init === 'object') {
-      this.keySize = this.opts.init.keySize
-    } else if (process.env.IPFS_KEYSIZE) {
-      this.keySize = process.env.IPFS_KEYSIZE
-    }
+    this.bits = this.opts.initOpts ? this.opts.initOpts.bits : process.env.IPFS_KEYSIZE
 
     this.exec = new IPFS({
       repo: this.repo,
@@ -123,7 +118,7 @@ class Node {
    * Initialize a repo.
    *
    * @param {Object} [initOpts={}]
-   * @param {number} [initOpts.keysize=2048] - The bit size of the identiy key.
+   * @param {number} [initOpts.bits=2048] - The bit size of the identiy key.
    * @param {string} [initOpts.directory=IPFS_PATH] - The location of the repo.
    * @param {string} [initOpts.pass] - The passphrase of the keychain.
    * @param {function (Error, Node)} callback
@@ -135,12 +130,12 @@ class Node {
       initOpts = {}
     }
 
-    const keySize = initOpts.keysize ? initOpts.keysize : this.keySize
+    const bits = initOpts.keysize ? initOpts.bits : this.bits
     // do not just set a default keysize,
     // in case we decide to change it at
     // the daemon level in the future
-    if (keySize) {
-      initOpts.bits = keySize
+    if (bits) {
+      initOpts.bits = bits
     }
     this.exec.init(initOpts, (err) => {
       if (err) {

test/spawn-options.spec.js

@@ -183,7 +183,7 @@ describe('Spawn options', () => {
       })
     })
 
-    describe('custom init options', () => {
+    describe('custom config options', () => {
       it('custom config', function (done) {
         this.timeout(40 * 1000)