fixup! Add stall detection to recover from frozen uploads

Author: m7kvqbe1

lib/options.ts

@@ -57,45 +57,39 @@ export interface StallDetectionOptions {
   checkInterval: number // How often to check for stalls
 }
 
-export type Part = { start: number; end: number }
-
 export interface UploadOptions {
-  endpoint?: string | null
-  uploadUrl?: string | null
-  metadata: Record<string, string>
-  metadataForPartialUploads?: Record<string, string>
-  uploadSize?: number | null
-  onProgress: ((bytesSent: number, bytesTotal: number | null) => void) | null
-  onChunkComplete:
-    | ((chunkSize: number, bytesAccepted: number, bytesTotal: number | null) => void)
-    | null
-  onSuccess: ((payload: OnSuccessPayload) => void) | null
-  onError: ((error: Error | DetailedError) => void) | null
-  onUploadUrlAvailable: (() => void) | null
-  onShouldRetry:
-    | ((err: Error | DetailedError, retryAttempt: number, options: UploadOptions) => boolean)
-    | null
+  endpoint?: string
+
+  uploadUrl?: string
+  metadata: { [key: string]: string }
+  metadataForPartialUploads: UploadOptions['metadata']
+  fingerprint: (file: UploadInput, options: UploadOptions) => Promise<string | null>
+  uploadSize?: number
+
+  onProgress?: (bytesSent: number, bytesTotal: number | null) => void
+  onChunkComplete?: (chunkSize: number, bytesAccepted: number, bytesTotal: number | null) => void
+  onSuccess?: (payload: OnSuccessPayload) => void
+  onError?: (error: Error | DetailedError) => void
+  onShouldRetry?: (error: DetailedError, retryAttempt: number, options: UploadOptions) => boolean
+  onUploadUrlAvailable?: () => void | Promise<void>
 
   overridePatchMethod: boolean
-  headers: Record<string, string>
+  headers: { [key: string]: string }
   addRequestId: boolean
-
-  onBeforeRequest: ((req: HttpRequest) => void | Promise<void>) | null
-  onAfterResponse: ((req: HttpRequest, res: HttpResponse) => void | Promise<void>) | null
+  onBeforeRequest?: (req: HttpRequest) => void | Promise<void>
+  onAfterResponse?: (req: HttpRequest, res: HttpResponse) => void | Promise<void>
 
   chunkSize: number
-  retryDelays: number[] | null
+  retryDelays: number[]
   parallelUploads: number
-  parallelUploadBoundaries?: Part[] | null
+  parallelUploadBoundaries?: { start: number; end: number }[]
   storeFingerprintForResuming: boolean
   removeFingerprintOnSuccess: boolean
   uploadLengthDeferred: boolean
   uploadDataDuringCreation: boolean
 
   urlStorage: UrlStorage
   fileReader: FileReader
-  fingerprint: (file: UploadInput, options: UploadOptions) => Promise<string | null>
-  // TODO: Types need to be double-checked
   httpStack: HttpStack
 
   protocol: typeof PROTOCOL_TUS_V1 | typeof PROTOCOL_IETF_DRAFT_03 | typeof PROTOCOL_IETF_DRAFT_05
@@ -158,9 +152,6 @@ export type SliceResult =
 export interface HttpStack {
   createRequest(method: string, url: string): HttpRequest
   getName(): string
-  // Indicates whether this HTTP stack implementation supports progress events
-  // during upload. If false, stall detection will use overall transfer rate instead.
-  supportsProgressEvents: () => boolean
 }
 
 export type HttpProgressHandler = (bytesSent: number) => void
@@ -179,6 +170,10 @@ export interface HttpRequest {
 
   // Return an environment specific object, e.g. the XMLHttpRequest object in browsers.
   getUnderlyingObject(): unknown
+
+  // Indicates whether this HTTP stack implementation supports progress events
+  // during upload. If false, stall detection will use overall transfer rate instead.
+  supportsProgressEvents: () => boolean
 }
 
 export interface HttpResponse {