refactor: tighten upload and viewer contracts

This commit is contained in:
Tom Boullay
2026-05-13 17:50:26 +02:00
parent 30ff9826dc
commit f6ac71dad2
11 changed files with 108 additions and 86 deletions
+27 -1
View File
@@ -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
}
+3 -2
View File
@@ -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(
+6 -1
View File
@@ -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),
})
})
}
}
+1 -1
View File
@@ -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'
+19 -3
View File
@@ -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,
}
}
+2 -2
View File
@@ -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')) {
+12 -6
View File
@@ -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,
}
}