-import 'multer'
-import { queue } from 'async'
+import { remove } from 'fs-extra'
import LRUCache from 'lru-cache'
import { join } from 'path'
import { ActorModel } from '@server/models/actor/actor'
import { buildUUID } from '@shared/extra-utils'
import { ActivityPubActorType, ActorImageType } from '@shared/models'
import { retryTransactionWrapper } from '../helpers/database-utils'
-import { processImage } from '../helpers/image-utils'
-import { downloadImage } from '../helpers/requests'
import { CONFIG } from '../initializers/config'
-import { ACTOR_IMAGES_SIZE, LRU_CACHE, QUEUE_CONCURRENCY, WEBSERVER } from '../initializers/constants'
+import { ACTOR_IMAGES_SIZE, LRU_CACHE, WEBSERVER } from '../initializers/constants'
import { sequelizeTypescript } from '../initializers/database'
import { MAccountDefault, MActor, MChannelDefault } from '../types/models'
-import { deleteActorImageInstance, updateActorImageInstance } from './activitypub/actors'
+import { deleteActorImages, updateActorImages } from './activitypub/actors'
import { sendUpdateActor } from './activitypub/send'
+import { downloadImageFromWorker, processImageFromWorker } from './worker/parent-process'
function buildActorInstance (type: ActivityPubActorType, url: string, preferredUsername: string) {
return new ActorModel({
}) as MActor
}
-async function updateLocalActorImageFile (
+async function updateLocalActorImageFiles (
accountOrChannel: MAccountDefault | MChannelDefault,
imagePhysicalFile: Express.Multer.File,
type: ActorImageType
) {
- const imageSize = type === ActorImageType.AVATAR
- ? ACTOR_IMAGES_SIZE.AVATARS
- : ACTOR_IMAGES_SIZE.BANNERS
-
- const extension = getLowercaseExtension(imagePhysicalFile.filename)
-
- const imageName = buildUUID() + extension
- const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, imageName)
- await processImage(imagePhysicalFile.path, destination, imageSize)
-
- return retryTransactionWrapper(() => {
- return sequelizeTypescript.transaction(async t => {
- const actorImageInfo = {
- name: imageName,
- fileUrl: null,
- height: imageSize.height,
- width: imageSize.width,
- onDisk: true
- }
-
- const updatedActor = await updateActorImageInstance(accountOrChannel.Actor, type, actorImageInfo, t)
- await updatedActor.save({ transaction: t })
-
- await sendUpdateActor(accountOrChannel, t)
-
- return type === ActorImageType.AVATAR
- ? updatedActor.Avatar
- : updatedActor.Banner
- })
- })
+ const processImageSize = async (imageSize: { width: number, height: number }) => {
+ const extension = getLowercaseExtension(imagePhysicalFile.filename)
+
+ const imageName = buildUUID() + extension
+ const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, imageName)
+ await processImageFromWorker({ path: imagePhysicalFile.path, destination, newSize: imageSize, keepOriginal: true })
+
+ return {
+ imageName,
+ imageSize
+ }
+ }
+
+ const processedImages = await Promise.all(ACTOR_IMAGES_SIZE[type].map(processImageSize))
+ await remove(imagePhysicalFile.path)
+
+ return retryTransactionWrapper(() => sequelizeTypescript.transaction(async t => {
+ const actorImagesInfo = processedImages.map(({ imageName, imageSize }) => ({
+ name: imageName,
+ fileUrl: null,
+ height: imageSize.height,
+ width: imageSize.width,
+ onDisk: true
+ }))
+
+ const updatedActor = await updateActorImages(accountOrChannel.Actor, type, actorImagesInfo, t)
+ await updatedActor.save({ transaction: t })
+
+ await sendUpdateActor(accountOrChannel, t)
+
+ return type === ActorImageType.AVATAR
+ ? updatedActor.Avatars
+ : updatedActor.Banners
+ }))
}
async function deleteLocalActorImageFile (accountOrChannel: MAccountDefault | MChannelDefault, type: ActorImageType) {
return retryTransactionWrapper(() => {
return sequelizeTypescript.transaction(async t => {
- const updatedActor = await deleteActorImageInstance(accountOrChannel.Actor, type, t)
+ const updatedActor = await deleteActorImages(accountOrChannel.Actor, type, t)
await updatedActor.save({ transaction: t })
await sendUpdateActor(accountOrChannel, t)
- return updatedActor.Avatar
+ return updatedActor.Avatars
})
})
}
-type DownloadImageQueueTask = { fileUrl: string, filename: string, type: ActorImageType }
-
-const downloadImageQueue = queue<DownloadImageQueueTask, Error>((task, cb) => {
- const size = task.type === ActorImageType.AVATAR
- ? ACTOR_IMAGES_SIZE.AVATARS
- : ACTOR_IMAGES_SIZE.BANNERS
-
- downloadImage(task.fileUrl, CONFIG.STORAGE.ACTOR_IMAGES, task.filename, size)
- .then(() => cb())
- .catch(err => cb(err))
-}, QUEUE_CONCURRENCY.ACTOR_PROCESS_IMAGE)
+// ---------------------------------------------------------------------------
-function pushActorImageProcessInQueue (task: DownloadImageQueueTask) {
- return new Promise<void>((res, rej) => {
- downloadImageQueue.push(task, err => {
- if (err) return rej(err)
-
- return res()
- })
- })
+function downloadActorImageFromWorker (options: {
+ fileUrl: string
+ filename: string
+ type: ActorImageType
+ size: typeof ACTOR_IMAGES_SIZE[ActorImageType][0]
+}) {
+ const downloaderOptions = {
+ url: options.fileUrl,
+ destDir: CONFIG.STORAGE.ACTOR_IMAGES,
+ destName: options.filename,
+ size: options.size
+ }
+
+ return downloadImageFromWorker(downloaderOptions)
}
// Unsafe so could returns paths that does not exist anymore
export {
actorImagePathUnsafeCache,
- updateLocalActorImageFile,
+ updateLocalActorImageFiles,
+ downloadActorImageFromWorker,
deleteLocalActorImageFile,
- pushActorImageProcessInQueue,
+ downloadImageFromWorker,
buildActorInstance
}