X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Flazy-static.ts;h=b082e41f64ebaadeab9c87854f7061cd5c66e32f;hb=bd09dfaf8dcb0ca4cd5dac9f13e3117486f3bcce;hp=632e4dcd8d6f5b7f5d72368541e6cb6e6f3b014c;hpb=a24bd1ed41b43790bab6ba789580bb4e85f07d85;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts
index 632e4dcd8..b082e41f6 100644
--- a/server/controllers/lazy-static.ts
+++ b/server/controllers/lazy-static.ts
@@ -1,12 +1,13 @@
-import * as cors from 'cors'
-import * as express from 'express'
+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 { LAZY_STATIC_PATHS, STATIC_MAX_AGE } from '../initializers/constants'
+import { ACTOR_IMAGES_SIZE, LAZY_STATIC_PATHS, STATIC_MAX_AGE } from '../initializers/constants'
 import { VideosCaptionCache, VideosPreviewCache } from '../lib/files-cache'
-import { actorImagePathUnsafeCache, pushActorImageProcessInQueue } from '../lib/local-actor'
-import { asyncMiddleware } from '../middlewares'
+import { actorImagePathUnsafeCache, downloadActorImageFromWorker } from '../lib/local-actor'
+import { asyncMiddleware, handleStaticError } from '../middlewares'
 import { ActorImageModel } from '../models/actor/actor-image'
 
 const lazyStaticRouter = express.Router()
@@ -15,27 +16,32 @@ lazyStaticRouter.use(cors())
 
 lazyStaticRouter.use(
   LAZY_STATIC_PATHS.AVATARS + ':filename',
-  asyncMiddleware(getActorImage)
+  asyncMiddleware(getActorImage),
+  handleStaticError
 )
 
 lazyStaticRouter.use(
   LAZY_STATIC_PATHS.BANNERS + ':filename',
-  asyncMiddleware(getActorImage)
+  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)
+  asyncMiddleware(getTorrent),
+  handleStaticError
 )
 
 // ---------------------------------------------------------------------------
@@ -64,7 +70,12 @@ async function getActorImage (req: express.Request, res: express.Response, next:
     logger.info('Lazy serve remote actor image %s.', image.fileUrl)
 
     try {
-      await pushActorImageProcessInQueue({ filename: image.filename, fileUrl: image.fileUrl, type: image.type })
+      await downloadActorImageFromWorker({
+        filename: image.filename,
+        fileUrl: image.fileUrl,
+        size: getActorImageSize(image),
+        type: image.type
+      })
     } catch (err) {
       logger.warn('Cannot process remote actor image %s.', image.fileUrl, { err })
       return res.status(HttpStatusCode.NOT_FOUND_404).end()
@@ -86,7 +97,7 @@ async function getActorImage (req: express.Request, res: express.Response, next:
     if (err.status === HttpStatusCode.NOT_FOUND_404 && !image.isOwned()) {
       logger.error('Cannot lazy serve actor image %s.', filename, { err })
 
-      actorImagePathUnsafeCache.del(filename)
+      actorImagePathUnsafeCache.delete(filename)
 
       image.onDisk = false
       image.save()
@@ -97,6 +108,17 @@ async function getActorImage (req: express.Request, res: express.Response, next:
   })
 }
 
+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.status(HttpStatusCode.NOT_FOUND_404).end()