refactoring routes

This commit is contained in:
les
2021-09-30 11:06:59 +02:00
parent 15cdba96eb
commit b8931ee8bf
5 changed files with 72 additions and 52 deletions

View File

@@ -1,67 +1,55 @@
const config = require('config')
const express = require('express')
const cors = require('cors')
const api = require('./api')
const oauth = require('./api/oauth')
const auth = require('./api/auth')
const cookieParser = require('cookie-parser')
const federation = require('./federation')
const webfinger = require('./federation/webfinger')
const { spamFilter } = require('./federation/helpers')
const log = require('./log')
const exportController = require('./api/controller/export')
const eventController = require('./api/controller/event')
const announceController = require('./api/controller/announce')
// const metricsController = require('./metrics')
// const promBundle = require('express-prom-bundle')
// const metricsMiddleware = promBundle({ includeMethod: true })
const config = require('./config')
const helpers = require('./helpers')
const log = require('./log')
const api = require('./api')
const app = express()
// ignore unimplemented ping url from fediverse
app.use(spamFilter)
app.use(helpers.logRequest)
// app.use(metricsMiddleware)
app.use((req, res, next) => {
log.debug(`${req.method} ${req.path}`)
next()
})
app.use('/media/', express.static(config.upload_path))
// initialize instance settings / authentication / locale
app.use(helpers.initSettings)
app.use(helpers.serveStatic())
app.use('/noimg.svg', (req, res, next) => {
return express.static('./static/noimg.svg')
})
// serve favicon and static content
app.use('/logo.png', (req, res, next) => {
const logoPath = req.settings.logo || './static/gancio'
return express.static(logoPath + '.png')(req, res, next)
})
app.use('/favicon.ico', (req, res, next) => {
const faviconPath = req.settings.logo || './assets/favicon'
return express.static(faviconPath + '.ico')(req, res, next)
})
// rss/ics/atom feed
app.get('/feed/:type', cors(), exportController.export)
// federation api / activitypub / webfinger / nodeinfo
app.use('/.well-known', webfinger)
app.use('/federation', federation)
// ignore unimplemented ping url from fediverse
app.use(cookieParser())
// fill req.user if request is authenticated
app.use(auth.fillUser)
// do not handle all routes on setup
if (!config.firstrun) {
const cors = require('cors')
const { spamFilter } = require('./federation/helpers')
const oauth = require('./api/oauth')
const auth = require('./api/auth')
const federation = require('./federation')
const webfinger = require('./federation/webfinger')
const exportController = require('./api/controller/export')
// rss/ics/atom feed
app.get('/feed/:type', cors(), exportController.export)
// federation api / activitypub / webfinger / nodeinfo
app.use('/.well-known', webfinger)
app.use('/federation', federation)
app.use(spamFilter)
// fill req.user if request is authenticated
app.use(auth.fillUser)
app.use('/oauth', oauth)
// app.use(metricsMiddleware)
}
// api!
app.use('/api', api)
app.use('/oauth', oauth)
// // Handle 500
app.use((error, req, res, next) => {
@@ -75,8 +63,13 @@ app.use((error, req, res, next) => {
app.use(async (req, res, next) => {
// const start_datetime = getUnixTime(startOfWeek(startOfMonth(new Date())))
// req.events = await eventController._select(start_datetime, 100)
req.meta = await eventController._getMeta()
req.announcements = await announceController._getVisible()
if (!config.firstrun) {
const eventController = require('./api/controller/event')
const announceController = require('./api/controller/announce')
req.meta = await eventController._getMeta()
req.announcements = await announceController._getVisible()
}
req.firstrun = config.firstrun
next()
})