X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fclient.ts;h=e4643e1711dc68a92b9b2c9158e2ca74536ebf00;hb=a30a136c9896c656cab98d2c92cde32c534dc098;hp=c3d28245c329bfc5d180d0073a21389abc893b1a;hpb=4d4e5cd4dca78480ec7f40e747f424cd107376a4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/client.ts b/server/controllers/client.ts index c3d28245c..e4643e171 100644 --- a/server/controllers/client.ts +++ b/server/controllers/client.ts @@ -1,42 +1,63 @@ -import { parallel } from 'async' import * as express from 'express' -import * as fs from 'fs' import { join } from 'path' -import * as validator from 'validator' - -import { database as db } from '../initializers/database' -import { - CONFIG, - REMOTE_SCHEME, - STATIC_PATHS, - STATIC_MAX_AGE -} from '../initializers' -import { root } from '../helpers' +import { root } from '../helpers/core-utils' +import { ACCEPT_HEADERS, STATIC_MAX_AGE } from '../initializers/constants' +import { asyncMiddleware } from '../middlewares' +import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '../../shared/models/i18n/i18n' +import { ClientHtml } from '../lib/client-html' +import { logger } from '../helpers/logger' const clientsRouter = express.Router() -// TODO: move to constants -const opengraphComment = '' const distPath = join(root(), 'client', 'dist') const embedPath = join(distPath, 'standalone', 'videos', 'embed.html') -const indexPath = join(distPath, 'index.html') +const testEmbedPath = join(distPath, 'standalone', 'videos', 'test-embed.html') -// Special route that add OpenGraph tags +// Special route that add OpenGraph and oEmbed tags // Do not use a template engine for a so little thing -clientsRouter.use('/videos/watch/:id', generateWatchHtmlPage) - -clientsRouter.use('/videos/embed', function (req, res, next) { - res.sendFile(embedPath) -}) +clientsRouter.use('/videos/watch/:id', asyncMiddleware(generateWatchHtmlPage)) +clientsRouter.use('/accounts/:nameWithHost', asyncMiddleware(generateAccountHtmlPage)) +clientsRouter.use('/video-channels/:nameWithHost', asyncMiddleware(generateVideoChannelHtmlPage)) + +clientsRouter.use( + '/videos/embed', + (req: express.Request, res: express.Response) => { + res.removeHeader('X-Frame-Options') + res.sendFile(embedPath) + } +) +clientsRouter.use( + '/videos/test-embed', + (req: express.Request, res: express.Response) => res.sendFile(testEmbedPath) +) // Static HTML/CSS/JS client files -clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE })) + +const staticClientFiles = [ + 'manifest.webmanifest', + 'ngsw-worker.js', + 'ngsw.json' +] +for (const staticClientFile of staticClientFiles) { + const path = join(root(), 'client', 'dist', staticClientFile) + + clientsRouter.get('/' + staticClientFile, (req: express.Request, res: express.Response) => { + res.sendFile(path, { maxAge: STATIC_MAX_AGE.SERVER }) + }) +} + +clientsRouter.use('/client/locales/:locale/:file.json', serveServerTranslations) +clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE.CLIENT })) // 404 for static files not found -clientsRouter.use('/client/*', function (req, res, next) { +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 { @@ -45,73 +66,60 @@ export { // --------------------------------------------------------------------------- -function addOpenGraphTags (htmlStringPage, video) { - let basePreviewUrlHttp +function serveServerTranslations (req: express.Request, res: express.Response) { + const locale = req.params.locale + const file = req.params.file + + if (is18nLocale(locale) && LOCALE_FILES.indexOf(file) !== -1) { + const completeLocale = getCompleteLocale(locale) + const completeFileLocale = buildFileLocale(completeLocale) - if (video.isOwned()) { - basePreviewUrlHttp = CONFIG.WEBSERVER.URL - } else { - basePreviewUrlHttp = REMOTE_SCHEME.HTTP + '://' + video.Author.Pod.host + const path = join(__dirname, `../../../client/dist/locale/${file}.${completeFileLocale}.json`) + return res.sendFile(path, { maxAge: STATIC_MAX_AGE.SERVER }) } - // We fetch the remote preview (bigger than the thumbnail) - // This should not overhead the remote server since social websites put in a cache the OpenGraph tags - // We can't use the thumbnail because these social websites want bigger images (> 200x200 for Facebook for example) - const previewUrl = basePreviewUrlHttp + STATIC_PATHS.PREVIEWS + video.getPreviewName() - const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.id - - const metaTags = { - 'og:type': 'video', - 'og:title': video.name, - 'og:image': previewUrl, - 'og:url': videoUrl, - 'og:description': video.description, - - 'name': video.name, - 'description': video.description, - 'image': previewUrl, - - 'twitter:card': 'summary_large_image', - 'twitter:site': '@Chocobozzz', - 'twitter:title': video.name, - 'twitter:description': video.description, - 'twitter:image': previewUrl + return res.sendStatus(404) +} + +async function serveIndexHTML (req: express.Request, res: express.Response) { + if (req.accepts(ACCEPT_HEADERS) === 'html') { + try { + await generateHTMLPage(req, res, req.params.language) + return + } catch (err) { + logger.error('Cannot generate HTML page.', err) + } } - let tagsString = '' - Object.keys(metaTags).forEach(function (tagName) { - const tagValue = metaTags[tagName] + return res.status(404).end() +} - tagsString += '' - }) +async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) { + const html = await ClientHtml.getDefaultHTMLPage(req, res, paramLang) - return htmlStringPage.replace(opengraphComment, tagsString) + return sendHTML(html, res) } -function generateWatchHtmlPage (req, res, next) { - const videoId = req.params.id +async function generateWatchHtmlPage (req: express.Request, res: express.Response) { + const html = await ClientHtml.getWatchHTMLPage(req.params.id + '', req, res) - // Let Angular application handle errors - if (!validator.isUUID(videoId, 4)) return res.sendFile(indexPath) + return sendHTML(html, res) +} - parallel({ - file: function (callback) { - fs.readFile(indexPath, callback) - }, +async function generateAccountHtmlPage (req: express.Request, res: express.Response) { + const html = await ClientHtml.getAccountHTMLPage(req.params.nameWithHost, req, res) - video: function (callback) { - db.Video.loadAndPopulateAuthorAndPodAndTags(videoId, callback) - } - }, function (err, result: any) { - if (err) return next(err) + return sendHTML(html, res) +} - const html = result.file.toString() - const video = result.video +async function generateVideoChannelHtmlPage (req: express.Request, res: express.Response) { + const html = await ClientHtml.getVideoChannelHTMLPage(req.params.nameWithHost, req, res) - // Let Angular application handle errors - if (!video) return res.sendFile(indexPath) + return sendHTML(html, res) +} - const htmlStringPageWithTags = addOpenGraphTags(html, video) - res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags) - }) +function sendHTML (html: string, res: express.Response) { + res.set('Content-Type', 'text/html; charset=UTF-8') + + return res.send(html) }