-import { queue } from 'async'
import { remove } from 'fs-extra'
import LRUCache from 'lru-cache'
import { join } from 'path'
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 { 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({
const imageName = buildUUID() + extension
const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, imageName)
- await processImage(imagePhysicalFile.path, destination, imageSize, true)
+ await processImageFromWorker({ path: imagePhysicalFile.path, destination, newSize: imageSize, keepOriginal: true })
return {
imageName,
})
}
-type DownloadImageQueueTask = {
+// ---------------------------------------------------------------------------
+
+function downloadActorImageFromWorker (options: {
fileUrl: string
filename: string
type: ActorImageType
size: typeof ACTOR_IMAGES_SIZE[ActorImageType][0]
-}
-
-const downloadImageQueue = queue<DownloadImageQueueTask, Error>((task, cb) => {
- downloadImage(task.fileUrl, CONFIG.STORAGE.ACTOR_IMAGES, task.filename, task.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)
+}) {
+ const downloaderOptions = {
+ url: options.fileUrl,
+ destDir: CONFIG.STORAGE.ACTOR_IMAGES,
+ destName: options.filename,
+ size: options.size
+ }
- return res()
- })
- })
+ return downloadImageFromWorker(downloaderOptions)
}
// Unsafe so could returns paths that does not exist anymore
export {
actorImagePathUnsafeCache,
updateLocalActorImageFiles,
+ downloadActorImageFromWorker,
deleteLocalActorImageFile,
- pushActorImageProcessInQueue,
+ downloadImageFromWorker,
buildActorInstance
}