Replace Shaka Player with hls.js on web

The web player carried a Shaka Player integration plus the scaffolding
built up around it while debugging: an ActionQueue that serialized every
play/pause/seek/volume call behind a 2s timeout, a shallowEqual source
comparison, and a large amount of debug logging. All of it existed to
work around Shaka's async attach/load lifecycle.

Every source this fork's consumer plays is HLS, and the only thing Shaka
was providing is HLS playback in browsers without native support. hls.js
does that in a fraction of the code, so drive the video element directly:
set `src` when the browser plays HLS natively (Safari/WebKit) or the
source isn't HLS at all, and attach hls.js otherwise.

Dropping the queue restores the original direct play/pause/seek/volume
implementations. `resume()` now swallows play() rejections, which the
queue used to absorb -- these are routine when play() lands before the
manifest is parsed or when autoplay is denied.

The source effect keys on the URI string rather than the source object.
Consumers pass `source={{uri}}` as a fresh object literal every render,
which is what shallowEqual was defending against.

Carried forward from the Shaka implementation: the onSeekComplete event
and objectFit: 'fill'. Also resolves `poster` to a URL string instead of
suppressing the type error with @ts-ignore.

Dropped: web-side cropStart/cropEnd handling, which was implemented with
Shaka's playRangeStart/playRangeEnd. No consumer passes those props, and
neither upstream's web player nor this file before Shaka supported them.

android/src/main/java/com/brentvatne/common/api/SideLoadedTextTrackList.kt

@@ -24,7 +24,7 @@ class SideLoadedTextTrackList {
             }
             val sideLoadedTextTrackList = SideLoadedTextTrackList()
             for (i in 0 until src.size()) {
-                val textTrack: ReadableMap = src.getMap(i)
+                val textTrack: ReadableMap = src.getMap(i) ?: continue
                 sideLoadedTextTrackList.tracks.add(SideLoadedTextTrack.parse(textTrack))
             }
             return sideLoadedTextTrackList

android/src/main/java/com/brentvatne/common/api/Source.kt

@@ -228,7 +228,7 @@ class Source {
                 if (propSrcHeadersArray != null) {
                     if (propSrcHeadersArray.size() > 0) {
                         for (i in 0 until propSrcHeadersArray.size()) {
-                            val current = propSrcHeadersArray.getMap(i)
+                            val current = propSrcHeadersArray.getMap(i) ?: continue
                             val key = if (current.hasKey("key")) current.getString("key") else null
                             val value = if (current.hasKey("value")) current.getString("value") else null
                             if (key != null && value != null) {

android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.kt

@@ -288,12 +288,22 @@ class VideoEventEmitter {
         }
     }
 
+    private class VideoEvent(
+        surfaceId: Int,
+        viewId: Int,
+        private val name: String,
+        private val data: WritableMap?
+    ) : Event<VideoEvent>(surfaceId, viewId) {
+        override fun getEventName() = name
+        override fun getEventData() = data
+    }
+
     private class EventBuilder(private val surfaceId: Int, private val viewId: Int, private val dispatcher: EventDispatcher) {
-        fun dispatch(event: EventTypes, paramsSetter: (WritableMap.() -> Unit)? = null) =
+        fun dispatch(event: EventTypes, paramsSetter: (WritableMap.() -> Unit)? = null) {
-            dispatcher.dispatchEvent(object : Event<Event<*>>(surfaceId, viewId) {
+            val eventName = "top${event.eventName.removePrefix("on")}"
-                override fun getEventName() = "top${event.eventName.removePrefix("on")}"
+            val eventData = Arguments.createMap().apply(paramsSetter ?: {})
-                override fun getEventData() = Arguments.createMap().apply(paramsSetter ?: {})
+            dispatcher.dispatchEvent(VideoEvent(surfaceId, viewId, eventName, eventData))
-            })
+        }
     }
 
     private fun audioTracksToArray(audioTracks: java.util.ArrayList<Track>?): WritableArray =

ios/Video/Features/RCTVideoUtils.swift

@@ -34,6 +34,22 @@ enum RCTVideoAssetsUtils {
             #endif
         }
     }
+
+    static func getDuration(asset: AVAsset) async -> CMTime? {
+        if #available(iOS 15, tvOS 15, visionOS 1.0, *) {
+            return try? await asset.load(.duration)
+        } else {
+            #if !os(visionOS)
+                return await withCheckedContinuation { continuation in
+                    asset.loadValuesAsynchronously(forKeys: ["duration"]) {
+                        var error: NSError?
+                        let status = asset.statusOfValue(forKey: "duration", error: &error)
+                        continuation.resume(returning: status == .loaded ? asset.duration : nil)
+                    }
+                }
+            #endif
+        }
+    }
 }
 
 // MARK: - RCTVideoUtils

ios/Video/RCTVideo.swift

@@ -1420,7 +1420,10 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
             }
 
             if onVideoLoad != nil, self._videoLoadStarted {
-                var duration = Float(CMTimeGetSeconds(_playerItem.asset.duration))
+                let assetDuration = await RCTVideoAssetsUtils.getDuration(asset: _playerItem.asset)
+                guard self._playerItem === _playerItem,
+                      self._source?.json === source.json else { return }
+                var duration = Float(CMTimeGetSeconds(assetDuration ?? .invalid))
 
                 if duration.isNaN || duration == 0 {
                     // This is a safety check for live video.
@@ -1449,6 +1452,8 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
 
                 let audioTracks = await RCTVideoUtils.getAudioTrackInfo(self._player)
                 let textTracks = await RCTVideoUtils.getTextTrackInfo(self._player)
+                guard self._playerItem === _playerItem,
+                      self._source?.json === source.json else { return }
                 self.onVideoLoad?(["duration": NSNumber(value: duration),
                                    "currentTime": NSNumber(value: Float(CMTimeGetSeconds(_playerItem.currentTime()))),
                                    "canPlayReverse": NSNumber(value: _playerItem.canPlayReverse),
@@ -1699,4 +1704,3 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
     @objc
     func setOnClick(_: Any) {}
 }
-

ios/Video/RCTVideoManager.swift

@@ -4,7 +4,13 @@ import React
 @objc(RCTVideoManager)
 class RCTVideoManager: RCTViewManager {
     override func view() -> UIView {
-        return RCTVideo(eventDispatcher: (RCTBridge.current().eventDispatcher() as! RCTEventDispatcher))
+        // `RCTBridge.current()` returns nil under bridgeless (New Architecture), and it
+        // is nonnull-annotated, so Swift emits an unconditional nil-check trap around
+        // the call -- optional chaining does not avoid it. Every <Video> mount killed
+        // the app. RCTVideo only stores this dispatcher and never reads it (events go
+        // out through the RCT_EXPORT_VIEW_PROPERTY direct event blocks), so skip the
+        // lookup entirely.
+        return RCTVideo(eventDispatcher: nil)
     }
 
     func methodQueue() -> DispatchQueue {

package.json

@@ -32,17 +32,17 @@
         "react-native": "0.73.2",
         "react-native-windows": "^0.61.0-0",
         "release-it": "^16.2.1",
-        "typescript": "5.1.6",
+        "typescript": "5.1.6"
-        "patch-package": "^8.0.0"
     },
     "dependencies": {
-        "shaka-player": "^4.11.7"
+        "hls.js": "^1.6.16"
     },
     "peerDependencies": {
         "react": "*",
         "react-native": "*"
     },
     "scripts": {
+        "install": "tsc --noCheck",
         "lint": "yarn eslint .",
         "build": "yarn tsc",
         "prepare": "yarn build",
@@ -61,6 +61,8 @@
         "windows",
         "src",
         "lib",
+        "tsconfig.json",
+        "tsconfig.build.json",
         "react-native-video.podspec",
         "app.plugin.js",
         "!android/build",

patches/shaka-player+4.11.7.patch

@@ -1,39 +0,0 @@
-diff --git a/node_modules/shaka-player/dist/shaka-player.compiled.d.ts b/node_modules/shaka-player/dist/shaka-player.compiled.d.ts
-index 19c0930..cc0a3fd 100644
---- a/node_modules/shaka-player/dist/shaka-player.compiled.d.ts
-+++ b/node_modules/shaka-player/dist/shaka-player.compiled.d.ts
-@@ -5117,3 +5117,5 @@ declare namespace shaka.extern {
- declare namespace shaka.extern {
-   type TransmuxerPlugin = ( ) => shaka.extern.Transmuxer ;
- }
-+
-+export default shaka;
-diff --git a/node_modules/shaka-player/dist/shaka-player.ui.d.ts b/node_modules/shaka-player/dist/shaka-player.ui.d.ts
-index 1618ca0..a6076c6 100644
---- a/node_modules/shaka-player/dist/shaka-player.ui.d.ts
-+++ b/node_modules/shaka-player/dist/shaka-player.ui.d.ts
-@@ -5830,3 +5830,5 @@ declare namespace shaka.extern {
- declare namespace shaka.extern {
-   type UIVolumeBarColors = { base : string , level : string } ;
- }
-+
-+export default shaka;
-diff --git a/node_modules/shaka-player/index.d.ts b/node_modules/shaka-player/index.d.ts
-new file mode 100644
-index 0000000..3ebfd96
---- /dev/null
-+++ b/node_modules/shaka-player/index.d.ts
-@@ -0,0 +1,2 @@
-+/// <reference path="./dist/shaka-player.compiled.d.ts" />
-+/// <reference path="./dist/shaka-player.ui.d.ts" />
-\ No newline at end of file
-diff --git a/node_modules/shaka-player/ui.d.ts b/node_modules/shaka-player/ui.d.ts
-new file mode 100644
-index 0000000..84a3be0
---- /dev/null
-+++ b/node_modules/shaka-player/ui.d.ts
-@@ -0,0 +1,3 @@
-+import shaka from 'shaka-player/dist/shaka-player.ui'
-+export * from 'shaka-player/dist/shaka-player.ui'
-+export default shaka;
-\ No newline at end of file

src/Video.tsx

@@ -734,7 +734,7 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
 
       // poster style
       const baseStyle: StyleProp<ImageStyle> = {
-        ...StyleSheet.absoluteFillObject,
+        ...StyleSheet.absoluteFill,
         resizeMode: _posterResizeMode,
       };
 
@@ -787,7 +787,7 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
 
     const _style: StyleProp<ViewStyle> = useMemo(
       () => ({
-        ...StyleSheet.absoluteFillObject,
+        ...StyleSheet.absoluteFill,
         ...(showPoster ? {display: 'none'} : {}),
       }),
       [showPoster],

src/Video.web.tsx

@@ -6,10 +6,25 @@ import React, {
   useRef,
   type RefObject,
 } from 'react';
-//@ts-ignore
+import Hls from 'hls.js';
-import shaka from 'shaka-player';
 import type {VideoRef, ReactVideoProps, VideoMetadata} from './types';
 
+const HLS_MIME = 'application/vnd.apple.mpegurl';
+
+const isHlsSource = (uri: string) => /\.m3u8(\?|#|$)/i.test(uri);
+
+// `poster` is either a (deprecated) plain URI string or a poster object whose
+// `source` follows the RN image-source shape. The DOM only takes a URL string.
+const resolvePosterUri = (
+  poster: ReactVideoProps['poster'],
+): string | undefined => {
+  if (typeof poster === 'string') {
+    return poster;
+  }
+  const source = poster?.source;
+  return typeof source === 'object' && source !== null ? source.uri : undefined;
+};
+
 const Video = forwardRef<VideoRef, ReactVideoProps>(
   (
     {
@@ -32,6 +47,7 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
       onError,
       onReadyForDisplay,
       onSeek,
+      onSeekComplete,
       onVolumeChange,
       onEnd,
       onPlaybackStateChanged,
@@ -39,7 +55,6 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
     ref,
   ) => {
     const nativeRef = useRef<HTMLVideoElement>(null);
-    const shakaPlayerRef = useRef<shaka.Player | null>(null);
 
     const isSeeking = useRef(false);
     const seek = useCallback(
@@ -69,7 +84,10 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
       if (!nativeRef.current) {
         return;
       }
-      nativeRef.current.play();
+      // play() rejects if it is called before the stream has data (common while
+      // hls.js is still parsing the manifest) or if autoplay is denied. Neither
+      // is fatal, so swallow it rather than surfacing an unhandled rejection.
+      nativeRef.current.play()?.catch(() => {});
     }, []);
 
     const setVolume = useCallback((vol: number) => {
@@ -228,36 +246,54 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
       nativeRef.current.playbackRate = rate;
     }, [rate]);
 
+    // `onError` is typically a fresh closure on every render. Keep it in a ref so
+    // the source effect below can depend on the URI alone -- callers pass
+    // `source={{uri}}` as a new object literal each render, so keying the effect
+    // on anything object-shaped would tear down and reload the stream constantly.
+    const onErrorRef = useRef(onError);
+    onErrorRef.current = onError;
+
+    const uri = source?.uri as string | undefined;
+
     useEffect(() => {
-      if (!nativeRef.current) {
+      const video = nativeRef.current;
-        console.log("Not starting shaka yet bc undefined")
+      if (!video || !uri) {
         return;
       }
-      if (shakaPlayerRef.current) {
+
-        shakaPlayerRef.current.unload()
+      // Safari (and iOS WebKit) plays HLS natively; everywhere else the browser
+      // has no HLS support at all, so an .m3u8 has to go through hls.js.
+      const needsMse =
+        isHlsSource(uri) && !video.canPlayType(HLS_MIME) && Hls.isSupported();
+
+      if (!needsMse) {
+        video.src = uri;
+        return () => {
+          video.removeAttribute('src');
+          video.load();
+        };
       }
-      shakaPlayerRef.current = new shaka.Player();
+
-      //@ts-ignore
+      const hls = new Hls();
-      shakaPlayerRef.current.addEventListener("error", (event) => {
+      hls.on(Hls.Events.ERROR, (_event, data) => {
-        //@ts-ignore
+        // hls.js surfaces plenty of recoverable warnings; only fatal errors are
-        const shakaError = event.detail;
+        // worth propagating as a video error.
-        console.error('Shaka Player Error', shakaError);
+        if (!data.fatal) {
-        onError?.({
+          return;
+        }
+        onErrorRef.current?.({
           error: {
-            errorString: shakaError.message,
+            errorString: `${data.type}: ${data.details}`,
-            code: shakaError.code,
           },
         });
       });
-      console.log("Initializing and attaching shaka")
+      hls.loadSource(uri);
-      shakaPlayerRef.current.attach(nativeRef.current, true);
+      hls.attachMedia(video);
 
-      //@ts-ignore
+      return () => {
-      shakaPlayerRef.current.load(source?.uri).then(
+        hls.destroy();
-        () => console.log(`${source?.uri} finished loading`)
+      };
-      );
+    }, [uri]);
-      console.log("Started shaka loading");
-    }, [source, nativeRef.current])
 
     useMediaSession(source?.metadata, nativeRef, showNotificationControls);
 
@@ -269,8 +305,7 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
         controls={controls}
         loop={repeat}
         playsInline
-        //@ts-ignore
+        poster={resolvePosterUri(poster)}
-        poster={poster}
         onCanPlay={() => onBuffer?.({isBuffering: false})}
         onWaiting={() => onBuffer?.({isBuffering: true})}
         onRateChange={() => {
@@ -342,7 +377,15 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
           })
         }
         onSeeking={() => (isSeeking.current = true)}
-        onSeeked={() => (isSeeking.current = false)}
+        onSeeked={() => {
+          isSeeking.current = false;
+          const currentTime = nativeRef.current?.currentTime ?? 0;
+          onSeekComplete?.({
+            currentTime,
+            seekTime: currentTime,
+            target: 0,
+          });
+        }}
         onVolumeChange={() => {
           if (!nativeRef.current) {
             return;
@@ -359,7 +402,9 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
 const videoStyle = {
   position: 'absolute',
   inset: 0,
-  objectFit: 'contain',
+  // Use 'fill' instead of 'contain' to force video to match container dimensions.
+  // This works around browsers miscalculating intrinsic dimensions from rotation matrices.
+  objectFit: 'fill',
   width: '100%',
   height: '100%',
 } satisfies React.CSSProperties;

tsconfig.build.json

@@ -1,4 +1,3 @@
-
 {
   "extends": "./tsconfig",
   "exclude": ["examples", "lib"]

tsconfig.json

@@ -14,8 +14,8 @@
     "forceConsistentCasingInFileNames": true,
     "jsx": "react",
     "lib": ["esnext"],
-    "module": "CommonJS",
+    "module": "Node16",
-    "moduleResolution": "node",
+    "moduleResolution": "Node16",
     "noFallthroughCasesInSwitch": true,
     "noImplicitReturns": true,
     "noImplicitUseStrict": false,