Merge pull request #47 from ivanatias/minor_refactors

Minor refactors

Author: linuxmobile

server/api/palettes/[hash].get.ts

@@ -1,18 +1,14 @@
 import { kv } from '~/lib/db'
 import { log } from '~/lib/logs'
+import { type ColorWithRgbAndHex } from '~/types/colors'
 
 interface Params {
   hash?: string
 }
 
-interface Color {
-  hex: string
-  rgb: number[]
-}
-
 interface ApiResponse {
   imageUrl: string | null
-  colors: Color[] | null
+  colors: ColorWithRgbAndHex[] | null
 }
 
 export default eventHandler(async (event): Promise<ApiResponse> => {
@@ -21,15 +17,17 @@ export default eventHandler(async (event): Promise<ApiResponse> => {
 
   const storedImageUrl: string | null =
     (
-      await kv.getItem(params?.hash ?? '').catch(() => {
-        log(
-          'error',
-          '❌ Something went wrong retrieving the image from KV store...'
-        )
-        throw createError({
-          statusCode: 500,
-          statusMessage: 'Something went wrong... Try again!'
-        })
+      await kv.getItem(params?.hash ?? '').catch(error => {
+        if (error instanceof Error) {
+          log(
+            'error',
+            `❌ Something went wrong retrieving the image from KV store...[${error.message.toUpperCase()}]`
+          )
+          throw createError({
+            statusCode: 500,
+            statusMessage: 'Something went wrong... Try again!'
+          })
+        }
       })
     )?.toString() ?? null
 
@@ -52,15 +50,17 @@ export default eventHandler(async (event): Promise<ApiResponse> => {
       })
     )?.toString() ?? null
 
-  let colors: Color[] | null = null
+  let colors: ColorWithRgbAndHex[] | null = null
   if (storedColorsString != null) {
-    colors = storedColorsString.split(';').map((colorStr): Color => {
-      const [hex, rgbStr] = colorStr.split('_')
-      const rgb: number[] = rgbStr
-        .split('-')
-        .map((num): number => parseInt(num, 10))
-      return { hex, rgb }
-    })
+    colors = storedColorsString
+      .split(';')
+      .map((colorStr): ColorWithRgbAndHex => {
+        const [hex, rgbStr] = colorStr.split('_')
+        const rgb: number[] = rgbStr
+          .split('-')
+          .map((num): number => parseInt(num, 10))
+        return { hex, rgb }
+      })
   }
 
   log('info', '✅ Image and colors found. Retrieving from KV store...')

server/api/palettes/save.post.ts

@@ -3,13 +3,12 @@ import { kv } from '~/lib/db'
 import { hashImageBase64 } from '~/utils/images'
 import { log } from '~/lib/logs'
 import { MAX_BYTES_SIZE } from '~/consts/files'
+import { type ColorWithRgbAndHex } from '~/types/colors'
 
 export default eventHandler(async event => {
   const formData = await readMultipartFormData(event)
   const file = formData?.at(0)
   const colorsData = formData?.at(1)?.data
-  const colors =
-    colorsData != null ? JSON.parse(colorsData.toString()) : undefined
 
   if (file === undefined) {
     log('error', '❌ No image provided...')
@@ -19,14 +18,24 @@ export default eventHandler(async event => {
     })
   }
 
-  if (colors === undefined || !Array.isArray(colors)) {
+  if (colorsData === undefined) {
     log('error', '❌ No colors provided...')
     throw createError({
       statusCode: 400,
       statusMessage: 'No colors provided!'
     })
   }
 
+  const colors: ColorWithRgbAndHex[] = JSON.parse(colorsData.toString())
+
+  if (!Array.isArray(colors)) {
+    log('error', '❌ Expected an array of rgb and hex color objects...')
+    throw createError({
+      statusCode: 400,
+      statusMessage: 'Invalid colors format!'
+    })
+  }
+
   const fileBytes = file.data.buffer.byteLength
 
   if (fileBytes > MAX_BYTES_SIZE) {
@@ -98,7 +107,7 @@ export default eventHandler(async event => {
       imageUrl,
       colors
     }
-  } catch (error: unknown) {
+  } catch (error) {
     if (error instanceof Error) {
       log(
         'error',