@fishjam-cloud/react-client 0.15.0 → 0.16.0

package/dist/contexts/initDevices.d.ts

@@ -1,3 +1,4 @@
+import type { InitializeDevicesSettings } from "../hooks/internal/devices/useMediaDevices";
 import type { InitializeDevicesResult } from "../types/public";
-export declare const InitDevicesContext: import("react").Context<(() => Promise<InitializeDevicesResult>) | null>;
+export declare const InitDevicesContext: import("react").Context<((settings?: InitializeDevicesSettings) => Promise<InitializeDevicesResult>) | null>;
 //# sourceMappingURL=initDevices.d.ts.map

package/dist/contexts/initDevices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initDevices.d.ts","sourceRoot":"","sources":["../../src/contexts/initDevices.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D,eAAO,MAAM,kBAAkB,iCAAwB,OAAO,CAAC,uBAAuB,CAAC,SAAe,CAAC"}
+{"version":3,"file":"initDevices.d.ts","sourceRoot":"","sources":["../../src/contexts/initDevices.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAC3F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D,eAAO,MAAM,kBAAkB,uCAChB,yBAAyB,KAAK,OAAO,CAAC,uBAAuB,CAAC,SACtE,CAAC"}

package/dist/hooks/devices/useCamera.d.ts

@@ -10,13 +10,18 @@ export declare function useCamera(): {
     /**
      * Selects the camera device
      */
-    selectCamera: (deviceId?: string) => Promise<undefined | import("../..").DeviceError>;
+    selectCamera: (deviceId: string) => Promise<undefined | import("../..").DeviceError>;
     /**
+     * @deprecated Use `currentCamera` and `isCameraOn` instead
      * Indicates which camera is now turned on and streaming
      */
     activeCamera: import("../..").DeviceItem | null;
     /**
-     * Indicates whether the microphone is streaming video
+     * Indicates which camera is now selected
+     */
+    currentCamera: MediaDeviceInfo | null;
+    /**
+     * Indicates whether the camera is streaming video
      */
     isCameraOn: boolean;
     /**

package/dist/hooks/devices/useCamera.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCamera.d.ts","sourceRoot":"","sources":["../../../src/hooks/devices/useCamera.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,SAAS;IAarB;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;EAGN"}
+{"version":3,"file":"useCamera.d.ts","sourceRoot":"","sources":["../../../src/hooks/devices/useCamera.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,SAAS;IAarB;;OAEG;;IAEH;;OAEG;;IAEH;;;OAGG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;EAGN"}

package/dist/hooks/devices/useCamera.js

@@ -25,11 +25,16 @@ export function useCamera() {
          */
         selectCamera: videoTrackManager.selectDevice,
         /**
+         * @deprecated Use `currentCamera` and `isCameraOn` instead
          * Indicates which camera is now turned on and streaming
          */
         activeCamera: cameraManager.activeDevice,
         /**
-         * Indicates whether the microphone is streaming video
+         * Indicates which camera is now selected
+         */
+        currentCamera: cameraManager.selectedDevice,
+        /**
+         * Indicates whether the camera is streaming video
          */
         isCameraOn: !!cameraStream,
         /**

package/dist/hooks/devices/useInitializeDevices.d.ts

@@ -10,6 +10,6 @@ export declare const useInitializeDevices: () => {
     /**
      * Initialize access to the devices before joining the room
      */
-    initializeDevices: () => Promise<import("../..").InitializeDevicesResult>;
+    initializeDevices: (settings?: import("../..").InitializeDevicesSettings) => Promise<import("../..").InitializeDevicesResult>;
 };
 //# sourceMappingURL=useInitializeDevices.d.ts.map

package/dist/hooks/devices/useMicrophone.d.ts

@@ -8,11 +8,16 @@ export declare function useMicrophone(): {
     /** Mutes/unmutes the microphone */
     toggleMicrophoneMute: () => Promise<void>;
     /** Selects the microphone device */
-    selectMicrophone: (deviceId?: string) => Promise<undefined | import("../..").DeviceError>;
+    selectMicrophone: (deviceId: string) => Promise<undefined | import("../..").DeviceError>;
     /**
+     * @deprecated Use `currentMicrophone` and `isMicrophoneOn` instead
      * Indicates which microphone is now turned on and streaming audio
      */
     activeMicrophone: import("../..").DeviceItem | null;
+    /**
+     * Indicates which microphone is now selected
+     */
+    currentMicrophone: MediaDeviceInfo | null;
     /**
      * Indicates whether the microphone is streaming audio
      */

package/dist/hooks/devices/useMicrophone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMicrophone.d.ts","sourceRoot":"","sources":["../../../src/hooks/devices/useMicrophone.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,aAAa;IAazB,wCAAwC;;IAExC,mCAAmC;;IAEnC,oCAAoC;;IAEpC;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;EAGN"}
+{"version":3,"file":"useMicrophone.d.ts","sourceRoot":"","sources":["../../../src/hooks/devices/useMicrophone.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,aAAa;IAazB,wCAAwC;;IAExC,mCAAmC;;IAEnC,oCAAoC;;IAEpC;;;OAGG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;EAGN"}

package/dist/hooks/devices/useMicrophone.js

@@ -23,9 +23,14 @@ export function useMicrophone() {
         /** Selects the microphone device */
         selectMicrophone: audioTrackManager.selectDevice,
         /**
+         * @deprecated Use `currentMicrophone` and `isMicrophoneOn` instead
          * Indicates which microphone is now turned on and streaming audio
          */
         activeMicrophone: microphoneManager.activeDevice,
+        /**
+         * Indicates which microphone is now selected
+         */
+        currentMicrophone: microphoneManager.selectedDevice,
         /**
          * Indicates whether the microphone is streaming audio
          */

package/dist/hooks/internal/devices/useDeviceManager.d.ts

@@ -9,11 +9,13 @@ type DeviceManagerProps = {
     deviceType: "audio" | "video";
     allDevicesList: MediaDeviceInfo[];
     constraints?: MediaTrackConstraints | boolean;
-    saveUsedDevice: (device: MediaDeviceInfo) => void;
+    setSelectedDevice: (device: MediaDeviceInfo) => void;
+    selectedDevice: MediaDeviceInfo | null;
 };
 export type DeviceManager = {
-    startDevice: (deviceId?: string) => Promise<[MediaStreamTrack, null] | [null, DeviceError]>;
+    startDevice: (deviceId?: string | null) => Promise<[MediaStreamTrack, null] | [null, DeviceError]>;
     stopDevice: () => void;
+    selectDevice: (deviceId: string) => Promise<[MediaStreamTrack, null] | [null, DeviceError]> | undefined;
     activeDevice: DeviceItem | null;
     deviceTrack: MediaStreamTrack | null;
     deviceList: DeviceItem[];
@@ -23,7 +25,8 @@ export type DeviceManager = {
     currentMiddleware: TrackMiddleware;
     applyMiddleware: (middleware: TrackMiddleware) => MediaStreamTrack | null;
     deviceError: DeviceError | null;
+    selectedDevice: MediaDeviceInfo | null;
 };
-export declare const useDeviceManager: ({ mediaStream, getInitialStream, deviceType, allDevicesList, setMediaStream, constraints, saveUsedDevice, deviceError, setDeviceError, }: DeviceManagerProps) => DeviceManager;
+export declare const useDeviceManager: ({ mediaStream, setMediaStream, getInitialStream, deviceType, constraints, allDevicesList, setSelectedDevice, deviceError, setDeviceError, selectedDevice, }: DeviceManagerProps) => DeviceManager;
 export {};
 //# sourceMappingURL=useDeviceManager.d.ts.map

package/dist/hooks/internal/devices/useDeviceManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDeviceManager.d.ts","sourceRoot":"","sources":["../../../../src/hooks/internal/devices/useDeviceManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAKtF,KAAK,kBAAkB,GAAG;IACxB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC;IACrE,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC;IACrE,gBAAgB,EAAE,MAAM,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IACpD,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC;IAC9B,cAAc,EAAE,eAAe,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC;IAC9C,cAAc,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAC5F,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,UAAU,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrC,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,iBAAiB,EAAE,eAAe,CAAC;IACnC,eAAe,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,gBAAgB,GAAG,IAAI,CAAC;IAC1E,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;CACjC,CAAC;AAsCF,eAAO,MAAM,gBAAgB,GAAI,0IAU9B,kBAAkB,KAAG,aAuFvB,CAAC"}
+{"version":3,"file":"useDeviceManager.d.ts","sourceRoot":"","sources":["../../../../src/hooks/internal/devices/useDeviceManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMtF,KAAK,kBAAkB,GAAG;IACxB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC;IACrE,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC;IACrE,gBAAgB,EAAE,MAAM,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IACpD,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC;IAC9B,cAAc,EAAE,eAAe,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC;IAC9C,iBAAiB,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IACrD,cAAc,EAAE,eAAe,GAAG,IAAI,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IACnG,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,GAAG,SAAS,CAAC;IACxG,YAAY,EAAE,UAAU,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrC,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,iBAAiB,EAAE,eAAe,CAAC;IACnC,eAAe,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,gBAAgB,GAAG,IAAI,CAAC;IAC1E,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,eAAe,GAAG,IAAI,CAAC;CACxC,CAAC;AAsCF,eAAO,MAAM,gBAAgB,GAAI,6JAW9B,kBAAkB,KAAG,aAgIvB,CAAC"}

package/dist/hooks/internal/devices/useDeviceManager.js

@@ -2,6 +2,7 @@ import { useCallback, useMemo, useState } from "react";
 import { parseUserMediaError } from "../../../utils/errors";
 import { getTrackFromStream, stopStream } from "../../../utils/track";
 import { useTrackMiddleware } from "../useTrackMiddleware";
+import { useHandleTrackEnd } from "./useHandleTrackEnd";
 function getReplaceStreamAction(newStream, deviceType) {
     return (oldStream) => {
         if (oldStream) {
@@ -28,8 +29,12 @@ async function getDeviceStream(type, constraints, deviceId) {
     });
     return stream;
 }
-export const useDeviceManager = ({ mediaStream, getInitialStream, deviceType, allDevicesList, setMediaStream, constraints, saveUsedDevice, deviceError, setDeviceError, }) => {
+export const useDeviceManager = ({ mediaStream, setMediaStream, getInitialStream, deviceType, constraints, allDevicesList, setSelectedDevice, deviceError, setDeviceError, selectedDevice, }) => {
     const rawTrack = useMemo(() => mediaStream && getTrackFromStream(mediaStream, deviceType), [mediaStream, deviceType]);
+    const clearStream = useCallback(() => {
+        setMediaStream(null);
+    }, [setMediaStream]);
+    useHandleTrackEnd(rawTrack, clearStream);
     const { processedTrack, applyMiddleware, currentMiddleware } = useTrackMiddleware(rawTrack);
     const currentTrack = processedTrack ?? rawTrack;
     const deviceList = useMemo(() => allDevicesList.filter(({ kind }) => kind === `${deviceType}input`), [allDevicesList, deviceType]);
@@ -41,7 +46,13 @@ export const useDeviceManager = ({ mediaStream, getInitialStream, deviceType, al
         return { label: currentDevice.label, deviceId: currentDevice.deviceId };
     }, [mediaStream, deviceList, deviceType]);
     const [deviceEnabled, setDeviceEnabled] = useState(true);
-    const startDevice = useCallback(async (deviceId) => {
+    const setSelectedDeviceId = useCallback((deviceId) => {
+        const device = deviceList.find((d) => d.deviceId === deviceId);
+        if (!device)
+            return;
+        setSelectedDevice(device);
+    }, [deviceList, setSelectedDevice]);
+    const startDevice = useCallback(async (deviceId = selectedDevice?.deviceId) => {
         const initialStream = await getInitialStream();
         const track = initialStream && getTrackFromStream(initialStream, deviceType);
         const isUsingDesiredDevice = !deviceId || deviceId === track?.getSettings().deviceId;
@@ -49,12 +60,15 @@ export const useDeviceManager = ({ mediaStream, getInitialStream, deviceType, al
             return [track, null];
         }
         try {
-            const stream = await getDeviceStream(deviceType, constraints, deviceId);
+            const stream = await getDeviceStream(deviceType, constraints, deviceId ?? null);
             setMediaStream(getReplaceStreamAction(stream, deviceType));
             const retrievedTrack = stream && getTrackFromStream(stream, deviceType);
-            const usedDevice = deviceList.find((device) => device.deviceId === retrievedTrack?.getSettings().deviceId);
-            if (usedDevice) {
-                saveUsedDevice(usedDevice);
+            const retrievedTrackDeviceId = retrievedTrack.getSettings().deviceId;
+            if (retrievedTrackDeviceId) {
+                setSelectedDeviceId(retrievedTrackDeviceId);
+            }
+            if (retrievedTrack && !deviceEnabled) {
+                retrievedTrack.enabled = false;
             }
             return [retrievedTrack, null];
         }
@@ -63,7 +77,24 @@ export const useDeviceManager = ({ mediaStream, getInitialStream, deviceType, al
             setDeviceError(parsedError);
             return [null, parsedError];
         }
-    }, [getInitialStream, deviceType, constraints, setMediaStream, deviceList, saveUsedDevice, setDeviceError]);
+    }, [
+        selectedDevice?.deviceId,
+        getInitialStream,
+        deviceType,
+        constraints,
+        setMediaStream,
+        deviceEnabled,
+        setSelectedDeviceId,
+        setDeviceError,
+    ]);
+    const selectDevice = useCallback((deviceId) => {
+        if (currentTrack) {
+            return startDevice(deviceId);
+        }
+        else {
+            setSelectedDeviceId(deviceId);
+        }
+    }, [currentTrack, setSelectedDeviceId, startDevice]);
     const stopDevice = useCallback(() => {
         setMediaStream(getStopStreamAction(deviceType));
     }, [setMediaStream, deviceType]);
@@ -82,6 +113,7 @@ export const useDeviceManager = ({ mediaStream, getInitialStream, deviceType, al
     return {
         startDevice,
         stopDevice,
+        selectDevice,
         activeDevice,
         deviceTrack: processedTrack ?? rawTrack,
         deviceList,
@@ -91,5 +123,6 @@ export const useDeviceManager = ({ mediaStream, getInitialStream, deviceType, al
         currentMiddleware,
         applyMiddleware,
         deviceError,
+        selectedDevice,
     };
 };

package/dist/hooks/internal/devices/useHandleTrackEnd.d.ts

@@ -0,0 +1,2 @@
+export declare const useHandleTrackEnd: (track: MediaStreamTrack | null, clearStream: () => void) => void;
+//# sourceMappingURL=useHandleTrackEnd.d.ts.map

package/dist/hooks/internal/devices/useHandleTrackEnd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useHandleTrackEnd.d.ts","sourceRoot":"","sources":["../../../../src/hooks/internal/devices/useHandleTrackEnd.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,GAAI,OAAO,gBAAgB,GAAG,IAAI,EAAE,aAAa,MAAM,IAAI,SASxF,CAAC"}

package/dist/hooks/internal/devices/useHandleTrackEnd.js

@@ -0,0 +1,11 @@
+import { useEffect } from "react";
+export const useHandleTrackEnd = (track, clearStream) => {
+    useEffect(() => {
+        if (!track)
+            return;
+        track.onended = () => {
+            track.stop();
+            clearStream();
+        };
+    }, [track, clearStream]);
+};

package/dist/hooks/internal/devices/useMediaDevices.d.ts

@@ -4,11 +4,12 @@ interface UseDevicesProps {
     audioConstraints?: MediaTrackConstraints | boolean;
     persistHandlers?: PersistLastDeviceHandlers;
 }
+export type InitializeDevicesSettings = {
+    enableVideo?: boolean;
+    enableAudio?: boolean;
+};
 export declare const useMediaDevices: ({ videoConstraints, audioConstraints, persistHandlers }: UseDevicesProps) => {
-    initializeDevices: (settings?: {
-        enableVideo?: boolean;
-        enableAudio?: boolean;
-    }) => Promise<InitializeDevicesResult>;
+    initializeDevices: (settings?: InitializeDevicesSettings) => Promise<InitializeDevicesResult>;
     cameraManager: import("./useDeviceManager").DeviceManager;
     microphoneManager: import("./useDeviceManager").DeviceManager;
 };

package/dist/hooks/internal/devices/useMediaDevices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMediaDevices.d.ts","sourceRoot":"","sources":["../../../../src/hooks/internal/devices/useMediaDevices.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAe,uBAAuB,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAI7G,UAAU,eAAe;IACvB,gBAAgB,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC;IACnD,gBAAgB,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC;IACnD,eAAe,CAAC,EAAE,yBAAyB,CAAC;CAC7C;AAED,eAAO,MAAM,eAAe,GAAI,yDAAyD,eAAe;mCA+BlF;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,KAAG,OAAO,CAAC,uBAAuB,CAAC;;;CA2GxG,CAAC"}
+{"version":3,"file":"useMediaDevices.d.ts","sourceRoot":"","sources":["../../../../src/hooks/internal/devices/useMediaDevices.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAe,uBAAuB,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAG7G,UAAU,eAAe;IACvB,gBAAgB,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC;IACnD,gBAAgB,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC;IACnD,eAAe,CAAC,EAAE,yBAAyB,CAAC;CAC7C;AAED,MAAM,MAAM,yBAAyB,GAAG;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEzF,eAAO,MAAM,eAAe,GAAI,yDAAyD,eAAe;mCAmClF,yBAAyB,KAAG,OAAO,CAAC,uBAAuB,CAAC;;;CA0GjF,CAAC"}

package/dist/hooks/internal/devices/useMediaDevices.js

@@ -2,22 +2,21 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { prepareConstraints } from "../../../devices/constraints";
 import { correctDevicesOnSafari, getAvailableMedia } from "../../../devices/mediaInitializer";
 import { useDeviceManager } from "./useDeviceManager";
-import { useHandleTrackEnd } from "./useHandleStreamEnd";
 export const useMediaDevices = ({ videoConstraints, audioConstraints, persistHandlers }) => {
     const [deviceList, setDeviceList] = useState([]);
     const [videoStream, setVideoStream] = useState(null);
     const [audioStream, setAudioStream] = useState(null);
     const [videoError, setVideoError] = useState(null);
     const [audioError, setAudioError] = useState(null);
-    const lastUsedCameraRef = useRef(persistHandlers?.getLastDevice("video") ?? null);
-    const lastUsedMicRef = useRef(persistHandlers?.getLastDevice("audio") ?? null);
+    const [selectedCamera, setSelectedCamera] = useState(persistHandlers?.getLastDevice("video") ?? null);
+    const [selectedMic, setSelectedMic] = useState(persistHandlers?.getLastDevice("audio") ?? null);
     const initializationRef = useRef(null);
-    const saveUsedCamera = useCallback((deviceInfo) => {
-        lastUsedCameraRef.current = deviceInfo;
+    const selectCamera = useCallback((deviceInfo) => {
+        setSelectedCamera(deviceInfo);
         persistHandlers?.saveLastDevice(deviceInfo, "video");
     }, [persistHandlers]);
-    const saveUsedMic = useCallback((deviceInfo) => {
-        lastUsedMicRef.current = deviceInfo;
+    const selectMic = useCallback((deviceInfo) => {
+        setSelectedMic(deviceInfo);
         persistHandlers?.saveLastDevice(deviceInfo, "audio");
     }, [persistHandlers]);
     const initializeDevices = useCallback(async (settings) => {
@@ -25,8 +24,8 @@ export const useMediaDevices = ({ videoConstraints, audioConstraints, persistHan
             return { stream: null, errors: null, status: "already_initialized" };
         }
         const lastUsed = {
-            audio: lastUsedMicRef.current,
-            video: lastUsedCameraRef.current,
+            audio: selectedMic,
+            video: selectedCamera,
         };
         const constraints = {
             video: settings?.enableVideo !== false && prepareConstraints(lastUsed.video?.deviceId, videoConstraints),
@@ -43,29 +42,29 @@ export const useMediaDevices = ({ videoConstraints, audioConstraints, persistHan
             const videoDevice = deviceList.find((device) => device.deviceId === stream?.getVideoTracks()[0].getSettings().deviceId);
             const audioDevice = deviceList.find((device) => device.deviceId === stream?.getAudioTracks()[0].getSettings().deviceId);
             if (videoDevice) {
-                saveUsedCamera(videoDevice);
+                selectCamera(videoDevice);
             }
             if (audioDevice) {
-                saveUsedMic(audioDevice);
+                selectMic(audioDevice);
             }
             setVideoStream(stream);
             setAudioStream(stream);
             setVideoError(errors.video);
             setAudioError(errors.audio);
             if (!stream) {
-                return { status: "failed", errors: errors, stream: null };
+                return { status: "failed", errors, stream: null };
             }
             else if (errors.video || errors.audio) {
                 return { status: "initialized_with_errors", errors, stream: null };
             }
             else {
-                return { status: "initialized", stream, errors: null };
+                return { status: "initialized", errors: null, stream };
             }
         };
         const initializePromise = intitialize();
         initializationRef.current = initializePromise;
         return await initializePromise;
-    }, [deviceList, videoConstraints, audioConstraints, saveUsedCamera, saveUsedMic]);
+    }, [deviceList, selectedMic, selectedCamera, videoConstraints, audioConstraints, selectCamera, selectMic]);
     useEffect(() => {
         const isInitialStreamIrrelevant = videoStream !== audioStream;
         if (isInitialStreamIrrelevant) {
@@ -76,8 +75,6 @@ export const useMediaDevices = ({ videoConstraints, audioConstraints, persistHan
         const result = await initializationRef.current;
         return result?.stream ?? null;
     }, []);
-    useHandleTrackEnd({ stream: videoStream, setStream: setVideoStream, type: "video" });
-    useHandleTrackEnd({ stream: audioStream, setStream: setAudioStream, type: "audio" });
     const cameraManager = useDeviceManager({
         mediaStream: videoStream,
         setMediaStream: setVideoStream,
@@ -87,7 +84,8 @@ export const useMediaDevices = ({ videoConstraints, audioConstraints, persistHan
         deviceType: "video",
         allDevicesList: deviceList,
         constraints: videoConstraints,
-        saveUsedDevice: saveUsedCamera,
+        setSelectedDevice: selectCamera,
+        selectedDevice: selectedCamera,
     });
     const microphoneManager = useDeviceManager({
         mediaStream: audioStream,
@@ -98,7 +96,8 @@ export const useMediaDevices = ({ videoConstraints, audioConstraints, persistHan
         deviceType: "audio",
         allDevicesList: deviceList,
         constraints: audioConstraints,
-        saveUsedDevice: saveUsedMic,
+        setSelectedDevice: selectMic,
+        selectedDevice: selectedMic,
     });
     return {
         initializeDevices,

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

@@ -1 +1 @@
-{"version":3,"file":"useTrackManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/internal/useTrackManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA+C,MAAM,0BAA0B,CAAC;AAG3G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAErG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,UAAU,kBAAkB;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;CAC/B;AAED,eAAO,MAAM,eAAe,GAAI,+EAO7B,kBAAkB,KAAG,YAuKvB,CAAC"}
+{"version":3,"file":"useTrackManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/internal/useTrackManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA+C,MAAM,0BAA0B,CAAC;AAG3G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAErG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,UAAU,kBAAkB;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;CAC/B;AAED,eAAO,MAAM,eAAe,GAAI,+EAO7B,kBAAkB,KAAG,YAkLvB,CAAC"}

package/dist/hooks/internal/useTrackManager.js

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useRef } from "react";
 import { getConfigAndBandwidthFromProps, getRemoteOrLocalTrack } from "../../utils/track";
 export const useTrackManager = ({ deviceManager, tsClient, peerStatus, bandwidthLimits, streamConfig, type, }) => {
     const currentTrackIdRef = useRef(null);
-    const { startDevice, stopDevice, enableDevice, disableDevice, deviceTrack, applyMiddleware, currentMiddleware } = deviceManager;
+    const { startDevice, stopDevice, enableDevice, disableDevice, deviceTrack, applyMiddleware, currentMiddleware, selectDevice: _selectDevice, } = deviceManager;
     const getCurrentTrackId = useCallback(() => {
         const refTrackId = currentTrackIdRef.current;
         if (!refTrackId)
@@ -12,14 +12,17 @@ export const useTrackManager = ({ deviceManager, tsClient, peerStatus, bandwidth
         return currentTrack?.trackId ?? null;
     }, [tsClient]);
     const selectDevice = useCallback(async (deviceId) => {
-        const [newTrack, error] = await startDevice(deviceId);
+        const result = await _selectDevice(deviceId);
+        if (!result)
+            return;
+        const [newTrack, error] = result;
         if (error)
             return error;
         const currentTrackId = getCurrentTrackId();
         if (!currentTrackId)
             return;
         await tsClient.replaceTrack(currentTrackId, newTrack);
-    }, [getCurrentTrackId, startDevice, tsClient]);
+    }, [getCurrentTrackId, _selectDevice, tsClient]);
     const setTrackMiddleware = useCallback(async (middleware) => {
         const processedTrack = applyMiddleware(middleware);
         const currentTrackId = getCurrentTrackId();

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export { FishjamProvider, type FishjamProviderProps } from "./FishjamProvider";
 export { useCamera } from "./hooks/devices/useCamera";
 export { useInitializeDevices, UseInitializeDevicesParams } from "./hooks/devices/useInitializeDevices";
 export { useMicrophone } from "./hooks/devices/useMicrophone";
+export { InitializeDevicesSettings } from "./hooks/internal/devices/useMediaDevices";
 export { type JoinRoomConfig, useConnection } from "./hooks/useConnection";
 export { type PeerWithTracks, usePeers } from "./hooks/usePeers";
 export { useScreenShare } from "./hooks/useScreenShare";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,KAAK,cAAc,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,KAAK,cAAc,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,YAAY,EACV,eAAe,EACf,KAAK,EACL,WAAW,EACX,UAAU,EACV,uBAAuB,EACvB,uBAAuB,EACvB,MAAM,EACN,UAAU,EACV,yBAAyB,EACzB,wBAAwB,EACxB,YAAY,EACZ,KAAK,EACL,OAAO,EACP,eAAe,EACf,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,eAAe,EACf,eAAe,EACf,QAAQ,EACR,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,eAAe,EACf,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,KAAK,cAAc,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,KAAK,cAAc,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,YAAY,EACV,eAAe,EACf,KAAK,EACL,WAAW,EACX,UAAU,EACV,uBAAuB,EACvB,uBAAuB,EACvB,MAAM,EACN,UAAU,EACV,yBAAyB,EACzB,wBAAwB,EACxB,YAAY,EACZ,KAAK,EACL,OAAO,EACP,eAAe,EACf,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,eAAe,EACf,eAAe,EACf,QAAQ,EACR,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,eAAe,EACf,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/tests/useHandleTrackEnd.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=useHandleTrackEnd.spec.d.ts.map

package/dist/tests/useHandleTrackEnd.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useHandleTrackEnd.spec.d.ts","sourceRoot":"","sources":["../../src/tests/useHandleTrackEnd.spec.ts"],"names":[],"mappings":""}

package/dist/tests/useHandleTrackEnd.spec.js

@@ -0,0 +1,14 @@
+import { renderHook } from "@testing-library/react";
+import { FakeMediaStreamTrack } from "fake-mediastreamtrack";
+import { describe, expect, it, vi } from "vitest";
+import { useHandleTrackEnd } from "../hooks/internal/devices/useHandleTrackEnd";
+describe("useHandleTrackEnd", () => {
+    it("should clear stream on track ended event", () => {
+        const clearStream = vi.fn();
+        const track = new FakeMediaStreamTrack({ kind: "it literally doesn't matter" });
+        renderHook(() => useHandleTrackEnd(track, clearStream));
+        expect(track.onended).toBeDefined();
+        track.remoteStop();
+        expect(clearStream).toHaveBeenCalled();
+    });
+});

package/dist/types/internal.d.ts

@@ -21,7 +21,7 @@ export type ScreenShareState = ({
     tracksMiddleware?: TracksMiddleware | null;
 };
 export interface TrackManager {
-    selectDevice: (deviceId?: string) => Promise<undefined | DeviceError>;
+    selectDevice: (deviceId: string) => Promise<undefined | DeviceError>;
     deviceTrack: MediaStreamTrack | null;
     currentMiddleware: TrackMiddleware;
     setTrackMiddleware: (middleware: TrackMiddleware | null) => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/types/internal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEvF,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC;AAEnD,MAAM,MAAM,cAAc,GAAG;IAAE,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IAAC,UAAU,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,CAAC;AAExG,MAAM,MAAM,gBAAgB,GAAG,CAC3B;IACE,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAClD,GACD;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAA;CAAE,CACnC,GAAG;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;CAAE,CAAC;AAEnD,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC,CAAC;IACtE,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrC,iBAAiB,EAAE,eAAe,CAAC;IACnC,kBAAkB,EAAE,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E;;;;;;;OAOG;IACH,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC,CAAC;CACtD;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC"}
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/types/internal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEvF,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC;AAEnD,MAAM,MAAM,cAAc,GAAG;IAAE,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IAAC,UAAU,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,CAAC;AAExG,MAAM,MAAM,gBAAgB,GAAG,CAC3B;IACE,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAClD,GACD;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAA;CAAE,CACnC,GAAG;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;CAAE,CAAC;AAEnD,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC,CAAC;IACrE,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrC,iBAAiB,EAAE,eAAe,CAAC;IACnC,kBAAkB,EAAE,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E;;;;;;;OAOG;IACH,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC,CAAC;CACtD;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC"}

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,EAAE,eAAe,EAA+B,MAAM,0BAA0B,CAAC;AAC5G,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,KAAK,EAAW,MAAM,iBAAiB,CAAC;AAiCvE,eAAO,MAAM,qBAAqB,GAAI,UAAU,aAAa,EAAE,sBAAsB,MAAM,iBAI1F,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,gBAAgB,EACvB,iBAAiB,EAAE,MAAM,MAAM,GAAG,SAAS,EAC3C,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,QAQ9B;AAOD,eAAO,MAAM,8BAA8B,GACzC,WAAW,OAAO,EAAE,GAAG,KAAK,GAAG,SAAS,EACxC,iBAAiB,eAAe,oFAcjC,CAAC;AAOF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,oBAE9E;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,QAKtE"}
+{"version":3,"file":"track.d.ts","sourceRoot":"","sources":["../../src/utils/track.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAA+B,MAAM,0BAA0B,CAAC;AAC5G,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,KAAK,EAAW,MAAM,iBAAiB,CAAC;AAiCvE,eAAO,MAAM,qBAAqB,GAAI,UAAU,aAAa,EAAE,sBAAsB,MAAM,iBAI1F,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,gBAAgB,EACvB,iBAAiB,EAAE,MAAM,MAAM,GAAG,SAAS,EAC3C,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,QAQ9B;AAOD,eAAO,MAAM,8BAA8B,GACzC,WAAW,OAAO,EAAE,GAAG,KAAK,GAAG,SAAS,EACxC,iBAAiB,eAAe,oFAgBjC,CAAC;AAOF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,oBAE9E;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,QAKtE"}

package/dist/utils/track.js

@@ -51,7 +51,7 @@ export const getConfigAndBandwidthFromProps = (encodings, bandwidthLimits) => {
         enabledVariants: encodings,
         disabledVariants: getDisabledEncodings(encodings),
     };
-    const variantEntries = Object.entries(bandwidthLimits.simulcast);
+    const variantEntries = Object.entries(bandwidthLimits.simulcast).map(([key, value]) => [Number(key), value]);
     const bandwidth = new Map(variantEntries);
     return [bandwidth, config];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/react-client",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "React client library for Fishjam",
   "license": "Apache-2.0",
   "author": "Fishjam Team",
@@ -34,6 +34,7 @@
   "scripts": {
     "build": "tsc",
     "e2e": "NODE_OPTIONS=--dns-result-order=ipv4first playwright test",
+    "test": "vitest",
     "docs": "typedoc src src/experimental",
     "format": "prettier --write . --ignore-path ./.eslintignore",
     "format:check": "prettier --check . --ignore-path ./.eslintignore",
@@ -43,18 +44,23 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.51.1",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/react": "^16.3.0",
     "@types/events": "^3.0.3",
     "@types/lodash.isequal": "^4.5.8",
-    "@types/node": "^22.13.10",
-    "@types/react": "^19.0.11",
+    "@types/node": "^22.14.0",
+    "@types/react": "^19.0.12",
+    "fake-mediastreamtrack": "^2.0.0",
+    "jsdom": "^26.0.0",
     "react": "^19.0.0",
     "typed-emitter": "^2.1.0",
-    "typedoc": "^0.28.0",
+    "typedoc": "^0.28.2",
     "typedoc-plugin-mdn-links": "^5.0.1",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.3",
+    "vitest": "^3.1.1"
   },
   "dependencies": {
-    "@fishjam-cloud/ts-client": "0.15.0",
+    "@fishjam-cloud/ts-client": "0.16.0",
     "events": "3.3.0",
     "lodash.isequal": "4.5.0"
   },

package/dist/hooks/internal/devices/useHandleStreamEnd.d.ts

@@ -1,9 +0,0 @@
-import type { SetStateAction } from "react";
-interface HandleTrackEndProps {
-    stream: MediaStream | null;
-    setStream: (action: SetStateAction<MediaStream | null>) => void;
-    type: "audio" | "video";
-}
-export declare const useHandleTrackEnd: ({ stream, setStream, type }: HandleTrackEndProps) => void;
-export {};
-//# sourceMappingURL=useHandleStreamEnd.d.ts.map

package/dist/hooks/internal/devices/useHandleStreamEnd.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useHandleStreamEnd.d.ts","sourceRoot":"","sources":["../../../../src/hooks/internal/devices/useHandleStreamEnd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAK5C,UAAU,mBAAmB;IAC3B,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC;IAChE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;CACzB;AAED,eAAO,MAAM,iBAAiB,GAAI,6BAA6B,mBAAmB,SAUjF,CAAC"}

package/dist/hooks/internal/devices/useHandleStreamEnd.js

@@ -1,13 +0,0 @@
-import { useEffect } from "react";
-import { getTrackFromStream } from "../../../utils/track";
-export const useHandleTrackEnd = ({ stream, setStream, type }) => {
-    useEffect(() => {
-        const track = stream && getTrackFromStream(stream, type);
-        if (!track)
-            return;
-        track.onended = () => {
-            track.stop();
-            setStream(null);
-        };
-    }, [type, stream, setStream]);
-};