Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

feat: web ui latest #2520

Merged
merged 5 commits into from
Oct 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/cli/commands/daemon.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand Down
48 changes: 26 additions & 22 deletions src/http/api/routes/webui.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,36 @@
'use strict'

const Joi = require('@hapi/joi')
const resources = require('../../gateway/resources')
const multiaddr = require('multiaddr')
const debug = require('debug')
const log = debug('ipfs:webui:info')
log.error = debug('ipfs:webui:error')

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('/ipfs/QmPURAjo3oneGH53ovt68UZEBvsc8nNmEhQZEpsVEQUMZE')
async handler (request, h) {
let scheme = 'http'
let port
let host

try {
const { ipfs } = request.server.app
const gateway = await ipfs.config.get('Addresses.Gateway')
const address = multiaddr(gateway).nodeAddress()

port = address.port
host = address.host
} catch (err) {
// may not have gateway configured
log.error(err)

scheme = 'https'
port = 443
host = 'gateway.ipfs.io'
}

return h.redirect(`${scheme}://${host}:${port}/ipns/webui.ipfs.io`)
}
}
]