X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=f17f2a5d29cb0d1bc4e56aeb5a74706742ed4a04;hb=092092969633bbcf6d4891a083ea497a7d5c3154;hp=aaa04889a1fca94ff7540268d8ef934f8e28ca27;hpb=65fcc3119c334b75dd13bcfdebf186afdc580a8f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/client.ts b/server/controllers/client.ts index aaa04889a..f17f2a5d2 100644 --- a/server/controllers/client.ts +++ b/server/controllers/client.ts @@ -1,43 +1,84 @@ -import { parallel } from 'async' -import express = require('express') -import fs = require('fs') +import * as express from 'express' import { join } from 'path' -import expressValidator = require('express-validator') -// TODO: use .validator when express-validator typing will have validator field -const validator = expressValidator['validator'] - -const db = require('../initializers/database') -import { - CONFIG, - REMOTE_SCHEME, - STATIC_PATHS, - STATIC_MAX_AGE -} from '../initializers' +import { root } from '../helpers/core-utils' +import { ACCEPT_HEADERS, STATIC_MAX_AGE } from '../initializers' +import { asyncMiddleware, embedCSP } 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(__dirname, '..', '..', 'client/dist') -const embedPath = join(distPath, 'standalone/videos/embed.html') -const indexPath = join(distPath, 'index.html') +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 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( + '/videos/embed', + embedCSP, + (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 + +const staticClientFiles = [ + '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`)) + } + + return res.sendStatus(404) +}) // 404 for static files not found -clientsRouter.use('/client/*', function (req, res, next) { +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') { + try { + await generateHTMLPage(req, res, req.params.language) + return + } catch (err) { + logger.error('Cannot generate HTML page.', err) + } + } + + return res.status(404).end() +}) + // --------------------------------------------------------------------------- export { @@ -46,73 +87,20 @@ export { // --------------------------------------------------------------------------- -function addOpenGraphTags (htmlStringPage, video) { - let basePreviewUrlHttp - - if (video.isOwned()) { - basePreviewUrlHttp = CONFIG.WEBSERVER.URL - } else { - basePreviewUrlHttp = REMOTE_SCHEME.HTTP + '://' + video.Author.Pod.host - } - - // 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 - } - - let tagsString = '' - Object.keys(metaTags).forEach(function (tagName) { - const tagValue = metaTags[tagName] +async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) { + const html = await ClientHtml.getDefaultHTMLPage(req, res, paramLang) - tagsString += '' - }) - - return htmlStringPage.replace(opengraphComment, tagsString) + return sendHTML(html, res) } -function generateWatchHtmlPage (req, res, next) { - const videoId = req.params.id - - // Let Angular application handle errors - if (!validator.isUUID(videoId, 4)) return res.sendFile(indexPath) - - parallel({ - file: function (callback) { - fs.readFile(indexPath, callback) - }, +async function generateWatchHtmlPage (req: express.Request, res: express.Response) { + const html = await ClientHtml.getWatchHTMLPage(req.params.id + '', req, res) - video: function (callback) { - db.Video.loadAndPopulateAuthorAndPodAndTags(videoId, callback) - } - }, function (err, result: any) { - if (err) return next(err) - - const html = result.file.toString() - const video = result.video + return sendHTML(html, res) +} - // Let Angular application handle errors - if (!video) return res.sendFile(indexPath) +function sendHTML (html: string, res: express.Response) { + res.set('Content-Type', 'text/html; charset=UTF-8') - const htmlStringPageWithTags = addOpenGraphTags(html, video) - res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags) - }) + return res.send(html) }