From 00dcb418beaf8911bd3c7e0ee440ae58dc1e630d Mon Sep 17 00:00:00 2001 From: jbenet Date: Mon, 25 Jun 2018 17:53:00 -0700 Subject: [PATCH 1/4] added resolve command --- src/resolve.js | 22 ++++++++++++++++++++++ src/utils/load-commands.js | 1 + 2 files changed, 23 insertions(+) create mode 100644 src/resolve.js diff --git a/src/resolve.js b/src/resolve.js new file mode 100644 index 000000000..05b62282d --- /dev/null +++ b/src/resolve.js @@ -0,0 +1,22 @@ +'use strict' + +const promisify = require('promisify-es6') + +const transform = function (res, callback) { + callback(null, res.Path) +} + +module.exports = (send) => { + return promisify((args, opts, callback) => { + if (typeof (opts) === 'function') { + callback = opts + opts = {} + } + + send.andTransform({ + path: 'resolve', + args: args, + qs: opts + }, transform, callback) + }) +} diff --git a/src/utils/load-commands.js b/src/utils/load-commands.js index ec56d2a11..55b4570ab 100644 --- a/src/utils/load-commands.js +++ b/src/utils/load-commands.js @@ -43,6 +43,7 @@ function requireCommands () { update: require('../update'), version: require('../version'), types: require('../types'), + resolve: require('../resolve'), dns: require('../dns') } From 383d2cdd0389dbff58d893d5ed3d58aef9ce61f5 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Mon, 6 Aug 2018 15:18:26 +0100 Subject: [PATCH 2/4] test: enable resolve tests License: MIT Signed-off-by: Alan Shaw --- test/interface.spec.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/interface.spec.js b/test/interface.spec.js index a3130159d..5f169433f 100644 --- a/test/interface.spec.js +++ b/test/interface.spec.js @@ -174,9 +174,7 @@ describe('interface-ipfs-core tests', () => { { name: 'should stop the node', reason: 'FIXME go-ipfs returns an error https://github.com/ipfs/go-ipfs/issues/4078' - }, - // resolve - 'resolve' + } ] }) From d3ac24ce4942c6382a41f81ba347362b39827d6f Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Mon, 6 Aug 2018 16:01:16 +0100 Subject: [PATCH 3/4] chore: use fixed interface-ipfs-core License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a018df4d3..47423648c 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "eslint-plugin-react": "^7.10.0", "go-ipfs-dep": "~0.4.17", "gulp": "^3.9.1", - "interface-ipfs-core": "~0.75.0", + "interface-ipfs-core": "github:ipfs/interface-ipfs-core#fix/resolve-recursive-ensure-node", "ipfsd-ctl": "~0.39.0", "pull-stream": "^3.6.8", "socket.io": "^2.1.1", From 53decc5e454eaaf3d7b69adffa2646281d58a92b Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Mon, 6 Aug 2018 17:01:25 +0100 Subject: [PATCH 4/4] chore: update interface-ipfs-core dependency License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 47423648c..da0f12c33 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "eslint-plugin-react": "^7.10.0", "go-ipfs-dep": "~0.4.17", "gulp": "^3.9.1", - "interface-ipfs-core": "github:ipfs/interface-ipfs-core#fix/resolve-recursive-ensure-node", + "interface-ipfs-core": "~0.75.1", "ipfsd-ctl": "~0.39.0", "pull-stream": "^3.6.8", "socket.io": "^2.1.1",