fix: fix version cmd and repo component

Author: hugomrdias

package.json

@@ -74,7 +74,7 @@
     "form-data": "^2.3.2",
     "hat": "0.0.3",
     "interface-ipfs-core": "~0.64.3",
-    "ipfsd-ctl": "^0.33.1",
+    "ipfsd-ctl": "~0.33.1",
     "lodash": "^4.17.10",
     "mocha": "^5.1.1",
     "ncp": "^2.0.0",
@@ -111,7 +111,7 @@
     "ipfs-block": "~0.7.1",
     "ipfs-block-service": "~0.14.0",
     "ipfs-multipart": "~0.1.0",
-    "ipfs-repo": "0.20.0",
+    "ipfs-repo": "~0.21.0",
     "ipfs-unixfs": "~0.1.14",
     "ipfs-unixfs-engine": "~0.29.0",
     "ipld": "^0.17.0",

src/cli/bin.js

@@ -77,7 +77,7 @@ let cli = yargs(argv)
   // .recommendCommands()
   .completion()
 
-if (argv[0] === 'daemon' || argv[0] === 'init' || argv[0] === 'id') {
+if (['daemon', 'init', 'id', 'version'].includes(argv[0])) {
   args = cli.fail((msg, err, yargs) => {
     if (err instanceof Error && err.message && !msg) {
       msg = err.message

src/cli/commands/version.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const os = require('os')
-const print = require('../utils').print
+const {print, getNodeOrAPI} = require('../utils')
 
 module.exports = {
   command: 'version',
@@ -33,27 +33,25 @@ module.exports = {
   },
 
   handler (argv) {
-    argv.ipfs.version((err, data) => {
-      if (err) {
-        throw err
-      }
+    return getNodeOrAPI(argv, {forceInitialized: false})
+      .then(node => node.version())
+      .then(data => {
+        const withCommit = argv.all || argv.commit
+        const parsedVersion = `${data.version}${withCommit ? `-${data.commit}` : ''}`
 
-      const withCommit = argv.all || argv.commit
-      const parsedVersion = `${data.version}${withCommit ? `-${data.commit}` : ''}`
-
-      if (argv.repo) {
+        if (argv.repo) {
         // go-ipfs prints only the number, even without the --number flag.
-        print(data.repo)
-      } else if (argv.number) {
-        print(parsedVersion)
-      } else if (argv.all) {
-        print(`js-ipfs version: ${parsedVersion}`)
-        print(`Repo version: ${data.repo}`)
-        print(`System version: ${os.arch()}/${os.platform()}`)
-        print(`Node.js version: ${process.version}`)
-      } else {
-        print(`js-ipfs version: ${parsedVersion}`)
-      }
-    })
+          print(data.repo)
+        } else if (argv.number) {
+          print(parsedVersion)
+        } else if (argv.all) {
+          print(`js-ipfs version: ${parsedVersion}`)
+          print(`Repo version: ${data.repo}`)
+          print(`System version: ${os.arch()}/${os.platform()}`)
+          print(`Node.js version: ${process.version}`)
+        } else {
+          print(`js-ipfs version: ${parsedVersion}`)
+        }
+      })
   }
 }

src/cli/utils.js

@@ -38,21 +38,21 @@ function getAPICtl (apiAddr) {
   return APIctl(apiAddr)
 }
 
-exports.getNodeOrAPI = (argv) => {
+exports.getNodeOrAPI = (argv, stateOptions = {forceInitialized: true}) => {
   log('get node or api async')
   if (argv.api || isDaemonOn()) {
     return Promise.resolve(getAPICtl(argv.api))
   }
 
-  return IPFS.createReadyNodePromise({
+  return IPFS.createNodePromise({
     repo: exports.getRepoPath(),
     init: false,
     start: false,
     pass: argv.pass,
     EXPERIMENTAL: {
       pubsub: true
     }
-  })
+  }, stateOptions)
 }
 
 exports.getRepoPath = () => {

src/core/boot.js

@@ -36,15 +36,7 @@ module.exports = (self) => {
       }
     ], (err, res) => {
       if (err) {
-        // If the error is that no repo exists,
-        // which happens when the version file is not found
-        // we just want to signal that no repo exist, not
-        // fail the whole process.
-        // TODO: improve datastore and ipfs-repo implemenations so this error is a bit more unified
-        if (err.message.match(/not found/) || // indexeddb
-          err.message.match(/ENOENT/) || // fs
-          err.message.match(/No value/) // memory
-        ) {
+        if (err.code === 'ERR_REPO_NOT_INITIALIZED') {
           return cb(null, false)
         }
         return cb(err)

src/core/components/repo.js

@@ -19,15 +19,7 @@ module.exports = function repo (self) {
     version: promisify((callback) => {
       self._repo._isInitialized(err => {
         if (err) {
-          // TODO: (dryajov) This is really hacky, there must be a better way
-          const match = [
-            /Key not found in database \[\/version\]/,
-            /ENOENT/,
-            /not yet initialized/
-          ].some((m) => {
-            return m.test(err.message)
-          })
-          if (match) {
+          if (err.code === 'ERR_REPO_NOT_INITIALIZED') {
             // this repo has not been initialized
             return callback(null, repoVersion)
           }

src/core/index.js

@@ -147,56 +147,33 @@ IPFS.createNode = (options) => {
 /**
  * Static factory method to create a node wrapped with a Promise
  *
- * The Promise does *NOT* wait for the Ready Event to resolve with a IPFS instance
- * and rejects with Error Events.
- *
- * @param {object} options
- * @returns {IPFS}
- */
-IPFS.createNodePromise = (options) => {
-  return new Promise((resolve, reject) => {
-    const node = new IPFS(options)
-
-    node.on('error', err => {
-      reject(err)
-    })
-
-    resolve(node)
-  })
-}
-
-/**
- * Static factory method to create a ready node wrapped with a Promise
-*
  * The Promise waits for the Ready Event to resolve with a IPFS instance
- * and rejects with Error Events or a repo not initialized.
+ * and rejects with Error Events. Rejections can be customized the with
+ * second param.
  *
- * @param {Object} options IPFS constructor options
+ * @param {object} options - IPFS node options
+ * @param {object} stateOptions - Node state options to reject with error
  * @returns {IPFS}
  */
-IPFS.createReadyNodePromise = (options = {}) => {
+IPFS.createNodePromise = (options = {}, stateOptions = {}) => {
   return new Promise((resolve, reject) => {
     const node = new IPFS(options)
 
-    node.once('error', err => {
+    node.on('error', err => {
       reject(err)
     })
 
     node.once('ready', () => {
-      /**
-       * We shouldn't need to do this but until we get a unified error from ipfs-repo
-       * we catch it here
-       */
-      node._repo._isInitialized((err) => {
-        if (err) {
-          reject(Object.assign(new Error('repo is not initialized yet'),
-            {
-              code: 'ERR_REPO_NOT_INITIALIZED',
-              path: node._repo.path
-            }))
-        }
+      if (stateOptions.forceInitialized) {
+        node._repo._isInitialized((err) => {
+          if (err) {
+            reject(err)
+          }
+          resolve(node)
+        })
+      } else {
         resolve(node)
-      })
+      }
     })
   })
 }

test/http-api/interface/index.js

@@ -4,7 +4,7 @@
 const fs = require('fs')
 const path = require('path')
 
-describe('## interface-ipfs-core over ipfs-api', () => {
+describe.only('## interface-ipfs-core over ipfs-api', () => {
   fs.readdirSync(path.join(__dirname))
     .forEach((file) => file !== 'index.js' && require(`./${file}`))
 })