X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Favatar.ts;h=be6657b6ffbe1c780c0d2f9411a5f36f7fa02307;hb=6bff8ce23ac9a2de8c6ddcea9df5f7bd2b653156;hp=14f0a05f58829f5d93a175c2e616392ce9cde1ec;hpb=0491173a61aed66205c017e0d7e0503ea316c144;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/avatar.ts b/server/lib/avatar.ts
index 14f0a05f5..be6657b6f 100644
--- a/server/lib/avatar.ts
+++ b/server/lib/avatar.ts
@@ -1,28 +1,68 @@
 import 'multer'
 import { sendUpdateActor } from './activitypub/send'
-import { AVATARS_SIZE, CONFIG, sequelizeTypescript } from '../initializers'
-import { updateActorAvatarInstance } from './activitypub'
+import { AVATARS_SIZE, LRU_CACHE, QUEUE_CONCURRENCY } from '../initializers/constants'
+import { updateActorAvatarInstance } from './activitypub/actor'
 import { processImage } from '../helpers/image-utils'
-import { AccountModel } from '../models/account/account'
-import { VideoChannelModel } from '../models/video/video-channel'
 import { extname, join } from 'path'
+import { retryTransactionWrapper } from '../helpers/database-utils'
+import { v4 as uuidv4 } from 'uuid'
+import { CONFIG } from '../initializers/config'
+import { sequelizeTypescript } from '../initializers/database'
+import * as LRUCache from 'lru-cache'
+import { queue } from 'async'
+import { downloadImage } from '../helpers/requests'
+import { MAccountDefault, MChannelDefault } from '../types/models'
 
-async function updateActorAvatarFile (avatarPhysicalFile: Express.Multer.File, accountOrChannel: AccountModel | VideoChannelModel) {
+async function updateActorAvatarFile (
+  avatarPhysicalFile: Express.Multer.File,
+  accountOrChannel: MAccountDefault | MChannelDefault
+) {
   const extension = extname(avatarPhysicalFile.filename)
-  const avatarName = accountOrChannel.Actor.uuid + extension
+  const avatarName = uuidv4() + extension
   const destination = join(CONFIG.STORAGE.AVATARS_DIR, avatarName)
-  await processImage(avatarPhysicalFile, destination, AVATARS_SIZE)
+  await processImage(avatarPhysicalFile.path, destination, AVATARS_SIZE)
 
-  return sequelizeTypescript.transaction(async t => {
-    const updatedActor = await updateActorAvatarInstance(accountOrChannel.Actor, avatarName, t)
-    await updatedActor.save({ transaction: t })
+  return retryTransactionWrapper(() => {
+    return sequelizeTypescript.transaction(async t => {
+      const avatarInfo = {
+        name: avatarName,
+        fileUrl: null,
+        onDisk: true
+      }
 
-    await sendUpdateActor(accountOrChannel, t)
+      const updatedActor = await updateActorAvatarInstance(accountOrChannel.Actor, avatarInfo, t)
+      await updatedActor.save({ transaction: t })
 
-    return updatedActor.Avatar
+      await sendUpdateActor(accountOrChannel, t)
+
+      return updatedActor.Avatar
+    })
+  })
+}
+
+type DownloadImageQueueTask = { fileUrl: string, filename: string }
+
+const downloadImageQueue = queue<DownloadImageQueueTask, Error>((task, cb) => {
+  downloadImage(task.fileUrl, CONFIG.STORAGE.AVATARS_DIR, task.filename, AVATARS_SIZE)
+    .then(() => cb())
+    .catch(err => cb(err))
+}, QUEUE_CONCURRENCY.AVATAR_PROCESS_IMAGE)
+
+function pushAvatarProcessInQueue (task: DownloadImageQueueTask) {
+  return new Promise((res, rej) => {
+    downloadImageQueue.push(task, err => {
+      if (err) return rej(err)
+
+      return res()
+    })
   })
 }
 
+// Unsafe so could returns paths that does not exist anymore
+const avatarPathUnsafeCache = new LRUCache<string, string>({ max: LRU_CACHE.AVATAR_STATIC.MAX_SIZE })
+
 export {
-  updateActorAvatarFile
+  avatarPathUnsafeCache,
+  updateActorAvatarFile,
+  pushAvatarProcessInQueue
 }