X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fclient-html.ts;h=32f5d29abbaa968bc40fa9b32f0a94c6db998f0a;hb=f2eb23cd87cf32b8fe545178143b5f49e06a58da;hp=9f668dedb37a68b5703fc6061432e2c610ac2c49;hpb=cf649c2ed918b3cc6bd4c92f38c7752174ac1e9a;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index 9f668dedb..32f5d29ab 100644
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -1,4 +1,5 @@
import * as express from 'express'
+import * as Bluebird from 'bluebird'
import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/core-utils/i18n/i18n'
import {
AVATARS_SIZE,
@@ -6,10 +7,11 @@ import {
EMBED_SIZE,
PLUGIN_GLOBAL_CSS_PATH,
WEBSERVER,
- FILES_CONTENT_HASH
+ FILES_CONTENT_HASH,
+ ACCEPT_HEADERS
} from '../initializers/constants'
import { join } from 'path'
-import { escapeHTML, sha256 } from '../helpers/core-utils'
+import { escapeHTML, isTestInstance, sha256 } from '../helpers/core-utils'
import { VideoModel } from '../models/video/video'
import { VideoPlaylistModel } from '../models/video/video-playlist'
import validator from 'validator'
@@ -18,10 +20,10 @@ import { readFile } from 'fs-extra'
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'
import { MAccountActor, MChannelActor } from '../types/models'
+import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
type Tags = {
ogType: string
@@ -32,8 +34,10 @@ type Tags = {
numberOfItems: number
}
+ siteName: string
title: string
url: string
+ originUrl: string
description: string
embed?: {
@@ -50,7 +54,7 @@ type Tags = {
}
}
-export class ClientHtml {
+class ClientHtml {
private static htmlCache: { [path: string]: string } = {}
@@ -74,7 +78,7 @@ export class ClientHtml {
static async getWatchHTMLPage (videoId: string, req: express.Request, res: express.Response) {
// Let Angular application handle errors
if (!validator.isInt(videoId) && !validator.isUUID(videoId, 4)) {
- res.status(404)
+ res.status(HttpStatusCode.NOT_FOUND_404)
return ClientHtml.getIndexHTML(req, res)
}
@@ -85,7 +89,7 @@ export class ClientHtml {
// Let Angular application handle errors
if (!video || video.privacy === VideoPrivacy.PRIVATE || video.privacy === VideoPrivacy.INTERNAL || video.VideoBlacklist) {
- res.status(404)
+ res.status(HttpStatusCode.NOT_FOUND_404)
return html
}
@@ -93,7 +97,9 @@ export class ClientHtml {
customHtml = ClientHtml.addDescriptionTag(customHtml, escapeHTML(video.description))
const url = WEBSERVER.URL + video.getWatchStaticPath()
+ const originUrl = video.url
const title = escapeHTML(video.name)
+ const siteName = escapeHTML(CONFIG.INSTANCE.NAME)
const description = escapeHTML(video.description)
const image = {
@@ -111,7 +117,18 @@ export class ClientHtml {
const twitterCard = CONFIG.SERVICES.TWITTER.WHITELISTED ? 'player' : 'summary_large_image'
const schemaType = 'VideoObject'
- customHtml = ClientHtml.addTags(customHtml, { url, title, description, image, embed, ogType, twitterCard, schemaType })
+ customHtml = ClientHtml.addTags(customHtml, {
+ url,
+ originUrl,
+ siteName,
+ title,
+ description,
+ image,
+ embed,
+ ogType,
+ twitterCard,
+ schemaType
+ })
return customHtml
}
@@ -119,7 +136,7 @@ export class ClientHtml {
static async getWatchPlaylistHTMLPage (videoPlaylistId: string, req: express.Request, res: express.Response) {
// Let Angular application handle errors
if (!validator.isInt(videoPlaylistId) && !validator.isUUID(videoPlaylistId, 4)) {
- res.status(404)
+ res.status(HttpStatusCode.NOT_FOUND_404)
return ClientHtml.getIndexHTML(req, res)
}
@@ -130,7 +147,7 @@ export class ClientHtml {
// Let Angular application handle errors
if (!videoPlaylist || videoPlaylist.privacy === VideoPlaylistPrivacy.PRIVATE) {
- res.status(404)
+ res.status(HttpStatusCode.NOT_FOUND_404)
return html
}
@@ -138,7 +155,9 @@ export class ClientHtml {
customHtml = ClientHtml.addDescriptionTag(customHtml, escapeHTML(videoPlaylist.description))
const url = videoPlaylist.getWatchUrl()
+ const originUrl = videoPlaylist.url
const title = escapeHTML(videoPlaylist.name)
+ const siteName = escapeHTML(CONFIG.INSTANCE.NAME)
const description = escapeHTML(videoPlaylist.description)
const image = {
@@ -158,7 +177,19 @@ export class ClientHtml {
const twitterCard = CONFIG.SERVICES.TWITTER.WHITELISTED ? 'player' : 'summary'
const schemaType = 'ItemList'
- customHtml = ClientHtml.addTags(customHtml, { url, embed, title, description, image, list, ogType, twitterCard, schemaType })
+ customHtml = ClientHtml.addTags(customHtml, {
+ url,
+ originUrl,
+ siteName,
+ embed,
+ title,
+ description,
+ image,
+ list,
+ ogType,
+ twitterCard,
+ schemaType
+ })
return customHtml
}
@@ -173,10 +204,8 @@ export class ClientHtml {
static async getEmbedHTML () {
const path = ClientHtml.getEmbedPath()
- console.log('coucu')
- console.log(path)
- if (ClientHtml.htmlCache[path]) return ClientHtml.htmlCache[path]
+ if (!isTestInstance() && ClientHtml.htmlCache[path]) return ClientHtml.htmlCache[path]
const buffer = await readFile(path)
@@ -200,14 +229,16 @@ export class ClientHtml {
// Let Angular application handle errors
if (!entity) {
- res.status(404)
+ res.status(HttpStatusCode.NOT_FOUND_404)
return ClientHtml.getIndexHTML(req, res)
}
let customHtml = ClientHtml.addTitleTag(html, escapeHTML(entity.getDisplayName()))
customHtml = ClientHtml.addDescriptionTag(customHtml, escapeHTML(entity.description))
- const url = entity.Actor.url
+ const url = entity.getLocalUrl()
+ const originUrl = entity.Actor.url
+ const siteName = escapeHTML(CONFIG.INSTANCE.NAME)
const title = escapeHTML(entity.getDisplayName())
const description = escapeHTML(entity.description)
@@ -221,14 +252,24 @@ export class ClientHtml {
const twitterCard = 'summary'
const schemaType = 'ProfilePage'
- customHtml = ClientHtml.addTags(customHtml, { url, title, description, image, ogType, twitterCard, schemaType })
+ customHtml = ClientHtml.addTags(customHtml, {
+ url,
+ originUrl,
+ title,
+ siteName,
+ description,
+ image,
+ ogType,
+ twitterCard,
+ schemaType
+ })
return customHtml
}
private static async getIndexHTML (req: express.Request, res: express.Response, paramLang?: string) {
const path = ClientHtml.getIndexPath(req, res, paramLang)
- if (ClientHtml.htmlCache[path]) return ClientHtml.htmlCache[path]
+ if (!isTestInstance() && ClientHtml.htmlCache[path]) return ClientHtml.htmlCache[path]
const buffer = await readFile(path)
@@ -324,6 +365,7 @@ export class ClientHtml {
private static generateOpenGraphMetaTags (tags: Tags) {
const metaTags = {
'og:type': tags.ogType,
+ 'og:site_name': tags.siteName,
'og:title': tags.title,
'og:image': tags.image.url
}
@@ -413,7 +455,7 @@ export class ClientHtml {
const twitterCardMetaTags = this.generateTwitterCardMetaTags(tagsValues)
const schemaTags = this.generateSchemaTags(tagsValues)
- const { url, title, embed } = tagsValues
+ const { url, title, embed, originUrl } = tagsValues
const oembedLinkTags: { type: string, href: string, title: string }[] = []
@@ -459,8 +501,43 @@ export class ClientHtml {
}
// SEO, use origin URL
- tagsString += ``
+ tagsString += ``
return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.META_TAGS, tagsString)
}
}
+
+function sendHTML (html: string, res: express.Response) {
+ res.set('Content-Type', 'text/html; charset=UTF-8')
+
+ return res.send(html)
+}
+
+async function serveIndexHTML (req: express.Request, res: express.Response) {
+ if (req.accepts(ACCEPT_HEADERS) === 'html' ||
+ !req.headers.accept) {
+ try {
+ await generateHTMLPage(req, res, req.params.language)
+ return
+ } catch (err) {
+ logger.error('Cannot generate HTML page.', err)
+ return res.sendStatus(HttpStatusCode.INTERNAL_SERVER_ERROR_500)
+ }
+ }
+
+ return res.sendStatus(HttpStatusCode.NOT_ACCEPTABLE_406)
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+ ClientHtml,
+ sendHTML,
+ serveIndexHTML
+}
+
+async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) {
+ const html = await ClientHtml.getDefaultHTMLPage(req, res, paramLang)
+
+ return sendHTML(html, res)
+}