kasunk99-livestream-core 0.2.9 → 0.3.1

package/dist/hooks/useHostSocket.d.ts

@@ -25,6 +25,7 @@ export type HostChatMessage = {
 export type UseHostSocketReturn = HostState & {
     chatMessages: HostChatMessage[];
     setDisplayName: (name: string) => void;
+    sendChatMessage: (text: string) => void;
     startPreview: () => Promise<void>;
     stopPreview: () => void;
     startLive: () => Promise<void>;

package/dist/hooks/useHostSocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useHostSocket.d.ts","sourceRoot":"","sources":["../../src/hooks/useHostSocket.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAYH,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,mBAAmB,CAAC;AAoB3B,MAAM,MAAM,oBAAoB,GAAG;IACjC,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG;IAC5C,YAAY,EAAE,eAAe,EAAE,CAAC;IAChC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC,CAAC;AAMF,wBAAgB,aAAa,CAAC,OAAO,GAAE,oBAAyB,GAAG,mBAAmB,CAmmBrF"}
+{"version":3,"file":"useHostSocket.d.ts","sourceRoot":"","sources":["../../src/hooks/useHostSocket.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAYH,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,mBAAmB,CAAC;AAoB3B,MAAM,MAAM,oBAAoB,GAAG;IACjC,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG;IAC5C,YAAY,EAAE,eAAe,EAAE,CAAC;IAChC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC,CAAC;AAMF,wBAAgB,aAAa,CAAC,OAAO,GAAE,oBAAyB,GAAG,mBAAmB,CAupBrF"}

package/dist/hooks/useHostSocket.js

@@ -172,6 +172,31 @@ export function useHostSocket(options = {}) {
         const onIceServers = (servers) => {
             hostSession.iceServers = Array.isArray(servers) ? servers : [];
         };
+        socket.on('connect', onConnect);
+        socket.on('connect_error', onConnectError);
+        socket.on('disconnect', onDisconnect);
+        socket.on('ice-servers', onIceServers);
+        return () => {
+            socket.off('connect', onConnect);
+            socket.off('connect_error', onConnectError);
+            socket.off('disconnect', onDisconnect);
+            socket.off('ice-servers', onIceServers);
+        };
+    }, [fullCleanup]);
+    // ── Chat subscription ──────────────────────────────────────────────────────
+    // Registered on a separate effect keyed to live state so it is guaranteed to
+    // be active only while the host is in the room (socket.join runs as part of
+    // startLive). Registering it in the socket setup effect is too early — the host
+    // has not joined the room yet, and reconnects after navigate-away clear the
+    // room membership, so we need to re-register on every live transition.
+    useEffect(() => {
+        if (!state.live) {
+            setChatMessages([]);
+            return;
+        }
+        const socket = hostSession.socket;
+        if (!socket)
+            return;
         const onChatMessage = (msg) => {
             if (!msg || typeof msg !== 'object')
                 return;
@@ -184,19 +209,10 @@ export function useHostSocket(options = {}) {
             const id = `${String(m.peerId ?? 'p')}-${timestamp}-${text.slice(0, 6)}`;
             setChatMessages((prev) => [...prev.slice(-99), { id, displayName, text, timestamp }]);
         };
-        socket.on('connect', onConnect);
-        socket.on('connect_error', onConnectError);
-        socket.on('disconnect', onDisconnect);
-        socket.on('ice-servers', onIceServers);
         socket.on('chat-message', onChatMessage);
-        return () => {
-            socket.off('connect', onConnect);
-            socket.off('connect_error', onConnectError);
-            socket.off('disconnect', onDisconnect);
-            socket.off('ice-servers', onIceServers);
-            socket.off('chat-message', onChatMessage);
-        };
-    }, [fullCleanup]);
+        return () => { socket.off('chat-message', onChatMessage); };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [state.live]);
     // ── Permissions ────────────────────────────────────────────────────────────
     const requestCameraMicPermissions = useCallback(async () => {
         if (Platform.OS !== 'android')
@@ -311,6 +327,20 @@ export function useHostSocket(options = {}) {
             screenStreamToStop.release?.();
         }
         catch { /* ignore */ }
+        if (Platform.OS !== 'android') {
+            // iOS: camera was never stopped — the existing track in localStream is still live.
+            // Just switch the producer back to it; no getUserMedia call needed.
+            const existingCamTrack = hostSession.localStream?.getVideoTracks()?.[0];
+            if (existingCamTrack) {
+                patchHostState({ streamURL: getStreamURL(hostSession.localStream), captureMode: 'camera' });
+                await replaceVideoProducer(existingCamTrack);
+            }
+            else {
+                patchHostState({ captureMode: 'camera' });
+            }
+            return;
+        }
+        // Android: camera was stopped when screen share started — re-acquire it.
         try {
             const { isFrontCamera: front } = getHostState();
             const newCamStream = (await mediaDevices.getUserMedia({
@@ -369,17 +399,31 @@ export function useHostSocket(options = {}) {
                 return;
             }
             hostSession.screenStream = screenStream;
-            // Free the camera hardware while screen sharing
-            hostSession.localStream?.getVideoTracks()
-                ?.forEach((t) => { try {
-                t.stop?.();
+            if (Platform.OS === 'android') {
+                // Android: stop camera hardware — MediaProjection captures the hardware
+                // display independently, so stopping the camera is safe and saves battery.
+                hostSession.localStream?.getVideoTracks()
+                    ?.forEach((t) => { try {
+                    t.stop?.();
+                }
+                catch { /* ignore */ } });
+                // Point the RTCView preview at the screen capture stream.
+                patchHostState({ streamURL: getStreamURL(screenStream), captureMode: 'screen' });
+            }
+            else {
+                // iOS: keep camera hardware running.
+                // RPScreenRecorder captures the app's own screen; if we stopped the camera
+                // first, the app would display black and that black frame would be captured
+                // → host and viewers both see a black screen. Keeping the camera alive
+                // means the host's RTCView still shows the camera preview while the
+                // WebRTC producer (replaced below) delivers screen content to viewers.
+                patchHostState({ captureMode: 'screen' });
+                // Update the preview URL so the RTCView keeps showing the local camera stream.
+                patchHostState({ streamURL: getStreamURL(hostSession.localStream) });
             }
-            catch { /* ignore */ } });
-            // Point preview at the native screenStream — avoids the black-screen bug
-            // caused by copying a screen-capture track into a different MediaStream object.
-            patchHostState({ streamURL: getStreamURL(screenStream), captureMode: 'screen' });
             await replaceVideoProducer(screenVideoTrack);
-            // Auto-revert when user dismisses screen share from the Android notification bar
+            // Auto-revert when user dismisses screen share
+            // (Android: from the notification bar; iOS: from the status-bar recording dot)
             screenVideoTrack.addEventListener?.('ended', () => {
                 void stopScreenShare();
             });
@@ -561,10 +605,17 @@ export function useHostSocket(options = {}) {
     const setDisplayName = useCallback((name) => {
         patchHostState({ displayName: name });
     }, []);
+    const sendChatMessage = useCallback((text) => {
+        const trimmed = text.trim();
+        if (!trimmed || !hostSession.socket?.connected)
+            return;
+        hostSession.socket.emit('chat-message', { text: trimmed });
+    }, []);
     return {
         ...state,
         chatMessages,
         setDisplayName,
+        sendChatMessage,
         startPreview,
         stopPreview,
         startLive,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasunk99-livestream-core",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "description": "Reusable livestream viewer/host module for React Native (Expo) — mediasoup + Socket.IO",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",