chore: integrate http response module (#1381)

ipfs · Jun 18, 2018 · ddd9849 · ddd9849
1 parent cd449ff
commit ddd9849
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 215 deletions.
diff --git a/package.json b/package.json
@@ -109,6 +109,7 @@
     "ipfs-bitswap": "~0.20.0",
     "ipfs-block": "~0.7.1",
     "ipfs-block-service": "~0.14.0",
+    "ipfs-http-response": "^0.1.2",
     "ipfs-multipart": "~0.1.0",
     "ipfs-repo": "~0.22.1",
     "ipfs-unixfs": "~0.1.14",

diff --git a/src/http/gateway/dir-view/index.js b/src/http/gateway/dir-view/index.js
diff --git a/src/http/gateway/dir-view/style.js b/src/http/gateway/dir-view/style.js
diff --git a/src/http/gateway/resolver.js b/src/http/gateway/resolver.js
diff --git a/src/http/gateway/resources/gateway.js b/src/http/gateway/resources/gateway.js
@@ -9,7 +9,7 @@ const fileType = require('file-type')
 const mime = require('mime-types')
 const Stream = require('readable-stream')
 
-const gatewayResolver = require('../resolver')
+const { resolver } = require('ipfs-http-response')
 const PathUtils = require('../utils/path')
 
 module.exports = {
@@ -37,7 +37,7 @@ module.exports = {
         // switch case with true feels so wrong.
         switch (true) {
           case (errorToString === 'Error: This dag node is a directory'):
-            gatewayResolver.resolveDirectory(ipfs, ref, err.fileName, (err, data) => {
+            resolver.directory(ipfs, ref, err.fileName, (err, data) => {
               if (err) {
                 log.error(err)
                 return reply(err.toString()).code(500)
@@ -71,7 +71,7 @@ module.exports = {
       }
     }
 
-    return gatewayResolver.resolveMultihash(ipfs, ref, (err, data) => {
+    return resolver.multihash(ipfs, ref, (err, data) => {
       if (err) {
         return handleGatewayResolverError(err)
       }