Merge pull request #304 from KenEucker/develop

v3.5.0

Author: KenEucker

functions/resize.mts

@@ -1,21 +1,23 @@
 import axios from 'axios'
 import sharp from 'sharp'
-import { getPayloadOpts } from './common/methods'
+import { acceptCorsHeaders, getPayloadOpts, log } from './common/methods'
 
 export default async (req: Request) => {
+  log('[resize] Incoming request', { method: req.method, url: req.url })
+
   const { url, width, format = 'webp', rotate } = await getPayloadOpts(req)
-  const headers: any = {
-    'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0',
-    'Access-Control-Allow-Origin': '*',
-    'Access-Control-Allow-Methods': 'GET, POST, OPTIONS',
-    'Access-Control-Allow-Headers': '*',
-  }
-  let body,
-    status = 200
+  log('[resize] Parsed query params', { url, width, format, rotate })
+
+  const headers = acceptCorsHeaders()
+  headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'
+
+  let body
+  let status = 200
 
   if (!url) {
     status = 400
     body = 'Missing required query params: url'
+    log('[resize] Missing url parameter', {}, 'error')
   }
 
   let widthNum
@@ -24,29 +26,35 @@ export default async (req: Request) => {
     if (isNaN(widthNum) || widthNum <= 0) {
       status = 400
       body = 'Invalid width parameter'
+      log('[resize] Invalid width parameter', { width }, 'error')
     }
   }
 
   if (!body) {
     try {
-      // Fetch source image
+      log('[resize] Fetching source image', { url })
       const response = await axios.get(url, { responseType: 'arraybuffer' })
       const inputBuffer = Buffer.from(response.data)
+      log('[resize] Image fetched, size', { bytes: inputBuffer.length })
 
-      // Resize and convert
-      let outputBuffer = sharp(inputBuffer).rotate(rotate)
+      const rotation = rotate ? parseInt(rotate, 10) : undefined
+      // Create Sharp instance
+      let transformer = sharp(inputBuffer).rotate(rotation)
+      log('[resize] Applied rotation', { rotation })
 
       if (widthNum) {
-        outputBuffer = outputBuffer.resize({ width: widthNum })
+        transformer = transformer.resize({ width: widthNum })
+        log('[resize] Applied resizing', { width: widthNum })
       }
 
-      const output = await outputBuffer.toFormat(format as keyof sharp.FormatEnum).toBuffer()
+      const output = await transformer.toFormat(format as keyof sharp.FormatEnum).toBuffer()
+      log('[resize] Image transformed', { format, finalSize: output.length })
 
       status = 200
       headers['Content-Type'] = `image/${format}`
       body = output
     } catch (err: any) {
-      console.error('Error resizing image:', err)
+      log('[resize] Error during image processing', { message: err.message }, 'error')
       status = 500
       body = 'Failed to resize image'
     }

src/common/methods.ts

@@ -187,7 +187,14 @@ export const setRegionPolygonInCookie = (
 
 export const getRegionPolygonFromCookie = (regionPolygonCookieKey = 'regionPolygon'): any => {
   const regionPolygonString = localStorage.getItem(regionPolygonCookieKey)
-  return regionPolygonString?.length ? JSON.parse(regionPolygonString) : undefined
+  try {
+    if (regionPolygonString?.length) {
+      const regionPolygon = JSON.parse(regionPolygonString)
+      return regionPolygon
+    }
+  } catch (e: any) {
+    console.error('failed to parse region polygon from cookie', e)
+  }
 }
 
 export const getTokenFromCookie = (tokenCookieKey = 'token'): string => {