X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fclient-html.ts;h=8841dd2ac2a69f02e88c26eb0caf3760cf49c851;hb=c5407d7046168abb4098df1408e7aa84519cb61a;hp=217f6a437ab65f0ebdae3be6fd89dcd869a52c4c;hpb=92bf2f62995bbaa0402cb4657473ad8d5b6fcf8d;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index 217f6a437..8841dd2ac 100644
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -1,8 +1,8 @@
import * as express from 'express'
import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/models/i18n/i18n'
-import { CONFIG, CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE } from '../initializers'
+import { CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE, PLUGIN_GLOBAL_CSS_PATH, WEBSERVER } from '../initializers/constants'
import { join } from 'path'
-import { escapeHTML } from '../helpers/core-utils'
+import { escapeHTML, sha256 } from '../helpers/core-utils'
import { VideoModel } from '../models/video/video'
import * as validator from 'validator'
import { VideoPrivacy } from '../../shared/models/videos'
@@ -11,12 +11,16 @@ import { getActivityStreamDuration } from '../models/video/video-format-utils'
import { AccountModel } from '../models/account/account'
import { VideoChannelModel } from '../models/video/video-channel'
import * as Bluebird from 'bluebird'
+import { CONFIG } from '../initializers/config'
+import { logger } from '../helpers/logger'
export class ClientHtml {
private static htmlCache: { [ path: string ]: string } = {}
static invalidCache () {
+ logger.info('Cleaning HTML cache.')
+
ClientHtml.htmlCache = {}
}
@@ -37,7 +41,7 @@ export class ClientHtml {
const [ html, video ] = await Promise.all([
ClientHtml.getIndexHTML(req, res),
- VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
+ VideoModel.load(videoId)
])
// Let Angular application handle errors
@@ -91,6 +95,7 @@ export class ClientHtml {
let html = buffer.toString()
html = ClientHtml.addCustomCSS(html)
+ html = await ClientHtml.addAsyncPluginCSS(html)
ClientHtml.htmlCache[ path ] = html
@@ -106,7 +111,7 @@ export class ClientHtml {
// Save locale in cookies
res.cookie('clientLanguage', lang, {
- secure: CONFIG.WEBSERVER.SCHEME === 'https',
+ secure: WEBSERVER.SCHEME === 'https',
sameSite: true,
maxAge: 1000 * 3600 * 24 * 90 // 3 months
})
@@ -137,18 +142,28 @@ export class ClientHtml {
}
private static addCustomCSS (htmlStringPage: string) {
- const styleTag = ''
+ const styleTag = ``
return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.CUSTOM_CSS, styleTag)
}
+ private static async addAsyncPluginCSS (htmlStringPage: string) {
+ const globalCSSContent = await readFile(PLUGIN_GLOBAL_CSS_PATH)
+ if (globalCSSContent.byteLength === 0) return htmlStringPage
+
+ const fileHash = sha256(globalCSSContent)
+ const linkTag = ``
+
+ return htmlStringPage.replace('', linkTag + '')
+ }
+
private static addVideoOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
- const previewUrl = CONFIG.WEBSERVER.URL + video.getPreviewStaticPath()
- const videoUrl = CONFIG.WEBSERVER.URL + video.getWatchStaticPath()
+ const previewUrl = WEBSERVER.URL + video.getPreviewStaticPath()
+ const videoUrl = WEBSERVER.URL + video.getWatchStaticPath()
const videoNameEscaped = escapeHTML(video.name)
const videoDescriptionEscaped = escapeHTML(video.description)
- const embedUrl = CONFIG.WEBSERVER.URL + video.getEmbedStaticPath()
+ const embedUrl = WEBSERVER.URL + video.getEmbedStaticPath()
const openGraphMetaTags = {
'og:type': 'video',
@@ -180,7 +195,7 @@ export class ClientHtml {
const oembedLinkTags = [
{
type: 'application/json+oembed',
- href: CONFIG.WEBSERVER.URL + '/services/oembed?url=' + encodeURIComponent(videoUrl),
+ href: WEBSERVER.URL + '/services/oembed?url=' + encodeURIComponent(videoUrl),
title: videoNameEscaped
}
]