From 3564ef48f676862cb44399b6595a5da9f9185492 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 10 Apr 2018 15:31:49 +0100 Subject: [PATCH 1/2] feat: Add offset/length arguments to files.cat --- src/files/cat-pull-stream.js | 7 ++++++- src/files/cat-readable-stream.js | 7 ++++++- src/files/cat.js | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/files/cat-pull-stream.js b/src/files/cat-pull-stream.js index 13cd06e07..364f566d2 100644 --- a/src/files/cat-pull-stream.js +++ b/src/files/cat-pull-stream.js @@ -19,7 +19,12 @@ module.exports = (send) => { } } - send({ path: 'cat', args: hash, buffer: opts.buffer }, (err, stream) => { + const query = { + offset: opts.offset, + length: opts.length + } + + send({ path: 'cat', args: hash, buffer: opts.buffer, qs: query }, (err, stream) => { if (err) { return p.end(err) } p.resolve(toPull(stream)) diff --git a/src/files/cat-readable-stream.js b/src/files/cat-readable-stream.js index 0ad80f919..58ca69c67 100644 --- a/src/files/cat-readable-stream.js +++ b/src/files/cat-readable-stream.js @@ -19,7 +19,12 @@ module.exports = (send) => { } } - send({ path: 'cat', args: hash, buffer: opts.buffer }, (err, stream) => { + const query = { + offset: opts.offset, + length: opts.length + } + + send({ path: 'cat', args: hash, buffer: opts.buffer, qs: query }, (err, stream) => { if (err) { return pt.destroy(err) } pump(stream, pt) diff --git a/src/files/cat.js b/src/files/cat.js index 65046fb9b..ff468eb34 100644 --- a/src/files/cat.js +++ b/src/files/cat.js @@ -20,7 +20,12 @@ module.exports = (send) => { } } - send({ path: 'cat', args: hash, buffer: opts.buffer }, (err, stream) => { + const query = { + offset: opts.offset, + length: opts.length + } + + send({ path: 'cat', args: hash, buffer: opts.buffer, qs: query }, (err, stream) => { if (err) { return callback(err) } stream.pipe(bl((err, data) => { From bd81b27c2639bf56ff137f25f714da4ed5adbbfe Mon Sep 17 00:00:00 2001 From: David Dias Date: Tue, 24 Apr 2018 10:41:33 +0200 Subject: [PATCH 2/2] chore: update deps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e50881cf1..c26482e8f 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "is-stream": "^1.1.0", "libp2p-crypto": "^0.13.0", "lru-cache": "^4.1.2", - "multiaddr": "^4.0.0", + "multiaddr": "^5.0.0", "multibase": "~0.4.0", "multihashes": "~0.4.13", "ndjson": "^1.5.0", @@ -79,7 +79,7 @@ "go-ipfs-dep": "^0.4.14", "gulp": "^3.9.1", "hapi": "^17.3.1", - "interface-ipfs-core": "~0.64.0", + "interface-ipfs-core": "~0.64.2", "ipfs": "~0.28.2", "ipfsd-ctl": "~0.32.1", "pre-commit": "^1.2.2",