fixup! Add stall detection to recover from frozen uploads

Author: m7kvqbe1

lib/options.ts

@@ -152,6 +152,10 @@ 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
@@ -170,10 +174,6 @@ 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 {

lib/upload.ts

@@ -1,5 +1,6 @@
 import { Base64 } from 'js-base64'
-// @ts-ignore
+// TODO: Package url-parse is CommonJS. Can we replace this with a ESM package that
+// provides WHATWG URL? Then we can get rid of @rollup/plugin-commonjs.
 import URL from 'url-parse'
 import { DetailedError } from './DetailedError.js'
 import { StallDetector } from './StallDetector.js'
@@ -11,15 +12,13 @@ import {
   PROTOCOL_IETF_DRAFT_03,
   PROTOCOL_IETF_DRAFT_05,
   PROTOCOL_TUS_V1,
-  type Part,
   type PreviousUpload,
   type SliceType,
   type UploadInput,
   type UploadOptions,
 } from './options.js'
 import { uuid } from './uuid.js'
 
-// Add this type definition after the imports
 interface ExtendedHttpRequest extends HttpRequest {
   _upload?: BaseUpload
 }
@@ -33,17 +32,17 @@ export const defaultOptions = {
   fingerprint: undefined,
   uploadSize: undefined,
 
-  onProgress: null,
-  onChunkComplete: null,
-  onSuccess: null,
-  onError: null,
-  onUploadUrlAvailable: null,
+  onProgress: undefined,
+  onChunkComplete: undefined,
+  onSuccess: undefined,
+  onError: undefined,
+  onUploadUrlAvailable: undefined,
 
   overridePatchMethod: false,
   headers: {},
   addRequestId: false,
-  onBeforeRequest: null,
-  onAfterResponse: null,
+  onBeforeRequest: undefined,
+  onAfterResponse: undefined,
   onShouldRetry: defaultOnShouldRetry,
 
   chunkSize: Number.POSITIVE_INFINITY,
@@ -1245,6 +1244,8 @@ function resolveUrl(origin: string, link: string): string {
   return new URL(link, origin).toString()
 }
 
+type Part = { start: number; end: number }
+
 /**
  * Calculate the start and end positions for the parts if an upload
  * is split into multiple parallel requests.