Weee exif

Author: deployor

app/actions/media.ts

@@ -422,7 +422,7 @@ export async function uploadMedia(formData: FormData) {
           filename: file.name,
           mimeType,
           fileSize: buffer.length,
-          exifData: exifData ? JSON.stringify(exifData) : null,
+          exifData,
           width,
           height,
           takenAt,

app/actions/upload.ts

@@ -564,7 +564,7 @@ export async function finalizeUpload(
             filename: data.filename,
             mimeType: data.mimeType,
             fileSize: realFileSize,
-            exifData: finalExifData ? JSON.stringify(finalExifData) : null,
+            exifData: finalExifData,
             width: (finalExifData?.width as number | undefined) || data.width,
             height:
               (finalExifData?.height as number | undefined) || data.height,

app/api/cron/repair-exif/route.ts

@@ -45,23 +45,6 @@ function getExifObject(item: MediaRow) {
     : null;
 }
 
-function alreadyHasReliableExif(item: MediaRow) {
-  const exif = getExifObject(item);
-  if (hasValue(item.latitude) && hasValue(item.longitude)) return true;
-  if (!exif) return false;
-  return Boolean(
-    hasValue(exif.gpsLatitude) ||
-      hasValue(exif.gpsLongitude) ||
-      hasValue(exif.make) ||
-      hasValue(exif.model) ||
-      hasValue(exif.lensModel) ||
-      hasValue(exif.focalLength) ||
-      hasValue(exif.fNumber) ||
-      hasValue(exif.iso) ||
-      hasValue(exif.exposureTime),
-  );
-}
-
 function mergeExifData(
   primary: Record<string, unknown> | null | undefined,
   fallback: Record<string, unknown> | null | undefined,
@@ -106,9 +89,6 @@ async function repairExifForMedia(item: MediaRow) {
   if (!item.mimeType.startsWith("image/")) {
     return { scanned: 0, skipped: 1, repaired: 0, failed: 0 };
   }
-  if (alreadyHasReliableExif(item)) {
-    return { scanned: 1, skipped: 1, repaired: 0, failed: 0 };
-  }
   try {
     const sourceKeys = [
       item.s3Key,

lib/media/browser-utils.ts

@@ -362,6 +362,37 @@ async function drawThumbnail(
     canvas.toBlob(resolve, "image/jpeg", 0.76);
   });
 }
+
+function toJsonSafeExifValue(value: unknown): unknown {
+  if (value instanceof Date) {
+    return Number.isNaN(value.getTime()) ? undefined : value.toISOString();
+  }
+  if (typeof value === "bigint") return value.toString();
+  if (Array.isArray(value)) {
+    return value
+      .map((item) => toJsonSafeExifValue(item))
+      .filter((item) => item !== undefined);
+  }
+  if (value && typeof value === "object") {
+    const safeObject: Record<string, unknown> = {};
+    for (const [key, nestedValue] of Object.entries(value)) {
+      const safeValue = toJsonSafeExifValue(nestedValue);
+      if (safeValue !== undefined) safeObject[key] = safeValue;
+    }
+    return Object.keys(safeObject).length > 0 ? safeObject : undefined;
+  }
+  return value;
+}
+
+function toJsonSafeExif(exif: Record<string, unknown>) {
+  const safeExif: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(exif)) {
+    const safeValue = toJsonSafeExifValue(value);
+    if (safeValue !== undefined) safeExif[key] = safeValue;
+  }
+  return safeExif;
+}
+
 export async function extractMetadata(file: File): Promise<{
   exifData: ExifData | null;
   width: number | null;
@@ -387,6 +418,7 @@ export async function extractMetadata(file: File): Promise<{
                 ? exif.ModifyDate
                 : null;
         const exifData: ExifData = {
+          ...toJsonSafeExif(exif as Record<string, unknown>),
           make: exif.Make,
           model: exif.Model,
           lensModel: exif.LensModel,

lib/media/exif.ts

@@ -1,6 +1,7 @@
 import exifr from "exifr";
 import { logger } from "@/lib/logger";
 export interface ExifData {
+  [key: string]: unknown;
   make?: string;
   model?: string;
   lensModel?: string;
@@ -29,6 +30,38 @@ function toIsoDate(value: unknown) {
   return undefined;
 }
 
+function toJsonSafeExifValue(value: unknown): unknown {
+  if (value instanceof Date) {
+    return Number.isNaN(value.getTime()) ? undefined : value.toISOString();
+  }
+  if (typeof value === "bigint") {
+    return value.toString();
+  }
+  if (Array.isArray(value)) {
+    return value
+      .map((item) => toJsonSafeExifValue(item))
+      .filter((item) => item !== undefined);
+  }
+  if (value && typeof value === "object") {
+    const safeObject: Record<string, unknown> = {};
+    for (const [key, nestedValue] of Object.entries(value)) {
+      const safeValue = toJsonSafeExifValue(nestedValue);
+      if (safeValue !== undefined) safeObject[key] = safeValue;
+    }
+    return Object.keys(safeObject).length > 0 ? safeObject : undefined;
+  }
+  return value;
+}
+
+function toJsonSafeExif(exif: Record<string, unknown>) {
+  const safeExif: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(exif)) {
+    const safeValue = toJsonSafeExifValue(value);
+    if (safeValue !== undefined) safeExif[key] = safeValue;
+  }
+  return safeExif;
+}
+
 export async function extractExifData(
   buffer: Buffer,
   contextInfo?: string,
@@ -96,6 +129,7 @@ export async function extractExifData(
       gpsLongitude = lonValue;
     }
     return {
+      ...toJsonSafeExif(exif as Record<string, unknown>),
       make: exif.Make,
       model: exif.Model,
       lensModel: exif.LensModel,