X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fclient.ts;h=385757fa6bb45729433b142458f918e9a815589e;hb=ff193d5e3fbe648f689be2e235dcf88daa1bba48;hp=f474c4282006c65ed0b8e2f772b56cfb5518e2ed;hpb=6bafac54bf375cd60f1c06f6afdc648e0e19743d;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index f474c4282..385757fa6 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -1,26 +1,20 @@
+import * as Bluebird from 'bluebird'
import * as express from 'express'
import { join } from 'path'
import * as validator from 'validator'
-import * as Bluebird from 'bluebird'
-
-import { database as db } from '../initializers/database'
-import {
- CONFIG,
- STATIC_PATHS,
- STATIC_MAX_AGE,
- OPENGRAPH_AND_OEMBED_COMMENT,
- EMBED_SIZE
-} from '../initializers'
-import { root, readFileBufferPromise, escapeHTML } from '../helpers'
+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 { asyncMiddleware } from '../middlewares'
-import { VideoInstance } from '../models'
+import { VideoModel } from '../models/video/video'
+import { VideoPrivacy } from '../../shared/models/videos'
+import { buildFileLocale, getCompleteLocale, getDefaultLocale, is18nLocale } from '../../shared/models'
+import { LOCALE_FILES } from '../../shared/models/i18n/i18n'
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 indexPath = join(distPath, 'index.html')
// Special route that add OpenGraph and oEmbed tags
// Do not use a template engine for a so little thing
@@ -33,14 +27,48 @@ clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response,
})
// Static HTML/CSS/JS client files
+
+const staticClientFiles = [
+ 'manifest.json',
+ '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/*', (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)?', function (req, res) {
+ if (req.accepts(ACCEPT_HEADERS) === 'html') {
+ return res.sendFile(getIndexPath(req, req.params.language))
+ }
+
+ return res.status(404).end()
+})
+
// ---------------------------------------------------------------------------
export {
@@ -49,7 +77,22 @@ export {
// ---------------------------------------------------------------------------
-function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance) {
+function getIndexPath (req: express.Request, paramLang?: string) {
+ let lang: string
+
+ // Check param lang validity
+ if (paramLang && is18nLocale(paramLang)) {
+ lang = paramLang
+ } else {
+ // lang = req.acceptsLanguages(POSSIBLE_LOCALES) || getDefaultLocale()
+ // Disable auto language for now
+ lang = getDefaultLocale()
+ }
+
+ return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html')
+}
+
+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
@@ -74,8 +117,8 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance
'description': videoDescriptionEscaped,
'image': previewUrl,
- 'twitter:card': 'summary_large_image',
- 'twitter:site': '@Chocobozzz',
+ '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,
@@ -92,42 +135,64 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance
}
]
+ 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 = ''
+
+ // Opengraph
Object.keys(openGraphMetaTags).forEach(tagName => {
const tagValue = openGraphMetaTags[tagName]
tagsString += ``
})
+ // OEmbed
for (const oembedLinkTag of oembedLinkTags) {
tagsString += ``
}
+ // Schema.org
+ tagsString += ``
+
+ // SEO
+ tagsString += ``
+
return htmlStringPage.replace(OPENGRAPH_AND_OEMBED_COMMENT, tagsString)
}
async function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) {
const videoId = '' + req.params.id
- let videoPromise: Bluebird
+ let videoPromise: Bluebird
// Let Angular application handle errors
if (validator.isUUID(videoId, 4)) {
- videoPromise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(videoId)
+ videoPromise = VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(videoId)
} else if (validator.isInt(videoId)) {
- videoPromise = db.Video.loadAndPopulateAccountAndServerAndTags(+videoId)
+ videoPromise = VideoModel.loadAndPopulateAccountAndServerAndTags(+videoId)
} else {
- return res.sendFile(indexPath)
+ return res.sendFile(getIndexPath(req))
}
let [ file, video ] = await Promise.all([
- readFileBufferPromise(indexPath),
+ readFileBufferPromise(getIndexPath(req)),
videoPromise
])
const html = file.toString()
// Let Angular application handle errors
- if (!video) return res.sendFile(indexPath)
+ if (!video || video.privacy === VideoPrivacy.PRIVATE) return res.sendFile(getIndexPath(req))
const htmlStringPageWithTags = addOpenGraphAndOEmbedTags(html, video)
res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)