fix: image resizing improvements (#204)

Author: fenos

src/backend/s3.ts

@@ -152,6 +152,6 @@ export class S3Backend implements GenericStorageBackend {
     }
 
     const command = new GetObjectCommand(input)
-    return getSignedUrl(this.client, command, { expiresIn: 3600 })
+    return getSignedUrl(this.client, command, { expiresIn: 300 })
   }
 }

src/renderer/imgproxy.ts

@@ -46,11 +46,21 @@ export class Imgproxy {
     const privateURL = await this.backend.privateAssetUrl(bucket, key)
     const urlTransformation = this.applyURLTransformation(options)
 
-    const url = ['/public', ...urlTransformation, 'plain', privateURL]
-
-    return this.getClient().get(url.join('/'), {
+    const url = [
+      '/public',
+      ...urlTransformation,
+      'plain',
+      privateURL.startsWith('local://') ? privateURL : encodeURIComponent(privateURL),
+    ]
+
+    const response = await this.getClient().get(url.join('/'), {
       responseType: 'stream',
     })
+
+    return {
+      response,
+      urlTransformation,
+    }
   }
 
   protected applyURLTransformation(options: TransformOptions) {

src/routes/render/renderAuthenticatedImage.ts

@@ -80,7 +80,11 @@ export default async function routes(fastify: FastifyInstance) {
       const s3Key = `${request.tenantId}/${bucketName}/${objectName}`
 
       try {
-        const imageResponse = await imageRenderer.transform(globalS3Bucket, s3Key, request.query)
+        const { response: imageResponse, urlTransformation } = await imageRenderer.transform(
+          globalS3Bucket,
+          s3Key,
+          request.query
+        )
 
         response
           .status(imageResponse.status)
@@ -89,6 +93,7 @@ export default async function routes(fastify: FastifyInstance) {
           .header('Cache-Control', imageResponse.headers['cache-control'])
           .header('Content-Length', imageResponse.headers['content-length'])
           .header('ETag', imageResponse.headers['etag'])
+          .header('X-Transformation', urlTransformation.concat(','))
 
         return response.send(imageResponse.data)
       } catch (err: any) {

src/routes/render/renderPublicImage.ts

@@ -7,7 +7,6 @@ import { FastifyInstance } from 'fastify'
 import { Bucket } from '../../types/types'
 import { normalizeContentType, transformPostgrestError } from '../../utils'
 import { Imgproxy } from '../../renderer/imgproxy'
-import { AxiosError } from 'axios'
 
 const { region, globalS3Bucket, globalS3Endpoint, storageBackendType, imgProxyURL } = getConfig()
 
@@ -77,7 +76,11 @@ export default async function routes(fastify: FastifyInstance) {
       const s3Key = `${request.tenantId}/${bucketName}/${objectName}`
 
       try {
-        const imageResponse = await imageRenderer.transform(globalS3Bucket, s3Key, request.query)
+        const { response: imageResponse, urlTransformation } = await imageRenderer.transform(
+          globalS3Bucket,
+          s3Key,
+          request.query
+        )
 
         response
           .status(imageResponse.status)
@@ -86,6 +89,7 @@ export default async function routes(fastify: FastifyInstance) {
           .header('Cache-Control', imageResponse.headers['cache-control'])
           .header('Content-Length', imageResponse.headers['content-length'])
           .header('ETag', imageResponse.headers['etag'])
+          .header('X-Transformations', urlTransformation.concat(','))
 
         return response.send(imageResponse.data)
       } catch (err: any) {