fix: redirect to the gateway

Author: achingbrain

src/cli/commands/daemon.js

@@ -79,10 +79,10 @@ module.exports = {
       try {
         await daemon.start()
         daemon._httpApi._apiServers.forEach(apiServer => {
-          print(`API listening on ${apiServer.info.ma.toString()}`)
+          print(`API listening on ${apiServer.info.ma}`)
         })
         daemon._httpApi._gatewayServers.forEach(gatewayServer => {
-          print(`Gateway (read only) listening on ${gatewayServer.info.ma.toString()}`)
+          print(`Gateway (read only) listening on ${gatewayServer.info.ma}`)
         })
         daemon._httpApi._apiServers.forEach(apiServer => {
           print(`Web UI available at ${toUri(apiServer.info.ma)}/webui`)

src/http/api/routes/webui.js

@@ -1,32 +1,21 @@
 'use strict'
 
-const Joi = require('@hapi/joi')
-const resources = require('../../gateway/resources')
+const multiaddr = require('multiaddr')
 
 module.exports = [
-  {
-    method: '*',
-    path: '/ipfs/{path*}',
-    options: {
-      handler: resources.gateway.handler,
-      validate: {
-        params: {
-          path: Joi.string().required()
-        }
-      },
-      response: {
-        ranges: false // disable built-in support, handler does it manually
-      },
-      ext: {
-        onPostHandler: { method: resources.gateway.afterHandler }
-      }
-    }
-  },
   {
     method: '*',
     path: '/webui',
-    handler (request, h) {
-      return h.redirect('/ipns/webui.ipfs.io')
+    async handler (request, h) {
+      const { ipfs } = request.server.app
+      const gateway = await ipfs.config.get('Addresses.Gateway')
+      const addr = multiaddr(gateway)
+      const {
+        port,
+        address
+      } = addr.nodeAddress()
+
+      return h.redirect(`http://${address}:${port}/ipns/webui.ipfs.io`)
     }
   }
 ]

src/http/gateway/resources/gateway.js

@@ -44,7 +44,6 @@ module.exports = {
     let ipfsPath = decodeURI(path.startsWith('/ipns/')
       ? await ipfs.name.resolve(path, { recursive: true })
       : path)
-
     let directory = false
     let data
     try {