@fishjam-cloud/react-client 0.7.1 → 0.7.2

package/dist/hooks/useScreenShare.js

@@ -1,49 +1,41 @@
-import { useCallback, useEffect, useRef } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { getRemoteOrLocalTrack } from "../utils/track";
 import { useFishjamContext } from "./useFishjamContext";
-const getTracks = (stream) => {
-    const video = stream.getVideoTracks()[0];
-    const audio = stream.getAudioTracks()[0] ?? null;
-    return [video, audio];
-};
 /**
  *
  * @category Screenshare
  */
-export const useScreenShare = () => {
-    const ctx = useFishjamContext();
-    const [state, setState] = ctx.screenShareState;
+export const useScreenShareManager = ({ fishjamClient }) => {
+    const [state, setState] = useState({ stream: null, trackIds: null });
     const cleanMiddlewareFnRef = useRef(null);
-    const { fishjamClientRef } = useFishjamContext();
-    const tsClient = fishjamClientRef.current;
     const stream = state.stream ?? null;
-    const [videoTrack, audioTrack] = stream ? getTracks(stream) : [null, null];
-    const getDisplayName = () => tsClient.getLocalPeer()?.metadata?.peer?.displayName;
+    const [videoTrack, audioTrack] = stream ? getTracksFromStream(stream) : [null, null];
+    const getDisplayName = () => fishjamClient.getLocalPeer()?.metadata?.peer?.displayName;
     const startStreaming = async (props) => {
         const stream = await navigator.mediaDevices.getDisplayMedia({
             video: props?.videoConstraints ?? true,
             audio: props?.audioConstraints ?? true,
         });
         const displayName = getDisplayName();
-        let [video, audio] = getTracks(stream);
+        let [video, audio] = getTracksFromStream(stream);
         if (state.tracksMiddleware) {
             const { videoTrack, audioTrack, onClear } = state.tracksMiddleware(video, audio);
             video = videoTrack;
             audio = audioTrack;
             cleanMiddlewareFnRef.current = onClear;
         }
-        const addTrackPromises = [tsClient.addTrack(video, { displayName, type: "screenShareVideo", paused: false })];
+        const addTrackPromises = [fishjamClient.addTrack(video, { displayName, type: "screenShareVideo", paused: false })];
         if (audio)
-            addTrackPromises.push(tsClient.addTrack(audio, { displayName, type: "screenShareAudio", paused: false }));
+            addTrackPromises.push(fishjamClient.addTrack(audio, { displayName, type: "screenShareAudio", paused: false }));
         const [videoId, audioId] = await Promise.all(addTrackPromises);
         setState({ stream, trackIds: { videoId, audioId } });
     };
     const replaceTracks = async (newVideoTrack, newAudioTrack) => {
         if (!state?.stream)
             return;
-        const addTrackPromises = [tsClient.replaceTrack(state.trackIds.videoId, newVideoTrack)];
+        const addTrackPromises = [fishjamClient.replaceTrack(state.trackIds.videoId, newVideoTrack)];
         if (newAudioTrack && state.trackIds.audioId) {
-            addTrackPromises.push(tsClient.replaceTrack(state.trackIds.audioId, newAudioTrack));
+            addTrackPromises.push(fishjamClient.replaceTrack(state.trackIds.audioId, newAudioTrack));
         }
         await Promise.all(addTrackPromises);
     };
@@ -54,7 +46,7 @@ export const useScreenShare = () => {
     const setTracksMiddleware = async (middleware) => {
         if (!state?.stream)
             return;
-        const [video, audio] = getTracks(state.stream);
+        const [video, audio] = getTracksFromStream(state.stream);
         cleanMiddleware();
         const { videoTrack, audioTrack, onClear } = middleware?.(video, audio) ?? {
             videoTrack: video,
@@ -69,22 +61,21 @@ export const useScreenShare = () => {
             console.warn("No stream to stop");
             return;
         }
-        const [video, audio] = getTracks(state.stream);
+        const [video, audio] = getTracksFromStream(state.stream);
         video.stop();
         if (audio)
             audio.stop();
-        const client = fishjamClientRef.current;
-        const removeTrackPromises = [client.removeTrack(state.trackIds.videoId)];
+        const removeTrackPromises = [fishjamClient.removeTrack(state.trackIds.videoId)];
         if (state.trackIds.audioId)
-            removeTrackPromises.push(client.removeTrack(state.trackIds.audioId));
+            removeTrackPromises.push(fishjamClient.removeTrack(state.trackIds.audioId));
         await Promise.all(removeTrackPromises);
         cleanMiddleware();
         setState(({ tracksMiddleware }) => ({ stream: null, trackIds: null, tracksMiddleware }));
-    }, [state, fishjamClientRef, setState, cleanMiddleware]);
+    }, [state, fishjamClient, setState, cleanMiddleware]);
     useEffect(() => {
         if (!state.stream)
             return;
-        const [video, audio] = getTracks(state.stream);
+        const [video, audio] = getTracksFromStream(state.stream);
         const trackEndedHandler = () => {
             stopStreaming();
         };
@@ -96,19 +87,18 @@ export const useScreenShare = () => {
         };
     }, [state, stopStreaming]);
     useEffect(() => {
-        const client = fishjamClientRef.current;
         const onDisconnected = () => {
             if (stream) {
                 stopStreaming();
             }
         };
-        client.on("disconnected", onDisconnected);
+        fishjamClient.on("disconnected", onDisconnected);
         return () => {
-            client.removeListener("disconnected", onDisconnected);
+            fishjamClient.removeListener("disconnected", onDisconnected);
         };
-    }, [stopStreaming, fishjamClientRef, stream]);
-    const videoBroadcast = state.stream ? getRemoteOrLocalTrack(tsClient, state.trackIds.videoId) : null;
-    const audioBroadcast = state.trackIds?.audioId ? getRemoteOrLocalTrack(tsClient, state.trackIds.audioId) : null;
+    }, [stopStreaming, fishjamClient, stream]);
+    const videoBroadcast = state.stream ? getRemoteOrLocalTrack(fishjamClient, state.trackIds.videoId) : null;
+    const audioBroadcast = state.trackIds?.audioId ? getRemoteOrLocalTrack(fishjamClient, state.trackIds.audioId) : null;
     return {
         startStreaming,
         stopStreaming,
@@ -121,3 +111,12 @@ export const useScreenShare = () => {
         currentTracksMiddleware: state?.tracksMiddleware ?? null,
     };
 };
+export const useScreenShare = () => {
+    const { screenShareManager } = useFishjamContext();
+    return screenShareManager;
+};
+export const getTracksFromStream = (stream) => {
+    const video = stream.getVideoTracks()[0];
+    const audio = stream.getAudioTracks()[0] ?? null;
+    return [video, audio];
+};

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

@@ -1 +1 @@
-{"version":3,"file":"useTrackManager.d.ts","sourceRoot":"","sources":["../../src/hooks/useTrackManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAwC,MAAM,0BAA0B,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGjG,OAAO,KAAK,EAAE,UAAU,EAA+B,MAAM,iBAAiB,CAAC;AAE/E,UAAU,kBAAkB;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACrD,oBAAoB,EAAE,MAAM,UAAU,CAAC;CACxC;AAOD,eAAO,MAAM,eAAe,qDAAsD,kBAAkB,KAAG,YA2MtG,CAAC"}
+{"version":3,"file":"useTrackManager.d.ts","sourceRoot":"","sources":["../../src/hooks/useTrackManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAwC,MAAM,0BAA0B,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGjG,OAAO,KAAK,EAAE,UAAU,EAAmB,MAAM,iBAAiB,CAAC;AAEnE,UAAU,kBAAkB;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACrD,oBAAoB,EAAE,MAAM,UAAU,CAAC;CACxC;AASD,eAAO,MAAM,eAAe,qDAAsD,kBAAkB,KAAG,YA0LtG,CAAC"}

package/dist/hooks/useTrackManager.js

@@ -1,5 +1,5 @@
 import { getRemoteOrLocalTrack } from "../utils/track";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 const TRACK_TYPE_TO_DEVICE = {
     video: "camera",
     audio: "microphone",
@@ -7,43 +7,22 @@ const TRACK_TYPE_TO_DEVICE = {
 export const useTrackManager = ({ mediaManager, tsClient, getCurrentPeerStatus }) => {
     const [currentTrackId, setCurrentTrackId] = useState(null);
     const [paused, setPaused] = useState(false);
-    const clearMiddlewareFnRef = useRef(null);
-    const [currentTrackMiddleware, setCurrentTrackMiddleware] = useState(null);
     const type = TRACK_TYPE_TO_DEVICE[mediaManager.getDeviceType()];
     const metadata = useMemo(() => ({ type, paused }), [type, paused]);
     const currentTrack = useMemo(() => getRemoteOrLocalTrack(tsClient, currentTrackId), [tsClient, currentTrackId]);
-    function clearMiddleware() {
-        clearMiddlewareFnRef.current?.();
-        clearMiddlewareFnRef.current = null;
-    }
-    const clearAndGetProcessedTrack = useCallback((inputTrack) => {
-        clearMiddleware();
-        const { onClear, track } = currentTrackMiddleware?.(inputTrack) ?? {};
-        if (onClear)
-            clearMiddlewareFnRef.current = onClear;
-        return track ?? inputTrack;
-    }, [currentTrackMiddleware]);
     async function setTrackMiddleware(middleware) {
-        const mediaTrack = mediaManager.getTracks()[0];
-        setCurrentTrackMiddleware(() => middleware);
-        if (!currentTrack || !mediaTrack)
-            return;
-        clearMiddleware();
-        const { onClear, track } = middleware?.(mediaTrack) ?? { track: mediaTrack };
-        if (onClear)
-            clearMiddlewareFnRef.current = onClear;
-        await tsClient.replaceTrack(currentTrack.trackId, track);
+        mediaManager.setTrackMiddleware(middleware);
+        await refreshStreamedTrack();
     }
     async function initialize(deviceId) {
         await mediaManager?.start(deviceId);
         if (!currentTrackId)
             return;
-        const newTrack = mediaManager.getTracks()[0];
-        await tsClient.replaceTrack(currentTrackId, clearAndGetProcessedTrack(newTrack));
+        const newTrack = mediaManager.getMedia()?.track ?? null;
+        await tsClient.replaceTrack(currentTrackId, newTrack);
     }
     function stop() {
-        clearMiddleware();
-        return mediaManager?.stop();
+        return mediaManager.stop();
     }
     const startStreaming = useCallback(async (simulcastConfig, maxBandwidth) => {
         if (currentTrackId)
@@ -58,24 +37,22 @@ export const useTrackManager = ({ mediaManager, tsClient, getCurrentPeerStatus }
         setCurrentTrackId(media.track.id);
         const displayName = tsClient.getLocalPeer()?.metadata?.peer?.displayName;
         const trackMetadata = { ...metadata, displayName, paused: false };
-        const processedTrack = clearAndGetProcessedTrack(media.track);
-        const remoteTrackId = await tsClient.addTrack(processedTrack, trackMetadata, simulcastConfig, maxBandwidth);
+        const remoteTrackId = await tsClient.addTrack(media.track, trackMetadata, simulcastConfig, maxBandwidth);
         setCurrentTrackId(remoteTrackId);
         setPaused(false);
         return remoteTrackId;
-    }, [clearAndGetProcessedTrack, currentTrackId, mediaManager, metadata, tsClient]);
+    }, [currentTrackId, mediaManager, metadata, tsClient]);
     async function refreshStreamedTrack() {
         if (!currentTrack)
             return;
-        const newTrack = mediaManager.getTracks()[0];
+        const newTrack = mediaManager.getMedia()?.track ?? null;
         if (!newTrack)
             throw Error("New track is empty");
-        return tsClient.replaceTrack(currentTrack.trackId, clearAndGetProcessedTrack(newTrack));
+        return tsClient.replaceTrack(currentTrack.trackId, newTrack);
     }
     async function stopStreaming() {
         if (!currentTrack)
             return;
-        clearMiddleware();
         setCurrentTrackId(null);
         setPaused(true);
         return tsClient.removeTrack(currentTrack.trackId);
@@ -94,9 +71,8 @@ export const useTrackManager = ({ mediaManager, tsClient, getCurrentPeerStatus }
         const media = mediaManager.getMedia();
         if (!media)
             throw Error("Device is unavailable");
-        const processedTrack = media.track ? clearAndGetProcessedTrack(media.track) : null;
         setPaused(false);
-        await tsClient.replaceTrack(currentTrack.trackId, processedTrack);
+        await tsClient.replaceTrack(currentTrack.trackId, media.track);
         const trackMetadata = { ...metadata, paused: false };
         return tsClient.updateTrackMetadata(currentTrack.trackId, trackMetadata);
     }
@@ -116,12 +92,9 @@ export const useTrackManager = ({ mediaManager, tsClient, getCurrentPeerStatus }
             await startStreaming();
         }
     };
-    /**
-     * @see {@link TrackManager#toggle} for more details.
-     */
-    async function toggle(mode = "hard") {
+    async function toggle(mode) {
         const mediaStream = mediaManager.getMedia()?.stream;
-        const track = mediaManager.getTracks()?.[0];
+        const track = mediaManager.getMedia()?.track ?? null;
         const enabled = Boolean(track?.enabled);
         if (mediaStream && enabled) {
             mediaManager.disable();
@@ -129,7 +102,7 @@ export const useTrackManager = ({ mediaManager, tsClient, getCurrentPeerStatus }
                 await pauseStreaming();
             }
             if (mode === "hard") {
-                await mediaManager.stop();
+                mediaManager.stop();
             }
         }
         else if (mediaStream && !enabled) {
@@ -141,9 +114,21 @@ export const useTrackManager = ({ mediaManager, tsClient, getCurrentPeerStatus }
             await stream();
         }
     }
+    /**
+     * @see {@link TrackManager#toggleMute} for more details.
+     */
+    async function toggleMute() {
+        await toggle("soft");
+    }
+    /**
+     * @see {@link TrackManager#toggleDevice} for more details.
+     */
+    async function toggleDevice() {
+        await toggle("hard");
+    }
     useEffect(() => {
         const joinedHandler = () => {
-            if (mediaManager.getTracks().length > 0) {
+            if (mediaManager.getMedia()?.track) {
                 startStreaming();
             }
         };
@@ -168,9 +153,9 @@ export const useTrackManager = ({ mediaManager, tsClient, getCurrentPeerStatus }
         resumeStreaming,
         disableTrack,
         enableTrack,
-        currentTrackMiddleware,
         refreshStreamedTrack,
         paused,
-        toggle,
+        toggleMute,
+        toggleDevice,
     };
 };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { useConnect, useDisconnect, useReconnection, useCamera, useMicrophone, useInitializeDevices, usePeers, useScreenShare, useStatus, } from "./hooks/public";
 export { FishjamProvider } from "./fishjamProvider";
-export { Track, TrackMiddleware, TracksMiddleware, PeerStatus, ToggleMode, Device, AudioDevice, PeerWithTracks, ConnectConfig, PersistLastDeviceHandlers, ScreenshareApi, } from "./types/public";
+export { Track, TrackMiddleware, TracksMiddleware, PeerStatus, Device, AudioDevice, PeerWithTracks, ConnectConfig, PersistLastDeviceHandlers, ScreenshareApi, } from "./types/public";
 export { AUDIO_TRACK_CONSTRAINTS, VIDEO_TRACK_CONSTRAINTS, SCREEN_SHARING_MEDIA_CONSTRAINTS } from "./constraints";
 export type { Peer, MessageEvents, CreateConfig, TrackBandwidthLimit, SimulcastBandwidthLimit, BandwidthLimit, WebRTCEndpointEvents, TrackContextEvents, Endpoint, SimulcastConfig, TrackContext, VadStatus, EncodingReason, MetadataParser, AuthErrorReason, Encoding, } from "@fishjam-cloud/ts-client";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EACb,eAAe,EACf,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,QAAQ,EACR,cAAc,EACd,SAAS,GACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EACL,KAAK,EACL,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,MAAM,EACN,WAAW,EACX,cAAc,EACd,aAAa,EACb,yBAAyB,EACzB,cAAc,GACf,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,MAAM,eAAe,CAAC;AAEnH,YAAY,EACV,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,EAClB,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,SAAS,EACT,cAAc,EACd,cAAc,EACd,eAAe,EACf,QAAQ,GACT,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EACb,eAAe,EACf,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,QAAQ,EACR,cAAc,EACd,SAAS,GACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EACL,KAAK,EACL,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,MAAM,EACN,WAAW,EACX,cAAc,EACd,aAAa,EACb,yBAAyB,EACzB,cAAc,GACf,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,MAAM,eAAe,CAAC;AAEnH,YAAY,EACV,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,EAClB,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,SAAS,EACT,cAAc,EACd,cAAc,EACd,eAAe,EACf,QAAQ,GACT,MAAM,0BAA0B,CAAC"}

package/dist/mediaInitializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mediaInitializer.d.ts","sourceRoot":"","sources":["../src/mediaInitializer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AASpD,KAAK,UAAU,CAAC,CAAC,IAAI;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC;AAE5C,KAAK,gBAAgB,GAAG,UAAU,CAAC,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC;AAEhF,KAAK,eAAe,GAAG,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;AAsB1D,eAAO,MAAM,iBAAiB,gBACf,sBAAsB,iBACrB,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,KAC3C,OAAO,CAAC,CAAC,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAuB9D,CAAC;AAIF,eAAO,MAAM,kBAAkB,WACrB,WAAW,gBACL,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,WACnC,eAAe,EAAE,eACb,gBAAgB,mBACZ,eAAe,KAC/B,OAAO,CAAC,CAAC,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAsB9D,CAAC"}
+{"version":3,"file":"mediaInitializer.d.ts","sourceRoot":"","sources":["../src/mediaInitializer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAkB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpE,KAAK,UAAU,CAAC,CAAC,IAAI;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC;AAE5C,KAAK,gBAAgB,GAAG,UAAU,CAAC,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC;AAEhF,KAAK,eAAe,GAAG,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;AAsB1D,eAAO,MAAM,iBAAiB,gBACf,sBAAsB,iBACrB,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,KAC3C,OAAO,CAAC,CAAC,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAuB9D,CAAC;AAIF,eAAO,MAAM,kBAAkB,WACrB,WAAW,gBACL,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,WACnC,eAAe,EAAE,eACb,gBAAgB,mBACZ,eAAe,KAC/B,OAAO,CAAC,CAAC,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAsB9D,CAAC"}

package/dist/mediaInitializer.js

@@ -1,6 +1,5 @@
 import { prepareConstraints } from "./constraints";
 import { NOT_FOUND_ERROR, OVERCONSTRAINED_ERROR, PERMISSION_DENIED, UNHANDLED_ERROR } from "./utils/errors";
-import { getCurrentDevicesSettings, stopTracks, isAnyDeviceDifferentFromLastSession, removeSpecifiedDeviceFromConstraints, } from "./utils/media";
 const defaultErrors = { audio: null, video: null };
 const tryToGetAudioOnlyThenVideoOnly = async (constraints, deviceErrors = defaultErrors, transformConstraint = () => false) => {
     const audioOnly = await getAvailableMedia({ ...constraints, video: transformConstraint(constraints.video) }, { ...deviceErrors, audio: null });
@@ -46,3 +45,33 @@ export const getCorrectedResult = async (stream, deviceErrors, devices, constrai
     };
     return await getAvailableMedia(exactConstraints, deviceErrors);
 };
+const getCurrentDevicesSettings = (requestedDevices, mediaDeviceInfos) => {
+    const currentDevices = { videoinput: null, audioinput: null };
+    for (const track of requestedDevices.getTracks()) {
+        const settings = track.getSettings();
+        if (settings.deviceId) {
+            const currentDevice = mediaDeviceInfos.find((device) => device.deviceId == settings.deviceId);
+            const kind = currentDevice?.kind ?? null;
+            if ((currentDevice && kind === "videoinput") || kind === "audioinput") {
+                currentDevices[kind] = currentDevice ?? null;
+            }
+        }
+    }
+    return currentDevices;
+};
+const isDeviceDifferentFromLastSession = (lastDevice, currentDevice) => lastDevice && (currentDevice?.deviceId !== lastDevice.deviceId || currentDevice?.label !== lastDevice?.label);
+const isAnyDeviceDifferentFromLastSession = (lastVideoDevice, lastAudioDevice, currentDevices) => !!((currentDevices?.videoinput &&
+    isDeviceDifferentFromLastSession(lastVideoDevice, currentDevices?.videoinput || null)) ||
+    (currentDevices?.audioinput &&
+        isDeviceDifferentFromLastSession(lastAudioDevice, currentDevices?.audioinput || null)));
+const stopTracks = (requestedDevices) => {
+    for (const track of requestedDevices.getTracks()) {
+        track.stop();
+    }
+};
+const removeSpecifiedDeviceFromConstraints = (trackConstraints) => {
+    if (typeof trackConstraints === "object") {
+        return { ...trackConstraints, deviceId: undefined };
+    }
+    return trackConstraints;
+};

package/dist/types/internal.d.ts

@@ -1,5 +1,6 @@
 import type { SimulcastConfig, TrackBandwidthLimit } from "@fishjam-cloud/ts-client";
-import type { ToggleMode, Track, TrackMiddleware, TracksMiddleware } from "./public";
+import type { Track, TrackMiddleware, TracksMiddleware } from "./public";
+import type { DeviceType } from "../DeviceManager";
 export type TrackId = string;
 export type PeerId = string;
 export type PeerState = {
@@ -24,7 +25,6 @@ export type DeviceManagerStatus = "uninitialized" | "initializing" | "initialize
 export interface DeviceManagerState {
     deviceState: DeviceState;
     status: DeviceManagerStatus;
-    tracks: MediaStreamTrack[];
 }
 export type Media = {
     stream: MediaStream | null;
@@ -38,18 +38,7 @@ export type DeviceState = {
     devices: MediaDeviceInfo[] | null;
     devicesStatus: DevicesStatus;
     error: DeviceError | null;
-};
-export type MediaState = {
-    video: DeviceState;
-    audio: DeviceState;
-};
-export type DeviceManagerInitConfig = {
-    videoTrackConstraints?: boolean | MediaTrackConstraints;
-    audioTrackConstraints?: boolean | MediaTrackConstraints;
-};
-export type DeviceManagerStartConfig = {
-    audioDeviceId?: string | boolean;
-    videoDeviceId?: string | boolean;
+    currentMiddleware: TrackMiddleware | null;
 };
 export type DeviceError = {
     name: "OverconstrainedError";
@@ -66,16 +55,17 @@ export type CurrentDevices = {
 };
 export interface MediaManager {
     start: (deviceId?: string) => Promise<void>;
-    stop: () => Promise<void>;
+    stop: () => void;
     disable: () => void;
     enable: () => void;
-    getTracks: () => MediaStreamTrack[];
+    setTrackMiddleware: (middleware: TrackMiddleware | null) => void;
+    getMiddleware: () => TrackMiddleware | null;
     getMedia: () => {
         stream: MediaStream | null;
         track: MediaStreamTrack | null;
         enabled: boolean;
     } | null;
-    getDeviceType: () => "audio" | "video";
+    getDeviceType: () => DeviceType;
 }
 export type ScreenShareState = ({
     stream: MediaStream;
@@ -91,7 +81,7 @@ export type ScreenShareState = ({
 };
 export interface TrackManager {
     initialize: (deviceId?: string) => Promise<void>;
-    stop: () => Promise<void>;
+    stop: () => void;
     startStreaming: (simulcastConfig?: SimulcastConfig, maxBandwidth?: TrackBandwidthLimit) => Promise<string>;
     stopStreaming: () => Promise<void>;
     pauseStreaming: () => Promise<void>;
@@ -99,26 +89,26 @@ export interface TrackManager {
     paused: boolean;
     disableTrack: () => void;
     enableTrack: () => void;
-    setTrackMiddleware: (middleware: TrackMiddleware) => Promise<void>;
-    currentTrackMiddleware: TrackMiddleware;
+    setTrackMiddleware: (middleware: TrackMiddleware | null) => Promise<void>;
     refreshStreamedTrack: () => Promise<void>;
     currentTrack: Track | null;
     /**
-     * Toggles the media stream state based on the provided mode.
-     * Either initiates or terminates the device or enables or disables the stream.
-     *
-     * @param {ToggleMode} [mode] - The toggle mode, either "hard" or "soft". Defaults to "hard".
-     *
-     * - **Hard Mode** - Turns the physical device on and off.
-     *   - If started: disables the media stream, pauses streaming, and stops the device.
-     *   - If stopped: starts the device and begins (or resumes) streaming.
+     * Either enables or disables the stream.
      *
      * - **Soft Mode** - Enables and disables the media stream. Starts the device if needed.
      *   - If enabled: disables the media stream and pauses streaming, but does not stop the device.
      *   - If disabled: enables the media stream and starts (or resumes) streaming.
      *   - If stopped: starts the device, enables the media stream, and starts (or resumes) streaming.
      */
-    toggle: (mode?: ToggleMode) => Promise<void>;
+    toggleMute: () => Promise<void>;
+    /**
+     * Either initiates or terminates the device.
+     *
+     * - **Hard Mode** - Turns the physical device on and off.
+     *   - If started: disables the media stream, pauses streaming, and stops the device.
+     *   - If stopped: starts the device and begins (or resumes) streaming.
+     */
+    toggleDevice: () => Promise<void>;
 }
 export type DistinguishedTracks = {
     cameraTrack?: Track;

package/dist/types/internal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/types/internal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/types/internal.ts"],"names":[],"mappings":"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"}

package/dist/types/public.d.ts

@@ -9,8 +9,8 @@ export type Track = {
     vadStatus: VadStatus;
     track: MediaStreamTrack | null;
 };
-export type TrackMiddleware = ((track: MediaStreamTrack | null) => {
-    track: MediaStreamTrack | null;
+export type TrackMiddleware = ((track: MediaStreamTrack) => {
+    track: MediaStreamTrack;
     onClear?: () => void;
 }) | null;
 export type TracksMiddleware = (videoTrack: MediaStreamTrack, audioTrack: MediaStreamTrack | null) => {
@@ -27,7 +27,6 @@ export type TracksMiddleware = (videoTrack: MediaStreamTrack, audioTrack: MediaS
  * error - There was an error in the connection process.
  */
 export type PeerStatus = "connecting" | "connected" | "error" | "idle";
-export type ToggleMode = "soft" | "hard";
 export type Device = {
     isStreaming: boolean;
     status: DeviceManagerStatus;
@@ -36,6 +35,7 @@ export type Device = {
     stream: MediaStream | null;
     devices: MediaDeviceInfo[];
     activeDevice: MediaDeviceInfo | null;
+    currentMiddleware: TrackMiddleware;
 } & Omit<TrackManager, "currentTrack">;
 export type AudioDevice = Device & {
     isAudioPlaying: boolean;
@@ -45,7 +45,7 @@ export type ConnectConfig = Omit<TSClientConnectConfig<PeerMetadata>, "peerMetad
     peerMetadata?: PeerMetadata;
 };
 export type PersistLastDeviceHandlers = {
-    getLastDevice: (() => MediaDeviceInfo | null) | null;
+    getLastDevice: () => MediaDeviceInfo | null;
     saveLastDevice: (info: MediaDeviceInfo) => void;
 };
 export type ScreenshareApi = {

package/dist/types/public.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/types/public.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/types/public.ts"],"names":[],"mappings":"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"}

package/dist/utils/localStorage.d.ts

@@ -1,5 +1,4 @@
-export declare const loadObject: <T>(key: string, defaultValue: T) => T;
-export declare const loadString: (key: string, defaultValue?: string) => string;
-export declare const saveObject: <T>(key: string, value: T) => void;
-export declare const saveString: (key: string, value: string) => void;
+import type { PersistLastDeviceHandlers } from "../types/public";
+import type { DeviceType } from "../DeviceManager";
+export declare function createStorageConfig(deviceType: DeviceType, storage?: boolean | PersistLastDeviceHandlers): PersistLastDeviceHandlers | null;
 //# sourceMappingURL=localStorage.d.ts.map

package/dist/utils/localStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localStorage.d.ts","sourceRoot":"","sources":["../../src/utils/localStorage.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,GAAI,CAAC,OAAO,MAAM,gBAAgB,CAAC,KAAG,CAM5D,CAAC;AAEF,eAAO,MAAM,UAAU,QAAS,MAAM,kCAMrC,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,CAAC,OAAO,MAAM,SAAS,CAAC,SAGlD,CAAC;AAEF,eAAO,MAAM,UAAU,QAAS,MAAM,SAAS,MAAM,SAEpD,CAAC"}
+{"version":3,"file":"localStorage.d.ts","sourceRoot":"","sources":["../../src/utils/localStorage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,OAAO,CAAC,EAAE,OAAO,GAAG,yBAAyB,GAC5C,yBAAyB,GAAG,IAAI,CAIlC"}

package/dist/utils/localStorage.js

@@ -1,21 +1,35 @@
-export const loadObject = (key, defaultValue) => {
+export function createStorageConfig(deviceType, storage) {
+    if (storage === false)
+        return null;
+    if (storage === true || storage === undefined)
+        return getLocalStorageConfig(deviceType);
+    return storage;
+}
+const getLocalStorageConfig = (deviceType) => {
+    const key = `last-selected-${deviceType}-device`;
+    return {
+        getLastDevice: () => loadObject(key, null),
+        saveLastDevice: (info) => saveObject(key, info),
+    };
+};
+const loadObject = (key, defaultValue) => {
     const stringValue = loadString(key, "");
     if (stringValue === "") {
         return defaultValue;
     }
     return JSON.parse(stringValue);
 };
-export const loadString = (key, defaultValue = "") => {
+const loadString = (key, defaultValue = "") => {
     const value = localStorage.getItem(key);
     if (value === null || value === undefined) {
         return defaultValue;
     }
     return value;
 };
-export const saveObject = (key, value) => {
+const saveObject = (key, value) => {
     const stringValue = JSON.stringify(value);
     saveString(key, stringValue);
 };
-export const saveString = (key, value) => {
+const saveString = (key, value) => {
     localStorage.setItem(key, value);
 };

package/dist/utils/track.d.ts

@@ -2,4 +2,5 @@ import type { FishjamClient } from "@fishjam-cloud/ts-client";
 import type { PeerMetadata, TrackMetadata } from "../types/internal";
 import type { Track } from "../types/public";
 export declare const getRemoteOrLocalTrack: (tsClient: FishjamClient<PeerMetadata, TrackMetadata>, remoteOrLocalTrackId: string | null) => Track | null;
+export declare function setupOnEndedCallback(track: MediaStreamTrack, getCurrentTrackId: () => string | undefined, callback: () => Promise<void>): void;
 //# sourceMappingURL=track.d.ts.map

package/dist/utils/track.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"track.d.ts","sourceRoot":"","sources":["../../src/utils/track.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoC7C,eAAO,MAAM,qBAAqB,aACtB,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,wBAC9B,MAAM,GAAG,IAAI,iBAKpC,CAAC"}
+{"version":3,"file":"track.d.ts","sourceRoot":"","sources":["../../src/utils/track.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoC7C,eAAO,MAAM,qBAAqB,aACtB,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,wBAC9B,MAAM,GAAG,IAAI,iBAKpC,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,gBAAgB,EACvB,iBAAiB,EAAE,MAAM,MAAM,GAAG,SAAS,EAC3C,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,QAQ9B"}

package/dist/utils/track.js

@@ -33,3 +33,11 @@ export const getRemoteOrLocalTrack = (tsClient, remoteOrLocalTrackId) => {
         return null;
     return getTrackFromContext(context);
 };
+export function setupOnEndedCallback(track, getCurrentTrackId, callback) {
+    track.addEventListener("ended", async (event) => {
+        const trackId = event.target.id;
+        if (trackId === getCurrentTrackId()) {
+            await callback();
+        }
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/react-client",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "React client library for Fishjam Cloud",
   "license": "Apache-2.0",
   "author": "Fishjam Cloud Team",
@@ -41,16 +41,16 @@
     "@playwright/test": "^1.47.2",
     "@types/events": "^3.0.3",
     "@types/lodash.isequal": "^4.5.8",
-    "@types/node": "^22.7.4",
-    "@types/react": "^18.3.10",
+    "@types/node": "^22.7.5",
+    "@types/react": "^18.3.11",
     "react": "^18.2.0",
     "typed-emitter": "^2.1.0",
-    "typedoc": "^0.26.7",
+    "typedoc": "^0.26.8",
     "typedoc-plugin-mdn-links": "^3.3.2",
     "typescript": "^5.6.2"
   },
   "dependencies": {
-    "@fishjam-cloud/ts-client": "0.7.1",
+    "@fishjam-cloud/ts-client": "0.7.2",
     "events": "3.3.0",
     "lodash.isequal": "4.5.0"
   },