@fishjam-cloud/react-client 0.14.0 → 0.15.0

package/dist/hooks/internal/useTrackManager.js

@@ -1,134 +1,124 @@
-import { Variant } from "@fishjam-cloud/ts-client";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { TrackTypeError, Variant } from "@fishjam-cloud/ts-client";
+import { useCallback, useEffect, useRef } from "react";
 import { getConfigAndBandwidthFromProps, getRemoteOrLocalTrack } from "../../utils/track";
-const TRACK_TYPE_TO_DEVICE = {
-    video: "camera",
-    audio: "microphone",
-};
-const getDeviceType = (mediaManager) => TRACK_TYPE_TO_DEVICE[mediaManager.getDeviceType()];
-export const useTrackManager = ({ mediaManager, tsClient, getCurrentPeerStatus, bandwidthLimits, streamConfig, devicesInitializationRef, }) => {
+export const useTrackManager = ({ deviceManager, tsClient, peerStatus, bandwidthLimits, streamConfig, type, }) => {
     const currentTrackIdRef = useRef(null);
-    const [paused, setPaused] = useState(false);
-    async function setTrackMiddleware(middleware) {
-        mediaManager.setTrackMiddleware(middleware);
-        await refreshStreamedTrack();
-    }
-    async function selectDevice(deviceId) {
-        await mediaManager?.start(deviceId);
-        const currentTrackId = currentTrackIdRef.current;
+    const { startDevice, stopDevice, enableDevice, disableDevice, deviceTrack, applyMiddleware, currentMiddleware } = deviceManager;
+    const getCurrentTrackId = useCallback(() => {
+        const refTrackId = currentTrackIdRef.current;
+        if (!refTrackId)
+            return null;
+        const currentTrack = getRemoteOrLocalTrack(tsClient, refTrackId);
+        return currentTrack?.trackId ?? null;
+    }, [tsClient]);
+    const selectDevice = useCallback(async (deviceId) => {
+        const [newTrack, error] = await startDevice(deviceId);
+        if (error)
+            return error;
+        const currentTrackId = getCurrentTrackId();
         if (!currentTrackId)
             return;
-        const newTrack = mediaManager.getMedia()?.track ?? null;
         await tsClient.replaceTrack(currentTrackId, newTrack);
-    }
-    const getCurrentTrackId = useCallback(() => getRemoteOrLocalTrack(tsClient, currentTrackIdRef.current)?.trackId, [tsClient]);
-    const startStreaming = useCallback(async (props = { simulcast: [Variant.VARIANT_LOW, Variant.VARIANT_MEDIUM, Variant.VARIANT_HIGH] }) => {
-        const currentTrackId = currentTrackIdRef.current;
-        if (currentTrackId)
-            throw Error("Track already added");
-        const media = mediaManager.getMedia();
-        if (!media || !media.stream || !media.track)
-            throw Error("Device is unavailable");
-        const track = getRemoteOrLocalTrack(tsClient, currentTrackId);
-        if (track)
-            return track.trackId;
-        // see `getRemoteOrLocalTrackContext()` explanation
-        currentTrackIdRef.current = media.track.id;
-        const deviceType = getDeviceType(mediaManager);
-        const trackMetadata = { type: deviceType, paused: false };
+    }, [getCurrentTrackId, startDevice, tsClient]);
+    const setTrackMiddleware = useCallback(async (middleware) => {
+        const processedTrack = applyMiddleware(middleware);
+        const currentTrackId = getCurrentTrackId();
+        if (!currentTrackId)
+            return;
+        await tsClient.replaceTrack(currentTrackId, processedTrack);
+    }, [applyMiddleware, getCurrentTrackId, tsClient]);
+    const startStreaming = useCallback(async (track, props = { simulcast: [Variant.VARIANT_LOW, Variant.VARIANT_MEDIUM, Variant.VARIANT_HIGH] }) => {
+        // temporarily setting the local trackId until we have the remoteTrackId
+        currentTrackIdRef.current = track.id;
+        const trackMetadata = { type, paused: false };
         const displayName = tsClient.getLocalPeer()?.metadata?.peer?.displayName;
         if (typeof displayName === "string") {
             trackMetadata.displayName = displayName;
         }
         const [maxBandwidth, simulcastConfig] = getConfigAndBandwidthFromProps(props.simulcast, bandwidthLimits);
-        const remoteTrackId = await tsClient.addTrack(media.track, trackMetadata, simulcastConfig, maxBandwidth);
-        currentTrackIdRef.current = remoteTrackId;
-        setPaused(false);
-        return remoteTrackId;
-    }, [mediaManager, tsClient, bandwidthLimits]);
-    const refreshStreamedTrack = useCallback(async () => {
-        const trackId = getCurrentTrackId();
-        if (!trackId)
-            return;
-        const newTrack = mediaManager.getMedia()?.track ?? null;
-        if (!newTrack)
-            throw Error("New track is empty");
-        return tsClient.replaceTrack(trackId, newTrack);
-    }, [getCurrentTrackId, mediaManager, tsClient]);
-    const pauseStreaming = useCallback(async () => {
-        const trackId = getCurrentTrackId();
-        if (!trackId)
+        try {
+            const remoteTrackId = await tsClient.addTrack(track, trackMetadata, simulcastConfig, maxBandwidth);
+            currentTrackIdRef.current = remoteTrackId;
+        }
+        catch (err) {
+            if (err instanceof TrackTypeError) {
+                console.warn(err.message);
+                currentTrackIdRef.current = null;
+            }
+            throw err;
+        }
+    }, [tsClient, type, bandwidthLimits]);
+    const pauseStreaming = useCallback(async (trackId) => {
+        if (peerStatus !== "connected")
             return;
-        setPaused(true);
         await tsClient.replaceTrack(trackId, null);
-        const deviceType = getDeviceType(mediaManager);
-        const trackMetadata = { type: deviceType, paused: true };
-        return tsClient.updateTrackMetadata(trackId, trackMetadata);
-    }, [mediaManager, getCurrentTrackId, tsClient]);
-    const resumeStreaming = useCallback(async () => {
-        const trackId = getCurrentTrackId();
-        if (!trackId)
+        return tsClient.updateTrackMetadata(trackId, { type, paused: true });
+    }, [tsClient, type, peerStatus]);
+    const resumeStreaming = useCallback(async (trackId, track) => {
+        if (peerStatus !== "connected")
             return;
-        const media = mediaManager.getMedia();
-        const deviceType = getDeviceType(mediaManager);
-        if (!media)
-            throw Error("Device is unavailable");
-        setPaused(false);
-        await tsClient.replaceTrack(trackId, media.track);
-        const trackMetadata = { type: deviceType, paused: false };
-        return tsClient.updateTrackMetadata(trackId, trackMetadata);
-    }, [mediaManager, tsClient, getCurrentTrackId]);
-    const stream = useCallback(async () => {
-        if (getCurrentPeerStatus() !== "connected")
+        await tsClient.replaceTrack(trackId, track);
+        return tsClient.updateTrackMetadata(trackId, { type, paused: false });
+    }, [peerStatus, tsClient, type]);
+    /**
+     * @see {@link TrackManager#toggleMute} for more details.
+     */
+    const toggleMute = useCallback(async () => {
+        const isTrackCurrentlyEnabled = Boolean(deviceTrack?.enabled);
+        const currentTrackId = getCurrentTrackId();
+        if (!currentTrackId) {
+            console.warn("Toggling mute is only possible while connected to a room.");
             return;
-        const trackId = getRemoteOrLocalTrack(tsClient, currentTrackIdRef.current)?.trackId;
-        if (trackId) {
-            await resumeStreaming();
         }
-        else {
-            await startStreaming();
+        if (isTrackCurrentlyEnabled) {
+            disableDevice();
+            await pauseStreaming(currentTrackId);
         }
-    }, [tsClient, getCurrentPeerStatus, resumeStreaming, startStreaming]);
-    const toggle = useCallback(async (mode) => {
-        await devicesInitializationRef.current;
-        const mediaStream = mediaManager.getMedia()?.stream;
-        const track = mediaManager.getMedia()?.track ?? null;
-        const enabled = Boolean(track?.enabled);
-        const trackId = getRemoteOrLocalTrack(tsClient, currentTrackIdRef.current)?.trackId;
-        if (mediaStream && enabled) {
-            mediaManager.disable();
-            if (trackId) {
-                await pauseStreaming();
-            }
-            if (mode === "hard") {
-                mediaManager.stop();
-            }
+        else if (deviceTrack) {
+            enableDevice();
+            await resumeStreaming(currentTrackId, deviceTrack);
         }
-        else if (mediaStream && !enabled) {
-            mediaManager.enable();
-            await stream();
-        }
-        else {
-            await mediaManager.start();
-            await stream();
-        }
-    }, [devicesInitializationRef, mediaManager, tsClient, pauseStreaming, stream]);
-    /**
-     * @see {@link TrackManager#toggleMute} for more details.
-     */
-    const toggleMute = useCallback(() => toggle("soft"), [toggle]);
+    }, [deviceTrack, getCurrentTrackId, disableDevice, pauseStreaming, enableDevice, resumeStreaming]);
     /**
      * @see {@link TrackManager#toggleDevice} for more details.
      */
-    const toggleDevice = useCallback(() => toggle("hard"), [toggle]);
+    const toggleDevice = useCallback(async () => {
+        const currentTrackId = getCurrentTrackId();
+        if (deviceTrack) {
+            stopDevice();
+            if (currentTrackId) {
+                pauseStreaming(currentTrackId);
+            }
+        }
+        else {
+            const [newTrack, error] = await startDevice();
+            if (error)
+                return error;
+            if (currentTrackId) {
+                await resumeStreaming(currentTrackId, newTrack);
+            }
+            else if (peerStatus === "connected") {
+                await startStreaming(newTrack, streamConfig);
+            }
+        }
+    }, [
+        getCurrentTrackId,
+        deviceTrack,
+        stopDevice,
+        pauseStreaming,
+        startDevice,
+        peerStatus,
+        resumeStreaming,
+        startStreaming,
+        streamConfig,
+    ]);
     useEffect(() => {
         const onJoinedRoom = () => {
-            if (mediaManager.getMedia()?.track) {
-                startStreaming(streamConfig);
+            if (deviceTrack) {
+                startStreaming(deviceTrack, streamConfig);
             }
         };
         const onLeftRoom = () => {
-            setPaused(true);
             currentTrackIdRef.current = null;
         };
         tsClient.on("joined", onJoinedRoom);
@@ -137,9 +127,10 @@ export const useTrackManager = ({ mediaManager, tsClient, getCurrentPeerStatus,
             tsClient.off("joined", onJoinedRoom);
             tsClient.off("disconnected", onLeftRoom);
         };
-    }, [mediaManager, startStreaming, tsClient, streamConfig]);
+    }, [deviceTrack, startStreaming, tsClient, streamConfig]);
     return {
-        paused,
+        deviceTrack,
+        currentMiddleware,
         setTrackMiddleware,
         selectDevice,
         toggleMute,

package/dist/hooks/internal/useTrackMiddleware.d.ts

@@ -0,0 +1,7 @@
+import type { TrackMiddleware } from "../../types/public";
+export declare const useTrackMiddleware: (rawTrack: MediaStreamTrack | null) => {
+    processedTrack: MediaStreamTrack | null;
+    applyMiddleware: (newMiddleware: TrackMiddleware) => MediaStreamTrack | null;
+    currentMiddleware: TrackMiddleware;
+};
+//# sourceMappingURL=useTrackMiddleware.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useTrackMiddleware.d.ts","sourceRoot":"","sources":["../../../src/hooks/internal/useTrackMiddleware.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,eAAO,MAAM,kBAAkB,GAAI,UAAU,gBAAgB,GAAG,IAAI;;qCAchD,eAAe;;CAkBlC,CAAC"}

package/dist/hooks/internal/useTrackMiddleware.js

@@ -0,0 +1,26 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+export const useTrackMiddleware = (rawTrack) => {
+    const [currentMiddleware, setMiddleware] = useState(null);
+    const [processedTrack, setProcessedTrack] = useState(null);
+    const cleanupRef = useRef(undefined);
+    useEffect(() => {
+        if (!rawTrack && processedTrack) {
+            processedTrack.stop();
+            cleanupRef.current?.();
+            setProcessedTrack(null);
+        }
+    }, [rawTrack, processedTrack]);
+    const applyMiddleware = useCallback((newMiddleware) => {
+        cleanupRef.current?.();
+        setMiddleware(() => newMiddleware);
+        if (newMiddleware && rawTrack) {
+            const { track, onClear } = newMiddleware(rawTrack);
+            cleanupRef.current = onClear;
+            setProcessedTrack(track);
+            return track;
+        }
+        setProcessedTrack(null);
+        return rawTrack;
+    }, [rawTrack]);
+    return { processedTrack, applyMiddleware, currentMiddleware };
+};

package/dist/hooks/useConnection.d.ts

@@ -1,5 +1,4 @@
-import type { GenericMetadata, ReconnectionStatus } from "@fishjam-cloud/ts-client";
-import type { PeerStatus } from "../types/public";
+import type { GenericMetadata } from "@fishjam-cloud/ts-client";
 export interface JoinRoomConfig<PeerMetadata extends GenericMetadata = GenericMetadata> {
     /**
      * Fishjam URL
@@ -31,9 +30,10 @@ export declare function useConnection(): {
     /**
      * Current peer connection status
      */
-    peerStatus: PeerStatus;
+    peerStatus: import("..").PeerStatus;
     /**
      * Current reconnection status
-     */ reconnectionStatus: ReconnectionStatus;
+     */
+    reconnectionStatus: import("@fishjam-cloud/ts-client").ReconnectionStatus;
 };
 //# sourceMappingURL=useConnection.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useConnection.d.ts","sourceRoot":"","sources":["../../src/hooks/useConnection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAGpF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAIlD,MAAM,WAAW,cAAc,CAAC,YAAY,SAAS,eAAe,GAAG,eAAe;IACpF;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,aAAa;IAsBzB;;OAEG;eAjBF,YAAY,SAAS,eAAe,uDAIlC,cAAc,CAAC,YAAY,CAAC;IAe/B;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;EAEN"}
+{"version":3,"file":"useConnection.d.ts","sourceRoot":"","sources":["../../src/hooks/useConnection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAOhE,MAAM,WAAW,cAAc,CAAC,YAAY,SAAS,eAAe,GAAG,eAAe;IACpF;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,aAAa;IAuBzB;;OAEG;eAfF,YAAY,SAAS,eAAe,uDAIlC,cAAc,CAAC,YAAY,CAAC;IAa/B;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;EAGN"}

package/dist/hooks/useConnection.js

@@ -1,5 +1,6 @@
-import { useCallback } from "react";
-import { useFishjamContext } from "./internal/useFishjamContext";
+import { useCallback, useContext } from "react";
+import { FishjamClientContext } from "../contexts/fishjamClient";
+import { PeerStatusContext } from "../contexts/peerStatus";
 import { useReconnection } from "./internal/useReconnection";
 /**
  * Hook allows to join or leave a room and check the current connection status.
@@ -7,14 +8,16 @@ import { useReconnection } from "./internal/useReconnection";
  * @group Hooks
  */
 export function useConnection() {
-    const context = useFishjamContext();
-    const client = context.fishjamClientRef.current;
+    const fishjamClientRef = useContext(FishjamClientContext);
+    if (!fishjamClientRef)
+        throw Error("useConnection must be used within FishjamProvider");
+    const peerStatus = useContext(PeerStatusContext);
+    const client = fishjamClientRef.current;
     const reconnectionStatus = useReconnection();
     const joinRoom = useCallback(({ url, peerToken, peerMetadata, }) => client.connect({ url, token: peerToken, peerMetadata: peerMetadata ?? {} }), [client]);
     const leaveRoom = useCallback(() => {
         client.disconnect();
     }, [client]);
-    const peerStatus = context.peerStatus;
     return {
         /**
          * Join room and start streaming camera and microphone
@@ -30,6 +33,7 @@ export function useConnection() {
         peerStatus,
         /**
          * Current reconnection status
-         */ reconnectionStatus,
+         */
+        reconnectionStatus,
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"usePeers.d.ts","sourceRoot":"","sources":["../../src/hooks/usePeers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,QAAQ,EAAqC,MAAM,0BAA0B,CAAC;AAGjH,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAW,MAAM,iBAAiB,CAAC;AAG9D;;;;GAIG;AACH,MAAM,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,IAAI;IACzD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAClD,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,eAAe,CAAC,EAAE,KAAK,CAAC;IACxB,qBAAqB,CAAC,EAAE,KAAK,CAAC;IAC9B,qBAAqB,CAAC,EAAE,KAAK,CAAC;CAC/B,CAAC;AAgCF;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAcrG;;;OAGG;IACH;;OAEG;IACH;;;;OAIG;;EAGN"}
+{"version":3,"file":"usePeers.d.ts","sourceRoot":"","sources":["../../src/hooks/usePeers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,QAAQ,EAAqC,MAAM,0BAA0B,CAAC;AAKjH,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAW,MAAM,iBAAiB,CAAC;AAE9D;;;;GAIG;AACH,MAAM,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,IAAI;IACzD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAClD,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,eAAe,CAAC,EAAE,KAAK,CAAC;IACxB,qBAAqB,CAAC,EAAE,KAAK,CAAC;IAC9B,qBAAqB,CAAC,EAAE,KAAK,CAAC;CAC/B,CAAC;AAgCF;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAerG;;;OAGG;IACH;;OAEG;IACH;;;;OAIG;;EAGN"}

package/dist/hooks/usePeers.js

@@ -1,4 +1,5 @@
-import { useFishjamContext } from "./internal/useFishjamContext";
+import { useContext } from "react";
+import { FishjamClientStateContext } from "../contexts/fishjamState";
 function trackContextToTrack(track) {
     return {
         metadata: track.metadata,
@@ -34,7 +35,9 @@ function getPeerWithDistinguishedTracks(peer) {
  * @typeParam ServerMetadata Type of metadata set by the server while creating a peer.
  */
 export function usePeers() {
-    const { clientState } = useFishjamContext();
+    const clientState = useContext(FishjamClientStateContext);
+    if (!clientState)
+        throw Error("usePeers must be used within FishjamProvider");
     const localPeer = clientState.localPeer
         ? getPeerWithDistinguishedTracks(clientState.localPeer)
         : null;

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

@@ -1 +1 @@
-{"version":3,"file":"useScreenShare.d.ts","sourceRoot":"","sources":["../../src/hooks/useScreenShare.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,cAAc;IAIvB;;OAEG;;wBAC2C,CAAC;wBAEP,CAAA;;IADxC;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;;;OAIG;;IAEH;;;;OAIG;;CAGN,CAAC"}
+{"version":3,"file":"useScreenShare.d.ts","sourceRoot":"","sources":["../../src/hooks/useScreenShare.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,eAAO,MAAM,cAAc;IAKvB;;OAEG;;wBADoD,CAAC;wBAEpD,CAAC;;IACL;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;;;OAIG;;IAEH;;;;OAIG;;CAGN,CAAC"}

package/dist/hooks/useScreenShare.js

@@ -1,11 +1,14 @@
-import { useFishjamContext } from "./internal/useFishjamContext";
+import { useContext } from "react";
+import { ScreenshareContext } from "../contexts/screenshare";
 /**
  * Hook to enable screen sharing within a room and manage the existing stream.
  * @category Devices
  * @group Hooks
  */
 export const useScreenShare = () => {
-    const { screenShareManager } = useFishjamContext();
+    const screenShareManager = useContext(ScreenshareContext);
+    if (!screenShareManager)
+        throw Error("useScreenShare must be used within FishjamProvider");
     return {
         /**
          * Invokes the screen sharing prompt in the user's browser and starts streaming upon approval.

package/dist/hooks/useStatistics.d.ts

@@ -0,0 +1,4 @@
+export declare const useStatistics: () => {
+    getStatistics: () => Promise<RTCStatsReport>;
+};
+//# sourceMappingURL=useStatistics.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useStatistics.d.ts","sourceRoot":"","sources":["../../src/hooks/useStatistics.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,aAAa;;CAUzB,CAAC"}

package/dist/hooks/useStatistics.js

@@ -0,0 +1,13 @@
+import { useContext } from "react";
+import { FishjamClientContext } from "../contexts/fishjamClient";
+export const useStatistics = () => {
+    const client = useContext(FishjamClientContext);
+    if (!client)
+        throw new Error("useStatistics must be used within a FishjamProvider");
+    return {
+        /*
+         * Returns a low level RTCStatsReport statistics object about the connection.
+         */
+        getStatistics: () => client.current.getStatistics(),
+    };
+};

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

@@ -1 +1 @@
-{"version":3,"file":"useUpdatePeerMetadata.d.ts","sourceRoot":"","sources":["../../src/hooks/useUpdatePeerMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAKhE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,YAAY,SAAS,eAAe;IAWtE;;OAEG;uCATY,YAAY;CAY9B,CAAC"}
+{"version":3,"file":"useUpdatePeerMetadata.d.ts","sourceRoot":"","sources":["../../src/hooks/useUpdatePeerMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAKhE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,YAAY,SAAS,eAAe,GAAG,eAAe;IAYxF;;OAEG;uCATY,YAAY;CAY9B,CAAC"}

package/dist/hooks/useUpdatePeerMetadata.js

@@ -1,5 +1,5 @@
-import { useCallback } from "react";
-import { useFishjamContext } from "./internal/useFishjamContext";
+import { useCallback, useContext } from "react";
+import { FishjamClientContext } from "../contexts/fishjamClient";
 /**
  * Hook provides a method to update the metadata of the local peer.
  * @category Connection
@@ -7,7 +7,9 @@ import { useFishjamContext } from "./internal/useFishjamContext";
  * @returns
  */
 export const useUpdatePeerMetadata = () => {
-    const { fishjamClientRef } = useFishjamContext();
+    const fishjamClientRef = useContext(FishjamClientContext);
+    if (!fishjamClientRef)
+        throw Error("useUpdatePeerMetadata must be used within FishjamProvider");
     const updatePeerMetadata = useCallback((peerMetadata) => {
         fishjamClientRef.current.updatePeerMetadata(peerMetadata);
     }, [fishjamClientRef]);

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

@@ -1 +1 @@
-{"version":3,"file":"useVAD.d.ts","sourceRoot":"","sources":["../../src/hooks/useVAD.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,iBAAiB,CAAC;AAIvD;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,MAAM,gBAAiB;IAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAgE9F,CAAC"}
+{"version":3,"file":"useVAD.d.ts","sourceRoot":"","sources":["../../src/hooks/useVAD.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,iBAAiB,CAAC;AAEvD;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,MAAM,GAAI,aAAa;IAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAgE9F,CAAC"}

package/dist/hooks/useVAD.js

@@ -1,6 +1,5 @@
-import { useEffect, useMemo, useState } from "react";
-import { useFishjamClientState } from "./internal/useFishjamClientState";
-import { useFishjamContext } from "./internal/useFishjamContext";
+import { useContext, useEffect, useMemo, useState } from "react";
+import { FishjamClientStateContext } from "../contexts/fishjamState";
 /**
  * Voice activity detection. Use this hook to check if voice is detected in audio track for given peer(s).
  *
@@ -19,14 +18,15 @@ import { useFishjamContext } from "./internal/useFishjamContext";
  * @returns Each key is a peerId and the boolean value indicates if voice activity is currently detected for that peer.
  */
 export const useVAD = ({ peerIds }) => {
-    const { fishjamClientRef } = useFishjamContext();
-    const { peers } = useFishjamClientState(fishjamClientRef.current);
-    const micTracksWithSelectedPeerIds = useMemo(() => Object.values(peers)
+    const clientState = useContext(FishjamClientStateContext);
+    if (!clientState)
+        throw Error("useVAD must be used within FishjamProvider");
+    const micTracksWithSelectedPeerIds = useMemo(() => Object.values(clientState.peers)
         .filter((peer) => peerIds.includes(peer.id))
         .map((peer) => ({
         peerId: peer.id,
         microphoneTracks: Array.from(peer.tracks.values()).filter(({ metadata }) => metadata?.type === "microphone"),
-    })), [peers, peerIds]);
+    })), [clientState.peers, peerIds]);
     const getDefaultVadStatuses = () => micTracksWithSelectedPeerIds.reduce((mappedTracks, peer) => ({
         ...mappedTracks,
         [peer.peerId]: peer.microphoneTracks.reduce((vadStatuses, track) => ({ ...vadStatuses, [track.trackId]: track.vadStatus }), {}),

package/dist/index.d.ts

@@ -1,13 +1,13 @@
 export { FishjamProvider, type FishjamProviderProps } from "./FishjamProvider";
 export { useCamera } from "./hooks/devices/useCamera";
-export { InitializeDevicesErrors, useInitializeDevices, UseInitializeDevicesParams, } from "./hooks/devices/useInitializeDevices";
+export { useInitializeDevices, UseInitializeDevicesParams } from "./hooks/devices/useInitializeDevices";
 export { useMicrophone } from "./hooks/devices/useMicrophone";
 export { type JoinRoomConfig, useConnection } from "./hooks/useConnection";
 export { type PeerWithTracks, usePeers } from "./hooks/usePeers";
 export { useScreenShare } from "./hooks/useScreenShare";
 export { useUpdatePeerMetadata } from "./hooks/useUpdatePeerMetadata";
 export { useVAD } from "./hooks/useVAD";
-export type { BandwidthLimits, Brand, DeviceError, DeviceItem, PeerId, PeerStatus, PersistLastDeviceHandlers, SimulcastBandwidthLimits, StreamConfig, Track, TrackId, TrackMiddleware, TracksMiddleware, } from "./types/public";
+export type { BandwidthLimits, Brand, DeviceError, DeviceItem, InitializeDevicesResult, InitializeDevicesStatus, PeerId, PeerStatus, PersistLastDeviceHandlers, SimulcastBandwidthLimits, StreamConfig, Track, TrackId, TrackMiddleware, TracksMiddleware, } from "./types/public";
 export type { AuthErrorReason, JoinErrorReason, Metadata, ReconnectConfig, ReconnectionStatus, SimulcastBandwidthLimit, SimulcastConfig, TrackBandwidthLimit, } from "@fishjam-cloud/ts-client";
 export { Variant } 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,EAAE,eAAe,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,sCAAsC,CAAC;AAC9C,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,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,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/index.js

@@ -1,6 +1,6 @@
 export { FishjamProvider } from "./FishjamProvider";
 export { useCamera } from "./hooks/devices/useCamera";
-export { useInitializeDevices, } from "./hooks/devices/useInitializeDevices";
+export { useInitializeDevices } from "./hooks/devices/useInitializeDevices";
 export { useMicrophone } from "./hooks/devices/useMicrophone";
 export { useConnection } from "./hooks/useConnection";
 export { usePeers } from "./hooks/usePeers";

package/dist/types/internal.d.ts

@@ -1,49 +1,17 @@
 import type { Peer } from "@fishjam-cloud/ts-client";
-import type { DeviceError, DeviceType, PeerId, TrackMiddleware, TracksMiddleware } from "./public";
-export type DevicesStatus = "OK" | "Error" | "Not requested" | "Requesting";
-export type MediaStatus = "OK" | "Error" | "Not requested" | "Requesting";
-export type DeviceManagerStatus = "uninitialized" | "initializing" | "initialized" | "error";
-export interface DeviceManagerState {
-    deviceState: DeviceState;
-    deviceStatus: DeviceManagerStatus;
-    deviceType: DeviceType;
-}
-export type Media = {
-    stream: MediaStream | null;
-    track: MediaStreamTrack | null;
-    enabled: boolean;
-    deviceInfo: MediaDeviceInfo | null;
-};
-export type DeviceState = {
-    media: Media | null;
-    mediaStatus: MediaStatus;
-    devices: MediaDeviceInfo[] | null;
-    devicesStatus: DevicesStatus;
-    error: DeviceError | null;
-    currentMiddleware: TrackMiddleware | null;
+import type { DeviceError, PeerId, TrackMiddleware, TracksMiddleware } from "./public";
+export type AudioVideo<T> = {
+    audio: T;
+    video: T;
 };
 export type CurrentDevices = {
     videoinput: MediaDeviceInfo | null;
     audioinput: MediaDeviceInfo | null;
 };
-export interface MediaManager {
-    start: (deviceId?: string) => Promise<void>;
-    stop: () => void;
-    disable: () => void;
-    enable: () => void;
-    setTrackMiddleware: (middleware: TrackMiddleware | null) => void;
-    getMiddleware: () => TrackMiddleware | null;
-    getMedia: () => {
-        stream: MediaStream | null;
-        track: MediaStreamTrack | null;
-        enabled: boolean;
-    } | null;
-    getDeviceType: () => DeviceType;
-}
 export type ScreenShareState = ({
     stream: MediaStream;
     trackIds: {
-        videoId: string;
+        videoId?: string;
         audioId?: string;
     };
 } | {
@@ -53,8 +21,9 @@ export type ScreenShareState = ({
     tracksMiddleware?: TracksMiddleware | null;
 };
 export interface TrackManager {
-    selectDevice: (deviceId?: string) => Promise<void>;
-    paused: boolean;
+    selectDevice: (deviceId?: string) => Promise<undefined | DeviceError>;
+    deviceTrack: MediaStreamTrack | null;
+    currentMiddleware: TrackMiddleware;
     setTrackMiddleware: (middleware: TrackMiddleware | null) => Promise<void>;
     /**
      * Either enables or disables the stream.
@@ -72,7 +41,7 @@ export interface TrackManager {
      *   - 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>;
+    toggleDevice: () => Promise<undefined | DeviceError>;
 }
 export type BrandedPeer<P, S> = Omit<Peer<P, S>, "id"> & {
     id: PeerId;

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":"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"}