@stream-io/video-react-native-sdk 0.0.1-alpha.188 → 0.0.1-alpha.190

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.0.1-alpha.190](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-0.0.1-alpha.189...@stream-io/video-react-native-sdk-0.0.1-alpha.190) (2023-06-21)
+
+
+
+## [0.0.1-alpha.189](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-0.0.1-alpha.188...@stream-io/video-react-native-sdk-0.0.1-alpha.189) (2023-06-21)
+
+
+### Bug Fixes
+
+* proper media stream disposal for rn webrtc ([#682](https://github.com/GetStream/stream-video-js/issues/682)) ([8879bac](https://github.com/GetStream/stream-video-js/commit/8879bac82080232928b78316fdb452bbc3c79fbc))
+
+
+
 ## [0.0.1-alpha.188](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-0.0.1-alpha.187...@stream-io/video-react-native-sdk-0.0.1-alpha.188) (2023-06-20)
 
 

package/dist/src/hooks/useLocalVideoStream.js

@@ -11,23 +11,34 @@ const contexts_1 = require("../contexts");
  */
 const useLocalVideoStream = () => {
     const [videoStream, setVideoStream] = (0, react_1.useState)(undefined);
-    const currentVideoDevice = (0, contexts_1.useStreamVideoStoreValue)((store) => store.currentVideoDevice);
+    const currentVideoDeviceId = (0, contexts_1.useStreamVideoStoreValue)((store) => store.currentVideoDevice)?.deviceId;
     (0, react_1.useEffect)(() => {
+        let mediaStream;
+        let interrupted = false;
         const loadVideoStream = async () => {
             // If there is no video device, we don't need to load a video stream.
-            if (!currentVideoDevice?.deviceId)
+            if (!currentVideoDeviceId) {
                 return null;
-            const stream = await (0, video_client_1.getVideoStream)({
-                deviceId: currentVideoDevice.deviceId,
-            });
-            setVideoStream((previousStream) => {
-                if (previousStream)
-                    (0, video_client_1.disposeOfMediaStream)(previousStream);
-                return stream;
+            }
+            const _mediaStream = await (0, video_client_1.getVideoStream)({
+                deviceId: currentVideoDeviceId,
             });
+            if (interrupted) {
+                // device changed while we were loading the video stream, so dispose of it
+                (0, video_client_1.disposeOfMediaStream)(_mediaStream);
+                return;
+            }
+            mediaStream = _mediaStream;
+            setVideoStream(_mediaStream);
         };
         loadVideoStream();
-    }, [currentVideoDevice?.deviceId]);
+        return () => {
+            interrupted = true;
+            if (mediaStream) {
+                (0, video_client_1.disposeOfMediaStream)(mediaStream);
+            }
+        };
+    }, [currentVideoDeviceId]);
     return videoStream;
 };
 exports.useLocalVideoStream = useLocalVideoStream;

package/dist/src/hooks/useLocalVideoStream.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLocalVideoStream.js","sourceRoot":"","sources":["../../../src/hooks/useLocalVideoStream.ts"],"names":[],"mappings":";;;AAAA,iCAA4C;AAC5C,0DAA+E;AAE/E,0CAAuD;AAEvD;;;;GAIG;AACI,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAC5C,SAAS,CACV,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAA,mCAAwB,EACjD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,kBAAkB,CACpC,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;YACjC,qEAAqE;YACrE,IAAI,CAAC,kBAAkB,EAAE,QAAQ;gBAAE,OAAO,IAAI,CAAC;YAE/C,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAc,EAAC;gBAClC,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;aACtC,CAAC,CAAC;YACH,cAAc,CAAC,CAAC,cAAc,EAAE,EAAE;gBAChC,IAAI,cAAc;oBAAE,IAAA,mCAAoB,EAAC,cAAc,CAAC,CAAC;gBACzD,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,eAAe,EAAE,CAAC;IACpB,CAAC,EAAE,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEnC,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAzBW,QAAA,mBAAmB,uBAyB9B"}
+{"version":3,"file":"useLocalVideoStream.js","sourceRoot":"","sources":["../../../src/hooks/useLocalVideoStream.ts"],"names":[],"mappings":";;;AAAA,iCAA4C;AAC5C,0DAA+E;AAE/E,0CAAuD;AAEvD;;;;GAIG;AACI,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAC5C,SAAS,CACV,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,mCAAwB,EACnD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,kBAAkB,CACpC,EAAE,QAAQ,CAAC;IAEZ,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,WAAoC,CAAC;QACzC,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;YACjC,qEAAqE;YACrE,IAAI,CAAC,oBAAoB,EAAE;gBACzB,OAAO,IAAI,CAAC;aACb;YAED,MAAM,YAAY,GAAG,MAAM,IAAA,6BAAc,EAAC;gBACxC,QAAQ,EAAE,oBAAoB;aAC/B,CAAC,CAAC;YACH,IAAI,WAAW,EAAE;gBACf,0EAA0E;gBAC1E,IAAA,mCAAoB,EAAC,YAAY,CAAC,CAAC;gBACnC,OAAO;aACR;YACD,WAAW,GAAG,YAAY,CAAC;YAC3B,cAAc,CAAC,YAAY,CAAC,CAAC;QAC/B,CAAC,CAAC;QACF,eAAe,EAAE,CAAC;QAClB,OAAO,GAAG,EAAE;YACV,WAAW,GAAG,IAAI,CAAC;YACnB,IAAI,WAAW,EAAE;gBACf,IAAA,mCAAoB,EAAC,WAAW,CAAC,CAAC;aACnC;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE3B,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAtCW,QAAA,mBAAmB,uBAsC9B"}

package/package.json

@@ -22,8 +22,8 @@
   ],
   "dependencies": {
     "@stream-io/i18n": "^0.0.5",
-    "@stream-io/video-client": "^0.0.19",
-    "@stream-io/video-react-bindings": "^0.0.20"
+    "@stream-io/video-client": "^0.0.21",
+    "@stream-io/video-react-bindings": "^0.0.22"
   },
   "peerDependencies": {
     "@notifee/react-native": ">=7.7.0",
@@ -83,5 +83,5 @@
     "typedoc-plugin-markdown": "^3.15.3",
     "typescript": "^4.9.5"
   },
-  "version": "0.0.1-alpha.188"
+  "version": "0.0.1-alpha.190"
 }

package/src/hooks/useLocalVideoStream.ts

@@ -12,25 +12,38 @@ export const useLocalVideoStream = () => {
   const [videoStream, setVideoStream] = useState<MediaStream | undefined>(
     undefined,
   );
-  const currentVideoDevice = useStreamVideoStoreValue(
+  const currentVideoDeviceId = useStreamVideoStoreValue(
     (store) => store.currentVideoDevice,
-  );
+  )?.deviceId;
 
   useEffect(() => {
+    let mediaStream: MediaStream | undefined;
+    let interrupted = false;
     const loadVideoStream = async () => {
       // If there is no video device, we don't need to load a video stream.
-      if (!currentVideoDevice?.deviceId) return null;
+      if (!currentVideoDeviceId) {
+        return null;
+      }
 
-      const stream = await getVideoStream({
-        deviceId: currentVideoDevice.deviceId,
-      });
-      setVideoStream((previousStream) => {
-        if (previousStream) disposeOfMediaStream(previousStream);
-        return stream;
+      const _mediaStream = await getVideoStream({
+        deviceId: currentVideoDeviceId,
       });
+      if (interrupted) {
+        // device changed while we were loading the video stream, so dispose of it
+        disposeOfMediaStream(_mediaStream);
+        return;
+      }
+      mediaStream = _mediaStream;
+      setVideoStream(_mediaStream);
     };
     loadVideoStream();
-  }, [currentVideoDevice?.deviceId]);
+    return () => {
+      interrupted = true;
+      if (mediaStream) {
+        disposeOfMediaStream(mediaStream);
+      }
+    };
+  }, [currentVideoDeviceId]);
 
   return videoStream;
 };