X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=b23f7e1aeb4fc6add8e640e7b55b563567325800;hb=aa2e7f1501ce108e0c250538aba7046fddefc935;hp=503eff75013ab5c58bf80869e3b0b0c24ecde67e;hpb=69818c9394366b954b6ba3bd697bd9d2b09f2a16;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 503eff750..b23f7e1ae 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -1,23 +1,20 @@
-import { parallel } from 'async'
import * as express from 'express'
-import * as fs from 'fs'
import { join } from 'path'
import * as validator from 'validator'
+import * as Promise from 'bluebird'
import { database as db } from '../initializers/database'
import {
CONFIG,
- REMOTE_SCHEME,
STATIC_PATHS,
- STATIC_MAX_AGE
+ STATIC_MAX_AGE,
+ OPENGRAPH_COMMENT
} from '../initializers'
-import { root } from '../helpers'
+import { root, readFileBufferPromise } from '../helpers'
import { VideoInstance } from '../models'
const clientsRouter = express.Router()
-// TODO: move to constants
-const opengraphComment = ''
const distPath = join(root(), 'client', 'dist')
const embedPath = join(distPath, 'standalone', 'videos', 'embed.html')
const indexPath = join(distPath, 'index.html')
@@ -26,7 +23,7 @@ const indexPath = join(distPath, 'index.html')
// Do not use a template engine for a so little thing
clientsRouter.use('/videos/watch/:id', generateWatchHtmlPage)
-clientsRouter.use('/videos/embed', function (req: express.Request, res: express.Response, next: express.NextFunction) {
+clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendFile(embedPath)
})
@@ -34,7 +31,7 @@ clientsRouter.use('/videos/embed', function (req: express.Request, res: express.
clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE }))
// 404 for static files not found
-clientsRouter.use('/client/*', function (req: express.Request, res: express.Response, next: express.NextFunction) {
+clientsRouter.use('/client/*', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendStatus(404)
})
@@ -47,18 +44,7 @@ export {
// ---------------------------------------------------------------------------
function addOpenGraphTags (htmlStringPage: string, video: VideoInstance) {
- 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 previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName()
const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.id
const metaTags = {
@@ -80,34 +66,37 @@ function addOpenGraphTags (htmlStringPage: string, video: VideoInstance) {
}
let tagsString = ''
- Object.keys(metaTags).forEach(function (tagName) {
+ Object.keys(metaTags).forEach(tagName => {
const tagValue = metaTags[tagName]
tagsString += ''
})
- return htmlStringPage.replace(opengraphComment, tagsString)
+ return htmlStringPage.replace(OPENGRAPH_COMMENT, tagsString)
}
function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) {
const videoId = '' + req.params.id
+ let videoPromise: Promise
// Let Angular application handle errors
- if (!validator.isUUID(videoId, 4)) return res.sendFile(indexPath)
-
- parallel({
- file: function (callback) {
- fs.readFile(indexPath, callback)
- },
+ if (validator.isUUID(videoId, 4)) {
+ videoPromise = db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(videoId)
+ } else if (validator.isInt(videoId)) {
+ videoPromise = db.Video.loadAndPopulateAuthorAndPodAndTags(+videoId)
+ } else {
+ return res.sendFile(indexPath)
+ }
- video: function (callback) {
- db.Video.loadAndPopulateAuthorAndPodAndTags(videoId, callback)
- }
- }, function (err: Error, result: { file: Buffer, video: VideoInstance }) {
- if (err) return next(err)
+ Promise.all([
+ readFileBufferPromise(indexPath),
+ videoPromise
+ ])
+ .then(([ file, video ]) => {
+ file = file as Buffer
+ video = video as VideoInstance
- const html = result.file.toString()
- const video = result.video
+ const html = file.toString()
// Let Angular application handle errors
if (!video) return res.sendFile(indexPath)
@@ -115,4 +104,5 @@ function generateWatchHtmlPage (req: express.Request, res: express.Response, nex
const htmlStringPageWithTags = addOpenGraphTags(html, video)
res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)
})
+ .catch(err => next(err))
}