projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move job queue to redis
[oweals/peertube.git]
/
server
/
controllers
/
client.ts
diff --git
a/server/controllers/client.ts
b/server/controllers/client.ts
index 6a2ac4aabc151f779eb8882fdeaa0cbf4a5e23fb..c85bd8a5ed79c94d880cd260837a2f5e18287169 100644
(file)
--- a/
server/controllers/client.ts
+++ b/
server/controllers/client.ts
@@
-1,27
+1,24
@@
+import * as Bluebird from 'bluebird'
import * as express from 'express'
import { join } from 'path'
import * as validator from 'validator'
import * as express from 'express'
import { join } from 'path'
import * as validator from 'validator'
-import * as Promise from 'bluebird'
-
-import { database as db } from '../initializers/database'
-import {
- CONFIG,
- STATIC_PATHS,
- STATIC_MAX_AGE,
- OPENGRAPH_AND_OEMBED_COMMENT
-} from '../initializers'
-import { root, readFileBufferPromise, escapeHTML } from '../helpers'
-import { VideoInstance } from '../models'
+import { escapeHTML, readFileBufferPromise, root } from '../helpers/core-utils'
+import { CONFIG, EMBED_SIZE, OPENGRAPH_AND_OEMBED_COMMENT, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
+import { asyncMiddleware } from '../middlewares'
+import { VideoModel } from '../models/video/video'
const clientsRouter = express.Router()
const distPath = join(root(), 'client', 'dist')
const clientsRouter = express.Router()
const distPath = join(root(), 'client', 'dist')
+const assetsImagesPath = join(root(), 'client', 'dist', 'client', '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
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
-clientsRouter.use('/videos/watch/:id', generateWatchHtmlPage)
+clientsRouter.use('/videos/watch/:id',
+ asyncMiddleware(generateWatchHtmlPage)
+)
clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendFile(embedPath)
clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendFile(embedPath)
@@
-29,6
+26,7
@@
clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response,
// Static HTML/CSS/JS client files
clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE }))
// Static HTML/CSS/JS client files
clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE }))
+clientsRouter.use('/client/assets/images', express.static(assetsImagesPath, { maxAge: STATIC_MAX_AGE }))
// 404 for static files not found
clientsRouter.use('/client/*', (req: express.Request, res: express.Response, next: express.NextFunction) => {
// 404 for static files not found
clientsRouter.use('/client/*', (req: express.Request, res: express.Response, next: express.NextFunction) => {
@@
-43,81
+41,104
@@
export {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: Video
Instance
) {
+function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: Video
Model
) {
const previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName()
const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
const previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName()
const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
- const videoName = escapeHTML(video.name)
- const videoDescription = escapeHTML(video.description)
+ const videoNameEscaped = escapeHTML(video.name)
+ const videoDescriptionEscaped = escapeHTML(video.description)
+ const embedUrl = CONFIG.WEBSERVER.URL + video.getEmbedPath()
const openGraphMetaTags = {
'og:type': 'video',
const openGraphMetaTags = {
'og:type': 'video',
- 'og:title': videoName,
+ 'og:title': videoName
Escaped
,
'og:image': previewUrl,
'og:url': videoUrl,
'og:image': previewUrl,
'og:url': videoUrl,
- 'og:description': videoDescription,
+ 'og:description': videoDescription
Escaped
,
- 'name': videoName,
- 'description': videoDescription,
+ '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': 'summary_large_image',
'twitter:site': '@Chocobozzz',
'image': previewUrl,
'twitter:card': 'summary_large_image',
'twitter:site': '@Chocobozzz',
- 'twitter:title': videoName,
- 'twitter:description': videoDescription,
- 'twitter:image': previewUrl
+ '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),
}
const oembedLinkTags = [
{
type: 'application/json+oembed',
href: CONFIG.WEBSERVER.URL + '/services/oembed?url=' + encodeURIComponent(videoUrl),
- title: videoName
+ title: videoName
Escaped
}
]
}
]
+ const schemaTags = {
+ '@context': 'http://schema.org',
+ '@type': 'VideoObject',
+ name: videoNameEscaped,
+ description: videoDescriptionEscaped,
+ duration: video.getActivityStreamDuration(),
+ thumbnailURL: previewUrl,
+ contentURL: videoUrl,
+ embedURL: embedUrl,
+ uploadDate: video.createdAt
+ }
+
let tagsString = ''
let tagsString = ''
+
+ // Opengraph
Object.keys(openGraphMetaTags).forEach(tagName => {
const tagValue = openGraphMetaTags[tagName]
tagsString += `<meta property="${tagName}" content="${tagValue}" />`
})
Object.keys(openGraphMetaTags).forEach(tagName => {
const tagValue = openGraphMetaTags[tagName]
tagsString += `<meta property="${tagName}" content="${tagValue}" />`
})
+ // OEmbed
for (const oembedLinkTag of oembedLinkTags) {
tagsString += `<link rel="alternate" type="${oembedLinkTag.type}" href="${oembedLinkTag.href}" title="${oembedLinkTag.title}" />`
}
for (const oembedLinkTag of oembedLinkTags) {
tagsString += `<link rel="alternate" type="${oembedLinkTag.type}" href="${oembedLinkTag.href}" title="${oembedLinkTag.title}" />`
}
+ // Schema.org
+ tagsString += `<script type="application/ld+json">${JSON.stringify(schemaTags)}</script>`
+
return htmlStringPage.replace(OPENGRAPH_AND_OEMBED_COMMENT, tagsString)
}
return htmlStringPage.replace(OPENGRAPH_AND_OEMBED_COMMENT, tagsString)
}
-function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) {
+
async
function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) {
const videoId = '' + req.params.id
const videoId = '' + req.params.id
- let videoPromise:
Promise<VideoInstance
>
+ let videoPromise:
Bluebird<VideoModel
>
// Let Angular application handle errors
if (validator.isUUID(videoId, 4)) {
// Let Angular application handle errors
if (validator.isUUID(videoId, 4)) {
- videoPromise =
db.Video.loadByUUIDAndPopulateAuthorAndPod
AndTags(videoId)
+ videoPromise =
VideoModel.loadByUUIDAndPopulateAccountAndServer
AndTags(videoId)
} else if (validator.isInt(videoId)) {
} else if (validator.isInt(videoId)) {
- videoPromise =
db.Video.loadAndPopulateAuthorAndPod
AndTags(+videoId)
+ videoPromise =
VideoModel.loadAndPopulateAccountAndServer
AndTags(+videoId)
} else {
return res.sendFile(indexPath)
}
} else {
return res.sendFile(indexPath)
}
- Promise.all([
+
let [ file, video ] = await
Promise.all([
readFileBufferPromise(indexPath),
videoPromise
])
readFileBufferPromise(indexPath),
videoPromise
])
- .then(([ file, video ]) => {
- file = file as Buffer
- video = video as VideoInstance
-
const html = file.toString()
+ const html = file.toString()
-
// Let Angular application handle errors
-
if (!video) return res.sendFile(indexPath)
+ // Let Angular application handle errors
+ if (!video) return res.sendFile(indexPath)
- const htmlStringPageWithTags = addOpenGraphAndOEmbedTags(html, video)
- res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)
- })
- .catch(err => next(err))
+ const htmlStringPageWithTags = addOpenGraphAndOEmbedTags(html, video)
+ res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)
}
}