From f6ac71dad248fdf2d4ffce2320b122861729a875 Mon Sep 17 00:00:00 2001
From: Tom Boullay <tom@famille-boullay.fr>
Date: Wed, 13 May 2026 17:50:26 +0200
Subject: [PATCH] refactor: tighten upload and viewer contracts

---
 components/ModelViewer.tsx     | 70 +++++++++++++++++-----------------
 components/SceneViewer.tsx     | 36 ++---------------
 components/UploadZone.tsx      |  1 -
 hooks/useUploadOrchestrator.ts |  1 -
 lib/client-types.ts            | 28 +++++++++++++-
 lib/github.ts                  |  5 ++-
 lib/prepare-git-assets.ts      |  7 +++-
 lib/types.ts                   |  2 +-
 lib/upload-api.ts              | 22 +++++++++--
 lib/upload-request.ts          |  4 +-
 lib/upload-staging.ts          | 18 ++++++---
 11 files changed, 108 insertions(+), 86 deletions(-)

diff --git a/components/ModelViewer.tsx b/components/ModelViewer.tsx
index 0b379c3..808881a 100644
--- a/components/ModelViewer.tsx
+++ b/components/ModelViewer.tsx
@@ -2,7 +2,7 @@
 
 import { Component, useEffect, useState } from 'react'
 import type { ComponentType, ReactNode } from 'react'
-import type { ModelHierarchyNode, ModelStats } from './SceneViewer'
+import type { ModelHierarchyNode, ModelStats, SceneViewerProps } from '@/lib/client-types'
 
 interface ModelViewerProps {
   url: string
@@ -11,6 +11,21 @@ interface ModelViewerProps {
   size: string
 }
 
+const VIEWER_FRAME_CLASS = 'w-full h-[450px] bg-black-800 border border-white/20 rounded-xl overflow-hidden'
+const CENTERED_VIEWER_FRAME_CLASS = `${VIEWER_FRAME_CLASS} flex items-center justify-center`
+
+const MODEL_STAT_ROWS = [
+  { label: 'Draw calls', getValue: (stats: ModelStats) => stats.drawCalls },
+  { label: 'Children', getValue: (stats: ModelStats) => stats.childObjects },
+  { label: 'Meshes', getValue: (stats: ModelStats) => stats.meshes },
+  { label: 'Triangles', getValue: (stats: ModelStats) => stats.triangles.toLocaleString('fr-FR') },
+  { label: 'Materials', getValue: (stats: ModelStats) => stats.materials },
+  { label: 'Textures', getValue: (stats: ModelStats) => stats.textures },
+] satisfies Array<{
+  label: string
+  getValue: (stats: ModelStats) => number | string
+}>
+
 function getPreviewErrorMessage(error: unknown) {
   return error instanceof Error ? error.message : 'Erreur preview inconnue'
 }
@@ -117,6 +132,19 @@ function HierarchyPanel({
   )
 }
 
+function ModelStatsPanel({ stats }: { stats: ModelStats }) {
+  return (
+    <div className="flex flex-col gap-1.5 rounded-lg border border-white/10 bg-black-900/75 p-2 text-xs text-gray-300 backdrop-blur">
+      {MODEL_STAT_ROWS.map(({ label, getValue }) => (
+        <span key={label} className="flex justify-between gap-3">
+          <span className="text-gray-500">{label}</span>
+          <span className="font-mono text-gray-200">{getValue(stats)}</span>
+        </span>
+      ))}
+    </div>
+  )
+}
+
 class PreviewErrorBoundary extends Component<
   { children: ReactNode },
   { message: string | null }
@@ -146,12 +174,7 @@ export default function ModelViewer({ url, assetUrls, filename, size }: ModelVie
   const [hierarchy, setHierarchy] = useState<ModelHierarchyNode | null>(null)
   const [hierarchyOpen, setHierarchyOpen] = useState(false)
   const [sceneError, setSceneError] = useState<string | null>(null)
-  const [Scene, setScene] = useState<ComponentType<{
-    url: string
-    assetUrls: Record<string, string>
-    onStatsReady: (stats: ModelStats) => void
-    onHierarchyReady: (hierarchy: ModelHierarchyNode) => void
-  }> | null>(null)
+  const [Scene, setScene] = useState<ComponentType<SceneViewerProps> | null>(null)
 
   useEffect(() => {
     if (!canPreview) return
@@ -175,7 +198,7 @@ export default function ModelViewer({ url, assetUrls, filename, size }: ModelVie
 
   if (!canPreview) {
     return (
-      <div className="w-full h-[450px] bg-black-800 border border-white/20 rounded-xl overflow-hidden flex items-center justify-center">
+      <div className={CENTERED_VIEWER_FRAME_CLASS}>
         <p className="text-sm text-gray-400 px-6 text-center">
           La preview 3D locale n&apos;est pas disponible pour les dossiers <span className="font-mono">model.gltf</span> avec fichiers associes.
         </p>
@@ -185,14 +208,14 @@ export default function ModelViewer({ url, assetUrls, filename, size }: ModelVie
 
   if (!Scene) {
     return (
-      <div className="w-full h-[450px] bg-black-800 border border-white/20 rounded-xl overflow-hidden flex items-center justify-center">
+      <div className={CENTERED_VIEWER_FRAME_CLASS}>
         <div className="w-6 h-6 border-2 border-gray-500 border-t-gray-300 rounded-full animate-spin" />
       </div>
     )
   }
 
   return (
-    <div className="w-full h-[450px] bg-black-800 border border-white/20 rounded-xl overflow-hidden relative">
+    <div className={`${VIEWER_FRAME_CLASS} relative`}>
       <div className="absolute top-3 left-3 z-10 flex items-center gap-2">
         <span className="text-xs text-gray-400 font-mono bg-black-900/60 px-2 py-1 rounded">
           {filename}
@@ -203,32 +226,7 @@ export default function ModelViewer({ url, assetUrls, filename, size }: ModelVie
       </div>
       {stats && (
         <div className="absolute top-3 right-3 z-20 flex w-44 flex-col gap-2">
-          <div className="flex flex-col gap-1.5 rounded-lg border border-white/10 bg-black-900/75 p-2 text-xs text-gray-300 backdrop-blur">
-            <span className="flex justify-between gap-3">
-              <span className="text-gray-500">Draw calls</span>
-              <span className="font-mono text-gray-200">{stats.drawCalls}</span>
-            </span>
-            <span className="flex justify-between gap-3">
-              <span className="text-gray-500">Children</span>
-              <span className="font-mono text-gray-200">{stats.childObjects}</span>
-            </span>
-            <span className="flex justify-between gap-3">
-              <span className="text-gray-500">Meshes</span>
-              <span className="font-mono text-gray-200">{stats.meshes}</span>
-            </span>
-            <span className="flex justify-between gap-3">
-              <span className="text-gray-500">Triangles</span>
-              <span className="font-mono text-gray-200">{stats.triangles.toLocaleString('fr-FR')}</span>
-            </span>
-            <span className="flex justify-between gap-3">
-              <span className="text-gray-500">Materials</span>
-              <span className="font-mono text-gray-200">{stats.materials}</span>
-            </span>
-            <span className="flex justify-between gap-3">
-              <span className="text-gray-500">Textures</span>
-              <span className="font-mono text-gray-200">{stats.textures}</span>
-            </span>
-          </div>
+          <ModelStatsPanel stats={stats} />
           <button
             type="button"
             disabled={!hierarchy}
diff --git a/components/SceneViewer.tsx b/components/SceneViewer.tsx
index bd6936b..52f795c 100644
--- a/components/SceneViewer.tsx
+++ b/components/SceneViewer.tsx
@@ -8,25 +8,7 @@ import { CanvasTexture, Mesh, TextureLoader } from 'three'
 import type { Material, Object3D, Texture } from 'three'
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'
 import { normalizeTextureFilename } from '@/lib/asset-naming'
-
-export interface ModelStats {
-  childObjects: number
-  drawCalls: number
-  materials: number
-  meshes: number
-  textures: number
-  triangles: number
-}
-
-export interface ModelHierarchyNode {
-  children: ModelHierarchyNode[]
-  id: string
-  name: string
-  position: [number, number, number]
-  rotation: [number, number, number]
-  type: string
-  visible: boolean
-}
+import type { ModelHierarchyNode, ModelStats, SceneViewerProps } from '@/lib/client-types'
 
 interface OpacityMapEntry {
   target: string
@@ -113,7 +95,7 @@ function createAlphaMapTexture(texture: Texture) {
   const cachedTexture = alphaMapTextureCache.get(texture)
   if (cachedTexture) return cachedTexture
 
-  const image = texture.image
+  const image: unknown = texture.image
 
   if (!isAlphaImageSource(image)) {
     texture.flipY = false
@@ -269,12 +251,7 @@ function Model({
   assetUrls,
   onStatsReady,
   onHierarchyReady,
-}: {
-  url: string
-  assetUrls: Record<string, string>
-  onStatsReady: (stats: ModelStats) => void
-  onHierarchyReady: (hierarchy: ModelHierarchyNode) => void
-}) {
+}: SceneViewerProps) {
   const { scene } = useLoader(GLTFLoader, url, (loader) => {
     loader.manager.setURLModifier((requestedUrl) => resolveAssetUrl(requestedUrl, assetUrls))
   })
@@ -308,12 +285,7 @@ export default function SceneViewer({
   assetUrls,
   onStatsReady,
   onHierarchyReady,
-}: {
-  url: string
-  assetUrls: Record<string, string>
-  onStatsReady: (stats: ModelStats) => void
-  onHierarchyReady: (hierarchy: ModelHierarchyNode) => void
-}) {
+}: SceneViewerProps) {
   return (
     <Canvas dpr={[1, 2]} camera={{ fov: 50 }}>
       <Suspense fallback={null}>
diff --git a/components/UploadZone.tsx b/components/UploadZone.tsx
index 02e3233..ec21fb3 100644
--- a/components/UploadZone.tsx
+++ b/components/UploadZone.tsx
@@ -41,7 +41,6 @@ export default function UploadZone() {
     globalError,
     setGlobalError,
     overwriteConfirm,
-    setOverwriteConfirm,
     noChangesFolder,
     setNoChangesFolder,
     driveError,
diff --git a/hooks/useUploadOrchestrator.ts b/hooks/useUploadOrchestrator.ts
index 47e9846..781447b 100644
--- a/hooks/useUploadOrchestrator.ts
+++ b/hooks/useUploadOrchestrator.ts
@@ -365,7 +365,6 @@ export function useUploadOrchestrator({
     globalError,
     setGlobalError,
     overwriteConfirm,
-    setOverwriteConfirm,
     noChangesFolder,
     setNoChangesFolder,
     driveError,
diff --git a/lib/client-types.ts b/lib/client-types.ts
index eda1f5f..37ece8e 100644
--- a/lib/client-types.ts
+++ b/lib/client-types.ts
@@ -1,4 +1,4 @@
-export type FileStatus = 'pending' | 'uploading' | 'success' | 'error'
+type FileStatus = 'pending' | 'uploading' | 'success' | 'error'
 
 export interface TextureFile {
   name: string
@@ -23,3 +23,29 @@ export interface FolderEntry {
   driveStatus?: DriveStatus
   driveError?: string
 }
+
+export interface ModelStats {
+  childObjects: number
+  drawCalls: number
+  materials: number
+  meshes: number
+  textures: number
+  triangles: number
+}
+
+export interface ModelHierarchyNode {
+  children: ModelHierarchyNode[]
+  id: string
+  name: string
+  position: [number, number, number]
+  rotation: [number, number, number]
+  type: string
+  visible: boolean
+}
+
+export interface SceneViewerProps {
+  url: string
+  assetUrls: Record<string, string>
+  onStatsReady: (stats: ModelStats) => void
+  onHierarchyReady: (hierarchy: ModelHierarchyNode) => void
+}
diff --git a/lib/github.ts b/lib/github.ts
index cdda391..e6f0b36 100644
--- a/lib/github.ts
+++ b/lib/github.ts
@@ -202,7 +202,8 @@ async function uploadToLfsBatch(
     throw new Error(`LFS batch request failed (${batchRes.status}): ${text}`)
   }
 
-  const batchObjects = parseLfsBatchResponse(await batchRes.json())
+  const batchData: unknown = await batchRes.json()
+  const batchObjects = parseLfsBatchResponse(batchData)
 
   const objectMap = new Map(objects.map((o) => [o.oid, o]))
 
@@ -277,7 +278,7 @@ export async function getRemoteFolder(
     })
 
     if (!Array.isArray(data)) {
-      return { exists: false, files: [] }
+      throw new Error(`Le chemin distant ${folderPath} existe mais ce n'est pas un dossier`)
     }
 
     const files: RemoteFile[] = await Promise.all(
diff --git a/lib/prepare-git-assets.ts b/lib/prepare-git-assets.ts
index bb6c1e1..a66614a 100644
--- a/lib/prepare-git-assets.ts
+++ b/lib/prepare-git-assets.ts
@@ -223,7 +223,12 @@ async function prepareDracoGlb(
       }
     }
   } finally {
-    await rm(tmpFolder, { recursive: true, force: true }).catch(() => {})
+    await rm(tmpFolder, { recursive: true, force: true }).catch((err) => {
+      console.warn('[WARN] Blender temp cleanup failed', {
+        folderName,
+        error: getErrorMessage(err),
+      })
+    })
   }
 }
 
diff --git a/lib/types.ts b/lib/types.ts
index 7e4e8fa..3ee2a8d 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -15,7 +15,7 @@ export type DriveAction = 'new' | 'replace'
 
 export type FileChange = 'new' | 'changed' | 'unchanged'
 
-export type FileDiffStatus = 'changed' | 'new' | 'deleted'
+type FileDiffStatus = 'changed' | 'new' | 'deleted'
 
 export type AssetCategory = 'color' | 'diffuse' | 'roughness' | 'normal' | 'metalness' | 'height' | 'opacity' | 'orm' | 'ao' | 'assets'
 
diff --git a/lib/upload-api.ts b/lib/upload-api.ts
index e8c7260..2e5a189 100644
--- a/lib/upload-api.ts
+++ b/lib/upload-api.ts
@@ -83,6 +83,24 @@ function isFileDiff(value: unknown): value is FileDiff {
     && (value.status === 'new' || value.status === 'changed' || value.status === 'deleted')
 }
 
+function parseFileDiffs(value: unknown): FileDiff[] {
+  if (!Array.isArray(value)) {
+    throw new Error('Reponse serveur invalide')
+  }
+
+  const diffs: FileDiff[] = []
+
+  for (const diff of value) {
+    if (!isFileDiff(diff)) {
+      throw new Error('Reponse serveur invalide')
+    }
+
+    diffs.push(diff)
+  }
+
+  return diffs
+}
+
 function buildUploadFormData(folder: FolderEntry, gitModelMode: GitModelMode): FormData {
   const formData = new FormData()
   formData.append('folderName', folder.folderName)
@@ -126,11 +144,9 @@ export async function checkFolderDiffs(
     }
   }
 
-  const diffs = Array.isArray(data.diffs) ? data.diffs.filter(isFileDiff) : []
-
   return {
     exists: true,
-    diffs,
+    diffs: parseFileDiffs(data.diffs),
     warning,
   }
 }
diff --git a/lib/upload-request.ts b/lib/upload-request.ts
index 0093f8c..bd16568 100644
--- a/lib/upload-request.ts
+++ b/lib/upload-request.ts
@@ -25,7 +25,7 @@ export function uploadLockConflictResponse() {
   return uploadErrorMessageResponse(UPLOAD_LOCK_ERROR, 409)
 }
 
-export function parseStagingRequestBody(value: unknown): StagingRequestBody {
+function parseStagingRequestBody(value: unknown): StagingRequestBody {
   if (!isRecord(value) || typeof value.stagingId !== 'string' || value.stagingId.trim() === '') {
     throw new Error('stagingId manquant')
   }
@@ -38,7 +38,7 @@ export async function readStagingRequestBody(req: Request): Promise<StagingReque
   return parseStagingRequestBody(body)
 }
 
-export function parseDriveRequestBody(value: unknown): DriveRequestBody {
+function parseDriveRequestBody(value: unknown): DriveRequestBody {
   const { stagingId } = parseStagingRequestBody(value)
 
   if (!isRecord(value) || (value.action !== 'new' && value.action !== 'replace')) {
diff --git a/lib/upload-staging.ts b/lib/upload-staging.ts
index 4627a4e..0acd242 100644
--- a/lib/upload-staging.ts
+++ b/lib/upload-staging.ts
@@ -3,7 +3,7 @@ import { dirname, join } from 'path'
 import { mkdir, readdir, readFile, rm, writeFile } from 'fs/promises'
 import { existsSync } from 'fs'
 import { TMP_DIR } from '@/lib/constants'
-import { isRecord } from '@/lib/guards'
+import { getErrorMessage, isRecord } from '@/lib/guards'
 import { getModelAssetPath } from '@/lib/model-paths'
 import { prepareGitAssets } from '@/lib/prepare-git-assets'
 import type {
@@ -28,7 +28,7 @@ interface StagedOriginalFile {
 interface StagedPreparedData {
   modelFilename: string
   compressed: boolean
-  deliveryMode?: GitModelMode
+  deliveryMode: GitModelMode
   compressionError?: string
   assetSummaries: PreparedAssetSummary[]
 }
@@ -94,7 +94,7 @@ function isStagedPreparedData(value: unknown): value is StagedPreparedData {
   return isRecord(value)
     && typeof value.modelFilename === 'string'
     && typeof value.compressed === 'boolean'
-    && (value.deliveryMode === undefined || isGitModelMode(value.deliveryMode))
+    && isGitModelMode(value.deliveryMode)
     && (value.compressionError === undefined || typeof value.compressionError === 'string')
     && Array.isArray(value.assetSummaries)
     && value.assetSummaries.every(isPreparedAssetSummary)
@@ -146,8 +146,14 @@ async function cleanupExpiredStagingUploads() {
       if (now - manifest.createdAt > STAGING_TTL_MS) {
         await cleanupStagingUpload(stagingId)
       }
-    } catch {
-      await cleanupStagingUpload(stagingId).catch(() => {})
+    } catch (err) {
+      await cleanupStagingUpload(stagingId).catch((cleanupErr) => {
+        console.warn('[WARN] Staging cleanup failed', {
+          stagingId,
+          error: getErrorMessage(cleanupErr),
+          originalError: getErrorMessage(err),
+        })
+      })
     }
   }
 }
@@ -259,7 +265,7 @@ export async function ensurePreparedStagingAssets(stagingId: string): Promise<Pr
     modelFilename: manifest.prepared.modelFilename,
     assetSummaries: manifest.prepared.assetSummaries,
     compressed: manifest.prepared.compressed,
-    deliveryMode: manifest.prepared.deliveryMode ?? manifest.gitModelMode,
+    deliveryMode: manifest.prepared.deliveryMode,
     compressionError: manifest.prepared.compressionError,
   }
 }