kasunk99-livestream-core 0.2.5 → 0.2.6

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,mBAAmB,GAAG,SAAS,GAAG;IAC5C,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,CAsjBrF"}
+{"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,mBAAmB,GAAG,SAAS,GAAG;IAC5C,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,CAmlBrF"}

package/dist/hooks/useHostSocket.js

@@ -70,6 +70,12 @@ export function useHostSocket(options = {}) {
         //   FIX: stop screen tracks synchronously in stopLive() BEFORE calling
         //   fullCleanup().  By the time we reach here, hostSession.screenStream
         //   is already null.
+        // Step 0 — null streamURL immediately so the RTCView renderer detaches from the
+        // track on the UI thread *before* we start disposing EGL/capture resources below.
+        // Without this, the UI-thread surfaceViewRenderer.release() races the executor-thread
+        // TrackPrivate.dispose() whenever onDisconnect triggers fullCleanup mid-stream
+        // (e.g. unexpected socket drop while screen sharing), wedging the main thread.
+        patchHostState({ streamURL: null });
         // Step 1 — transport first (calls transportClosed on producers, sets _closed=true)
         const transportToClose = hostSession.sendTransport;
         hostSession.sendTransport = null;
@@ -277,13 +283,14 @@ export function useHostSocket(options = {}) {
     const stopScreenShare = useCallback(async () => {
         if (!hostSession.screenStream)
             return; // fullCleanup already ran, bail
+        // Detach the RTCView renderer FIRST (same logic as stopLive):
+        // Null streamURL so the UI-thread surfaceViewRenderer.release() fires against
+        // the still-live screen track. Only after a short yield do we release() the
+        // native capture. This prevents the EGL deadlock on the toggle/auto-revert path.
+        patchHostState({ streamURL: null });
+        await new Promise((resolve) => setTimeout(resolve, 150));
         const screenStreamToStop = hostSession.screenStream;
         hostSession.screenStream = null;
-        // release() → track.release() → mediaStreamTrackRelease → TrackPrivate.dispose()
-        // → stopCapture() (returns true) + dispose() → videoCapturer.dispose()
-        // → ScreenCapturerAndroid.dispose() → mediaProjection.stop(). This is the only
-        // path that properly stops the MediaProjection; t.stop() only calls stopCapture()
-        // which is now a no-op to avoid blocking the executor.
         try {
             screenStreamToStop.release?.();
         }
@@ -498,16 +505,34 @@ export function useHostSocket(options = {}) {
     }, [fullCleanup, hostUserId]);
     const stopLive = useCallback(async () => {
         const { captureMode } = getHostState();
-        if (captureMode === 'screen' && hostSession.screenStream) {
-            patchHostState({ status: 'Stopping screen share...' });
+        const wasScreen = captureMode === 'screen' && !!hostSession.screenStream;
+        if (wasScreen) {
+            // DETACH THE RENDERER FIRST, before disposing the native screen track/capturer.
+            //
+            // Root cause of the freeze (Flow B — navigate away then back, then Stop):
+            //   When the Go-Live screen unmounts mid-stream, WebRTCView.onDetachedFromWindow()
+            //   releases + reinitialises its EGL renderer. On Stop, two teardowns run in
+            //   parallel on different threads:
+            //     1. UI thread: RTCView sees streamURL → null, calls surfaceViewRenderer.release()
+            //        which blocks an EGL latch until the render thread drains.
+            //     2. Executor thread: screenStream.release() → TrackPrivate.dispose() tears down
+            //        the VideoTrack, MediaSource, SurfaceTextureHelper, and EGL frame buffers.
+            //   When they overlap the EGL latch never fires → main thread wedged → app freeze.
+            //   The foreground service (MediaProjection) also never reaches abort() → lingering
+            //   background process that requires Force Stop.
+            //
+            // Fix: null streamURL here (step A) so the UI thread releases the renderer against
+            // a still-live track — nothing to contend, latch resolves immediately. Only after a
+            // short yield (step B) do we dispose the native track/capturer (step C). No overlap,
+            // no deadlock, dispose() reaches MediaProjectionService.abort() and exits cleanly.
+            // Step A — detach RTCView renderer while the screen track is still alive.
+            patchHostState({ status: 'Stopping screen share...', streamURL: null });
+            // Step B — let React flush the streamURL change to native and the UI-thread
+            // renderer release() complete before we dispose EGL resources from the executor.
+            await new Promise((resolve) => setTimeout(resolve, 150));
+            // Step C — dispose the native screen capture (executor thread, non-blocking).
             const screenStream = hostSession.screenStream;
             hostSession.screenStream = null; // guard: stopScreenShare() bails on re-entry
-            // release() calls TrackPrivate.dispose() → ScreenCaptureController.dispose()
-            // → MediaProjectionService.abort() + videoCapturer.dispose() which unblocks
-            // captureStopped.await() immediately. t.stop() alone does not call dispose(),
-            // so the background thread in stopCapture() blocks the latch for up to 60 s
-            // when peerConnectionDispose() already freed SurfaceTextureHelper (e.g. after
-            // the user navigates away and comes back to a fresh component mount).
             try {
                 screenStream.release?.();
             }

package/package.json

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