interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move controller in dedicated functions

This commit is contained in:
Chocobozzz 2019-07-25 16:56:41 +02:00
parent c8861d5dc0
commit 552d95b1e6
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
server/controllers/client.ts
View File

@ -48,7 +48,26 @@ for (const staticClientFile of staticClientFiles) {
clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE })) clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE }))
clientsRouter.use('/client/assets/images', express.static(assetsImagesPath, { maxAge: STATIC_MAX_AGE })) clientsRouter.use('/client/assets/images', express.static(assetsImagesPath, { maxAge: STATIC_MAX_AGE }))
clientsRouter.use('/client/locales/:locale/:file.json', function (req, res) { clientsRouter.use('/client/locales/:locale/:file.json', serveServerTranslations)
// 404 for static files not found
clientsRouter.use('/client/*', (req: express.Request, res: express.Response) => {
res.sendStatus(404)
})
// Always serve index client page (the client is a single page application, let it handle routing)
// Try to provide the right language index.html
clientsRouter.use('/(:language)?', asyncMiddleware(serveIndexHTML))
// ---------------------------------------------------------------------------
export {
clientsRouter
}
// ---------------------------------------------------------------------------
async function serveServerTranslations (req: express.Request, res: express.Response) {
const locale = req.params.locale const locale = req.params.locale
const file = req.params.file const file = req.params.file
@ -59,16 +78,9 @@ clientsRouter.use('/client/locales/:locale/:file.json', function (req, res) {
} }
return res.sendStatus(404) return res.sendStatus(404)
}) }
// 404 for static files not found async function serveIndexHTML (req: express.Request, res: express.Response) {
clientsRouter.use('/client/*', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendStatus(404)
})
// Always serve index client page (the client is a single page application, let it handle routing)
// Try to provide the right language index.html
clientsRouter.use('/(:language)?', async function (req, res) {
if (req.accepts(ACCEPT_HEADERS) === 'html') { if (req.accepts(ACCEPT_HEADERS) === 'html') {
try { try {
await generateHTMLPage(req, res, req.params.language) await generateHTMLPage(req, res, req.params.language)
@ -79,16 +91,8 @@ clientsRouter.use('/(:language)?', async function (req, res) {
} }
return res.status(404).end() return res.status(404).end()
})
// ---------------------------------------------------------------------------
export {
clientsRouter
} }
// ---------------------------------------------------------------------------
async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) { async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) {
const html = await ClientHtml.getDefaultHTMLPage(req, res, paramLang) const html = await ClientHtml.getDefaultHTMLPage(req, res, paramLang)