fix various type issues

packages/@uppy/core/src/Uppy.ts

@@ -47,7 +47,7 @@
 import locale from './locale.ts'
 
 import type BasePlugin from './BasePlugin.ts'
 import type UIPlugin from './UIPlugin.ts'
 import type { Restrictions, ValidateableFile } from './Restricter.ts'
 
 type Processor = (fileIDs: string[], uploadID: string) => Promise<void> | void
@@ -942,7 +942,7 @@
         bytesTotal: size,
         uploadComplete: false,
         uploadStarted: null,
-      } as FileProgressNotStarted,
+      } satisfies FileProgressNotStarted,
       size,
       isGhost: false,
       isRemote: file.isRemote || false,
@@ -1377,6 +1377,8 @@
   //    and click 'ADD MORE FILES', - focus won't activate in Firefox.
   //    - We must throttle at around >500ms to avoid performance lags.
   //    [Practical Check] Firefox, try to upload a big file for a prolonged period of time. Laptop will start to heat up.
+  // todo when uploading multiple files, this will cause problems because they share the same throttle,
+  // meaning some files might never get their progress reported (eaten up by progress events from other files)
   calculateProgress = throttle(
     (file, data) => {
       const fileInState = this.getFile(file?.id)
@@ -1559,7 +1561,6 @@
           file.id,
           {
             progress: {
-              progress: 0,
               uploadStarted: Date.now(),
               uploadComplete: false,
               percentage: 0,

packages/@uppy/utils/src/FileProgress.ts

@@ -13,10 +13,9 @@ export type FileProcessingInfo =
   | DeterminateFileProcessing
 
 interface FileProgressBase {
-  progress?: number
   uploadComplete?: boolean
   percentage?: number
-  bytesTotal: number
+  bytesTotal: number | null
   preprocess?: FileProcessingInfo
   postprocess?: FileProcessingInfo
 }
@@ -26,7 +25,6 @@ interface FileProgressBase {
 export type FileProgressStarted = FileProgressBase & {
   uploadStarted: number
   bytesUploaded: number
-  progress?: number
 }
 export type FileProgressNotStarted = FileProgressBase & {
   uploadStarted: null

packages/@uppy/utils/src/emitSocketProgress.ts

@@ -4,17 +4,22 @@ import type { FileProgress } from './FileProgress'
 
 function emitSocketProgress(
   uploader: any,
-  progressData: FileProgress,
+  progressData: {
+    progress: string // pre-formatted percentage
+    bytesTotal: number
+    bytesUploaded: number
+  },
   file: UppyFile<any, any>,
 ): void {
   const { progress, bytesUploaded, bytesTotal } = progressData
   if (progress) {
     uploader.uppy.log(`Upload progress: ${progress}`)
     uploader.uppy.emit('upload-progress', file, {
+      // @ts-expect-error todo remove in next major
       uploader,
       bytesUploaded,
       bytesTotal,
-    })
+    } satisfies FileProgress)
   }
 }
 

packages/@uppy/utils/src/getBytesRemaining.ts

@@ -1,5 +1,6 @@
 import type { FileProgress } from './FileProgress'
 
 export default function getBytesRemaining(fileProgress: FileProgress): number {
+  if (fileProgress.bytesTotal == null) return 0
   return fileProgress.bytesTotal - (fileProgress.bytesUploaded as number)
 }