@fishjam-cloud/react-client 0.26.0 → 0.26.1-rc.1

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

@@ -1 +1 @@
-{"version":3,"file":"useLocalVAD.d.ts","sourceRoot":"","sources":["../../src/hooks/useLocalVAD.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAW9C;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS;IAAE,QAAQ,EAAE,OAAO,CAAA;CAAE,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAsClF,CAAC"}
+{"version":3,"file":"useLocalVAD.d.ts","sourceRoot":"","sources":["../../src/hooks/useLocalVAD.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAW9C;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS;IAAE,QAAQ,EAAE,OAAO,CAAA;CAAE,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CA8ClF,CAAC"}

package/dist/hooks/useLocalVAD.js

@@ -33,8 +33,14 @@ export const useLocalVAD = (options) => {
             return;
         let silenceTicks = 0;
         let timeoutId;
+        const controller = new AbortController();
+        const { signal } = controller;
         const poll = async () => {
+            if (signal.aborted)
+                return;
             const trackAudio = await fishjamClient?.current?.getLocalTrackAudioLevel(microphoneTrackId);
+            if (signal.aborted)
+                return;
             if (trackAudio != null && trackAudio.level > THRESHOLD) {
                 silenceTicks = 0;
                 setIsSpeaking(true);
@@ -45,10 +51,13 @@ export const useLocalVAD = (options) => {
                     setIsSpeaking(false);
                 }
             }
+            if (signal.aborted)
+                return;
             timeoutId = setTimeout(poll, 100);
         };
         timeoutId = setTimeout(poll, 0);
         return () => {
+            controller.abort();
             clearTimeout(timeoutId);
             setIsSpeaking(false);
         };

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

@@ -1 +1 @@
-{"version":3,"file":"useVAD.d.ts","sourceRoot":"","sources":["../../src/hooks/useVAD.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,iBAAiB,CAAC;AAGvD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS;IAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAuE1F,CAAC"}
+{"version":3,"file":"useVAD.d.ts","sourceRoot":"","sources":["../../src/hooks/useVAD.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG9C;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS;IAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAyD1F,CAAC"}

package/dist/hooks/useVAD.js

@@ -1,4 +1,4 @@
-import { useContext, useEffect, useMemo, useState } from "react";
+import { useContext, useEffect, useMemo, useReducer } from "react";
 import { FishjamClientStateContext } from "../contexts/fishjamState";
 import { useLocalVAD } from "./useLocalVAD";
 /**
@@ -40,37 +40,33 @@ export const useVAD = (options) => {
         peerId: peer.id,
         microphoneTrack: Array.from(peer.tracks.values()).find(({ metadata }) => metadata?.type === "microphone"),
     })), [clientState.peers, peerIds]);
-    const getDefaultVadStatuses = () => micTracksWithSelectedPeerIds.reduce((mappedTracks, { peerId, microphoneTrack }) => ({
-        ...mappedTracks,
-        [peerId]: microphoneTrack ? { [microphoneTrack.trackId]: microphoneTrack.vadStatus } : {},
-    }), {});
-    const [_vadStatuses, setVadStatuses] = useState(getDefaultVadStatuses);
+    // `voiceActivityChanged` mutates the track context in place and does not flow through
+    // `useFishjamClientState`, so we need an explicit re-render trigger to re-read the
+    // current `vadStatus` off each mic track.
+    const [version, bumpVersion] = useReducer((n) => n + 1, 0);
     useEffect(() => {
-        const unsubs = micTracksWithSelectedPeerIds.map(({ peerId, microphoneTrack }) => {
-            const updateVadStatus = (track) => {
-                setVadStatuses((prev) => ({
-                    ...prev,
-                    [peerId]: { ...prev[peerId], [track.trackId]: track.vadStatus },
-                }));
-            };
-            if (microphoneTrack) {
-                microphoneTrack.on("voiceActivityChanged", updateVadStatus);
-            }
+        const unsubs = micTracksWithSelectedPeerIds.map(({ microphoneTrack }) => {
+            if (!microphoneTrack)
+                return () => { };
+            microphoneTrack.on("voiceActivityChanged", bumpVersion);
             return () => {
-                if (microphoneTrack) {
-                    microphoneTrack.off("voiceActivityChanged", updateVadStatus);
-                }
+                microphoneTrack.off("voiceActivityChanged", bumpVersion);
             };
         });
         return () => unsubs.forEach((unsub) => unsub());
     }, [micTracksWithSelectedPeerIds]);
     const localVAD = useLocalVAD({ disabled: !showLocalPeerVAD });
-    const vadStatuses = useMemo(() => ({
-        ...Object.fromEntries(Object.entries(_vadStatuses).map(([peerId, tracks]) => [
-            peerId,
-            Object.values(tracks).some((vad) => vad === "speech"),
-        ])),
-        ...localVAD,
-    }), [_vadStatuses, localVAD]);
+    const vadStatuses = useMemo(() => {
+        // Referencing `version` makes the memo recompute on every `voiceActivityChanged`
+        // event, so we re-read each current mic track's mutable `vadStatus`.
+        void version;
+        return {
+            ...Object.fromEntries(micTracksWithSelectedPeerIds.map(({ peerId, microphoneTrack }) => [
+                peerId,
+                microphoneTrack?.vadStatus === "speech",
+            ])),
+            ...localVAD,
+        };
+    }, [micTracksWithSelectedPeerIds, localVAD, version]);
     return vadStatuses;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/react-client",
-  "version": "0.26.0",
+  "version": "0.26.1-rc.1",
   "description": "React client library for Fishjam",
   "license": "Apache-2.0",
   "author": "Fishjam Team",
@@ -62,7 +62,7 @@
     "vitest": "^3.1.1"
   },
   "dependencies": {
-    "@fishjam-cloud/ts-client": "0.26.0",
+    "@fishjam-cloud/ts-client": "0.26.1-rc.1",
     "events": "3.3.0",
     "lodash.isequal": "4.5.0"
   },