fix: fixes and cleanup

License: MIT
Signed-off-by: Alan Shaw <alan.shaw@protocol.ai>

Author: Alan Shaw

package.json

@@ -107,12 +107,12 @@
     "ipfs-block": "~0.8.0",
     "ipfs-block-service": "~0.15.1",
     "ipfs-http-response": "~0.2.1",
-    "ipfs-mfs": "~0.5.0",
+    "ipfs-mfs": "~0.5.2",
     "ipfs-multipart": "~0.1.0",
     "ipfs-repo": "~0.25.0",
     "ipfs-unixfs": "~0.1.16",
     "ipfs-unixfs-engine": "~0.34.0",
-    "ipld": "~0.20.0",
+    "ipld": "~0.20.1",
     "ipld-bitcoin": "~0.1.8",
     "ipld-dag-pb": "~0.15.0",
     "ipld-ethereum": "^2.0.1",

src/cli/bin.js

@@ -102,7 +102,7 @@ if (args[0] === 'daemon' || args[0] === 'init') {
           exitCode = 1
         })
         .then(() => cleanup())
-        .catch((e) => {})
+        .catch(() => {})
         .then(() => {
           if (exitCode !== 0) {
             process.exit(exitCode)

src/cli/commands/add.js

@@ -231,7 +231,7 @@ module.exports = {
           }
         }
 
-        next(null, ipfs.files.addPullStream(options))
+        next(null, ipfs.addPullStream(options))
       }
     ], (err, addStream) => {
       if (err) throw err

src/core/components/files-mfs.js

@@ -1,39 +1,9 @@
 'use strict'
 
-const promisify = require('promisify-es6')
 const mfs = require('ipfs-mfs/core')
 
-module.exports = (self) => {
-  const proxy = {
-    add: self.add,
-    dag: {
-      get: promisify((cid, path, opts, cb) => {
-        if (typeof path === 'function') {
-          cb = path
-          path = undefined
-        }
-
-        if (typeof opts === 'function') {
-          cb = opts
-          opts = {}
-        }
-
-        opts = Object.assign({}, opts, { preload: false })
-
-        return self.dag.get(cid, path, opts, cb)
-      }),
-      put: promisify((node, opts, cb) => {
-        if (typeof opts === 'function') {
-          cb = opts
-          opts = {}
-        }
-
-        opts = Object.assign({}, opts, { preload: false })
-
-        return self.dag.put(node, opts, cb)
-      })
-    }
-  }
-
-  return mfs(proxy, self._options)
-}
+module.exports = self => mfs({
+  ipld: self._ipld,
+  repo: self._repo,
+  repoOwner: self._options.repoOwner
+})

src/core/components/files-regular.js

@@ -488,5 +488,9 @@ module.exports = function (self) {
     },
 
     lsPullStream: _lsPullStream
+
+    // TODO create addFromFs
+    // TODO create addFromStream
+    // TODO create addFromUrl
   }
 }

src/core/index.js

@@ -137,6 +137,7 @@ class IPFS extends EventEmitter {
     this.shutdown = this.stop
     this.isOnline = components.isOnline(this)
     //   - interface-ipfs-core defined API
+    Object.assign(this, components.filesRegular(this))
     this.version = components.version(this)
     this.id = components.id(this)
     this.repo = components.repo(this)
@@ -145,6 +146,7 @@ class IPFS extends EventEmitter {
     this.block = components.block(this)
     this.object = components.object(this)
     this.dag = components.dag(this)
+    this.files = components.filesMFS(this)
     this.libp2p = components.libp2p(this)
     this.swarm = components.swarm(this)
     this.name = components.name(this)
@@ -172,27 +174,6 @@ class IPFS extends EventEmitter {
 
     this.state = require('./state')(this)
 
-    // ipfs regular Files APIs
-    const filesRegular = components.filesRegular(this)
-    this.add = filesRegular.add
-    this.addReadableStream = filesRegular.addReadableStream
-    this.addPullStream = filesRegular.addPullStream
-    // TODO create this.addFromFs
-    // TODO create this.addFromStream
-    // TODO create this.addFromUrl
-    this.cat = filesRegular.catImmutable
-    this.catReadableStream = filesRegular.catReadableStream
-    this.catPullStream = filesRegular.catPullStream
-    this.get = filesRegular.getImmutable
-    this.getReadableStream = filesRegular.getReadableStream
-    this.getPullStream = filesRegular.getPullStream
-    this.ls = filesRegular.lsImmutable
-    this.lsReadableStream = filesRegular.lsReadableStream
-    this.lsPullStream = filesRegular.lsPullStream
-
-    // ipfs.files API (aka MFS)
-    this.files = components.filesMFS(this)
-
     // ipfs.util
     this.util = {
       crypto,

src/http/api/resources/files.js renamed to src/http/api/resources/files-regular.js

@@ -282,7 +282,7 @@ exports.add = {
   }
 }
 
-exports.immutableLs = {
+exports.ls = {
   // uses common parseKey method that returns a `key`
   parseArgs: exports.parseKey,
 

src/http/api/resources/index.js

@@ -13,7 +13,7 @@ exports.block = require('./block')
 exports.swarm = require('./swarm')
 exports.bitswap = require('./bitswap')
 exports.file = require('./file')
-exports.files = require('./files')
+exports.filesRegular = require('./files-regular')
 exports.pubsub = require('./pubsub')
 exports.dns = require('./dns')
 exports.key = require('./key')

src/http/api/routes/files.js

@@ -12,9 +12,9 @@ module.exports = (server) => {
     path: '/api/v0/cat',
     config: {
       pre: [
-        { method: resources.cat.parseArgs, assign: 'args' }
+        { method: resources.filesRegular.cat.parseArgs, assign: 'args' }
       ],
-      handler: resources.cat.handler
+      handler: resources.filesRegular.cat.handler
     }
   })
 
@@ -24,9 +24,9 @@ module.exports = (server) => {
     path: '/api/v0/get',
     config: {
       pre: [
-        { method: resources.get.parseArgs, assign: 'args' }
+        { method: resources.filesRegular.get.parseArgs, assign: 'args' }
       ],
-      handler: resources.get.handler
+      handler: resources.filesRegular.get.handler
     }
   })
 
@@ -40,8 +40,8 @@ module.exports = (server) => {
         output: 'stream',
         maxBytes: Number.MAX_SAFE_INTEGER
       },
-      handler: resources.add.handler,
-      validate: resources.add.validate
+      handler: resources.filesRegular.add.handler,
+      validate: resources.filesRegular.add.validate
     }
   })
 
@@ -51,9 +51,9 @@ module.exports = (server) => {
     path: '/api/v0/ls',
     config: {
       pre: [
-        { method: resources.files.immutableLs.parseArgs, assign: 'args' }
+        { method: resources.filesRegular.ls.parseArgs, assign: 'args' }
       ],
-      handler: resources.files.immutableLs.handler
+      handler: resources.filesRegular.ls.handler
     }
   })
 

test/core/files.spec.js

@@ -11,7 +11,7 @@ const pull = require('pull-stream')
 const IPFSFactory = require('ipfsd-ctl')
 const IPFS = require('../../src/core')
 
-describe.only('files', () => {
+describe('files', () => {
   let ipfsd, ipfs
 
   before(function (done) {

test/core/interface.spec.js

@@ -79,38 +79,16 @@ describe('interface-ipfs-core tests', () => {
   })
 
   tests.filesRegular(defaultCommonFactory, {
-    skip: [
-      // .addFromStream
-      isNode ? null : {
-        name: 'same as .add',
-        reason: 'Designed for Node.js only'
-      },
-      // .addFromFs
-      isNode ? null : {
-        name: 'a directory',
-        reason: 'Designed for Node.js only'
-      },
-      isNode ? null : {
-        name: 'a directory with an odd name',
-        reason: 'Designed for Node.js only'
-      },
-      isNode ? null : {
-        name: 'add and ignore a directory',
-        reason: 'Designed for Node.js only'
-      },
-      isNode ? null : {
-        name: 'a file',
-        reason: 'Designed for Node.js only'
-      },
-      isNode ? null : {
-        name: 'a hidden file in a directory',
-        reason: 'Designed for Node.js only'
-      },
-      isNode ? null : {
-        name: 'a with only-hash=true',
-        reason: 'Designed for Node.js only'
-      }
-    ]
+    skip: [{
+      name: 'addFromStream',
+      reason: 'TODO: not implemented yet'
+    }, {
+      name: 'addFromFs',
+      reason: 'TODO: not implemented yet'
+    }, {
+      name: 'addFromUrl',
+      reason: 'TODO: not implemented yet'
+    }]
   })
 
   // TODO needs MFS module to be updated

test/http-api/interface.js

@@ -26,6 +26,7 @@ describe('interface-ipfs-core over ipfs-api tests', () => {
   })
 
   tests.filesRegular(defaultCommonFactory)
+
   tests.filesMFS(defaultCommonFactory)
 
   tests.key(CommonFactory.create({