X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=dc3ff18fc7e6f1cd8b7a721eff48776f696977c5;hb=000eb0e40d74e914f6691305511c44e89cd8bf07;hp=13ca15e9d3ffe5ea2ddffd8a9e5db0e719f97b76;hpb=d00e2393d4269c0b4e280753e5f82ac06bd218c6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/client.ts b/server/controllers/client.ts index 13ca15e9d..dc3ff18fc 100644 --- a/server/controllers/client.ts +++ b/server/controllers/client.ts @@ -1,89 +1,62 @@ -import * as Bluebird from 'bluebird' import * as express from 'express' -import * as helmet from 'helmet' import { join } from 'path' -import * as validator from 'validator' -import { escapeHTML, readFileBufferPromise, root } from '../helpers/core-utils' -import { ACCEPT_HEADERS, CONFIG, EMBED_SIZE, OPENGRAPH_AND_OEMBED_COMMENT, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers' +import { root } from '../helpers/core-utils' +import { ACCEPT_HEADERS, STATIC_MAX_AGE } from '../initializers/constants' import { asyncMiddleware } from '../middlewares' -import { VideoModel } from '../models/video/video' -import { VideoPrivacy } from '../../shared/models/videos' -import { - buildFileLocale, - getCompleteLocale, - getDefaultLocale, - is18nLocale, - LOCALE_FILES, - POSSIBLE_LOCALES -} from '../../shared/models/i18n/i18n' +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() const distPath = join(root(), 'client', 'dist') -const assetsImagesPath = join(root(), 'client', 'dist', 'assets', 'images') const embedPath = join(distPath, 'standalone', 'videos', 'embed.html') const testEmbedPath = join(distPath, 'standalone', 'videos', 'test-embed.html') // Special route that add OpenGraph and oEmbed tags // Do not use a template engine for a so little thing -clientsRouter.use('/videos/watch/:id', - asyncMiddleware(generateWatchHtmlPage) -) +clientsRouter.use('/videos/watch/:id', asyncMiddleware(generateWatchHtmlPage)) +clientsRouter.use('/accounts/:nameWithHost', asyncMiddleware(generateAccountHtmlPage)) +clientsRouter.use('/video-channels/:nameWithHost', asyncMiddleware(generateVideoChannelHtmlPage)) -clientsRouter.use('' + +clientsRouter.use( '/videos/embed', - (req: express.Request, res: express.Response, next: express.NextFunction) => { + (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, next: express.NextFunction) => { - res.sendFile(testEmbedPath) -}) +clientsRouter.use( + '/videos/test-embed', + (req: express.Request, res: express.Response) => res.sendFile(testEmbedPath) +) // Static HTML/CSS/JS client files const staticClientFiles = [ - 'manifest.json', + 'manifest.webmanifest', 'ngsw-worker.js', 'ngsw.json' ] for (const staticClientFile of staticClientFiles) { const path = join(root(), 'client', 'dist', staticClientFile) - clientsRouter.use('/' + staticClientFile, express.static(path, { 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/locales/:locale/:file.json', function (req, res) { - 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) - return res.sendFile(join(__dirname, `../../../client/dist/locale/${file}_${completeFileLocale}.json`)) - } + clientsRouter.get('/' + staticClientFile, (req: express.Request, res: express.Response) => { + res.sendFile(path, { maxAge: STATIC_MAX_AGE.SERVER }) + }) +} - return res.sendStatus(404) -}) +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/*', (req: express.Request, res: express.Response, next: express.NextFunction) => { +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)?', function (req, res) { - if (req.accepts(ACCEPT_HEADERS) === 'html') { - return res.sendFile(getIndexPath(req, res, req.params.language)) - } - - return res.status(404).end() -}) +clientsRouter.use('/(:language)?', asyncMiddleware(serveIndexHTML)) // --------------------------------------------------------------------------- @@ -93,131 +66,60 @@ export { // --------------------------------------------------------------------------- -function getIndexPath (req: express.Request, res: express.Response, paramLang?: string) { - let lang: string - - // Check param lang validity - if (paramLang && is18nLocale(paramLang)) { - lang = paramLang +async function serveServerTranslations (req: express.Request, res: express.Response) { + const locale = req.params.locale + const file = req.params.file - // Save locale in cookies - res.cookie('clientLanguage', lang, { - secure: CONFIG.WEBSERVER.SCHEME === 'https', - sameSite: true, - maxAge: 1000 * 3600 * 24 * 90 // 3 months - }) + if (is18nLocale(locale) && LOCALE_FILES.indexOf(file) !== -1) { + const completeLocale = getCompleteLocale(locale) + const completeFileLocale = buildFileLocale(completeLocale) - } else if (req.cookies.clientLanguage && is18nLocale(req.cookies.clientLanguage)) { - lang = req.cookies.clientLanguage - } else { - lang = req.acceptsLanguages(POSSIBLE_LOCALES) || getDefaultLocale() + const path = join(__dirname, `../../../client/dist/locale/${file}.${completeFileLocale}.json`) + return res.sendFile(path, { maxAge: STATIC_MAX_AGE.SERVER }) } - return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html') + return res.sendStatus(404) } -function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) { - const previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName() - const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid - - const videoNameEscaped = escapeHTML(video.name) - const videoDescriptionEscaped = escapeHTML(video.description) - const embedUrl = CONFIG.WEBSERVER.URL + video.getEmbedStaticPath() - - const openGraphMetaTags = { - 'og:type': 'video', - 'og:title': videoNameEscaped, - 'og:image': previewUrl, - 'og:url': videoUrl, - 'og:description': videoDescriptionEscaped, - - 'og:video:url': embedUrl, - 'og:video:secure_url': embedUrl, - 'og:video:type': 'text/html', - 'og:video:width': EMBED_SIZE.width, - 'og:video:height': EMBED_SIZE.height, - - 'name': videoNameEscaped, - 'description': videoDescriptionEscaped, - 'image': previewUrl, - - 'twitter:card': CONFIG.SERVICES.TWITTER.WHITELISTED ? 'player' : 'summary_large_image', - 'twitter:site': CONFIG.SERVICES.TWITTER.USERNAME, - 'twitter:title': videoNameEscaped, - 'twitter:description': videoDescriptionEscaped, - 'twitter:image': previewUrl, - 'twitter:player': embedUrl, - 'twitter:player:width': EMBED_SIZE.width, - 'twitter:player:height': EMBED_SIZE.height - } - - const oembedLinkTags = [ - { - type: 'application/json+oembed', - href: CONFIG.WEBSERVER.URL + '/services/oembed?url=' + encodeURIComponent(videoUrl), - title: videoNameEscaped +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) } - ] - - const schemaTags = { - '@context': 'http://schema.org', - '@type': 'VideoObject', - name: videoNameEscaped, - description: videoDescriptionEscaped, - thumbnailUrl: previewUrl, - uploadDate: video.createdAt.toISOString(), - duration: video.getActivityStreamDuration(), - contentUrl: videoUrl, - embedUrl: embedUrl, - interactionCount: video.views } - let tagsString = '' + return res.status(404).end() +} - // Opengraph - Object.keys(openGraphMetaTags).forEach(tagName => { - const tagValue = openGraphMetaTags[tagName] +async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) { + const html = await ClientHtml.getDefaultHTMLPage(req, res, paramLang) - tagsString += `` - }) + return sendHTML(html, res) +} - // OEmbed - for (const oembedLinkTag of oembedLinkTags) { - tagsString += `` - } +async function generateWatchHtmlPage (req: express.Request, res: express.Response) { + const html = await ClientHtml.getWatchHTMLPage(req.params.id + '', req, res) - // Schema.org - tagsString += `` + return sendHTML(html, res) +} - // SEO - tagsString += `` +async function generateAccountHtmlPage (req: express.Request, res: express.Response) { + const html = await ClientHtml.getAccountHTMLPage(req.params.nameWithHost, req, res) - return htmlStringPage.replace(OPENGRAPH_AND_OEMBED_COMMENT, tagsString) + return sendHTML(html, res) } -async function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) { - const videoId = '' + req.params.id - let videoPromise: Bluebird - - // Let Angular application handle errors - if (validator.isUUID(videoId, 4)) { - videoPromise = VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(videoId) - } else if (validator.isInt(videoId)) { - videoPromise = VideoModel.loadAndPopulateAccountAndServerAndTags(+videoId) - } else { - return res.sendFile(getIndexPath(req, res)) - } +async function generateVideoChannelHtmlPage (req: express.Request, res: express.Response) { + const html = await ClientHtml.getVideoChannelHTMLPage(req.params.nameWithHost, req, res) - let [ file, video ] = await Promise.all([ - readFileBufferPromise(getIndexPath(req, res)), - videoPromise - ]) - - const html = file.toString() + return sendHTML(html, res) +} - // Let Angular application handle errors - if (!video || video.privacy === VideoPrivacy.PRIVATE) return res.sendFile(getIndexPath(req, res)) +function sendHTML (html: string, res: express.Response) { + res.set('Content-Type', 'text/html; charset=UTF-8') - const htmlStringPageWithTags = addOpenGraphAndOEmbedTags(html, video) - res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags) + return res.send(html) }