@fishjam-cloud/react-client 0.10.2 → 0.12.0

package/dist/hooks/usePeers.d.ts

@@ -1,31 +1,40 @@
-import type { DistinguishedTracks, PeerState } from "../types/internal";
-export type PeerWithTracks<P, S> = PeerState<P, S> & DistinguishedTracks;
+import type { Metadata } from "@fishjam-cloud/ts-client";
+import type { PeerId, Track } from "../types/public";
 /**
- * Result type for the usePeers hook.
+ *
+ * @typeParam PeerMetadata Type of metadata set by peer while connecting to a room.
+ * @typeParam ServerMetadata Type of metadata set by the server while creating a peer.
  */
-export type UsePeersResult<P, S> = {
+export type PeerWithTracks<PeerMetadata, ServerMetadata> = {
+    id: PeerId;
+    metadata?: Metadata<PeerMetadata, ServerMetadata>;
+    tracks: Track[];
+    cameraTrack?: Track;
+    microphoneTrack?: Track;
+    screenShareVideoTrack?: Track;
+    screenShareAudioTrack?: Track;
+};
+/**
+ * Hook allows to access id, tracks and metadata of the local and remote peers.
+ *
+ * @category Connection
+ * @group Hooks
+ * @typeParam PeerMetadata Type of metadata set by peer while connecting to a room.
+ * @typeParam ServerMetadata Type of metadata set by the server while creating a peer.
+ */
+export declare function usePeers<PeerMetadata = Record<string, unknown>, ServerMetadata = Record<string, unknown>>(): {
     /**
      * The local peer with distinguished tracks (camera, microphone, screen share).
      * Will be null if the local peer is not found.
-     */
-    localPeer: PeerWithTracks<P, S> | null;
+     */ localPeer: PeerWithTracks<PeerMetadata, ServerMetadata> | null;
     /**
      * Array of remote peers with distinguished tracks (camera, microphone, screen share).
-     */
-    remotePeers: PeerWithTracks<P, S>[];
+     */ remotePeers: PeerWithTracks<PeerMetadata, ServerMetadata>[];
     /**
      * @deprecated Use remotePeers instead
      * Legacy array containing remote peers.
      * This property will be removed in future versions.
      */
-    peers: PeerWithTracks<P, S>[];
+    peers: PeerWithTracks<PeerMetadata, ServerMetadata>[];
 };
-/**
- *
- * @category Connection
- *
- * @typeParam P Type of metadata set by peer while connecting to a room.
- * @typeParam S Type of metadata set by the server while creating a peer.
- */
-export declare function usePeers<P = Record<string, unknown>, S = Record<string, unknown>>(): UsePeersResult<P, S>;
 //# sourceMappingURL=usePeers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"usePeers.d.ts","sourceRoot":"","sources":["../../src/hooks/usePeers.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAExE,MAAM,MAAM,cAAc,CAAC,CAAC,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,mBAAmB,CAAC;AAiCzE;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,EAAE,CAAC,IAAI;IACjC;;;OAGG;IACH,SAAS,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;IAEvC;;OAEG;IACH,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IAEpC;;;;OAIG;IACH,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;CAC/B,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAQzG"}
+{"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"}

package/dist/hooks/usePeers.js

@@ -6,7 +6,6 @@ function trackContextToTrack(track) {
         stream: track.stream,
         simulcastConfig: track.simulcastConfig ?? null,
         encoding: track.encoding ?? null,
-        vadStatus: track.vadStatus,
         track: track.track,
     };
 }
@@ -27,15 +26,32 @@ function getPeerWithDistinguishedTracks(peer) {
     };
 }
 /**
+ * Hook allows to access id, tracks and metadata of the local and remote peers.
  *
  * @category Connection
- *
- * @typeParam P Type of metadata set by peer while connecting to a room.
- * @typeParam S Type of metadata set by the server while creating a peer.
+ * @group Hooks
+ * @typeParam PeerMetadata Type of metadata set by peer while connecting to a room.
+ * @typeParam ServerMetadata Type of metadata set by the server while creating a peer.
  */
 export function usePeers() {
     const { clientState } = useFishjamContext();
-    const localPeer = clientState.localPeer ? getPeerWithDistinguishedTracks(clientState.localPeer) : null;
+    const localPeer = clientState.localPeer
+        ? getPeerWithDistinguishedTracks(clientState.localPeer)
+        : null;
     const remotePeers = Object.values(clientState.peers).map((peer) => getPeerWithDistinguishedTracks(peer));
-    return { localPeer, remotePeers, peers: remotePeers };
+    return {
+        /**
+         * The local peer with distinguished tracks (camera, microphone, screen share).
+         * Will be null if the local peer is not found.
+         */ localPeer,
+        /**
+         * Array of remote peers with distinguished tracks (camera, microphone, screen share).
+         */ remotePeers,
+        /**
+         * @deprecated Use remotePeers instead
+         * Legacy array containing remote peers.
+         * This property will be removed in future versions.
+         */
+        peers: remotePeers,
+    };
 }

package/dist/hooks/useScreenShare.d.ts

@@ -1,14 +1,43 @@
-import type { FishjamClient } from "@fishjam-cloud/ts-client";
-import type { ScreenshareApi, PeerStatus } from "../types/public";
-interface ScreenShareManagerProps {
-    fishjamClient: FishjamClient;
-    getCurrentPeerStatus: () => PeerStatus;
-}
 /**
- *
- * @category Screenshare
+ * Hook to enable screen sharing within a room and manage the existing stream.
+ * @category Devices
+ * @group Hooks
  */
-export declare const useScreenShareManager: ({ fishjamClient, getCurrentPeerStatus, }: ScreenShareManagerProps) => ScreenshareApi;
-export declare const useScreenShare: () => ScreenshareApi;
-export {};
+export declare const useScreenShare: () => {
+    /**
+     * Invokes the screen sharing prompt in the user's browser and starts streaming upon approval.
+     */
+    startStreaming: (props?: {
+        audioConstraints?: boolean | MediaTrackConstraints;
+        videoConstraints?: boolean | MediaTrackConstraints;
+    }) => Promise<void>;
+    /**
+     * Stops the stream and cancels browser screen sharing.
+     */
+    stopStreaming: () => Promise<void>;
+    /**
+     * The MediaStream object containing both tracks.
+     */
+    stream: MediaStream | null;
+    /**
+     * The separate video MediaStreamTrack.
+     */
+    videoTrack: MediaStreamTrack | null;
+    /**
+     * The separate audio MediaStreamTrack.
+     */
+    audioTrack: MediaStreamTrack | null;
+    /**
+     * The middleware currently assigned to process the tracks.
+     * A screenshare may include both audio and video tracks, and this middleware is capable of processing
+     * each track type.
+     */
+    currentTracksMiddleware: import("..").TracksMiddleware | null;
+    /**
+     * Sets the middleware responsible for processing the tracks.
+     * @param middleware The middleware to set, which can be a TracksMiddleware instance or null to remove the middleware.
+     * @returns A Promise that resolves once the middleware is successfully set.
+     */
+    setTracksMiddleware: (middleware: import("..").TracksMiddleware | null) => Promise<void>;
+};
 //# sourceMappingURL=useScreenShare.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useScreenShare.d.ts","sourceRoot":"","sources":["../../src/hooks/useScreenShare.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,KAAK,EAAoB,cAAc,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAIpF,UAAU,uBAAuB;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,oBAAoB,EAAE,MAAM,UAAU,CAAC;CACxC;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,6CAG/B,uBAAuB,KAAG,cAwI5B,CAAC;AAEF,eAAO,MAAM,cAAc,sBAI1B,CAAC"}
+{"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"}

package/dist/hooks/useScreenShare.js

@@ -1,128 +1,43 @@
-import { useCallback, useEffect, useRef, useState } from "react";
-import { getRemoteOrLocalTrack } from "../utils/track";
 import { useFishjamContext } from "./internal/useFishjamContext";
 /**
- *
- * @category Screenshare
+ * Hook to enable screen sharing within a room and manage the existing stream.
+ * @category Devices
+ * @group Hooks
  */
-export const useScreenShareManager = ({ fishjamClient, getCurrentPeerStatus, }) => {
-    const [state, setState] = useState({ stream: null, trackIds: null });
-    const cleanMiddlewareFnRef = useRef(null);
-    const stream = state.stream ?? null;
-    const [videoTrack, audioTrack] = stream ? getTracksFromStream(stream) : [null, null];
-    const getDisplayName = () => {
-        const name = fishjamClient.getLocalPeer()?.metadata?.peer?.displayName;
-        if (typeof name === "string")
-            return name;
-    };
-    const startStreaming = async (props) => {
-        const stream = await navigator.mediaDevices.getDisplayMedia({
-            video: props?.videoConstraints ?? true,
-            audio: props?.audioConstraints ?? true,
-        });
-        const displayName = getDisplayName();
-        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 = [fishjamClient.addTrack(video, { displayName, type: "screenShareVideo", paused: false })];
-        if (audio)
-            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 = [fishjamClient.replaceTrack(state.trackIds.videoId, newVideoTrack)];
-        if (newAudioTrack && state.trackIds.audioId) {
-            addTrackPromises.push(fishjamClient.replaceTrack(state.trackIds.audioId, newAudioTrack));
-        }
-        await Promise.all(addTrackPromises);
-    };
-    const cleanMiddleware = useCallback(() => {
-        cleanMiddlewareFnRef.current?.();
-        cleanMiddlewareFnRef.current = null;
-    }, []);
-    const setTracksMiddleware = async (middleware) => {
-        if (!state?.stream)
-            return;
-        const [video, audio] = getTracksFromStream(state.stream);
-        cleanMiddleware();
-        const { videoTrack, audioTrack, onClear } = middleware?.(video, audio) ?? {
-            videoTrack: video,
-            audioTrack: audio,
-            onClear: null,
-        };
-        cleanMiddlewareFnRef.current = onClear;
-        await replaceTracks(videoTrack, audioTrack);
-    };
-    const stopStreaming = useCallback(async () => {
-        if (!state.stream) {
-            console.warn("No stream to stop");
-            return;
-        }
-        const [video, audio] = getTracksFromStream(state.stream);
-        video.stop();
-        if (audio)
-            audio.stop();
-        if (getCurrentPeerStatus() === "connected") {
-            const removeTrackPromises = [fishjamClient.removeTrack(state.trackIds.videoId)];
-            if (state.trackIds.audioId)
-                removeTrackPromises.push(fishjamClient.removeTrack(state.trackIds.audioId));
-            await Promise.all(removeTrackPromises);
-        }
-        cleanMiddleware();
-        setState(({ tracksMiddleware }) => ({ stream: null, trackIds: null, tracksMiddleware }));
-    }, [state, fishjamClient, setState, cleanMiddleware, getCurrentPeerStatus]);
-    useEffect(() => {
-        if (!state.stream)
-            return;
-        const [video, audio] = getTracksFromStream(state.stream);
-        const trackEndedHandler = () => {
-            stopStreaming();
-        };
-        video.addEventListener("ended", trackEndedHandler);
-        audio?.addEventListener("ended", trackEndedHandler);
-        return () => {
-            video.removeEventListener("ended", trackEndedHandler);
-            audio?.removeEventListener("ended", trackEndedHandler);
-        };
-    }, [state, stopStreaming]);
-    useEffect(() => {
-        const onDisconnected = () => {
-            if (stream) {
-                stopStreaming();
-            }
-        };
-        fishjamClient.on("disconnected", onDisconnected);
-        return () => {
-            fishjamClient.removeListener("disconnected", onDisconnected);
-        };
-    }, [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,
-        stream,
-        videoTrack,
-        audioTrack,
-        videoBroadcast,
-        audioBroadcast,
-        setTracksMiddleware,
-        currentTracksMiddleware: state?.tracksMiddleware ?? null,
-    };
-};
 export const useScreenShare = () => {
     const { screenShareManager } = useFishjamContext();
-    return screenShareManager;
-};
-const getTracksFromStream = (stream) => {
-    const video = stream.getVideoTracks()[0];
-    const audio = stream.getAudioTracks()[0] ?? null;
-    return [video, audio];
+    return {
+        /**
+         * Invokes the screen sharing prompt in the user's browser and starts streaming upon approval.
+         */
+        startStreaming: screenShareManager.startStreaming,
+        /**
+         * Stops the stream and cancels browser screen sharing.
+         */
+        stopStreaming: screenShareManager.stopStreaming,
+        /**
+         * The MediaStream object containing both tracks.
+         */
+        stream: screenShareManager.stream,
+        /**
+         * The separate video MediaStreamTrack.
+         */
+        videoTrack: screenShareManager.videoTrack,
+        /**
+         * The separate audio MediaStreamTrack.
+         */
+        audioTrack: screenShareManager.audioTrack,
+        /**
+         * The middleware currently assigned to process the tracks.
+         * A screenshare may include both audio and video tracks, and this middleware is capable of processing
+         * each track type.
+         */
+        currentTracksMiddleware: screenShareManager.currentTracksMiddleware,
+        /**
+         * Sets the middleware responsible for processing the tracks.
+         * @param middleware The middleware to set, which can be a TracksMiddleware instance or null to remove the middleware.
+         * @returns A Promise that resolves once the middleware is successfully set.
+         */
+        setTracksMiddleware: screenShareManager.setTracksMiddleware,
+    };
 };

package/dist/hooks/useUpdatePeerMetadata.d.ts

@@ -1,5 +1,14 @@
 import type { GenericMetadata } from "@fishjam-cloud/ts-client";
+/**
+ * Hook provides a method to update the metadata of the local peer.
+ * @category Connection
+ * @group Hooks
+ * @returns
+ */
 export declare const useUpdatePeerMetadata: <PeerMetadata extends GenericMetadata = GenericMetadata>() => {
+    /**
+     * Updates metadata visible to other peers
+     */
     updatePeerMetadata: (peerMetadata: PeerMetadata) => void;
 };
 //# sourceMappingURL=useUpdatePeerMetadata.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useUpdatePeerMetadata.d.ts","sourceRoot":"","sources":["../../src/hooks/useUpdatePeerMetadata.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAEhE,eAAO,MAAM,qBAAqB,GAAI,YAAY,SAAS,eAAe;uCAIvD,YAAY;CAO9B,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;IAWtE;;OAEG;uCATY,YAAY;CAY9B,CAAC"}

package/dist/hooks/useUpdatePeerMetadata.js

@@ -1,9 +1,20 @@
 import { useCallback } from "react";
 import { useFishjamContext } from "./internal/useFishjamContext";
+/**
+ * Hook provides a method to update the metadata of the local peer.
+ * @category Connection
+ * @group Hooks
+ * @returns
+ */
 export const useUpdatePeerMetadata = () => {
     const { fishjamClientRef } = useFishjamContext();
     const updatePeerMetadata = useCallback((peerMetadata) => {
         fishjamClientRef.current.updatePeerMetadata(peerMetadata);
     }, [fishjamClientRef]);
-    return { updatePeerMetadata };
+    return {
+        /**
+         * Updates metadata visible to other peers
+         */
+        updatePeerMetadata,
+    };
 };

package/dist/hooks/useVAD.d.ts

@@ -1,3 +1,22 @@
-import type { PeerId } from "../types/internal";
-export declare const useVAD: (peerIds: PeerId[]) => Record<PeerId, boolean>;
+import type { PeerId } from "../types/public";
+/**
+ * Voice activity detection. Use this hook to check if voice is detected in audio track for given peer(s).
+ *
+ * Example usage:
+ * ```tsx
+ * function WhoIsTalkingComponent({ peerIds }: { peerIds: PeerId[] }) {
+ *   const peersInfo = useVAD({peerIds});
+ *   const activePeers = (Object.keys(peersInfo) as PeerId[]).filter((peerId) => peersInfo[peerId]);
+ *
+ *   return `Now talking: ${activePeers.join(", ")}`;
+ * }
+ * ```
+ * @param peerIds List of ids of peers to subscribe to for voice activity detection notifications.
+ * @category Connection
+ * @group Hooks
+ * @returns Each key is a peerId and the boolean value indicates if voice activity is currently detected for that peer.
+ */
+export declare const useVAD: ({ peerIds }: {
+    peerIds: ReadonlyArray<PeerId>;
+}) => Record<PeerId, boolean>;
 //# sourceMappingURL=useVAD.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useVAD.d.ts","sourceRoot":"","sources":["../../src/hooks/useVAD.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,mBAAmB,CAAC;AAKzD,eAAO,MAAM,MAAM,YAAa,MAAM,EAAE,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CA6DhE,CAAC"}
+{"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"}

package/dist/hooks/useVAD.js

@@ -1,7 +1,24 @@
 import { useEffect, useMemo, useState } from "react";
-import { useFishjamContext } from "./internal/useFishjamContext";
 import { useFishjamClientState } from "./internal/useFishjamClientState";
-export const useVAD = (peerIds) => {
+import { useFishjamContext } from "./internal/useFishjamContext";
+/**
+ * Voice activity detection. Use this hook to check if voice is detected in audio track for given peer(s).
+ *
+ * Example usage:
+ * ```tsx
+ * function WhoIsTalkingComponent({ peerIds }: { peerIds: PeerId[] }) {
+ *   const peersInfo = useVAD({peerIds});
+ *   const activePeers = (Object.keys(peersInfo) as PeerId[]).filter((peerId) => peersInfo[peerId]);
+ *
+ *   return `Now talking: ${activePeers.join(", ")}`;
+ * }
+ * ```
+ * @param peerIds List of ids of peers to subscribe to for voice activity detection notifications.
+ * @category Connection
+ * @group Hooks
+ * @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)
@@ -10,9 +27,9 @@ export const useVAD = (peerIds) => {
         peerId: peer.id,
         microphoneTracks: Array.from(peer.tracks.values()).filter(({ metadata }) => metadata?.type === "microphone"),
     })), [peers, peerIds]);
-    const getDefaultVadStatuses = () => micTracksWithSelectedPeerIds.reduce((acc, peer) => ({
-        ...acc,
-        [peer.peerId]: peer.microphoneTracks.reduce((acc, track) => ({ ...acc, [track.trackId]: track.vadStatus }), {}),
+    const getDefaultVadStatuses = () => micTracksWithSelectedPeerIds.reduce((mappedTracks, peer) => ({
+        ...mappedTracks,
+        [peer.peerId]: peer.microphoneTracks.reduce((vadStatuses, track) => ({ ...vadStatuses, [track.trackId]: track.vadStatus }), {}),
     }), {});
     const [_vadStatuses, setVadStatuses] = useState(getDefaultVadStatuses);
     useEffect(() => {

package/dist/index.d.ts

@@ -1,15 +1,13 @@
-export type { JoinRoomConfig } from "./hooks/useConnection";
-export type { PeerWithTracks } from "./hooks/usePeers";
-export { useConnection } from "./hooks/useConnection";
-export { usePeers } from "./hooks/usePeers";
+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 { useInitializeDevices } from "./hooks/devices/useInitializeDevices";
+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 { FishjamProvider } from "./fishjamProvider";
-export type { Track, TrackMiddleware, TracksMiddleware, PeerStatus, Device, PersistLastDeviceHandlers, ScreenshareApi, StartStreamingProps, DeviceType, } from "./types/public";
-export type { Peer, MessageEvents, CreateConfig, TrackBandwidthLimit, SimulcastBandwidthLimit, BandwidthLimit, TrackContextEvents, SimulcastConfig, TrackContext, VadStatus, EncodingReason, AuthErrorReason, } from "@fishjam-cloud/ts-client";
+export type { BandwidthLimits, Brand, DeviceError, DeviceItem, 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,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,YAAY,EACV,KAAK,EACL,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,MAAM,EACN,yBAAyB,EACzB,cAAc,EACd,mBAAmB,EACnB,UAAU,GACX,MAAM,gBAAgB,CAAC;AAExB,YAAY,EACV,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,YAAY,EACZ,SAAS,EACT,cAAc,EACd,eAAe,GAChB,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,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,10 +1,10 @@
-export { useConnection } from "./hooks/useConnection";
-export { usePeers } from "./hooks/usePeers";
+export { FishjamProvider } from "./FishjamProvider";
 export { useCamera } from "./hooks/devices/useCamera";
-export { useMicrophone } from "./hooks/devices/useMicrophone";
 export { useInitializeDevices } from "./hooks/devices/useInitializeDevices";
+export { useMicrophone } from "./hooks/devices/useMicrophone";
+export { useConnection } from "./hooks/useConnection";
+export { usePeers } from "./hooks/usePeers";
 export { useScreenShare } from "./hooks/useScreenShare";
 export { useUpdatePeerMetadata } from "./hooks/useUpdatePeerMetadata";
 export { useVAD } from "./hooks/useVAD";
-export { FishjamProvider } from "./fishjamProvider";
 export { Variant } from "@fishjam-cloud/ts-client";

package/dist/types/internal.d.ts

@@ -1,19 +1,12 @@
-import type { StartStreamingProps, Track, TrackMiddleware, TracksMiddleware, DeviceType } from "./public";
 import type { Peer } from "@fishjam-cloud/ts-client";
-export type TrackId = string;
-export type PeerId = string;
-export type PeerState<P, S> = {
-    id: PeerId;
-    metadata?: Peer<P, S>["metadata"];
-    tracks: Track[];
-};
+import type { DeviceError, DeviceType, PeerId, Track, 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;
-    status: DeviceManagerStatus;
-    type: DeviceType;
+    deviceStatus: DeviceManagerStatus;
+    deviceType: DeviceType;
 }
 export type Media = {
     stream: MediaStream | null;
@@ -29,15 +22,6 @@ export type DeviceState = {
     error: DeviceError | null;
     currentMiddleware: TrackMiddleware | null;
 };
-export type DeviceError = {
-    name: "OverconstrainedError";
-} | {
-    name: "NotAllowedError";
-} | {
-    name: "NotFoundError";
-} | {
-    name: "UNHANDLED_ERROR";
-};
 export type CurrentDevices = {
     videoinput: MediaDeviceInfo | null;
     audioinput: MediaDeviceInfo | null;
@@ -69,17 +53,9 @@ export type ScreenShareState = ({
     tracksMiddleware?: TracksMiddleware | null;
 };
 export interface TrackManager {
-    initialize: (deviceId?: string) => Promise<void>;
-    stop: () => void;
-    startStreaming: (startStreamingProps?: StartStreamingProps) => Promise<string>;
-    stopStreaming: () => Promise<void>;
-    pauseStreaming: () => Promise<void>;
-    resumeStreaming: () => Promise<void>;
+    selectDevice: (deviceId?: string) => Promise<void>;
     paused: boolean;
-    disableTrack: () => void;
-    enableTrack: () => void;
     setTrackMiddleware: (middleware: TrackMiddleware | null) => Promise<void>;
-    refreshStreamedTrack: () => Promise<void>;
     currentTrack: Track | null;
     /**
      * Either enables or disables the stream.
@@ -99,10 +75,7 @@ export interface TrackManager {
      */
     toggleDevice: () => Promise<void>;
 }
-export type DistinguishedTracks = {
-    cameraTrack?: Track;
-    microphoneTrack?: Track;
-    screenShareVideoTrack?: Track;
-    screenShareAudioTrack?: Track;
+export type BrandedPeer<P, S> = Omit<Peer<P, S>, "id"> & {
+    id: PeerId;
 };
 //# sourceMappingURL=internal.d.ts.map

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