@5stones/react-native-audio-browser 0.1.4 → 0.1.6

package/src/web/browser/FavoriteManager.ts

@@ -53,7 +53,7 @@ export class FavoriteManager {
 
     return {
       ...track,
-      favorited: true,
+      favorited: true
     }
   }
 
@@ -68,10 +68,12 @@ export class FavoriteManager {
     const children = resolvedTrack.children
     if (!children) return resolvedTrack
 
-    const hydratedChildren = children.map(track => this.hydrateFavorite(track))
+    const hydratedChildren = children.map((track) =>
+      this.hydrateFavorite(track)
+    )
     return {
       ...resolvedTrack,
-      children: hydratedChildren,
+      children: hydratedChildren
     }
   }
 }

package/src/web/browser/NavigationErrorManager.ts

@@ -2,7 +2,7 @@ import type {
   NavigationError,
   NavigationErrorType,
   FormattedNavigationError,
-  NavigationErrorEvent,
+  NavigationErrorEvent
 } from '../../features'
 import type { NativeBrowserConfiguration } from '../../types/browser-native'
 
@@ -11,7 +11,7 @@ const ERROR_TITLES: Record<NavigationErrorType, string> = {
   'http-error': 'Server Error',
   'content-not-found': 'Content Not Found',
   'callback-error': 'Error',
-  'unknown-error': 'Error',
+  'unknown-error': 'Error'
 }
 
 /**
@@ -25,12 +25,16 @@ export class NavigationErrorManager {
 
   // Event callbacks
   onNavigationError: (data: NavigationErrorEvent) => void = () => {}
-  onFormattedNavigationError: (formattedError: FormattedNavigationError | undefined) => void = () => {}
+  onFormattedNavigationError: (
+    formattedError: FormattedNavigationError | undefined
+  ) => void = () => {}
 
   /**
    * Sets the custom error formatter callback from configuration.
    */
-  setFormatCallback(callback: NativeBrowserConfiguration['formatNavigationError']): void {
+  setFormatCallback(
+    callback: NativeBrowserConfiguration['formatNavigationError']
+  ): void {
     this.formatCallback = callback
   }
 
@@ -38,7 +42,10 @@ export class NavigationErrorManager {
    * Clears the current navigation error and emits clear events.
    */
   clearNavigationError(): void {
-    if (this._navigationError !== undefined || this._formattedNavigationError !== undefined) {
+    if (
+      this._navigationError !== undefined ||
+      this._formattedNavigationError !== undefined
+    ) {
       this._navigationError = undefined
       this._formattedNavigationError = undefined
       this.onNavigationError({ error: undefined })
@@ -65,7 +72,7 @@ export class NavigationErrorManager {
       code,
       message,
       statusCode,
-      statusCodeSuccess: undefined,
+      statusCodeSuccess: undefined
     }
     this._navigationError = navError
     this.onNavigationError({ error: navError })
@@ -73,7 +80,7 @@ export class NavigationErrorManager {
     // Default formatted error
     const defaultFormatted: FormattedNavigationError = {
       title: ERROR_TITLES[code],
-      message,
+      message
     }
 
     // Call custom formatter if available
@@ -82,7 +89,7 @@ export class NavigationErrorManager {
         const customFormatted = this.formatCallback({
           error: navError,
           defaultFormatted,
-          path,
+          path
         })
         this._formattedNavigationError = customFormatted || defaultFormatted
       } catch (error) {

package/src/web/browser/SearchManager.ts

@@ -1,6 +1,6 @@
 import type { Track, SearchParams } from '../../types'
-import type { BrowserManager } from './BrowserManager'
 import type { HttpClient } from '../http/HttpClient'
+import type { BrowserManager } from './BrowserManager'
 import { RequestConfigBuilder } from '../http/RequestConfigBuilder'
 
 /**
@@ -23,7 +23,9 @@ export class SearchManager {
    */
   async search(params: SearchParams): Promise<Track[]> {
     // Find __search__ route entry
-    const searchRoute = this.browserManager.configuration.routes?.find(r => r.path === '__search__')
+    const searchRoute = this.browserManager.configuration.routes?.find(
+      (r) => r.path === '__search__'
+    )
     if (!searchRoute) {
       return []
     }
@@ -38,7 +40,7 @@ export class SearchManager {
     else if (searchRoute.searchConfig) {
       // Build query parameters from SearchParams (matches Android's executeSearchApiRequest)
       const searchQueryParams: Record<string, string> = {
-        q: params.query,
+        q: params.query
       }
       if (params.mode) searchQueryParams.mode = params.mode
       if (params.genre) searchQueryParams.genre = params.genre
@@ -47,9 +49,12 @@ export class SearchManager {
       if (params.title) searchQueryParams.title = params.title
       if (params.playlist) searchQueryParams.playlist = params.playlist
 
-      const requestConfig = this.httpClient.mergeRequestConfig(searchRoute.searchConfig, {
-        query: searchQueryParams
-      })
+      const requestConfig = this.httpClient.mergeRequestConfig(
+        searchRoute.searchConfig,
+        {
+          query: searchQueryParams
+        }
+      )
 
       try {
         const response = await this.httpClient.executeRequest(requestConfig)
@@ -64,11 +69,12 @@ export class SearchManager {
     const artworkConfig = this.browserManager.configuration.artwork
     if (artworkConfig) {
       results = await Promise.all(
-        results.map(async track => {
-          const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(
-            track,
-            artworkConfig
-          )
+        results.map(async (track) => {
+          const artworkSource =
+            await RequestConfigBuilder.resolveArtworkSourceAsync(
+              track,
+              artworkConfig
+            )
           if (artworkSource && !track.artworkSource) {
             return { ...track, artworkSource }
           }

package/src/web/http/HttpClient.ts

@@ -1,8 +1,5 @@
-import type {
-  RequestConfig,
-  TransformableRequestConfig,
-} from '../../types'
 import type { NavigationErrorType } from '../../features'
+import type { RequestConfig, TransformableRequestConfig } from '../../types'
 import { RequestConfigBuilder } from './RequestConfigBuilder'
 
 type HttpError = Error & {
@@ -21,6 +18,8 @@ function isHttpError(error: unknown): error is HttpError {
   )
 }
 
+const TIMEOUT_MS = 30_000
+
 /**
  * HTTP client for making browser API requests.
  * Mirrors Android's HttpClient.kt
@@ -54,7 +53,10 @@ export class HttpClient {
       base as RequestConfig
     )
     // Then merge with overrides
-    return RequestConfigBuilder.mergeConfig(withBase, overrides as RequestConfig)
+    return RequestConfigBuilder.mergeConfig(
+      withBase,
+      overrides as RequestConfig
+    )
   }
 
   /**
@@ -67,22 +69,36 @@ export class HttpClient {
     const headers = config.headers ?? {}
     const method = config.method ?? 'GET'
 
+    const controller = new AbortController()
+    const timeoutId = setTimeout(() => controller.abort(), TIMEOUT_MS)
+
     try {
       const response = await fetch(url, {
         method,
         headers,
+        signal: controller.signal
       })
 
       if (!response.ok) {
-        const error = new Error(`HTTP ${response.status}: ${response.statusText}`) as HttpError
+        const error = new Error(
+          `HTTP ${response.status}: ${response.statusText}`
+        ) as HttpError
         error.isHttpError = true
         error.status = response.status
         error.statusText = response.statusText
         throw error
       }
 
-      return response.json()
+      // await so JSON parse errors are caught by the surrounding try/catch
+      return await response.json()
     } catch (error: unknown) {
+      if (error instanceof DOMException && error.name === 'AbortError') {
+        const navError = new Error(
+          `Request timed out after ${TIMEOUT_MS}ms`
+        ) as Error & { code: NavigationErrorType }
+        navError.code = 'network-error'
+        throw navError
+      }
       // Distinguish between network errors and HTTP errors
       if (isHttpError(error)) {
         const navError = new Error(error.message) as Error & {
@@ -102,6 +118,8 @@ export class HttpClient {
       }
       navError.code = 'network-error'
       throw navError
+    } finally {
+      clearTimeout(timeoutId)
     }
   }
 }

package/src/web/http/RequestConfigBuilder.ts

@@ -6,7 +6,7 @@ import type {
   ImageSource,
   Track,
   ImageContext,
-  ImageQueryParams,
+  ImageQueryParams
 } from '../../types'
 import { BrowserPathHelper } from '../util/BrowserPathHelper'
 
@@ -88,7 +88,7 @@ export const RequestConfigBuilder = {
       query: this.mergeQuery(base.query, override.query),
       body: override.body ?? base.body,
       contentType: override.contentType ?? base.contentType,
-      userAgent: override.userAgent ?? base.userAgent,
+      userAgent: override.userAgent ?? base.userAgent
     }
   },
 
@@ -111,7 +111,10 @@ export const RequestConfigBuilder = {
         const transformed = await override.transform(base)
         return transformed
       } catch (e) {
-        console.error('Failed to apply media transform function, using base config', e)
+        console.error(
+          'Failed to apply media transform function, using base config',
+          e
+        )
         return base
       }
     }
@@ -135,7 +138,12 @@ export const RequestConfigBuilder = {
   /**
    * Converts a TransformableRequestConfig to a plain RequestConfig.
    */
-  toRequestConfig(config: TransformableRequestConfig | MediaRequestConfig | ArtworkRequestConfig): RequestConfig {
+  toRequestConfig(
+    config:
+      | TransformableRequestConfig
+      | MediaRequestConfig
+      | ArtworkRequestConfig
+  ): RequestConfig {
     return {
       path: config.path,
       method: config.method,
@@ -144,7 +152,7 @@ export const RequestConfigBuilder = {
       query: config.query,
       body: config.body,
       contentType: config.contentType,
-      userAgent: config.userAgent,
+      userAgent: config.userAgent
     }
   },
 
@@ -187,12 +195,15 @@ export const RequestConfigBuilder = {
       ? this.mergeArtworkConfig({ path: artworkUrl }, artworkConfig)
       : { path: artworkUrl }
 
-    const resolvedUri = BrowserPathHelper.buildUrl(config.baseUrl, config.path ?? artworkUrl)
+    const resolvedUri = BrowserPathHelper.buildUrl(
+      config.baseUrl,
+      config.path ?? artworkUrl
+    )
 
     return {
       uri: resolvedUri,
       method: config.method ?? 'GET',
-      headers: config.headers,
+      headers: config.headers
     }
   },
 
@@ -258,7 +269,7 @@ export const RequestConfigBuilder = {
       if (artworkConfig.transform) {
         mergedConfig = await artworkConfig.transform({
           request: mergedConfig,
-          context: imageContext,
+          context: imageContext
         })
       }
 
@@ -273,7 +284,7 @@ export const RequestConfigBuilder = {
         uri: finalUri,
         method: mergedConfig.method ?? 'GET',
         headers: mergedConfig.headers,
-        body: mergedConfig.body,
+        body: mergedConfig.body
       }
     } catch (error) {
       // resolve/transform threw - log error, return undefined to avoid broken images
@@ -298,12 +309,15 @@ export const RequestConfigBuilder = {
     // If artworkSource is already set, don't override it
     if (track.artworkSource) return track
 
-    const artworkSource = this.resolveArtworkSource(track.artwork, artworkConfig)
+    const artworkSource = this.resolveArtworkSource(
+      track.artwork,
+      artworkConfig
+    )
     if (!artworkSource) return track
 
     return {
       ...track,
-      artworkSource,
+      artworkSource
     }
   },
 
@@ -318,7 +332,9 @@ export const RequestConfigBuilder = {
     tracks: Track[],
     artworkConfig: ArtworkRequestConfig | undefined
   ): Track[] {
-    return tracks.map(track => this.transformTrackArtwork(track, artworkConfig))
+    return tracks.map((track) =>
+      this.transformTrackArtwork(track, artworkConfig)
+    )
   },
 
   /**
@@ -343,5 +359,5 @@ export const RequestConfigBuilder = {
     if (!base) return override
     if (!override) return base
     return { ...base, ...override }
-  },
+  }
 } as const

package/src/web/player/NowPlayingManager.ts

@@ -1,7 +1,4 @@
-import type {
-  NowPlayingUpdate,
-  NowPlayingMetadata,
-} from '../../features'
+import type { NowPlayingUpdate, NowPlayingMetadata } from '../../features'
 import type { Track } from '../../types'
 
 /**
@@ -38,14 +35,20 @@ export class NowPlayingManager {
           artist: update.artist ?? currentTrack.artist,
           album: currentTrack.album,
           artwork: currentTrack.artwork,
-          duration,
+          description: currentTrack.description,
+          mediaId: currentTrack.src ?? currentTrack.url,
+          genre: currentTrack.genre,
+          duration
         }
       : {
           title: currentTrack.title,
           artist: currentTrack.artist,
           album: currentTrack.album,
           artwork: currentTrack.artwork,
-          duration,
+          description: currentTrack.description,
+          mediaId: currentTrack.src ?? currentTrack.url,
+          genre: currentTrack.genre,
+          duration
         }
 
     this.onNowPlayingChanged(metadata)
@@ -69,7 +72,10 @@ export class NowPlayingManager {
       artist: this.override?.artist ?? currentTrack.artist,
       album: currentTrack.album,
       artwork: currentTrack.artwork,
-      duration,
+      description: currentTrack.description,
+      mediaId: currentTrack.src ?? currentTrack.url,
+      genre: currentTrack.genre,
+      duration
     }
   }
 

package/src/web/player/OptionsManager.ts

@@ -2,7 +2,7 @@ import type {
   NativeUpdateOptions,
   UpdateOptions,
   Options,
-  RepeatMode as RepeatModeType,
+  RepeatMode as RepeatModeType
 } from '../../features'
 import { RepeatMode } from '../TrackPlayer'
 
@@ -20,7 +20,7 @@ export class OptionsManager {
     backwardJumpInterval: 15,
     progressUpdateEventInterval: null,
     repeatMode: RepeatMode.Off,
-    capabilities: {},
+    capabilities: {}
   }
 
   // Event callback
@@ -38,7 +38,7 @@ export class OptionsManager {
       options.progressUpdateEventInterval !== undefined &&
       typeof options.progressUpdateEventInterval !== 'number'
     ) {
-      throw new Error('NullSentinal type is not valid on web.')
+      throw new Error('NullSentinel type is not valid on web.')
     }
 
     // Merge platform-agnostic options
@@ -52,7 +52,8 @@ export class OptionsManager {
       progressUpdateEventInterval:
         options.progressUpdateEventInterval === null
           ? null
-          : (options.progressUpdateEventInterval ?? this.options.progressUpdateEventInterval),
+          : (options.progressUpdateEventInterval ??
+            this.options.progressUpdateEventInterval)
     }
 
     // Store merged options
@@ -65,7 +66,7 @@ export class OptionsManager {
       progressUpdateEventInterval:
         mergedOptions.progressUpdateEventInterval ?? 15,
       capabilities: mergedOptions.capabilities ?? {},
-      repeatMode: mergedOptions.repeatMode,
+      repeatMode: mergedOptions.repeatMode
     }
     this.onOptionsChanged(fullOptions)
   }
@@ -78,7 +79,7 @@ export class OptionsManager {
       forwardJumpInterval: this.options.forwardJumpInterval,
       backwardJumpInterval: this.options.backwardJumpInterval,
       progressUpdateEventInterval: this.options.progressUpdateEventInterval,
-      capabilities: this.options.capabilities,
+      capabilities: this.options.capabilities
     }
   }
 

package/src/web/util/BrowserPathHelper.ts

@@ -103,7 +103,8 @@ export const BrowserPathHelper = {
 
     try {
       // Parse the URL - handle both full URLs and paths
-      const isFullUrl = path.startsWith('http://') || path.startsWith('https://')
+      const isFullUrl =
+        path.startsWith('http://') || path.startsWith('https://')
       const urlObj = new URL(path, isFullUrl ? undefined : 'http://placeholder')
       return urlObj.searchParams.get(this.CONTEXTUAL_TRACK_PARAM) ?? undefined
     } catch {
@@ -143,5 +144,5 @@ export const BrowserPathHelper = {
     const normalizedBase = baseUrl.replace(/\/+$/, '') + '/'
     const normalizedPath = path.replace(/^\/+/, '')
     return `${normalizedBase}${normalizedPath}`
-  },
+  }
 } as const