perf: optimize file access promises (#12275)
Improves performance in local strategy uploads by reading the file and metadata info synchronously. This change uses `promise.all` for three separately awaited calls. This improves the perf by making all calls in a non-blocking way.
This commit is contained in:
@@ -10,7 +10,7 @@ import type { SanitizedConfig } from '../config/types.js'
|
|||||||
import type { PayloadRequest } from '../types/index.js'
|
import type { PayloadRequest } from '../types/index.js'
|
||||||
import type { FileData, FileToSave, ProbedImageSize, UploadEdits } from './types.js'
|
import type { FileData, FileToSave, ProbedImageSize, UploadEdits } from './types.js'
|
||||||
|
|
||||||
import { FileRetrievalError, FileUploadError, MissingFile } from '../errors/index.js'
|
import { FileRetrievalError, FileUploadError, Forbidden, MissingFile } from '../errors/index.js'
|
||||||
import { canResizeImage } from './canResizeImage.js'
|
import { canResizeImage } from './canResizeImage.js'
|
||||||
import { cropImage } from './cropImage.js'
|
import { cropImage } from './cropImage.js'
|
||||||
import { getExternalFile } from './getExternalFile.js'
|
import { getExternalFile } from './getExternalFile.js'
|
||||||
@@ -85,6 +85,10 @@ export const generateFileData = async <T>({
|
|||||||
if (!file && uploadEdits && incomingFileData) {
|
if (!file && uploadEdits && incomingFileData) {
|
||||||
const { filename, url } = incomingFileData as FileData
|
const { filename, url } = incomingFileData as FileData
|
||||||
|
|
||||||
|
if (filename && (filename.includes('../') || filename.includes('..\\'))) {
|
||||||
|
throw new Forbidden(req.t)
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (url && url.startsWith('/') && !disableLocalStorage) {
|
if (url && url.startsWith('/') && !disableLocalStorage) {
|
||||||
const filePath = `${staticPath}/${filename}`
|
const filePath = `${staticPath}/${filename}`
|
||||||
|
|||||||
@@ -5,28 +5,28 @@ import path from 'path'
|
|||||||
|
|
||||||
import type { PayloadRequest } from '../types/index.js'
|
import type { PayloadRequest } from '../types/index.js'
|
||||||
|
|
||||||
const mimeTypeEstimate = {
|
const mimeTypeEstimate: Record<string, string> = {
|
||||||
svg: 'image/svg+xml',
|
svg: 'image/svg+xml',
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getFileByPath = async (filePath: string): Promise<PayloadRequest['file']> => {
|
export const getFileByPath = async (filePath: string): Promise<PayloadRequest['file']> => {
|
||||||
if (typeof filePath === 'string') {
|
if (typeof filePath !== 'string') {
|
||||||
const data = await fs.readFile(filePath)
|
return undefined
|
||||||
const mimetype = fileTypeFromFile(filePath)
|
|
||||||
const { size } = await fs.stat(filePath)
|
|
||||||
|
|
||||||
const name = path.basename(filePath)
|
|
||||||
const ext = path.extname(filePath).slice(1)
|
|
||||||
|
|
||||||
const mime = (await mimetype)?.mime || mimeTypeEstimate[ext]
|
|
||||||
|
|
||||||
return {
|
|
||||||
name,
|
|
||||||
data,
|
|
||||||
mimetype: mime,
|
|
||||||
size,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return undefined
|
const name = path.basename(filePath)
|
||||||
|
const ext = path.extname(filePath).slice(1)
|
||||||
|
|
||||||
|
const [data, stat, type] = await Promise.all([
|
||||||
|
fs.readFile(filePath),
|
||||||
|
fs.stat(filePath),
|
||||||
|
fileTypeFromFile(filePath),
|
||||||
|
])
|
||||||
|
|
||||||
|
return {
|
||||||
|
name,
|
||||||
|
data,
|
||||||
|
mimetype: type?.mime || mimeTypeEstimate[ext],
|
||||||
|
size: stat.size,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user