fix: chunked upload session collision + workspace name i18n

app/Http/Controllers/App/AssetController.php

@@ -83,6 +83,7 @@ public function storeChunked(StoreChunkedAssetRequest $request, ChunkedAssetRece
             (int) $request->validated('range_start'),
             (int) $request->validated('range_end'),
             (int) $request->validated('total_size'),
+            (string) $request->validated('upload_id'),
         )->toResponse();
     }
 

app/Http/Requests/App/Asset/StoreChunkedAssetRequest.php

@@ -29,6 +29,7 @@ protected function prepareForValidation(): void
             'range_end' => $parsed[1] ?? null,
             'total_size' => $parsed[2] ?? null,
             'file_name' => strtolower(rawurldecode((string) $this->header('X-File-Name', 'upload'))),
+            'upload_id' => $this->header('X-Upload-Id'),
         ]);
     }
 
@@ -47,6 +48,7 @@ public function rules(): array
             'range_end' => ['required', 'integer', 'gte:range_start'],
             'total_size' => ['required', 'integer', 'min:1', 'max:'.MediaType::Video->maxSizeInBytes()],
             'file_name' => ['required', 'string', 'ends_with:'.implode(',', $allowedSuffixes)],
+            'upload_id' => ['required', 'string', 'uuid'],
         ];
     }
 
@@ -56,11 +58,7 @@ public function rules(): array
     public function messages(): array
     {
         return [
-            'range_start.required' => 'Invalid Content-Range header',
-            'range_end.required' => 'Invalid Content-Range header',
-            'total_size.required' => 'Invalid Content-Range header',
-            'total_size.max' => 'File size exceeds the maximum allowed ('.MediaType::Video->maxSizeInMb().' MB).',
-            'file_name.ends_with' => 'File type not supported.',
+            'total_size.max' => __('assets.upload.file_too_large', ['max' => MediaType::Video->maxSizeInMb()]),
         ];
     }
 }

app/Http/Requests/App/Workspace/StoreWorkspaceRequest.php

@@ -38,12 +38,4 @@ public function rules(): array
             'logo_url' => ['nullable', 'url', 'max:1024'],
         ];
     }
-
-    public function messages(): array
-    {
-        return [
-            'name.required' => 'O nome do workspace é obrigatório.',
-            'name.max' => 'O nome do workspace deve ter no máximo 255 caracteres.',
-        ];
-    }
 }

app/Http/Requests/App/Workspace/UpdateWorkspaceRequest.php

@@ -37,12 +37,4 @@ public function rules(): array
             'logo_url' => ['nullable', 'url', 'max:1024'],
         ];
     }
-
-    public function messages(): array
-    {
-        return [
-            'name.required' => 'The workspace name is required.',
-            'name.max' => 'The workspace name must be at most 255 characters.',
-        ];
-    }
 }

app/Services/Media/ChunkedAssetReceiver.php

@@ -21,8 +21,9 @@ public function receive(
         int $rangeStart,
         int $rangeEnd,
         int $totalSize,
+        string $attemptId,
     ): ChunkReceipt {
-        $identifier = md5($user->id.$fileName.$totalSize);
+        $identifier = md5("{$user->id}{$fileName}{$totalSize}{$attemptId}");
 
         return $this->cloud->shouldUseMultipart($fileName)
             ? $this->receiveViaMultipart($workspace, $identifier, $fileName, $chunk, $rangeStart, $rangeEnd, $totalSize)

lang/ar/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG، PNG، GIF، WebP، MP4، PDF',
         'uploading' => 'جارٍ الرفع...',
         'failed' => 'تعذر رفع :file. يرجى المحاولة مرة أخرى.',
+        'file_too_large' => 'حجم الملف يتجاوز الحد الأقصى المسموح به (:max ميجابايت).',
+        'cancelled' => 'تم إلغاء الرفع.',
     ],
 
     'empty' => [

lang/de/assets.php

@@ -16,6 +16,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Wird hochgeladen...',
         'failed' => ':file konnte nicht hochgeladen werden. Bitte versuche es erneut.',
+        'file_too_large' => 'Die Dateigröße überschreitet das zulässige Maximum (:max MB).',
+        'cancelled' => 'Upload abgebrochen.',
     ],
 
     'empty' => [

lang/el/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Μεταφόρτωση...',
         'failed' => 'Δεν ήταν δυνατή η μεταφόρτωση του :file. Παρακαλούμε δοκιμάστε ξανά.',
+        'file_too_large' => 'Το μέγεθος του αρχείου υπερβαίνει το μέγιστο επιτρεπόμενο (:max MB).',
+        'cancelled' => 'Η μεταφόρτωση ακυρώθηκε.',
     ],
 
     'empty' => [

lang/en/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Uploading...',
         'failed' => 'Could not upload :file. Please try again.',
+        'file_too_large' => 'File size exceeds the maximum allowed (:max MB).',
+        'cancelled' => 'Upload cancelled.',
     ],
 
     'empty' => [

lang/es/assets.php

@@ -16,6 +16,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Subiendo...',
         'failed' => 'No se pudo subir :file. Inténtalo de nuevo.',
+        'file_too_large' => 'El tamaño del archivo supera el máximo permitido (:max MB).',
+        'cancelled' => 'Subida cancelada.',
     ],
 
     'empty' => [

lang/fr/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Import en cours...',
         'failed' => 'Impossible d\'importer :file. Veuillez réessayer.',
+        'file_too_large' => 'La taille du fichier dépasse le maximum autorisé (:max Mo).',
+        'cancelled' => 'Import annulé.',
     ],
 
     'empty' => [

lang/it/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Caricamento in corso...',
         'failed' => 'Impossibile caricare :file. Riprova.',
+        'file_too_large' => 'La dimensione del file supera il massimo consentito (:max MB).',
+        'cancelled' => 'Caricamento annullato.',
     ],
 
     'empty' => [

lang/ja/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG、PNG、GIF、WebP、MP4、PDF',
         'uploading' => 'アップロード中...',
         'failed' => ':file をアップロードできませんでした。もう一度お試しください。',
+        'file_too_large' => 'ファイルサイズが許容される最大値(:max MB)を超えています。',
+        'cancelled' => 'アップロードをキャンセルしました。',
     ],
 
     'empty' => [

lang/ko/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => '업로드 중...',
         'failed' => ':file을(를) 업로드할 수 없습니다. 다시 시도해 주세요.',
+        'file_too_large' => '파일 크기가 허용된 최대값(:max MB)을 초과했습니다.',
+        'cancelled' => '업로드가 취소되었습니다.',
     ],
 
     'empty' => [

lang/nl/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Uploaden...',
         'failed' => ':file kon niet worden geüpload. Probeer het opnieuw.',
+        'file_too_large' => 'Bestandsgrootte overschrijdt het toegestane maximum (:max MB).',
+        'cancelled' => 'Upload geannuleerd.',
     ],
 
     'empty' => [

lang/pl/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Przesyłanie...',
         'failed' => 'Nie udało się przesłać :file. Spróbuj ponownie.',
+        'file_too_large' => 'Rozmiar pliku przekracza dozwolone maksimum (:max MB).',
+        'cancelled' => 'Przesyłanie anulowane.',
     ],
 
     'empty' => [

lang/pt-BR/assets.php

@@ -16,6 +16,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Enviando...',
         'failed' => 'Não foi possível enviar :file. Tente novamente.',
+        'file_too_large' => 'O tamanho do arquivo excede o máximo permitido (:max MB).',
+        'cancelled' => 'Envio cancelado.',
     ],
 
     'empty' => [

lang/ru/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Загрузка...',
         'failed' => 'Не удалось загрузить :file. Попробуйте ещё раз.',
+        'file_too_large' => 'Размер файла превышает максимально допустимый (:max МБ).',
+        'cancelled' => 'Загрузка отменена.',
     ],
 
     'empty' => [

lang/tr/assets.php

@@ -16,6 +16,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Yükleniyor...',
         'failed' => ':file yüklenemedi. Lütfen tekrar deneyin.',
+        'file_too_large' => 'Dosya boyutu izin verilen maksimumu aşıyor (:max MB).',
+        'cancelled' => 'Yükleme iptal edildi.',
     ],
 
     'empty' => [

lang/uk/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG, PNG, GIF, WebP, MP4, PDF',
         'uploading' => 'Завантаження...',
         'failed' => 'Не вдалося завантажити :file. Спробуйте ще раз.',
+        'file_too_large' => 'Розмір файлу перевищує максимально допустимий (:max МБ).',
+        'cancelled' => 'Завантаження скасовано.',
     ],
 
     'empty' => [

lang/zh/assets.php

@@ -14,6 +14,8 @@
         'formats' => 'JPEG、PNG、GIF、WebP、MP4、PDF',
         'uploading' => '上传中…',
         'failed' => '无法上传 :file，请重试。',
+        'file_too_large' => '文件大小超过允许的最大值(:max MB)。',
+        'cancelled' => '上传已取消。',
     ],
 
     'empty' => [

resources/js/components/assets/GalleryBrowser.vue

@@ -161,6 +161,7 @@ const uploadsSentinel = useTemplateRef<HTMLDivElement>('uploadsSentinel');
 const isDragging = ref(false);
 const uploading = ref(false);
 let uploadsObserver: IntersectionObserver | null = null;
+let uploadAbortController: AbortController | null = null;
 
 const fetchUploads = async (page: number, term: string) => {
     const response = await fetch(
@@ -240,15 +241,22 @@ const handleDrop = (event: DragEvent) => {
 };
 
 const uploadFiles = async (files: File[]) => {
+    if (uploading.value) return;
     uploading.value = true;
+    uploadAbortController = new AbortController();
     for (const file of files) {
         try {
             await uploadChunked({
                 file,
                 url: assetsStoreChunked.url(),
                 collection: 'assets',
+                signal: uploadAbortController.signal,
             });
-        } catch {
+        } catch (error) {
+            if (error instanceof DOMException && error.name === 'AbortError') {
+                toast.info(trans('assets.upload.cancelled'));
+                break;
+            }
             toast.error(trans('assets.upload.failed', { file: file.name }));
         }
     }
@@ -596,6 +604,7 @@ onUnmounted(() => {
     uploadsObserver?.disconnect();
     unsplashObserver?.disconnect();
     giphyObserver?.disconnect();
+    uploadAbortController?.abort();
 });
 </script>
 
@@ -612,7 +621,10 @@ onUnmounted(() => {
             <TabsContent value="uploads" class="mt-6">
                 <div
                     class="relative mb-4 flex cursor-pointer flex-col items-center justify-center gap-2 rounded-2xl border-2 border-dashed p-8 text-center transition-colors"
-                    :class="isDragging ? 'border-foreground bg-violet-100' : 'border-foreground/25 bg-card hover:bg-foreground/5'"
+                    :class="[
+                        isDragging ? 'border-foreground bg-violet-100' : 'border-foreground/25 bg-card hover:bg-foreground/5',
+                        uploading ? 'pointer-events-none' : '',
+                    ]"
                     @click="triggerFileInput"
                     @dragover.prevent="isDragging = true"
                     @dragleave.prevent="isDragging = false"

resources/js/utils/chunkedUpload.ts

@@ -5,6 +5,7 @@ interface ChunkedUploadOptions {
     modelId?: string;
     collection?: string;
     chunkSize?: number;
+    signal?: AbortSignal;
     onProgress?: (progress: number) => void;
     onComplete?: (response: any) => void;
     onError?: (error: any) => void;
@@ -30,6 +31,7 @@ export const uploadChunked = async (options: ChunkedUploadOptions): Promise<Chun
         modelId,
         collection = 'default',
         chunkSize = DEFAULT_CHUNK_SIZE,
+        signal,
         onProgress,
         onComplete,
         onError,
@@ -38,6 +40,7 @@ export const uploadChunked = async (options: ChunkedUploadOptions): Promise<Chun
     const csrfToken = document.querySelector<HTMLMetaElement>('meta[name="csrf-token"]')?.content ?? '';
     const totalSize = file.size;
     const totalChunks = Math.ceil(totalSize / chunkSize);
+    const uploadId = crypto.randomUUID();
     let uploadedBytes = 0;
 
     try {
@@ -50,6 +53,7 @@ export const uploadChunked = async (options: ChunkedUploadOptions): Promise<Chun
                 'Content-Type': 'application/octet-stream',
                 'Content-Range': `bytes ${start}-${end - 1}/${totalSize}`,
                 'X-File-Name': encodeURIComponent(file.name),
+                'X-Upload-Id': uploadId,
                 'X-CSRF-TOKEN': csrfToken,
                 'X-Requested-With': 'XMLHttpRequest',
                 Accept: 'application/json',
@@ -63,6 +67,7 @@ export const uploadChunked = async (options: ChunkedUploadOptions): Promise<Chun
                 method: 'POST',
                 headers,
                 body: chunk,
+                signal,
             });
 
             if (!response.ok) throw new Error(`Upload chunk failed: ${response.statusText}`);
@@ -81,6 +86,7 @@ export const uploadChunked = async (options: ChunkedUploadOptions): Promise<Chun
 
         throw new Error('Upload did not complete');
     } catch (error) {
+        if (error instanceof DOMException && error.name === 'AbortError') throw error;
         onError?.(error);
         throw error;
     }

tests/Feature/AssetControllerTest.php

@@ -11,6 +11,7 @@
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 beforeEach(function () {
     Storage::fake();
@@ -214,6 +215,7 @@
         [
             'HTTP_CONTENT_RANGE' => 'bytes 0-'.($size - 1).'/'.$size,
             'HTTP_X_FILE_NAME' => 'test.png',
+            'HTTP_X_UPLOAD_ID' => Str::uuid()->toString(),
             'HTTP_ACCEPT' => 'application/json',
             'CONTENT_TYPE' => 'application/octet-stream',
         ],
@@ -238,6 +240,7 @@
         [
             'HTTP_CONTENT_RANGE' => 'bytes 0-'.($size - 1).'/'.$size,
             'HTTP_X_FILE_NAME' => 'deck.pdf',
+            'HTTP_X_UPLOAD_ID' => Str::uuid()->toString(),
             'HTTP_ACCEPT' => 'application/json',
             'CONTENT_TYPE' => 'application/octet-stream',
         ],
@@ -257,6 +260,7 @@
         [
             'HTTP_CONTENT_RANGE' => 'bytes 0-499/1000',
             'HTTP_X_FILE_NAME' => 'test-video.mp4',
+            'HTTP_X_UPLOAD_ID' => Str::uuid()->toString(),
             'HTTP_ACCEPT' => 'application/json',
             'CONTENT_TYPE' => 'application/octet-stream',
         ],
@@ -276,13 +280,15 @@
         [
             'HTTP_CONTENT_RANGE' => 'bytes 0-99/100',
             'HTTP_X_FILE_NAME' => 'malware.exe',
+            'HTTP_X_UPLOAD_ID' => Str::uuid()->toString(),
             'HTTP_ACCEPT' => 'application/json',
             'CONTENT_TYPE' => 'application/octet-stream',
         ],
         str_repeat('x', 100),
     );
 
     $response->assertUnprocessable();
+    $response->assertJsonValidationErrors('file_name');
 });
 
 test('chunked upload rejects invalid Content-Range header', function () {
@@ -293,6 +299,7 @@
         [
             'HTTP_CONTENT_RANGE' => 'invalid',
             'HTTP_X_FILE_NAME' => 'test.jpg',
+            'HTTP_X_UPLOAD_ID' => Str::uuid()->toString(),
             'HTTP_ACCEPT' => 'application/json',
             'CONTENT_TYPE' => 'application/octet-stream',
         ],
@@ -302,6 +309,7 @@
     // FormRequest validation surfaces parse failures as 422
     // (range_start / range_end / total_size all required).
     $response->assertUnprocessable();
+    $response->assertJsonValidationErrors(['range_start', 'range_end', 'total_size']);
 });
 
 test('chunked upload rejects unauthenticated', function () {