@fishjam-cloud/react-native-client 0.23.0-RC.0 → 0.24.0

package/build/livestream/hooks/useLivestreamViewer.js

@@ -1,5 +1,5 @@
-import { useCallback, useEffect, useRef } from 'react';
-import { WhepClient, useWhepConnectionState } from 'react-native-whip-whep';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { useWhepConnectionState, } from 'react-native-whip-whep';
 import { FISHJAM_WHEP_URL } from '../../consts';
 const urlFromConfig = (config) => {
     if (config.streamId)
@@ -12,34 +12,62 @@ const urlFromConfig = (config) => {
  * @group Hooks
  */
 export const useLivestreamViewer = () => {
+    const [isLoading, setIsLoading] = useState(false);
+    const [isInitialized, setIsInitialized] = useState(false);
     const state = useWhepConnectionState();
     const isConnected = state === 'connected';
-    const whepClient = useRef(null);
+    const whepClientRef = useRef(null);
+    const isConnectingRef = useRef(false);
     useEffect(() => {
         const createClient = () => {
-            whepClient.current = new WhepClient({
+            whepClientRef.current?.createWhepClient({
                 audioEnabled: true,
                 videoEnabled: true,
             });
         };
         createClient();
+        const ref = whepClientRef.current;
         return () => {
-            whepClient.current?.disconnect();
+            ref?.disconnect();
         };
     }, []);
     const connect = useCallback(async (config, url) => {
-        await whepClient.current?.connect({
-            serverUrl: url ?? urlFromConfig(config),
-            authToken: config.token,
-        });
-    }, []);
+        if (isConnectingRef.current) {
+            return;
+        }
+        isConnectingRef.current = true;
+        setIsLoading(true);
+        try {
+            if (!isInitialized) {
+                await whepClientRef.current?.createWhepClient({
+                    audioEnabled: true,
+                    videoEnabled: true,
+                });
+                setIsInitialized(true);
+            }
+            await whepClientRef.current?.connect({
+                serverUrl: url ?? urlFromConfig(config),
+                authToken: config.token,
+            });
+            setIsLoading(false);
+        }
+        catch (error) {
+            console.error('Failed to connect to WHEP Client', error);
+            setIsLoading(false);
+        }
+        finally {
+            isConnectingRef.current = false;
+        }
+    }, [isInitialized]);
     const disconnect = useCallback(async () => {
-        await whepClient.current?.disconnect();
+        await whepClientRef.current?.disconnect();
     }, []);
     return {
         connect,
         disconnect,
+        whepClientRef,
         isConnected,
+        isLoading,
     };
 };
 //# sourceMappingURL=useLivestreamViewer.js.map

package/build/livestream/hooks/useLivestreamViewer.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLivestreamViewer.js","sourceRoot":"","sources":["../../../src/livestream/hooks/useLivestreamViewer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMhD,MAAM,aAAa,GAAG,CAAC,MAA2B,EAAE,EAAE;IACpD,IAAI,MAAM,CAAC,QAAQ;QAAE,OAAO,GAAG,gBAAgB,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;IACrE,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAkBF;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAA8B,EAAE;IACjE,MAAM,KAAK,GAAG,sBAAsB,EAAE,CAAC;IACvC,MAAM,WAAW,GAAG,KAAK,KAAK,WAAW,CAAC;IAE1C,MAAM,UAAU,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,GAAG,EAAE;YACxB,UAAU,CAAC,OAAO,GAAG,IAAI,UAAU,CAAC;gBAClC,YAAY,EAAE,IAAI;gBAClB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC,CAAC;QACF,YAAY,EAAE,CAAC;QAEf,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;QACnC,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,OAAO,GAAG,WAAW,CACzB,KAAK,EAAE,MAA2B,EAAE,GAAY,EAAE,EAAE;QAClD,MAAM,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC;YAChC,SAAS,EAAE,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC;YACvC,SAAS,EAAE,MAAM,CAAC,KAAK;SACxB,CAAC,CAAC;IACL,CAAC,EACD,EAAE,CACH,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACxC,MAAM,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;IACzC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,OAAO;QACP,UAAU;QACV,WAAW;KACZ,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { useCallback, useEffect, useRef } from 'react';\nimport { WhepClient, useWhepConnectionState } from 'react-native-whip-whep';\nimport { FISHJAM_WHEP_URL } from '../../consts';\n\nexport type ConnectViewerConfig =\n  | { token: string; streamId?: never }\n  | { streamId: string; token?: never };\n\nconst urlFromConfig = (config: ConnectViewerConfig) => {\n  if (config.streamId) return `${FISHJAM_WHEP_URL}/${config.streamId}`;\n  return FISHJAM_WHEP_URL;\n};\n\n/**\n * @category Livestream\n */\nexport interface useLivestreamViewerResult {\n  /**\n   * Callback to start receiving a livestream.\n   * If the livestream is private, provide `token`.\n   * If the livestream is public, provide `streamId`.\n   */\n  connect: (config: ConnectViewerConfig, url?: string) => Promise<void>;\n  /** Disconnect from a stream previously connected to with {@link connect} */\n  disconnect: () => Promise<void>;\n  /** Utility flag which indicates the current connection status */\n  isConnected: boolean;\n}\n\n/**\n * Hook for receiving a published livestream.\n * @category Livestream\n * @group Hooks\n */\nexport const useLivestreamViewer = (): useLivestreamViewerResult => {\n  const state = useWhepConnectionState();\n  const isConnected = state === 'connected';\n\n  const whepClient = useRef<WhepClient | null>(null);\n\n  useEffect(() => {\n    const createClient = () => {\n      whepClient.current = new WhepClient({\n        audioEnabled: true,\n        videoEnabled: true,\n      });\n    };\n    createClient();\n\n    return () => {\n      whepClient.current?.disconnect();\n    };\n  }, []);\n\n  const connect = useCallback(\n    async (config: ConnectViewerConfig, url?: string) => {\n      await whepClient.current?.connect({\n        serverUrl: url ?? urlFromConfig(config),\n        authToken: config.token,\n      });\n    },\n    [],\n  );\n\n  const disconnect = useCallback(async () => {\n    await whepClient.current?.disconnect();\n  }, []);\n\n  return {\n    connect,\n    disconnect,\n    isConnected,\n  };\n};\n"]}
+{"version":3,"file":"useLivestreamViewer.js","sourceRoot":"","sources":["../../../src/livestream/hooks/useLivestreamViewer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EACL,sBAAsB,GAEvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMhD,MAAM,aAAa,GAAG,CAAC,MAA2B,EAAE,EAAE;IACpD,IAAI,MAAM,CAAC,QAAQ;QAAE,OAAO,GAAG,gBAAgB,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;IACrE,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAwBF;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAA8B,EAAE;IACjE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,sBAAsB,EAAE,CAAC;IACvC,MAAM,WAAW,GAAG,KAAK,KAAK,WAAW,CAAC;IAE1C,MAAM,aAAa,GAAG,MAAM,CAA2B,IAAI,CAAC,CAAC;IAC7D,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,GAAG,EAAE;YACxB,aAAa,CAAC,OAAO,EAAE,gBAAgB,CAAC;gBACtC,YAAY,EAAE,IAAI;gBAClB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC,CAAC;QACF,YAAY,EAAE,CAAC;QAEf,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC;QAClC,OAAO,GAAG,EAAE;YACV,GAAG,EAAE,UAAU,EAAE,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,OAAO,GAAG,WAAW,CACzB,KAAK,EAAE,MAA2B,EAAE,GAAY,EAAE,EAAE;QAClD,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC;QAC/B,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnB,IAAI,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,aAAa,CAAC,OAAO,EAAE,gBAAgB,CAAC;oBAC5C,YAAY,EAAE,IAAI;oBAClB,YAAY,EAAE,IAAI;iBACnB,CAAC,CAAC;gBACH,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YAED,MAAM,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC;gBACnC,SAAS,EAAE,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC;gBACvC,SAAS,EAAE,MAAM,CAAC,KAAK;aACxB,CAAC,CAAC;YAEH,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;YACzD,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;gBAAS,CAAC;YACT,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC;QAClC,CAAC;IACH,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACxC,MAAM,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;IAC5C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,OAAO;QACP,UAAU;QACV,aAAa;QACb,WAAW;QACX,SAAS;KACV,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { useCallback, useEffect, useRef, useState } from 'react';\nimport {\n  useWhepConnectionState,\n  WhepClientViewRef,\n} from 'react-native-whip-whep';\nimport { FISHJAM_WHEP_URL } from '../../consts';\n\nexport type ConnectViewerConfig =\n  | { token: string; streamId?: never }\n  | { streamId: string; token?: never };\n\nconst urlFromConfig = (config: ConnectViewerConfig) => {\n  if (config.streamId) return `${FISHJAM_WHEP_URL}/${config.streamId}`;\n  return FISHJAM_WHEP_URL;\n};\n\n/**\n * @category Livestream\n */\nexport interface useLivestreamViewerResult {\n  /**\n   * Callback to start receiving a livestream.\n   * If the livestream is private, provide `token`.\n   * If the livestream is public, provide `streamId`.\n   */\n  connect: (config: ConnectViewerConfig, url?: string) => Promise<void>;\n  /** Disconnect from a stream previously connected to with {@link connect} */\n  disconnect: () => Promise<void>;\n  /** Utility flag which indicates the current connection status */\n  isConnected: boolean;\n  /** Utility flag which indicates if whep client is connecting */\n  isLoading: boolean;\n  /**\n   * Reference to the WhepClient instance. Needs to be passed to the {@link LivestreamViewer} component.\n   */\n  whepClientRef: React.RefObject<WhepClientViewRef | null>;\n}\n\n/**\n * Hook for receiving a published livestream.\n * @category Livestream\n * @group Hooks\n */\nexport const useLivestreamViewer = (): useLivestreamViewerResult => {\n  const [isLoading, setIsLoading] = useState(false);\n  const [isInitialized, setIsInitialized] = useState(false);\n  const state = useWhepConnectionState();\n  const isConnected = state === 'connected';\n\n  const whepClientRef = useRef<WhepClientViewRef | null>(null);\n  const isConnectingRef = useRef(false);\n\n  useEffect(() => {\n    const createClient = () => {\n      whepClientRef.current?.createWhepClient({\n        audioEnabled: true,\n        videoEnabled: true,\n      });\n    };\n    createClient();\n\n    const ref = whepClientRef.current;\n    return () => {\n      ref?.disconnect();\n    };\n  }, []);\n\n  const connect = useCallback(\n    async (config: ConnectViewerConfig, url?: string) => {\n      if (isConnectingRef.current) {\n        return;\n      }\n\n      isConnectingRef.current = true;\n      setIsLoading(true);\n\n      try {\n        if (!isInitialized) {\n          await whepClientRef.current?.createWhepClient({\n            audioEnabled: true,\n            videoEnabled: true,\n          });\n          setIsInitialized(true);\n        }\n\n        await whepClientRef.current?.connect({\n          serverUrl: url ?? urlFromConfig(config),\n          authToken: config.token,\n        });\n\n        setIsLoading(false);\n      } catch (error) {\n        console.error('Failed to connect to WHEP Client', error);\n        setIsLoading(false);\n      } finally {\n        isConnectingRef.current = false;\n      }\n    },\n    [isInitialized],\n  );\n\n  const disconnect = useCallback(async () => {\n    await whepClientRef.current?.disconnect();\n  }, []);\n\n  return {\n    connect,\n    disconnect,\n    whepClientRef,\n    isConnected,\n    isLoading,\n  };\n};\n"]}

package/build/livestream/index.d.ts

@@ -2,7 +2,8 @@ export { LivestreamStreamer } from './components/LivestreamStreamer';
 export { LivestreamViewer } from './components/LivestreamViewer';
 export { useLivestreamViewer } from './hooks/useLivestreamViewer';
 export { useLivestreamStreamer } from './hooks/useLivestreamStreamer';
-export { cameras, VideoParameters, WhipClient, WhepClient, } from 'react-native-whip-whep';
+export { useLivestreamScreenSharingStreamer } from './hooks/useLivestreamScreenSharingStreamer';
+export { cameras, VideoParameters } from 'react-native-whip-whep';
 export type { LivestreamStreamerProps } from './components/LivestreamStreamer';
 export type { ConnectViewerConfig } from './hooks/useLivestreamViewer';
 export type { useLivestreamViewerResult } from './hooks/useLivestreamViewer';

package/build/livestream/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/livestream/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EACL,OAAO,EACP,eAAe,EACf,UAAU,EACV,UAAU,GACX,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,YAAY,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,YAAY,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,YAAY,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACjF,YAAY,EACV,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/livestream/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,kCAAkC,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAClE,YAAY,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,YAAY,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,YAAY,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,YAAY,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACjF,YAAY,EACV,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,+BAA+B,CAAC"}

package/build/livestream/index.js

@@ -2,5 +2,6 @@ export { LivestreamStreamer } from './components/LivestreamStreamer';
 export { LivestreamViewer } from './components/LivestreamViewer';
 export { useLivestreamViewer } from './hooks/useLivestreamViewer';
 export { useLivestreamStreamer } from './hooks/useLivestreamStreamer';
-export { cameras, VideoParameters, WhipClient, WhepClient, } from 'react-native-whip-whep';
+export { useLivestreamScreenSharingStreamer } from './hooks/useLivestreamScreenSharingStreamer';
+export { cameras, VideoParameters } from 'react-native-whip-whep';
 //# sourceMappingURL=index.js.map

package/build/livestream/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/livestream/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EACL,OAAO,EACP,eAAe,EACf,UAAU,EACV,UAAU,GACX,MAAM,wBAAwB,CAAC","sourcesContent":["export { LivestreamStreamer } from './components/LivestreamStreamer';\nexport { LivestreamViewer } from './components/LivestreamViewer';\nexport { useLivestreamViewer } from './hooks/useLivestreamViewer';\nexport { useLivestreamStreamer } from './hooks/useLivestreamStreamer';\nexport {\n  cameras,\n  VideoParameters,\n  WhipClient,\n  WhepClient,\n} from 'react-native-whip-whep';\nexport type { LivestreamStreamerProps } from './components/LivestreamStreamer';\nexport type { ConnectViewerConfig } from './hooks/useLivestreamViewer';\nexport type { useLivestreamViewerResult } from './hooks/useLivestreamViewer';\nexport type { useLivestreamStreamerResult } from './hooks/useLivestreamStreamer';\nexport type {\n  LivestreamViewerProps,\n  LivestreamViewerRef,\n} from './components/LivestreamViewer';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/livestream/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,kCAAkC,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC","sourcesContent":["export { LivestreamStreamer } from './components/LivestreamStreamer';\nexport { LivestreamViewer } from './components/LivestreamViewer';\nexport { useLivestreamViewer } from './hooks/useLivestreamViewer';\nexport { useLivestreamStreamer } from './hooks/useLivestreamStreamer';\nexport { useLivestreamScreenSharingStreamer } from './hooks/useLivestreamScreenSharingStreamer';\nexport { cameras, VideoParameters } from 'react-native-whip-whep';\nexport type { LivestreamStreamerProps } from './components/LivestreamStreamer';\nexport type { ConnectViewerConfig } from './hooks/useLivestreamViewer';\nexport type { useLivestreamViewerResult } from './hooks/useLivestreamViewer';\nexport type { useLivestreamStreamerResult } from './hooks/useLivestreamStreamer';\nexport type {\n  LivestreamViewerProps,\n  LivestreamViewerRef,\n} from './components/LivestreamViewer';\n"]}

package/expo-module.config.json

@@ -4,14 +4,16 @@
     "modules": [
       "RNFishjamClientModule",
       "VideoPreviewViewModule",
-      "VideoRendererViewModule"
+      "VideoRendererViewModule",
+      "PipContainerViewModule"
     ]
   },
   "android": {
     "modules": [
       "io.fishjam.reactnative.RNFishjamClientModule",
       "io.fishjam.reactnative.VideoPreviewViewModule",
-      "io.fishjam.reactnative.VideoRendererViewModule"
+      "io.fishjam.reactnative.VideoRendererViewModule",
+      "io.fishjam.reactnative.PipContainerViewModule"
     ]
   }
 }

package/ios/PictureInPictureManager.swift

@@ -0,0 +1,215 @@
+import AVKit
+import FishjamCloudClient
+import WebRTC
+
+@MainActor
+class PictureInPictureManager {
+    private let sourceView: UIView
+    private let eventEmitter: (EmitableEvent) -> Void
+    private weak var fishjamClient: FishjamClient?
+    private var lastActiveVadInfo: RemoteTrackInfo? = nil
+    
+    private var controller: PictureInPictureController?
+    
+    private var startAutomatically: Bool {
+        didSet {
+            controller?.startAutomatically = startAutomatically
+        }
+    }
+    
+    private var stopAutomatically: Bool {
+        didSet {
+            controller?.stopAutomatically = stopAutomatically
+        }
+    }
+    
+    var primaryPlaceholderText: String = "No camera" {
+        didSet {
+            controller?.primaryPlaceholderText = primaryPlaceholderText
+        }
+    }
+    
+    var secondaryPlaceholderText: String = "No active speaker" {
+        didSet {
+            controller?.secondaryPlaceholderText = secondaryPlaceholderText
+        }
+    }
+
+    init(
+        sourceView: UIView,
+        eventEmitter: @escaping (EmitableEvent) -> Void,
+        fishjamClient: FishjamClient?
+    ) {
+        self.sourceView = sourceView
+        self.eventEmitter = eventEmitter
+        self.fishjamClient = fishjamClient
+        self.startAutomatically = true
+        self.stopAutomatically = true
+        
+        RNFishjamClient.tracksUpdateListenersManager.add(self)
+    }
+    
+    deinit {
+        RNFishjamClient.tracksUpdateListenersManager.remove(self)
+    }
+    
+    @discardableResult
+    private func ensureController() -> PictureInPictureController? {
+        if controller == nil {
+            let newController = PictureInPictureController(
+                sourceView: sourceView,
+                primaryPlaceholder: primaryPlaceholderText,
+                secondaryPlaceholder: secondaryPlaceholderText
+            )
+            newController.startAutomatically = startAutomatically
+            newController.stopAutomatically = stopAutomatically
+            controller = newController
+            
+            updateTracks()
+        }
+        return controller
+    }
+    
+    private func findLocalCameraTrack() -> RTCVideoTrack? {
+        guard let fishjamClient = fishjamClient else { return nil }
+        
+        let localEndpoint = fishjamClient.getLocalEndpoint()
+        
+        for (_, track) in localEndpoint.tracks {
+            if let videoTrack = track as? LocalVideoTrack,
+               track.metadata.toDict()["type"] as? String == "camera" {
+                return videoTrack.mediaTrack as? RTCVideoTrack
+            }
+        }
+        
+        return nil
+    }
+    
+    private func findRemoteVadActiveTrack() -> RemoteTrackInfo? {
+        guard let fishjamClient else { return nil }
+        
+        let remoteEndpoints = fishjamClient.getRemoteEndpoints()
+        
+        // First pass: look for active VAD
+        for endpoint in remoteEndpoints {
+            // Check if this endpoint has an active VAD audio track
+            let hasActiveVad = endpoint.tracks.values.contains { track in
+                if let audioTrack = track as? RemoteAudioTrack {
+                    return audioTrack.vadStatus == .speech
+                }
+                return false
+            }
+            
+            if hasActiveVad {
+                let videoTrack = endpoint.tracks.values.first { track in
+                    track is RemoteVideoTrack
+                } as? RemoteVideoTrack
+                lastActiveVadInfo = trackToTrackInfo(videoTrack: videoTrack, endpoint: endpoint)
+                return lastActiveVadInfo
+            }
+        }
+        if lastActiveVadInfo != nil {
+            return lastActiveVadInfo
+        }
+        
+        // Fallback: return first available remote peer with video track
+        for endpoint in remoteEndpoints {
+            if let videoTrack = endpoint.tracks.values.first(where: { $0 is RemoteVideoTrack }) as? RemoteVideoTrack {
+                return trackToTrackInfo(videoTrack: videoTrack, endpoint: endpoint)
+            }
+        }
+        
+        return nil
+    }
+    
+    private func trackToTrackInfo(videoTrack: RemoteVideoTrack?, endpoint: Endpoint) -> RemoteTrackInfo {
+        let metadataDict = endpoint.metadata.toDict()
+        let peerMetadata = metadataDict["peer"] as? [String: String]
+        let displayName = peerMetadata?["displayName"] ?? peerMetadata?["name"]
+        
+        var isVideoTrackActive: Bool? = nil
+        if videoTrack?.metadata["active"] as? Bool == false { isVideoTrackActive = false }
+        if videoTrack?.metadata["paused"] as? Bool == true { isVideoTrackActive = false }
+        
+        return RemoteTrackInfo(
+            videoTrack: videoTrack?.mediaTrack as? RTCVideoTrack,
+            displayName: displayName,
+            hasVideoTrack: videoTrack != nil,
+            isVideoActive: isVideoTrackActive ?? true
+        )
+    }
+    
+    private func updateTracks() {
+        guard let pipController = controller else { return }
+        
+        let localCameraTrack = findLocalCameraTrack()
+        let remoteTrackInfo = findRemoteVadActiveTrack()
+        
+        pipController.primaryVideoTrack = localCameraTrack
+        pipController.updateSecondaryTrack(trackInfo: remoteTrackInfo)
+    }
+    
+
+    
+    private func emitWarning(_ message: String) {
+        eventEmitter(.warning(message: message))
+    }
+    
+    
+    func start() {
+        _ = ensureController()
+        controller?.startPictureInPicture()
+    }
+    
+    func stop() {
+        controller?.stopPictureInPicture()
+        lastActiveVadInfo = nil
+    }
+    
+    func setAllowsCameraWhileInPictureInPicture(_ enabled: Bool) {
+        guard let fishjamClient = fishjamClient else {
+            emitWarning("PictureInPicture: Fishjam client not available")
+            return
+        }
+        
+        let localEndpoint = fishjamClient.getLocalEndpoint()
+        guard let cameraTrack = localEndpoint.tracks.compactMap({ $0.value as? LocalCameraTrack }).first else {
+            emitWarning("PictureInPicture: Unable to configure background camera - camera not initialized")
+            return
+        }
+        
+        guard cameraTrack.isMultitaskingCameraAccessSupported() else {
+            emitWarning("PictureInPicture: Background camera is not supported on this device.")
+            return
+        }
+
+        cameraTrack.setMultitaskingCameraAccessEnabled(enabled)
+    }
+    
+    func setStartAutomatically(_ enabled: Bool) {
+        if enabled {
+            ensureController()
+        }
+        startAutomatically = enabled
+        controller?.startAutomatically = enabled
+    }
+    
+    func setStopAutomatically(_ enabled: Bool) {
+        stopAutomatically = enabled
+        controller?.stopAutomatically = enabled
+    }
+    
+    func cleanup() {
+        controller?.stopPictureInPicture()
+        controller = nil
+        lastActiveVadInfo = nil
+    }
+}
+
+extension PictureInPictureManager: TrackUpdateListener {
+    nonisolated func onTracksUpdate() {
+        Task { @MainActor in
+            updateTracks()
+        }
+    }
+}

package/ios/PipContainerView.swift

@@ -0,0 +1,56 @@
+import ExpoModulesCore
+
+@MainActor
+class PipContainerView: ExpoView {
+    private var pipManager: PictureInPictureManager!
+    
+    required init(appContext: AppContext? = nil) {
+        super.init(appContext: appContext)
+        pipManager = PictureInPictureManager(
+            sourceView: self,
+            eventEmitter: { event in
+                RNFishjamClient.sendEvent?(event)
+            },
+            fishjamClient: RNFishjamClient.fishjamClient
+        )
+    }
+    
+    var startAutomatically: Bool = true {
+        didSet {
+            pipManager.setStartAutomatically(startAutomatically)
+        }
+    }
+    
+    var stopAutomatically: Bool = true {
+        didSet {
+            pipManager.setStopAutomatically(stopAutomatically)
+        }
+    }
+    
+    var allowsCameraInBackground: Bool = false {
+        didSet {
+            pipManager.setAllowsCameraWhileInPictureInPicture(allowsCameraInBackground)
+        }
+    }
+    
+    var primaryPlaceholderText: String = "No camera" {
+        didSet {
+            pipManager.primaryPlaceholderText = primaryPlaceholderText
+        }
+    }
+    
+    var secondaryPlaceholderText: String = "No active speaker" {
+        didSet {
+            pipManager.secondaryPlaceholderText = secondaryPlaceholderText
+        }
+    }
+    
+    func startPictureInPicture() {
+        pipManager.start()
+    }
+    
+    func stopPictureInPicture() {
+        pipManager.stop()
+    }
+}
+

package/ios/PipContainerViewModule.swift

@@ -0,0 +1,48 @@
+import ExpoModulesCore
+
+public class PipContainerViewModule: Module {
+    public func definition() -> ModuleDefinition {
+        Name("PipContainerViewModule")
+
+        View(PipContainerView.self) {
+            Prop("startAutomatically") { (view: PipContainerView, value: Bool) in
+                Task { @MainActor in
+                    view.startAutomatically = value
+                }
+            }
+            
+            Prop("stopAutomatically") { (view: PipContainerView, value: Bool) in
+                Task { @MainActor in
+                    view.stopAutomatically = value
+                }
+            }
+            
+            Prop("allowsCameraInBackground") { (view: PipContainerView, value: Bool) in
+                Task { @MainActor in
+                    view.allowsCameraInBackground = value
+                }
+            }
+            
+            Prop("primaryPlaceholderText") { (view: PipContainerView, value: String) in
+                Task { @MainActor in
+                    view.primaryPlaceholderText = value
+                }
+            }
+            
+            Prop("secondaryPlaceholderText") { (view: PipContainerView, value: String) in
+                Task { @MainActor in
+                    view.secondaryPlaceholderText = value
+                }
+            }
+            
+            AsyncFunction("startPictureInPicture") { (view: PipContainerView) in
+                await view.startPictureInPicture()
+            }
+            
+            AsyncFunction("stopPictureInPicture") { (view: PipContainerView) in
+                await view.stopPictureInPicture()
+            }
+        }
+    }
+}
+

package/ios/RNFishjamClient.swift

@@ -803,6 +803,7 @@ class RNFishjamClient: FishjamClientListener {
 
     func emitEndpoints() {
         emit(event: .peersUpdate())
+        RNFishjamClient.tracksUpdateListenersManager.notifyListeners()
     }
 
     func onJoined(peerID: String, peersInRoom: [String: Endpoint]) {

package/ios/RNFishjamClientModule.swift

@@ -121,6 +121,10 @@ public class RNFishjamClientModule: Module {
             return rnFishjamClient.isCameraInitialized
         }
         
+        Property("hasActiveCallKitSession") {
+            return rnFishjamClient.hasActiveCallKitSession
+        }
+        
         Function("getPeers") {
             return rnFishjamClient.getPeers()
         }
@@ -281,8 +285,5 @@ public class RNFishjamClientModule: Module {
             rnFishjamClient.endCallKitSession()
         }
         
-        Property("hasActiveCallKitSession") {
-            return rnFishjamClient.hasActiveCallKitSession
-        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/react-native-client",
-  "version": "0.23.0-RC.0",
+  "version": "0.24.0",
   "description": "A React Native client for Fishjam",
   "author": "Fishjam Team",
   "license": "Apache-2.0",
@@ -42,7 +42,7 @@
   "dependencies": {
     "promise-fs": "^2.1.1",
     "protobufjs": "^7.4.0",
-    "react-native-whip-whep": "0.3.1",
+    "react-native-whip-whep": "0.7.1",
     "zod": "^3.25.71"
   },
   "devDependencies": {

package/plugin/broadcastExtensionFiles/FishjamBroadcastSampleHandler.swift

@@ -1,4 +1,4 @@
-import FishjamCloudClient
+import FishjamCloudBroadcastClient
 import Foundation
 import ReplayKit
 import WebRTC

package/plugin/broadcastExtensionFiles/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDisplayName</key>
-	<string>FishjamScreenBroadcast</string>
+	<string>{{DISPLAY_NAME}}</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

package/plugin/build/types.d.ts

@@ -11,5 +11,6 @@ export type FishjamPluginOptions = {
         appGroupContainerId?: string;
         mainTargetName?: string;
         broadcastExtensionTargetName?: string;
+        broadcastExtensionDisplayName?: string;
     };
 } | undefined;

package/plugin/build/withFishjam.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const withFishjamAndroid_1 = require("./withFishjamAndroid");
 const withFishjamIos_1 = __importDefault(require("./withFishjamIos"));
 const withFishjam = (config, options) => {
-    (0, withFishjamAndroid_1.withFishjamAndroid)(config, options);
-    (0, withFishjamIos_1.default)(config, options);
+    config = (0, withFishjamAndroid_1.withFishjamAndroid)(config, options);
+    config = (0, withFishjamIos_1.default)(config, options);
     return config;
 };
 exports.default = withFishjam;

package/plugin/build/withFishjamAndroid.js

@@ -9,19 +9,57 @@ const withFishjamForegroundService = (config, props) => (0, config_plugins_1.wit
     }
     const mainApplication = (0, Manifest_1.getMainApplicationOrThrow)(configuration.modResults);
     mainApplication.service = mainApplication.service || [];
-    const newService = {
+    const fishjamService = {
         $: {
             'android:name': 'io.fishjam.reactnative.foregroundService.FishjamForegroundService',
             'android:foregroundServiceType': 'camera|microphone|mediaProjection',
             'android:stopWithTask': 'true',
         },
     };
-    const existingServiceIndex = mainApplication.service.findIndex((service) => service.$['android:name'] === newService.$['android:name']);
-    if (existingServiceIndex !== -1) {
-        mainApplication.service[existingServiceIndex] = newService;
+    const whipWhepService = {
+        $: {
+            'android:name': 'com.swmansion.reactnativeclient.foregroundService.ScreenCaptureService',
+            'android:foregroundServiceType': 'mediaProjection',
+            'android:stopWithTask': 'true',
+        },
+    };
+    // Add Fishjam service
+    const existingFishjamServiceIndex = mainApplication.service.findIndex((service) => service.$['android:name'] === fishjamService.$['android:name']);
+    if (existingFishjamServiceIndex !== -1) {
+        mainApplication.service[existingFishjamServiceIndex] = fishjamService;
     }
     else {
-        mainApplication.service.push(newService);
+        mainApplication.service.push(fishjamService);
+    }
+    // Add WhipWhep service
+    const existingWhipWhepServiceIndex = mainApplication.service.findIndex((service) => service.$['android:name'] === whipWhepService.$['android:name']);
+    if (existingWhipWhepServiceIndex !== -1) {
+        mainApplication.service[existingWhipWhepServiceIndex] = whipWhepService;
+    }
+    else {
+        mainApplication.service.push(whipWhepService);
+    }
+    return configuration;
+});
+const withFishjamForegroundServicePermission = (config, props) => (0, config_plugins_1.withAndroidManifest)(config, (configuration) => {
+    if (!props?.android?.enableForegroundService) {
+        return configuration;
+    }
+    const mainApplication = configuration.modResults;
+    if (!mainApplication.manifest) {
+        return configuration;
+    }
+    if (!mainApplication.manifest['uses-permission']) {
+        mainApplication.manifest['uses-permission'] = [];
+    }
+    const permissions = mainApplication.manifest['uses-permission'];
+    const hasForegroundServicePermission = permissions.some((perm) => perm.$?.['android:name'] === 'android.permission.FOREGROUND_SERVICE');
+    if (!hasForegroundServicePermission) {
+        permissions.push({
+            $: {
+                'android:name': 'android.permission.FOREGROUND_SERVICE',
+            },
+        });
     }
     return configuration;
 });
@@ -36,6 +74,7 @@ const withFishjamPictureInPicture = (config, props) => (0, config_plugins_1.with
     return configuration;
 });
 const withFishjamAndroid = (config, props) => {
+    config = withFishjamForegroundServicePermission(config, props);
     config = withFishjamForegroundService(config, props);
     config = withFishjamPictureInPicture(config, props);
     return config;