X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Flazy-static.ts;h=b082e41f64ebaadeab9c87854f7061cd5c66e32f;hb=8d33235de737e18eabb0816a950ba89f4a807e70;hp=656dea2230b4650a517fecf676d771645fc6729e;hpb=6302d599cdf98b5a5363a2a1dcdc266447950191;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts
index 656dea223..b082e41f6 100644
--- a/server/controllers/lazy-static.ts
+++ b/server/controllers/lazy-static.ts
@@ -1,12 +1,14 @@
-import * as cors from 'cors'
-import * as express from 'express'
-import { LAZY_STATIC_PATHS, STATIC_MAX_AGE } from '../initializers/constants'
-import { VideosCaptionCache, VideosPreviewCache } from '../lib/files-cache'
-import { asyncMiddleware } from '../middlewares'
-import { AvatarModel } from '../models/avatar/avatar'
+import cors from 'cors'
+import express from 'express'
+import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache'
+import { MActorImage } from '@server/types/models'
+import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
 import { logger } from '../helpers/logger'
-import { avatarPathUnsafeCache, pushAvatarProcessInQueue } from '../lib/avatar'
-import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
+import { ACTOR_IMAGES_SIZE, LAZY_STATIC_PATHS, STATIC_MAX_AGE } from '../initializers/constants'
+import { VideosCaptionCache, VideosPreviewCache } from '../lib/files-cache'
+import { actorImagePathUnsafeCache, downloadActorImageFromWorker } from '../lib/local-actor'
+import { asyncMiddleware, handleStaticError } from '../middlewares'
+import { ActorImageModel } from '../models/actor/actor-image'
 
 const lazyStaticRouter = express.Router()
 
@@ -14,17 +16,32 @@ lazyStaticRouter.use(cors())
 
 lazyStaticRouter.use(
   LAZY_STATIC_PATHS.AVATARS + ':filename',
-  asyncMiddleware(getAvatar)
+  asyncMiddleware(getActorImage),
+  handleStaticError
+)
+
+lazyStaticRouter.use(
+  LAZY_STATIC_PATHS.BANNERS + ':filename',
+  asyncMiddleware(getActorImage),
+  handleStaticError
 )
 
 lazyStaticRouter.use(
   LAZY_STATIC_PATHS.PREVIEWS + ':filename',
-  asyncMiddleware(getPreview)
+  asyncMiddleware(getPreview),
+  handleStaticError
 )
 
 lazyStaticRouter.use(
   LAZY_STATIC_PATHS.VIDEO_CAPTIONS + ':filename',
-  asyncMiddleware(getVideoCaption)
+  asyncMiddleware(getVideoCaption),
+  handleStaticError
+)
+
+lazyStaticRouter.use(
+  LAZY_STATIC_PATHS.TORRENTS + ':filename',
+  asyncMiddleware(getTorrent),
+  handleStaticError
 )
 
 // ---------------------------------------------------------------------------
@@ -37,49 +54,89 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function getAvatar (req: express.Request, res: express.Response) {
+async function getActorImage (req: express.Request, res: express.Response, next: express.NextFunction) {
   const filename = req.params.filename
 
-  if (avatarPathUnsafeCache.has(filename)) {
-    return res.sendFile(avatarPathUnsafeCache.get(filename), { maxAge: STATIC_MAX_AGE.SERVER })
+  if (actorImagePathUnsafeCache.has(filename)) {
+    return res.sendFile(actorImagePathUnsafeCache.get(filename), { maxAge: STATIC_MAX_AGE.SERVER })
   }
 
-  const avatar = await AvatarModel.loadByName(filename)
-  if (!avatar) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+  const image = await ActorImageModel.loadByName(filename)
+  if (!image) return res.status(HttpStatusCode.NOT_FOUND_404).end()
 
-  if (avatar.onDisk === false) {
-    if (!avatar.fileUrl) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+  if (image.onDisk === false) {
+    if (!image.fileUrl) return res.status(HttpStatusCode.NOT_FOUND_404).end()
 
-    logger.info('Lazy serve remote avatar image %s.', avatar.fileUrl)
+    logger.info('Lazy serve remote actor image %s.', image.fileUrl)
 
     try {
-      await pushAvatarProcessInQueue({ filename: avatar.filename, fileUrl: avatar.fileUrl })
+      await downloadActorImageFromWorker({
+        filename: image.filename,
+        fileUrl: image.fileUrl,
+        size: getActorImageSize(image),
+        type: image.type
+      })
     } catch (err) {
-      logger.warn('Cannot process remote avatar %s.', avatar.fileUrl, { err })
-      return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+      logger.warn('Cannot process remote actor image %s.', image.fileUrl, { err })
+      return res.status(HttpStatusCode.NOT_FOUND_404).end()
     }
 
-    avatar.onDisk = true
-    avatar.save()
-      .catch(err => logger.error('Cannot save new avatar disk state.', { err }))
+    image.onDisk = true
+    image.save()
+      .catch(err => logger.error('Cannot save new actor image disk state.', { err }))
   }
 
-  const path = avatar.getPath()
+  const path = image.getPath()
+
+  actorImagePathUnsafeCache.set(filename, path)
+
+  return res.sendFile(path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER }, (err: any) => {
+    if (!err) return
+
+    // It seems this actor image is not on the disk anymore
+    if (err.status === HttpStatusCode.NOT_FOUND_404 && !image.isOwned()) {
+      logger.error('Cannot lazy serve actor image %s.', filename, { err })
+
+      actorImagePathUnsafeCache.delete(filename)
 
-  avatarPathUnsafeCache.set(filename, path)
-  return res.sendFile(path, { maxAge: STATIC_MAX_AGE.SERVER })
+      image.onDisk = false
+      image.save()
+       .catch(err => logger.error('Cannot save new actor image disk state.', { err }))
+    }
+
+    return next(err)
+  })
+}
+
+function getActorImageSize (image: MActorImage): { width: number, height: number } {
+  if (image.width && image.height) {
+    return {
+      height: image.height,
+      width: image.width
+    }
+  }
+
+  return ACTOR_IMAGES_SIZE[image.type][0]
 }
 
 async function getPreview (req: express.Request, res: express.Response) {
   const result = await VideosPreviewCache.Instance.getFilePath(req.params.filename)
-  if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+  if (!result) return res.status(HttpStatusCode.NOT_FOUND_404).end()
 
-  return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.SERVER })
+  return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER })
 }
 
 async function getVideoCaption (req: express.Request, res: express.Response) {
   const result = await VideosCaptionCache.Instance.getFilePath(req.params.filename)
-  if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+  if (!result) return res.status(HttpStatusCode.NOT_FOUND_404).end()
+
+  return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER })
+}
+
+async function getTorrent (req: express.Request, res: express.Response) {
+  const result = await VideosTorrentCache.Instance.getFilePath(req.params.filename)
+  if (!result) return res.status(HttpStatusCode.NOT_FOUND_404).end()
 
+  // Torrents still use the old naming convention (video uuid + .torrent)
   return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.SERVER })
 }