Misc upload improvements

packages/common/src/models/Analytics.ts

@@ -1089,12 +1089,13 @@ type TrackUploadStartUploading = {
 type TrackUploadTrackUploading = {
   eventName: Name.TRACK_UPLOAD_TRACK_UPLOADING
   artworkSource: 'unsplash' | 'original'
-  genre: string
-  mood: string
   downloadable: 'yes' | 'no' | 'follow'
+  trackId: number
   size: number
-  type: string
+  fileType: string
   name: string
+  genre: string
+  mood?: string
 }
 type TrackUploadCompleteUpload = {
   eventName: Name.TRACK_UPLOAD_COMPLETE_UPLOAD
@@ -2194,7 +2195,7 @@ type StripeSessionCreationError = StripeEventFields & {
   eventName: Name.STRIPE_SESSION_CREATION_ERROR
   code: string
   stripeErrorMessage: string
-  type: string
+  kind: string
 }
 
 type StripeSessionCreated = StripeEventFields & {

packages/common/src/store/ui/stripe-modal/sagas.ts

@@ -98,7 +98,7 @@ function* handleInitializeStripeModal({
         code,
         destinationCurrency,
         stripeErrorMessage,
-        type
+        kind: type
       })
     )
   }

packages/sdk/src/sdk/services/Storage/Storage.ts

@@ -21,7 +21,8 @@ import type {
 } from './types'
 
 const MAX_TRACK_TRANSCODE_TIMEOUT = 3600000 // 1 hour
-const MAX_IMAGE_RESIZE_TIMEOUT_MS = 5 * 60_000 // 5 minutes
+const MAX_TRACK_TRANSCODE_NO_PROGRESS_TIMEOUT = 600000 // 10 minutes
+const MAX_IMAGE_RESIZE_TIMEOUT_MS = 300000 // 5 minutes
 const POLL_STATUS_INTERVAL = 3000 // 3s
 
 export class Storage implements StorageService {
@@ -180,6 +181,8 @@ export class Storage implements StorageService {
     onProgress?: ProgressHandler
   ) {
     const start = Date.now()
+    let lastProgressUpdate = Date.now()
+    let lastTranscodeProgress = 0
 
     const maxPollingMs =
       template === 'audio'
@@ -190,6 +193,19 @@ export class Storage implements StorageService {
       try {
         const resp = await this.getProcessingStatus(id)
         if (template === 'audio' && resp.transcode_progress) {
+          // Only update lastProgressUpdate if the progress has increased
+          if (resp.transcode_progress > lastTranscodeProgress) {
+            lastProgressUpdate = Date.now()
+            lastTranscodeProgress = resp.transcode_progress
+          } else if (
+            Date.now() - lastProgressUpdate >
+            MAX_TRACK_TRANSCODE_NO_PROGRESS_TIMEOUT
+          ) {
+            throw new Error(
+              `No transcoding progress increase for ${MAX_TRACK_TRANSCODE_NO_PROGRESS_TIMEOUT}ms. Progress stuck at ${lastTranscodeProgress}. id=${id}`
+            )
+          }
+
           onProgress?.({
             audio: {
               transcode: { decimal: resp.transcode_progress }
@@ -208,9 +224,10 @@ export class Storage implements StorageService {
           )
         }
       } catch (e: any) {
-        // Rethrow if error is "Upload failed" or if status code is 422 (Unprocessable Entity)
+        // Rethrow if error is "Upload failed", stalled, or if status code is 422 (Unprocessable Entity)
         if (
           e.message?.startsWith('Upload failed') ||
+          e.message?.startsWith('No transcoding progress increase') ||
           (e.response && e.response?.status === 422)
         ) {
           throw e

packages/web/src/common/store/upload/sagas.ts

@@ -38,7 +38,8 @@ import {
   replaceTrackProgressModalActions,
   queueSelectors,
   queueActions,
-  playerActions
+  playerActions,
+  BatchCachedTracks
 } from '@audius/common/store'
 import {
   actionChannelDispatcher,
@@ -429,7 +430,7 @@ export function* handleUploads({
   // Channel to listen for responses
   const responseChannel = yield* call(
     channel<UploadTrackResponse>,
-    buffers.expanding(10)
+    buffers.expanding(200)
   )
 
   // Channel to relay progress actions
@@ -453,10 +454,11 @@ export function* handleUploads({
           track.metadata.artwork && 'source' in track.metadata.artwork
             ? track.metadata.artwork?.source
             : undefined,
+        trackId: track.metadata.track_id,
         genre: track.metadata.genre,
         moode: track.metadata.mood,
         size: track.file.size,
-        type: track.file.type,
+        fileType: track.file.type,
         name: track.file.name,
         downloadable: isContentFollowGated(track.metadata.download_conditions)
           ? 'follow'
@@ -1072,10 +1074,20 @@ export function* uploadMultipleTracks(
   })
 
   // Get true track metadatas back
-  const newTracks = yield* call(retrieveTracks, {
-    trackIds,
-    forceRetrieveFromSource: true
-  })
+  // Allow for retries in case the tracks are not immediately available
+  let retries = 20
+  let newTracks: BatchCachedTracks[] = []
+  while (retries > 0) {
+    newTracks = yield* call(retrieveTracks, {
+      trackIds,
+      forceRetrieveFromSource: true
+    })
+    if (newTracks.length > 0) {
+      break
+    }
+    yield* delay(2000)
+    retries--
+  }
   if (newTracks.length === 0) {
     throw new Error('No tracks found after uploading.')
   }