feature object

package.json

@@ -58,7 +58,7 @@
  "rimraf": "^2.4.4",
  "standard": "^5.4.1",
  "transform-loader": "^0.2.3",
- "webpack": "diasdavid/webpack#81f5994"
+ "webpack": "^2.0.5-beta"
  },
  "dependencies": {
  "bl": "^1.0.0",
@@ -67,7 +67,7 @@
  "debug": "^2.2.0",
  "hapi": "^12.0.0",
  "ipfs-blocks": "^0.1.0",
- "ipfs-merkle-dag": "^0.1.1",
+ "ipfs-merkle-dag": "^0.2.1",
  "ipfs-repo": "^0.5.0",
  "lodash.get": "^4.0.0",
  "lodash.set": "^4.0.0",

src/cli/commands/config.js

@@ -24,7 +24,7 @@ module.exports = Command.extend({
 
  run: (bool, json, key, value) => {
  if (!key) {
- throw new Error('argument \'key\' is required')
+ throw new Error("argument 'key' is required")
  }
 
  var node = new IPFS()

src/ipfs-core/index.js

@@ -2,10 +2,12 @@
 
 const defaultRepo = require('./default-repo')
 // const bl = require('bl')
-// const MerkleDAG = require('ipfs-merkle-dag')
 const blocks = require('ipfs-blocks')
 const BlockService = blocks.BlockService
-// const Block = MerkleDAG.Block
+const Block = blocks.Block
+const mDAG = require('ipfs-merkle-dag')
+const DAGNode = mDAG.DAGNode
+const DAGService = mDAG.DAGService
 
 exports = module.exports = IPFS
 
@@ -17,7 +19,8 @@ function IPFS (repo) {
  if (!repo) {
  repo = defaultRepo()
  }
- const bs = new BlockService(repo)
+ const blockS = new BlockService(repo)
+ const dagS = new DAGService(blockS)
 
  this.daemon = callback => {
  // 1. read repo to get peer data
@@ -133,16 +136,16 @@ function IPFS (repo) {
 
  this.block = {
  get: (multihash, callback) => {
- bs.getBlock(multihash, callback)
+ blockS.getBlock(multihash, callback)
  },
  put: (block, callback) => {
- bs.addBlock(block, callback)
+ blockS.addBlock(block, callback)
  },
  del: (multihash, callback) => {
- bs.deleteBlock(multihash, callback)
+ blockS.deleteBlock(multihash, callback)
  },
  stat: (multihash, callback) => {
- bs.getBlock(multihash, (err, block) => {
+ blockS.getBlock(multihash, (err, block) => {
  if (err) {
  return callback(err)
  }
@@ -153,4 +156,131 @@ function IPFS (repo) {
  })
  }
  }
+
+ this.object = {
+ new: (template, callback) => {
+ if (!callback) {
+ callback = template
+ }
+ var node = new DAGNode()
+ var block = new Block(node.marshal())
+ blockS.addBlock(block, function (err) {
+ if (err) {
+ return callback(err)
+ }
+ callback(null, {
+ Hash: block.key,
+ Size: node.size(),
+ Name: ''
+ })
+ })
+ },
+ patch: {
+ appendData: (multihash, data, callback) => {
+ this.object.get(multihash, (err, obj) => {
+ if (err) { return callback(err) }
+ obj.data = Buffer.concat([obj.data, data])
+ dagS.add(obj, (err) => {
+ if (err) {
+ return callback(err)
+ }
+ callback(null, obj.multihash())
+ })
+ })
+ },
+ addLink: (multihash, link, callback) => {
+ this.object.get(multihash, (err, obj) => {
+ if (err) { return callback(err) }
+ obj.addRawLink(link)
+ dagS.add(obj, (err) => {
+ if (err) {
+ return callback(err)
+ }
+ callback(null, obj.multihash())
+ })
+ })
+ },
+ rmLink: (multihash, multihashLink, callback) => {
+ this.object.get(multihash, (err, obj) => {
+ if (err) { return callback(err) }
+ obj.links = obj.links.filter((link) => {
+ if (link.hash.equals(multihashLink)) {
+ return false
+ }
+ return true
+ })
+ dagS.add(obj, (err) => {
+ if (err) {
+ return callback(err)
+ }
+ callback(null, obj.multihash())
+ })
+ })
+ },
+ setData: (multihash, data, callback) => {
+ this.object.get(multihash, (err, obj) => {
+ if (err) { return callback(err) }
+ obj.data = data
+ dagS.add(obj, (err) => {
+ if (err) {
+ return callback(err)
+ }
+ callback(null, obj.multihash())
+ })
+ })
+ }
+ },
+ data: (multihash, callback) => {
+ this.object.get(multihash, (err, obj) => {
+ if (err) {
+ return callback(err)
+ }
+ callback(null, obj.data)
+ })
+ },
+ links: (multihash, callback) => {
+ this.object.get(multihash, (err, obj) => {
+ if (err) {
+ return callback(err)
+ }
+ callback(null, obj.links)
+ })
+ },
+ get: (multihash, options, callback) => {
+ if (typeof options === 'function') {
+ callback = options
+ options = {}
+ }
+ dagS.get(multihash, callback)
+ },
+ put: (dagNode, options, callback) => {
+ if (typeof options === 'function') {
+ callback = options
+ options = {}
+ }
+ dagS.add(dagNode, callback)
+ },
+ stat: (multihash, options, callback) => {
+ if (typeof options === 'function') {
+ callback = options
+ options = {}
+ }
+
+ this.object.get(multihash, (err, obj) => {
+ if (err) {
+ return callback(err)
+ }
+ var res = {
+ NumLinks: obj.links.length,
+ BlockSize: obj.marshal().length,
+ LinksSize: obj.links.reduce((prev, link) => {
+ return prev + link.size
+ }, 0),
+ DataSize: obj.data.length,
+ CumulativeSize: ''
+ }
+ callback(null, res)
+ })
+ }
+ }
 }

tests/repo-example/blocks/12203aa9/12203aa913048b2ef582d4ee2bf6eccad869e2ae1d9e41a2df4e086fe2e1403e8a5b.data

@@ -0,0 +1,3 @@
+/
+" wҢ���x�G�ܙ��}X���������yZdirect�T2
+" �˧7Fw�}�|ɣ�*�#��'V>�|� recursive�T

tests/repo-example/blocks/122048b2/122048b220016f4051d7dd74315bf1ffcb1454f0dd7ae43df2dde01bef8a8bdae446.data

@@ -0,0 +1,3 @@
+/
+" ��!6���1�ص��F��
2$`7#u@1�direct�T2
+" ����Hz�8�#3u2�ED� ��ƥ��*Q�KMQ� recursive�T

tests/repo-example/blocks/1220e586/1220e586199640e1a4c63fa38c5434b9e72dc99d23a391d3db5e1e42d00527241671.data

@@ -0,0 +1,115 @@
+
+��# 0.1 - Quick Start
+
+This is a set of short examples with minimal explanation. It is meant as
+a "quick start". Soon, we'll write a longer tour :-)
+
+
+Add a file to ipfs:
+
+ echo "hello world" >hello
+ ipfs add hello
+
+
+View it:
+
+ ipfs cat <the-hash-you-got-here>
+
+
+Try a directory:
+
+ mkdir foo
+ mkdir foo/bar
+ echo "baz" > foo/baz
+ echo "baz" > foo/bar/baz
+ ipfs add -r foo
+
+
+View things:
+
+ ipfs ls <the-hash-here>
+ ipfs ls <the-hash-here>/bar
+ ipfs cat <the-hash-here>/baz
+ ipfs cat <the-hash-here>/bar/baz
+ ipfs cat <the-hash-here>/bar
+ ipfs ls <the-hash-here>/baz
+
+
+References:
+
+ ipfs refs <the-hash-here>
+ ipfs refs -r <the-hash-here>
+ ipfs refs --help
+
+
+Get:
+
+ ipfs get <the-hash-here> -o foo2
+ diff foo foo2
+
+
+Objects:
+
+ ipfs object get <the-hash-here>
+ ipfs object get <the-hash-here>/foo2
+ ipfs object --help
+
+
+Pin + GC:
+
+ ipfs pin add <the-hash-here>
+ ipfs repo gc
+ ipfs ls <the-hash-here>
+ ipfs pin rm <the-hash-here>
+ ipfs repo gc
+
+
+Daemon:
+
+ ipfs daemon (in another terminal)
+ ipfs id
+
+
+Network:
+
+ (must be online)
+ ipfs swarm peers
+ ipfs id
+ ipfs cat <hash-of-remote-object>
+
+
+Mount:
+
+ (warning: fuse is finicky!)
+ ipfs mount
+ cd /ipfs/<the-hash-here>
+ ls
+
+
+Tool:
+
+ ipfs version
+ ipfs update
+ ipfs commands
+ ipfs config --help
+ open http://localhost:5001/webui
+
+
+Browse:
+
+ webui:
+
+ http://localhost:5001/webui
+
+ video:
+
+ http://localhost:8080/ipfs/QmVc6zuAneKJzicnJpfrqCH9gSy6bz54JhcypfJYhGUFQu/play#/ipfs/QmTKZgRNwDNZwHtJSjCp6r5FYefzpULfy37JvMt9DwvXse
+
+ images:
+
+ http://localhost:8080/ipfs/QmZpc3HvfjEXvLWGQPWbHk3AjD5j8NEN4gmFN8Jmrd5g83/cs
+
+ markdown renderer app:
+
+ http://localhost:8080/ipfs/QmX7M9CiYXjVeFnkfVGf3y5ixTZ2ACeSGyL1vBJY1HvQPp/mdown
+�

tests/test-cli/test-config.js

@@ -66,7 +66,7 @@ describe('config', () => {
  it('set a config key with invalid json', done => {
  nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config', 'foo', '{"bar: 0}', '--json'])
  .run((err, stdout, exitcode) => {
- const expected = 'error invalid JSON provided'
+ const expected = 'error\tinvalid JSON provided'
  expect(stdout[0]).to.equal(expected)
  expect(err).to.not.exist
  expect(exitcode).to.equal(1)
@@ -77,7 +77,7 @@ describe('config', () => {
  it('call config with no arguments', done => {
  nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'config'])
  .run((err, stdout, exitcode) => {
- const expected = 'error argument \'key\' is required'
+ const expected = "error\targument 'key' is required"
  expect(stdout[0]).to.equal(expected)
  expect(err).to.not.exist
  expect(exitcode).to.equal(1)

tests/test-core/browser.js

@@ -7,9 +7,9 @@ const _ = require('lodash')
 const repoContext = require.context('buffer!./../repo-example', true)
 
 const idb = window.indexedDB ||
-  window.mozIndexedDB ||
-  window.webkitIndexedDB ||
-  window.msIndexedDB
+ window.mozIndexedDB ||
+ window.webkitIndexedDB ||
+ window.msIndexedDB
 
 idb.deleteDatabase('ipfs')
 idb.deleteDatabase('ipfs/blocks')

tests/test-core/test-block.js

@@ -61,7 +61,7 @@ describe('block', function () {
 
  it('stat', function (done) {
  const mh = new Buffer(base58
-  .decode('QmVtU7ths96fMgZ8YSZAbKghyieq7AjxNdcqyVzxTt3qVe'))
+ .decode('QmVtU7ths96fMgZ8YSZAbKghyieq7AjxNdcqyVzxTt3qVe'))
  ipfs.block.stat(mh, (err, stats) => {
  expect(err).to.not.exist
  expect(stats.Key.equals(mh)).to.equal(true)

tests/test-core/test-config.js

@@ -90,12 +90,12 @@ describe('config', () => {
  })
  })
 
- // cli only feature built with show and replace
- // it.skip('edit', done => {
- // const ipfs = new IPFS()
- // ipfs.config((err, config) => {
- // expect(err).to.not.exist
- // done()
- // })
- // })
+// cli only feature built with show and replace
+// it.skip('edit', done => {
+// const ipfs = new IPFS()
+// ipfs.config((err, config) => {
+// expect(err).to.not.exist
+// done()
+// })
+// })
 })