extended-vlc-player 0.1.4 → 0.1.5

package/README.md

@@ -7,7 +7,7 @@ Under the hood:
 | Platform | Engine                              | Default version | Min OS    |
 | -------- | ----------------------------------- | --------------- | --------- |
 | iOS      | [MobileVLCKit](https://code.videolan.org/videolan/VLCKit) | `~3.7.3`        | iOS 16.4+ |
-| Android  | [libVLC](https://code.videolan.org/videolan/vlc-android)  | `3.6.0`         | API 26+   |
+| Android  | [libVLC](https://code.videolan.org/videolan/vlc-android)  | `3.7.5`         | API 26+   |
 
 The JS surface intentionally mirrors `expo-video` so an existing `<VideoView>` consumer (e.g. `BackgroundVideoPlayer.jsx`) can be migrated with a one-line import swap.
 
@@ -185,7 +185,7 @@ Then in `app.json`:
 "plugins": [
   ["extended-vlc-player", {
     "ios":     { "mobileVlcKitVersion": "3.7.3" },
-    "android": { "libVlcVersion": "3.6.0" }
+    "android": { "libVlcVersion": "3.7.5" }
   }]
 ]
 ```
@@ -200,7 +200,7 @@ The plugin (`app.plugin.js`) does the following, idempotently:
 
 - **iOS Podfile** — adds `pod 'MobileVLCKit', '~> 3.7.3'` and a `post_install` hook that pins `IPHONEOS_DEPLOYMENT_TARGET = 16.4` on the MobileVLCKit target.
 - **iOS Info.plist** — adds `"audio"` to `UIBackgroundModes` so the audio session is eligible for background playback and PiP.
-- **Android `android/app/build.gradle`** — adds `implementation "org.videolan.android:libvlc:3.6.0"`. ABI filters are inherited from the host app.
+- **Android `android/app/build.gradle`** — adds `implementation "org.videolan.android:libvlc-all:3.7.5"`. ABI filters are inherited from the host app.
 - **Android `AndroidManifest.xml`** — adds `android:supportsPictureInPicture="true"` and the `configChanges` set to `MainActivity`.
 
 To publish to npm, run `npm publish` from the module root. To consume from a local checkout, `file:` works during development and you should switch to the registry version before shipping (see [Troubleshooting](#troubleshooting)).
@@ -341,8 +341,9 @@ All options are optional. Defaults match what the plugin is pinned to in CI.
       enableBitcode: false,
     },
     android: {
-      // org.videolan.android:libvlc version.
-      libVlcVersion: '3.6.0',
+      // org.videolan.android:libvlc-all version. 3.7.5 ships 16 KB-aligned
+      // arm64 native binaries required by Android 15+ 16 KB devices.
+      libVlcVersion: '3.7.5',
     },
     pip: {
       // Reserved for the snapshot bridge. The current bridge runs at the

package/android/build.gradle

@@ -20,5 +20,5 @@ android {
 }
 
 dependencies {
-  implementation 'org.videolan.android:libvlc-all:3.6.0'
+  implementation 'org.videolan.android:libvlc-all:3.7.5'
 }

package/android/src/main/java/expo/modules/extendedvlcplayer/ExtendedVlcPlayerModule.kt

@@ -2,12 +2,11 @@ package expo.modules.extendedvlcplayer
 
 import android.app.Activity
 import android.app.PictureInPictureParams
-import android.content.Context
-import android.content.res.Configuration
 import android.os.Build
 import android.util.Rational
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
+import expo.modules.kotlin.records.Record
 
 /**
  * TurboModule for `extended-vlc-player` on Android.
@@ -22,6 +21,37 @@ class ExtendedVlcPlayerModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("ExtendedVlcPlayer")
 
+    Function("createPlayer") {
+      val context = appContext.reactContext
+        ?: throw IllegalStateException("React context is not available")
+      PlayerRegistry.create(context).first
+    }
+
+    Function("destroyPlayer") { instanceId: Int ->
+      PlayerRegistry.destroy(instanceId)
+    }
+
+    View(ExtendedVlcPlayerViewComponentView::class) {
+      Name("ExtendedVlcPlayerView")
+      Events(
+        "onLoad",
+        "onProgress",
+        "onPlaying",
+        "onPaused",
+        "onEnded",
+        "onError",
+        "onBuffering",
+        "onPictureInPictureStart",
+        "onPictureInPictureStop"
+      )
+      Prop("player") { view: ExtendedVlcPlayerViewComponentView, id: Int ->
+        view.setPlayer(id)
+      }
+      Prop("contentFit") { view: ExtendedVlcPlayerViewComponentView, fit: String ->
+        view.setContentFit(fit)
+      }
+    }
+
     AsyncFunction("isPictureInPictureSupported") {
       Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
         appContext.currentActivity?.application?.packageManager?.hasSystemFeature(
@@ -96,4 +126,4 @@ class ExtendedVlcPlayerModule : Module() {
 class ReplacePayload(
   val uri: String,
   val instanceId: Int = 0
-)
+) : Record

package/android/src/main/java/expo/modules/extendedvlcplayer/ExtendedVlcPlayerViewComponentView.kt

@@ -1,7 +1,6 @@
 package expo.modules.extendedvlcplayer
 
 import android.content.Context
-import android.view.View
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -17,6 +16,7 @@ class ExtendedVlcPlayerViewComponentView(context: Context, appContext: AppContex
   ExpoView(context, appContext) {
 
   private var playerId: Int = 0
+  private var contentFit: String = "contain"
 
   val onLoad by EventDispatcher<Map<String, Any>>()
   val onProgress by EventDispatcher<Map<String, Any>>()
@@ -29,11 +29,23 @@ class ExtendedVlcPlayerViewComponentView(context: Context, appContext: AppContex
   val onPictureInPictureStop by EventDispatcher<Unit>()
 
   fun setPlayer(id: Int) {
-    if (playerId == id) return
-    // If we were attached to a previous session, detach.
+    if (playerId == id) {
+      attachToSession()
+      return
+    }
     detachFromSession()
     playerId = id
-    val session = PlayerRegistry.session(id) ?: return
+    attachToSession()
+  }
+
+  fun setContentFit(value: String) {
+    contentFit = value
+  }
+
+  private fun attachToSession() {
+    if (playerId == 0) return
+    val session = PlayerRegistry.session(playerId) ?: return
+    if (session.drawable.parent === this) return
     val drawable = session.drawable
     drawable.layoutParams = android.view.ViewGroup.LayoutParams(
       android.view.ViewGroup.LayoutParams.MATCH_PARENT,
@@ -53,12 +65,6 @@ class ExtendedVlcPlayerViewComponentView(context: Context, appContext: AppContex
     session.onPictureInPictureStop = { onPictureInPictureStop(Unit) }
   }
 
-  fun createPlayer(): Int {
-    val (id, _) = PlayerRegistry.create(context)
-    playerId = id
-    return id
-  }
-
   private fun detachFromSession() {
     if (playerId == 0) return
     val session = PlayerRegistry.session(playerId) ?: return
@@ -76,7 +82,12 @@ class ExtendedVlcPlayerViewComponentView(context: Context, appContext: AppContex
   }
 
   override fun onDetachedFromWindow() {
-    super.onDetachedFromWindow()
     detachFromSession()
+    super.onDetachedFromWindow()
+  }
+
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    attachToSession()
   }
 }

package/android/src/main/java/expo/modules/extendedvlcplayer/PlayerSession.kt

@@ -106,6 +106,7 @@ class PlayerSession(
     val media = Media(libVlc, Uri.parse(uri))
     currentMedia = media
     mediaPlayer.media = media
+    mediaPlayer.play()
   }
 
   private fun durationSeconds(): Double = mediaPlayer.getLength() / 1000.0
@@ -165,6 +166,10 @@ class PlayerSession(
   }
 
   fun release() {
+    val vout = mediaPlayer.getVLCVout()
+    if (vout.areViewsAttached()) {
+      vout.detachViews()
+    }
     mediaPlayer.stop()
     currentMedia?.release()
     libVlc.release()

package/app.plugin.js

@@ -22,7 +22,7 @@
  * Plugin options (all optional):
  *   {
  *     ios:     { mobileVlcKitVersion: '3.7.3', enableBitcode: false },
- *     android: { libVlcVersion: '3.6.0' },
+ *     android: { libVlcVersion: '3.7.5' },
  *     pip:     { snapshotFps: 30, snapshotQuality: 'medium' },
  *   }
  */
@@ -83,7 +83,7 @@ const GRADLE_TAG = 'extended-vlc-player-gradle';
 const GRADLE_VLC = (vlcVersion) => `  implementation "org.videolan.android:libvlc-all:${vlcVersion}"`;
 
 function withAndroidGradle(config, options) {
-  const vlcVersion = (options?.android?.libVlcVersion || '3.6.0').toString();
+  const vlcVersion = (options?.android?.libVlcVersion || '3.7.5').toString();
   return withAppBuildGradle(config, (gradleConfig) => {
     if (gradleConfig.modResults.language !== 'groovy') {
       // The main app module is Groovy in this Expo template (verified in
@@ -93,15 +93,30 @@ function withAndroidGradle(config, options) {
         '[extended-vlc-player] Android build.gradle is not Groovy. Update the plugin to handle the new DSL.'
       );
     }
-    const newSrc = mergeContents({
+
+    const currentContents = gradleConfig.modResults.contents;
+    const existingBlock = new RegExp(
+      `(// @generated begin ${GRADLE_TAG}\\b[\\s\\S]*?implementation\\s+[\"']org\\.videolan\\.android:libvlc(?:-all)?:)([^\"']+)([\"'])`,
+      'm'
+    );
+    const updatedContents = currentContents.replace(
+      existingBlock,
+      (_match, prefix, _previousVersion, closingQuote) => `${prefix}${vlcVersion}${closingQuote}`
+    );
+
+    if (updatedContents !== currentContents) {
+      gradleConfig.modResults.contents = updatedContents;
+      return gradleConfig;
+    }
+
+    gradleConfig.modResults.contents = mergeContents({
       tag: GRADLE_TAG,
-      src: gradleConfig.modResults.contents,
+      src: currentContents,
       newSrc: `\n${INFOPLIST_AUDIO_SESSION}\ndependencies {\n${GRADLE_VLC(vlcVersion)}\n}\n`,
       anchor: /^android\s*\{/m,
       offset: 1,
       comment: '//',
     }).contents;
-    gradleConfig.modResults.contents = newSrc;
     return gradleConfig;
   });
 }

package/build/useExtendedVlcPlayer.d.ts

@@ -5,8 +5,8 @@ export interface UseExtendedVlcPlayerOptions {
 }
 /**
  * Returns a stable player object for the given source. The native player
- * is created once (lazy on first method call) and replaced in place when
- * `source` changes via the same `replace` API used by `expo-video`.
+ * is created once on mount and replaced in place when `source` changes via
+ * the same `replace` API used by `expo-video`.
  */
 export declare function useExtendedVlcPlayer(source: ExtendedVlcSource, options?: UseExtendedVlcPlayerOptions): ExtendedVlcPlayer;
 //# sourceMappingURL=useExtendedVlcPlayer.d.ts.map

package/build/useExtendedVlcPlayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useExtendedVlcPlayer.d.ts","sourceRoot":"","sources":["../src/useExtendedVlcPlayer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,iBAAiB,EAEjB,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAqCjB,MAAM,WAAW,2BAA2B;IAC1C,sFAAsF;IACtF,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC/C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,iBAAiB,EACzB,OAAO,GAAE,2BAAgC,GACxC,iBAAiB,CAqGnB"}
+{"version":3,"file":"useExtendedVlcPlayer.d.ts","sourceRoot":"","sources":["../src/useExtendedVlcPlayer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAqCpE,MAAM,WAAW,2BAA2B;IAC1C,sFAAsF;IACtF,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC/C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,iBAAiB,EACzB,OAAO,GAAE,2BAAgC,GACxC,iBAAiB,CA0GnB"}

package/build/useExtendedVlcPlayer.js

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { requireNativeModule } from 'expo-modules-core';
 // Native module is registered by the platform-specific module under the
 // JS module name "ExtendedVlcPlayer". The requireNativeModule helper resolves
@@ -34,8 +34,8 @@ function normalizeSource(source) {
 }
 /**
  * Returns a stable player object for the given source. The native player
- * is created once (lazy on first method call) and replaced in place when
- * `source` changes via the same `replace` API used by `expo-video`.
+ * is created once on mount and replaced in place when `source` changes via
+ * the same `replace` API used by `expo-video`.
  */
 export function useExtendedVlcPlayer(source, options = {}) {
     const normalized = useMemo(() => normalizeSource(source), [source]);
@@ -53,12 +53,36 @@ export function useExtendedVlcPlayer(source, options = {}) {
             isMountedRef.current = false;
         };
     }, []);
+    useEffect(() => {
+        let createdId = 0;
+        try {
+            createdId = getModule().createPlayer();
+            setNativeId(createdId);
+        }
+        catch (error) {
+            // eslint-disable-next-line no-console
+            console.warn('[extended-vlc-player] player creation failed:', error);
+        }
+        return () => {
+            if (createdId <= 0)
+                return;
+            try {
+                getModule().destroyPlayer(createdId);
+            }
+            catch (error) {
+                // eslint-disable-next-line no-console
+                console.warn('[extended-vlc-player] player cleanup failed:', error);
+            }
+        };
+    }, []);
     useEffect(() => {
         // When the source prop changes, ask the native module to swap in place
         // instead of remounting the view (which would reset audio session, PiP
         // delegate wiring, etc.).
+        if (nativeId <= 0)
+            return;
         try {
-            getModule().replace(normalized);
+            getModule().replace(nativeId, normalized);
         }
         catch (error) {
             // Surface as console error; the player view will also emit onError
@@ -66,7 +90,7 @@ export function useExtendedVlcPlayer(source, options = {}) {
             // eslint-disable-next-line no-console
             console.warn('[extended-vlc-player] replace failed:', error);
         }
-    }, [normalized]);
+    }, [nativeId, normalized]);
     // The player object is intentionally stable across renders. Methods are
     // closures over `nativeId` so the latest normalized source is always
     // referenced, but the object identity does not change — consumers can
@@ -85,12 +109,7 @@ export function useExtendedVlcPlayer(source, options = {}) {
             replace: (next) => {
                 const nextNormalized = normalizeSource(next);
                 try {
-                    getModule().replace({
-                        ...nextNormalized,
-                        // Tag the replace with the current nativeId so the existing
-                        // instance is updated rather than a new one allocated.
-                        instanceId: nativeId,
-                    });
+                    getModule().replace(nativeId, nextNormalized);
                 }
                 catch (error) {
                     // eslint-disable-next-line no-console
@@ -118,20 +137,9 @@ export function useExtendedVlcPlayer(source, options = {}) {
             }
         }
     }, [player, options]);
-    // Bump the native id once on mount so the first source prop is committed
-    // to the native side. We use a ref-based "first" instead of an effect to
-    // avoid an extra render.
-    const firstRef = useRef(true);
-    useEffect(() => {
-        if (firstRef.current) {
-            firstRef.current = false;
-            setNativeId(1);
-        }
-    }, []);
-    // Mark unused variables to keep TypeScript happy with strict checks.
-    void useCallback;
+    // Keep the ref in the hook for consumers that unmount while a native call
+    // is in flight; the native registry owns the actual session lifetime.
     void isMountedRef;
-    void undefined;
     return player;
 }
 //# sourceMappingURL=useExtendedVlcPlayer.js.map

package/build/useExtendedVlcPlayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"useExtendedVlcPlayer.js","sourceRoot":"","sources":["../src/useExtendedVlcPlayer.ts"],"names":[],"mappings":"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","sourcesContent":["import { useCallback, useEffect, useMemo, useRef, useState } from 'react';\nimport { requireNativeModule } from 'expo-modules-core';\n\nimport type {\n  ExtendedVlcLoadEvent,\n  ExtendedVlcPlayer,\n  ExtendedVlcProgressEvent,\n  ExtendedVlcSource,\n} from './types';\n\n// Native module is registered by the platform-specific module under the\n// JS module name \"ExtendedVlcPlayer\". The requireNativeModule helper resolves\n// it at runtime; if the native side is missing, accessing the module throws\n// — we surface a clear error so the consumer knows what failed instead of\n// silently producing a no-op player.\nlet nativeModule: any = null;\ntry {\n  nativeModule = requireNativeModule('ExtendedVlcPlayer');\n} catch (error) {\n  // Allow JS-side import of the module to succeed even when the native side\n  // is not yet built (e.g. in a Jest test environment). We throw a helpful\n  // error only when the consumer actually calls a method.\n  nativeModule = null;\n}\n\nfunction getModule() {\n  if (!nativeModule) {\n    throw new Error(\n      '[extended-vlc-player] Native module is not available. ' +\n        'Run `npx expo prebuild --clean` and rebuild the app, ' +\n        'or check that the plugin ran successfully.'\n    );\n  }\n  return nativeModule;\n}\n\nfunction normalizeSource(source: ExtendedVlcSource) {\n  if (typeof source === 'string') return { uri: source };\n  const { uri } = source;\n  if (!uri) {\n    throw new Error('[extended-vlc-player] source.uri is required');\n  }\n  return { uri, headers: source.headers ?? null, drm: source.drm ?? null };\n}\n\nexport interface UseExtendedVlcPlayerOptions {\n  /** Called once after the player is constructed. Useful for attaching PiP handlers. */\n  onReady?: (player: ExtendedVlcPlayer) => void;\n}\n\n/**\n * Returns a stable player object for the given source. The native player\n * is created once (lazy on first method call) and replaced in place when\n * `source` changes via the same `replace` API used by `expo-video`.\n */\nexport function useExtendedVlcPlayer(\n  source: ExtendedVlcSource,\n  options: UseExtendedVlcPlayerOptions = {}\n): ExtendedVlcPlayer {\n  const normalized = useMemo(() => normalizeSource(source), [source]);\n  // We hold a numeric id of the \"current native source\" so we can detect\n  // when the JS source prop has changed and tell the native module to swap.\n  const [nativeId, setNativeId] = useState(0);\n  const isMountedRef = useRef(true);\n\n  // Event subscription is wired through the Fabric view component, not the\n  // module — events flow back into the JS player object via the\n  // ExtendedVlcPlayerView's callbacks. We keep the module call surface\n  // (play/pause/seek/PiP) here.\n\n  useEffect(() => {\n    isMountedRef.current = true;\n    return () => {\n      isMountedRef.current = false;\n    };\n  }, []);\n\n  useEffect(() => {\n    // When the source prop changes, ask the native module to swap in place\n    // instead of remounting the view (which would reset audio session, PiP\n    // delegate wiring, etc.).\n    try {\n      getModule().replace(normalized);\n    } catch (error) {\n      // Surface as console error; the player view will also emit onError\n      // once the Fabric event dispatcher picks it up.\n      // eslint-disable-next-line no-console\n      console.warn('[extended-vlc-player] replace failed:', error);\n    }\n  }, [normalized]);\n\n  // The player object is intentionally stable across renders. Methods are\n  // closures over `nativeId` so the latest normalized source is always\n  // referenced, but the object identity does not change — consumers can\n  // safely put it in dependency arrays.\n  const player = useMemo<ExtendedVlcPlayer>(() => {\n    const p: ExtendedVlcPlayer & { _nativeId: number } = {\n      _nativeId: nativeId,\n      play: () => getModule().play(nativeId),\n      pause: () => getModule().pause(nativeId),\n      stop: () => getModule().stop(nativeId),\n      seek: (seconds: number) => getModule().seek(nativeId, seconds),\n      setRate: (rate: number) => getModule().setRate(nativeId, rate),\n      setVolume: (volume: number) => getModule().setVolume(nativeId, volume),\n      setAudioTrack: (index: number) => getModule().setAudioTrack(nativeId, index),\n      setSubtitleTrack: (index: number) => getModule().setSubtitleTrack(nativeId, index),\n      replace: (next: ExtendedVlcSource) => {\n        const nextNormalized = normalizeSource(next);\n        try {\n          getModule().replace({\n            ...nextNormalized,\n            // Tag the replace with the current nativeId so the existing\n            // instance is updated rather than a new one allocated.\n            instanceId: nativeId,\n          });\n        } catch (error) {\n          // eslint-disable-next-line no-console\n          console.warn('[extended-vlc-player] replace failed:', error);\n        }\n      },\n      startPictureInPicture: () => getModule().startPictureInPicture(nativeId),\n      stopPictureInPicture: () => getModule().stopPictureInPicture(nativeId),\n      isPictureInPictureActive: () => getModule().isPictureInPictureActive(nativeId),\n      isPictureInPictureSupported: () => getModule().isPictureInPictureSupported(),\n    };\n    return p;\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [nativeId]);\n\n  // Bridge the native callback API. The hook surfaces the player as soon\n  // as it exists, so consumers can attach PiP handlers from `onReady`.\n  useEffect(() => {\n    if (options.onReady) {\n      try {\n        options.onReady(player);\n      } catch (error) {\n        // eslint-disable-next-line no-console\n        console.warn('[extended-vlc-player] onReady handler threw:', error);\n      }\n    }\n  }, [player, options]);\n\n  // Bump the native id once on mount so the first source prop is committed\n  // to the native side. We use a ref-based \"first\" instead of an effect to\n  // avoid an extra render.\n  const firstRef = useRef(true);\n  useEffect(() => {\n    if (firstRef.current) {\n      firstRef.current = false;\n      setNativeId(1);\n    }\n  }, []);\n\n  // Mark unused variables to keep TypeScript happy with strict checks.\n  void useCallback;\n  void isMountedRef;\n  void (undefined as ExtendedVlcLoadEvent | ExtendedVlcProgressEvent | undefined);\n\n  return player;\n}\n"]}
+{"version":3,"file":"useExtendedVlcPlayer.js","sourceRoot":"","sources":["../src/useExtendedVlcPlayer.ts"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useMemo, useRef, useState } from 'react';\nimport { requireNativeModule } from 'expo-modules-core';\n\nimport type { ExtendedVlcPlayer, ExtendedVlcSource } from './types';\n\n// Native module is registered by the platform-specific module under the\n// JS module name \"ExtendedVlcPlayer\". The requireNativeModule helper resolves\n// it at runtime; if the native side is missing, accessing the module throws\n// — we surface a clear error so the consumer knows what failed instead of\n// silently producing a no-op player.\nlet nativeModule: any = null;\ntry {\n  nativeModule = requireNativeModule('ExtendedVlcPlayer');\n} catch (error) {\n  // Allow JS-side import of the module to succeed even when the native side\n  // is not yet built (e.g. in a Jest test environment). We throw a helpful\n  // error only when the consumer actually calls a method.\n  nativeModule = null;\n}\n\nfunction getModule() {\n  if (!nativeModule) {\n    throw new Error(\n      '[extended-vlc-player] Native module is not available. ' +\n        'Run `npx expo prebuild --clean` and rebuild the app, ' +\n        'or check that the plugin ran successfully.'\n    );\n  }\n  return nativeModule;\n}\n\nfunction normalizeSource(source: ExtendedVlcSource) {\n  if (typeof source === 'string') return { uri: source };\n  const { uri } = source;\n  if (!uri) {\n    throw new Error('[extended-vlc-player] source.uri is required');\n  }\n  return { uri, headers: source.headers ?? null, drm: source.drm ?? null };\n}\n\nexport interface UseExtendedVlcPlayerOptions {\n  /** Called once after the player is constructed. Useful for attaching PiP handlers. */\n  onReady?: (player: ExtendedVlcPlayer) => void;\n}\n\n/**\n * Returns a stable player object for the given source. The native player\n * is created once on mount and replaced in place when `source` changes via\n * the same `replace` API used by `expo-video`.\n */\nexport function useExtendedVlcPlayer(\n  source: ExtendedVlcSource,\n  options: UseExtendedVlcPlayerOptions = {}\n): ExtendedVlcPlayer {\n  const normalized = useMemo(() => normalizeSource(source), [source]);\n  // We hold a numeric id of the \"current native source\" so we can detect\n  // when the JS source prop has changed and tell the native module to swap.\n  const [nativeId, setNativeId] = useState(0);\n  const isMountedRef = useRef(true);\n\n  // Event subscription is wired through the Fabric view component, not the\n  // module — events flow back into the JS player object via the\n  // ExtendedVlcPlayerView's callbacks. We keep the module call surface\n  // (play/pause/seek/PiP) here.\n\n  useEffect(() => {\n    isMountedRef.current = true;\n    return () => {\n      isMountedRef.current = false;\n    };\n  }, []);\n\n  useEffect(() => {\n    let createdId = 0;\n    try {\n      createdId = getModule().createPlayer();\n      setNativeId(createdId);\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.warn('[extended-vlc-player] player creation failed:', error);\n    }\n\n    return () => {\n      if (createdId <= 0) return;\n      try {\n        getModule().destroyPlayer(createdId);\n      } catch (error) {\n        // eslint-disable-next-line no-console\n        console.warn('[extended-vlc-player] player cleanup failed:', error);\n      }\n    };\n  }, []);\n\n  useEffect(() => {\n    // When the source prop changes, ask the native module to swap in place\n    // instead of remounting the view (which would reset audio session, PiP\n    // delegate wiring, etc.).\n    if (nativeId <= 0) return;\n    try {\n      getModule().replace(nativeId, normalized);\n    } catch (error) {\n      // Surface as console error; the player view will also emit onError\n      // once the Fabric event dispatcher picks it up.\n      // eslint-disable-next-line no-console\n      console.warn('[extended-vlc-player] replace failed:', error);\n    }\n  }, [nativeId, normalized]);\n\n  // The player object is intentionally stable across renders. Methods are\n  // closures over `nativeId` so the latest normalized source is always\n  // referenced, but the object identity does not change — consumers can\n  // safely put it in dependency arrays.\n  const player = useMemo<ExtendedVlcPlayer>(() => {\n    const p: ExtendedVlcPlayer & { _nativeId: number } = {\n      _nativeId: nativeId,\n      play: () => getModule().play(nativeId),\n      pause: () => getModule().pause(nativeId),\n      stop: () => getModule().stop(nativeId),\n      seek: (seconds: number) => getModule().seek(nativeId, seconds),\n      setRate: (rate: number) => getModule().setRate(nativeId, rate),\n      setVolume: (volume: number) => getModule().setVolume(nativeId, volume),\n      setAudioTrack: (index: number) => getModule().setAudioTrack(nativeId, index),\n      setSubtitleTrack: (index: number) => getModule().setSubtitleTrack(nativeId, index),\n      replace: (next: ExtendedVlcSource) => {\n        const nextNormalized = normalizeSource(next);\n        try {\n          getModule().replace(nativeId, nextNormalized);\n        } catch (error) {\n          // eslint-disable-next-line no-console\n          console.warn('[extended-vlc-player] replace failed:', error);\n        }\n      },\n      startPictureInPicture: () => getModule().startPictureInPicture(nativeId),\n      stopPictureInPicture: () => getModule().stopPictureInPicture(nativeId),\n      isPictureInPictureActive: () => getModule().isPictureInPictureActive(nativeId),\n      isPictureInPictureSupported: () => getModule().isPictureInPictureSupported(),\n    };\n    return p;\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [nativeId]);\n\n  // Bridge the native callback API. The hook surfaces the player as soon\n  // as it exists, so consumers can attach PiP handlers from `onReady`.\n  useEffect(() => {\n    if (options.onReady) {\n      try {\n        options.onReady(player);\n      } catch (error) {\n        // eslint-disable-next-line no-console\n        console.warn('[extended-vlc-player] onReady handler threw:', error);\n      }\n    }\n  }, [player, options]);\n\n  // Keep the ref in the hook for consumers that unmount while a native call\n  // is in flight; the native registry owns the actual session lifetime.\n  void isMountedRef;\n\n  return player;\n}\n"]}

package/ios/ExtendedVlcPlayerModule.swift

@@ -19,6 +19,14 @@ public final class ExtendedVlcPlayerModule: Module {
       AudioSessionConfigurator.configureForPlayback()
     }
 
+    Function("createPlayer") { () -> Int in
+      PlayerRegistry.shared.next().0
+    }
+
+    Function("destroyPlayer") { (instanceId: Int) in
+      PlayerRegistry.shared.remove(id: instanceId)
+    }
+
     AsyncFunction("isPictureInPictureSupported") { () -> Bool in
       AVPictureInPictureController.isPictureInPictureSupported()
     }

package/ios/ExtendedVlcPlayerViewComponentView.mm

@@ -33,6 +33,19 @@ RCT_EXPORT_VIEW_PROPERTY(onBuffering, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPictureInPictureStart, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPictureInPictureStop, RCTBubblingEventBlock)
 
+- (void)setPlayer:(NSNumber *)player
+{
+  NSNumber *nextId = player ?: @0;
+  if (self.playerId != nil && [self.playerId isEqualToNumber:nextId]) {
+    [self attachSessionIfPossible];
+    return;
+  }
+
+  [self detachSession];
+  self.playerId = nextId;
+  [self attachSessionIfPossible];
+}
+
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
   return [RCTViewComponentView new];
@@ -49,23 +62,47 @@ RCT_EXPORT_VIEW_PROPERTY(onPictureInPictureStop, RCTBubblingEventBlock)
 - (void)didMoveToWindow
 {
   [super didMoveToWindow];
-  if (self.window != nil && self.playerId == nil) {
-    NSNumber *newId = [EXVLCPlayerRegistryBridge createSession];
-    self.playerId = newId;
-    NSValue *boxed = [EXVLCPlayerRegistryBridge sessionForId:newId];
-    PlayerSession *session = (PlayerSession *)[boxed nonretainedObjectValue];
-    if (session != nil) {
-      session.drawable.frame = self.contentView.bounds;
-      session.drawable.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-      [self.contentView addSubview:session.drawable];
-      [EXVLCPlayerRegistryBridge attachEventSinks:newId view:self];
-    }
+  [self attachSessionIfPossible];
+}
+
+- (void)attachSessionIfPossible
+{
+  if (self.window == nil || self.playerId == nil || self.playerId.intValue == 0) {
+    return;
   }
+
+  NSValue *boxed = [EXVLCPlayerRegistryBridge sessionForId:self.playerId];
+  PlayerSession *session = (PlayerSession *)[boxed nonretainedObjectValue];
+  if (session == nil) {
+    return;
+  }
+
+  if (session.drawable.superview != self.contentView) {
+    session.drawable.frame = self.contentView.bounds;
+    session.drawable.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    [self.contentView addSubview:session.drawable];
+  }
+  [EXVLCPlayerRegistryBridge attachEventSinks:self.playerId view:self];
+}
+
+- (void)detachSession
+{
+  if (self.playerId == nil || self.playerId.intValue == 0) {
+    return;
+  }
+
+  NSValue *boxed = [EXVLCPlayerRegistryBridge sessionForId:self.playerId];
+  PlayerSession *session = (PlayerSession *)[boxed nonretainedObjectValue];
+  if (session != nil && session.drawable.superview == self.contentView) {
+    [session.drawable removeFromSuperview];
+  }
+  [EXVLCPlayerRegistryBridge detachEventSinks:self.playerId];
 }
 
 - (void)dealloc
 {
-  if (self.playerId != nil) {
+  [self detachSession];
+  if (self.playerId != nil && self.playerId.intValue != 0) {
     [EXVLCPlayerRegistryBridge destroySession:self.playerId];
   }
 }

package/ios/PlayerRegistryBridge.swift

@@ -56,6 +56,19 @@ final class PlayerRegistryBridge: NSObject {
       (view as? ExtendedVlcPlayerViewEventReceiver)?.exvlcEmit("onPictureInPictureStop", [:])
     }
   }
+
+  @objc static func detachEventSinks(_ id: NSNumber) {
+    guard let session = PlayerRegistry.shared.session(for: id.intValue) else { return }
+    session.onLoad = nil
+    session.onProgress = nil
+    session.onPlaying = nil
+    session.onPaused = nil
+    session.onEnded = nil
+    session.onError = nil
+    session.onBuffering = nil
+    session.onPictureInPictureStart = nil
+    session.onPictureInPictureStop = nil
+  }
 }
 
 /// Implemented by the Fabric component view (in Obj-C++) so that the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extended-vlc-player",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "React Native video player built on MobileVLCKit (iOS) and libVLC (Android) with true iOS Picture-in-Picture via AVSampleBufferDisplayLayer bridge.",
   "license": "MIT",
   "main": "build/index.js",

package/src/useExtendedVlcPlayer.ts

@@ -1,12 +1,7 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { requireNativeModule } from 'expo-modules-core';
 
-import type {
-  ExtendedVlcLoadEvent,
-  ExtendedVlcPlayer,
-  ExtendedVlcProgressEvent,
-  ExtendedVlcSource,
-} from './types';
+import type { ExtendedVlcPlayer, ExtendedVlcSource } from './types';
 
 // Native module is registered by the platform-specific module under the
 // JS module name "ExtendedVlcPlayer". The requireNativeModule helper resolves
@@ -50,8 +45,8 @@ export interface UseExtendedVlcPlayerOptions {
 
 /**
  * Returns a stable player object for the given source. The native player
- * is created once (lazy on first method call) and replaced in place when
- * `source` changes via the same `replace` API used by `expo-video`.
+ * is created once on mount and replaced in place when `source` changes via
+ * the same `replace` API used by `expo-video`.
  */
 export function useExtendedVlcPlayer(
   source: ExtendedVlcSource,
@@ -75,19 +70,41 @@ export function useExtendedVlcPlayer(
     };
   }, []);
 
+  useEffect(() => {
+    let createdId = 0;
+    try {
+      createdId = getModule().createPlayer();
+      setNativeId(createdId);
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.warn('[extended-vlc-player] player creation failed:', error);
+    }
+
+    return () => {
+      if (createdId <= 0) return;
+      try {
+        getModule().destroyPlayer(createdId);
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn('[extended-vlc-player] player cleanup failed:', error);
+      }
+    };
+  }, []);
+
   useEffect(() => {
     // When the source prop changes, ask the native module to swap in place
     // instead of remounting the view (which would reset audio session, PiP
     // delegate wiring, etc.).
+    if (nativeId <= 0) return;
     try {
-      getModule().replace(normalized);
+      getModule().replace(nativeId, normalized);
     } catch (error) {
       // Surface as console error; the player view will also emit onError
       // once the Fabric event dispatcher picks it up.
       // eslint-disable-next-line no-console
       console.warn('[extended-vlc-player] replace failed:', error);
     }
-  }, [normalized]);
+  }, [nativeId, normalized]);
 
   // The player object is intentionally stable across renders. Methods are
   // closures over `nativeId` so the latest normalized source is always
@@ -107,12 +124,7 @@ export function useExtendedVlcPlayer(
       replace: (next: ExtendedVlcSource) => {
         const nextNormalized = normalizeSource(next);
         try {
-          getModule().replace({
-            ...nextNormalized,
-            // Tag the replace with the current nativeId so the existing
-            // instance is updated rather than a new one allocated.
-            instanceId: nativeId,
-          });
+          getModule().replace(nativeId, nextNormalized);
         } catch (error) {
           // eslint-disable-next-line no-console
           console.warn('[extended-vlc-player] replace failed:', error);
@@ -140,21 +152,9 @@ export function useExtendedVlcPlayer(
     }
   }, [player, options]);
 
-  // Bump the native id once on mount so the first source prop is committed
-  // to the native side. We use a ref-based "first" instead of an effect to
-  // avoid an extra render.
-  const firstRef = useRef(true);
-  useEffect(() => {
-    if (firstRef.current) {
-      firstRef.current = false;
-      setNativeId(1);
-    }
-  }, []);
-
-  // Mark unused variables to keep TypeScript happy with strict checks.
-  void useCallback;
+  // Keep the ref in the hook for consumers that unmount while a native call
+  // is in flight; the native registry owns the actual session lifetime.
   void isMountedRef;
-  void (undefined as ExtendedVlcLoadEvent | ExtendedVlcProgressEvent | undefined);
 
   return player;
 }