@fishjam-cloud/react-client 0.7.0 → 0.7.2

package/dist/hooks/{useDevices.js → devices.js}

@@ -1,16 +1,18 @@
 import { useFishjamContext } from "./useFishjamContext";
-import { useVideoDeviceManager } from "./deviceManagers/useVideoDeviceManager";
-import { useAudioDeviceManager } from "./deviceManagers/useAudioDeviceManager";
 import { useCallback } from "react";
+import { useDeviceManager } from "./deviceManagers/useDeviceManager";
 import { getAvailableMedia, getCorrectedResult } from "../mediaInitializer";
-import { useProcessedPreviewStream } from "./useProcessedPreviewStream";
 import { prepareConstraints } from "../constraints";
+/**
+ *
+ * @category Devices
+ */
 export function useCamera() {
-    const { videoTrackManager } = useFishjamContext();
-    const { deviceState } = useVideoDeviceManager();
+    const { videoTrackManager, videoDeviceManagerRef } = useFishjamContext();
+    const { deviceState, status } = useDeviceManager(videoDeviceManagerRef.current);
     const { currentTrack, ...trackManager } = videoTrackManager;
-    const processedPreviewStream = useProcessedPreviewStream(videoTrackManager, deviceState.media?.track);
-    const stream = currentTrack?.stream ?? processedPreviewStream ?? deviceState.media?.stream ?? null;
+    const stream = deviceState.media?.stream ?? null;
+    const currentMiddleware = deviceState.currentMiddleware ?? null;
     const isStreaming = Boolean(currentTrack?.stream);
     const track = stream?.getAudioTracks()[0] ?? null;
     const trackId = currentTrack?.trackId ?? null;
@@ -18,20 +20,26 @@ export function useCamera() {
     const activeDevice = deviceState.media?.deviceInfo ?? null;
     return {
         ...trackManager,
+        currentMiddleware,
+        status,
         stream,
+        track,
         devices,
         activeDevice,
         isStreaming,
-        track,
         trackId,
     };
 }
+/**
+ *
+ * @category Devices
+ */
 export function useMicrophone() {
-    const { audioTrackManager } = useFishjamContext();
-    const { deviceState } = useAudioDeviceManager();
+    const { audioTrackManager, audioDeviceManagerRef } = useFishjamContext();
+    const { deviceState, status } = useDeviceManager(audioDeviceManagerRef.current);
     const { currentTrack, ...trackManager } = audioTrackManager;
-    const processedPreviewStream = useProcessedPreviewStream(audioTrackManager, deviceState.media?.track);
-    const stream = currentTrack?.stream ?? processedPreviewStream ?? deviceState.media?.stream ?? null;
+    const stream = deviceState.media?.stream ?? null;
+    const currentMiddleware = deviceState.currentMiddleware ?? null;
     const isStreaming = Boolean(currentTrack?.stream);
     const track = stream?.getAudioTracks()[0] ?? null;
     const trackId = currentTrack?.trackId ?? null;
@@ -40,15 +48,21 @@ export function useMicrophone() {
     const isAudioPlaying = currentTrack?.vadStatus === "speech";
     return {
         ...trackManager,
+        currentMiddleware,
+        status,
         stream,
-        isStreaming,
         track,
+        isStreaming,
         trackId,
         devices,
         activeDevice,
         isAudioPlaying,
     };
 }
+/**
+ *
+ * @category Devices
+ */
 export const useInitializeDevices = () => {
     const { videoDeviceManagerRef, audioDeviceManagerRef, hasDevicesBeenInitializedRef } = useFishjamContext();
     const initializeDevices = useCallback(async () => {
@@ -58,8 +72,8 @@ export const useInitializeDevices = () => {
         const videoManager = videoDeviceManagerRef.current;
         const audioManager = audioDeviceManagerRef.current;
         const constraints = {
-            video: videoManager.getConstraints(true),
-            audio: audioManager.getConstraints(true),
+            video: videoManager.getConstraints(),
+            audio: audioManager.getConstraints(),
         };
         const previousDevices = {
             video: videoManager.getLastDevice(),

package/dist/hooks/public.d.ts

@@ -1,9 +1,7 @@
 export { useConnect, useDisconnect } from "./useConnection";
 export { useReconnection } from "./useReconnection";
-export { useCamera, useMicrophone, useInitializeDevices } from "./useDevices";
-export { useParticipants } from "./useParticipants";
+export { useCamera, useMicrophone, useInitializeDevices } from "./devices";
+export { usePeers } from "./usePeers";
 export { useScreenShare } from "./useScreenShare";
 export { useStatus } from "./useStatus";
-export { useAudioDeviceManager } from "./deviceManagers/useAudioDeviceManager";
-export { useVideoDeviceManager } from "./deviceManagers/useVideoDeviceManager";
 //# sourceMappingURL=public.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/hooks/public.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/hooks/public.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}

package/dist/hooks/public.js

@@ -1,8 +1,6 @@
 export { useConnect, useDisconnect } from "./useConnection";
 export { useReconnection } from "./useReconnection";
-export { useCamera, useMicrophone, useInitializeDevices } from "./useDevices";
-export { useParticipants } from "./useParticipants";
+export { useCamera, useMicrophone, useInitializeDevices } from "./devices";
+export { usePeers } from "./usePeers";
 export { useScreenShare } from "./useScreenShare";
 export { useStatus } from "./useStatus";
-export { useAudioDeviceManager } from "./deviceManagers/useAudioDeviceManager";
-export { useVideoDeviceManager } from "./deviceManagers/useVideoDeviceManager";

package/dist/hooks/useConnection.d.ts

@@ -1,4 +1,12 @@
-import type { UseConnect } from "../types";
-export declare function useConnect(): UseConnect;
+import type { ConnectConfig } from "../types/public";
+/**
+ *
+ * @category Connection
+ */
+export declare function useConnect(): (config: ConnectConfig) => Promise<void>;
+/**
+ *
+ * @category Connection
+ */
 export declare function useDisconnect(): () => void;
 //# 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,EAAiB,UAAU,EAAE,MAAM,UAAU,CAAC;AAI1D,wBAAgB,UAAU,IAAI,UAAU,CAOvC;AAED,wBAAgB,aAAa,eAM5B"}
+{"version":3,"file":"useConnection.d.ts","sourceRoot":"","sources":["../../src/hooks/useConnection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD;;;GAGG;AACH,wBAAgB,UAAU,IAAI,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAIrE;AAED;;;GAGG;AACH,wBAAgB,aAAa,eAM5B"}

package/dist/hooks/useConnection.js

@@ -1,9 +1,17 @@
 import { useCallback } from "react";
 import { useFishjamContext } from "./useFishjamContext";
+/**
+ *
+ * @category Connection
+ */
 export function useConnect() {
     const client = useFishjamContext().fishjamClientRef.current;
     return useCallback((config) => client.connect({ ...config, peerMetadata: config.peerMetadata ?? {} }), [client]);
 }
+/**
+ *
+ * @category Connection
+ */
 export function useDisconnect() {
     const client = useFishjamContext().fishjamClientRef.current;
     return useCallback(() => {

package/dist/hooks/useFishjamClientState.d.ts

@@ -1,6 +1,5 @@
 import type { FishjamClient } from "@fishjam-cloud/ts-client";
-import type { PeerMetadata, TrackMetadata } from "../types";
-import type { PeerState } from "../state.types";
+import type { PeerMetadata, PeerState, TrackMetadata } from "../types/internal";
 export interface FishjamClientState {
     peers: PeerState[];
     components: PeerState[];

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

@@ -1 +1 @@
-{"version":3,"file":"useFishjamClientState.d.ts","sourceRoot":"","sources":["../../src/hooks/useFishjamClientState.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA0D,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACtH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,gBAAgB,CAAC;AA0ChE,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;CACzB;AAuCD,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,GAAG,kBAAkB,CAyCnH"}
+{"version":3,"file":"useFishjamClientState.d.ts","sourceRoot":"","sources":["../../src/hooks/useFishjamClientState.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA0D,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACtH,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAW,aAAa,EAAE,MAAM,mBAAmB,CAAC;AA2CzF,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;CACzB;AAmCD,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,GAAG,kBAAkB,CAyCnH"}

package/dist/hooks/useFishjamClientState.js

@@ -40,7 +40,6 @@ const eventNames = [
 ];
 function trackContextToTrack(track) {
     return {
-        rawMetadata: track.rawMetadata,
         metadata: track.metadata,
         trackId: track.trackId,
         stream: track.stream,
@@ -48,15 +47,12 @@ function trackContextToTrack(track) {
         encoding: track.encoding ?? null,
         vadStatus: track.vadStatus,
         track: track.track,
-        metadataParsingError: track.metadataParsingError,
     };
 }
 function endpointToPeerState(peer) {
     const tracks = [...peer.tracks].reduce((acc, [, track]) => ({ ...acc, [track.trackId]: trackContextToTrack(track) }), {});
     return {
-        rawMetadata: peer.rawMetadata,
         metadata: peer.metadata,
-        metadataParsingError: peer.metadataParsingError,
         id: peer.id,
         tracks,
     };

package/dist/hooks/useFishjamClient_DO_NOT_USE.d.ts

@@ -1,2 +1,7 @@
-export declare function useFishjamClient_DO_NOT_USE(): import("@fishjam-cloud/ts-client").FishjamClient<import("..").PeerMetadata, import("..").TrackMetadata>;
+/**
+ *
+ * @category Connection
+ * @deprecated
+ */
+export declare function useFishjamClient_DO_NOT_USE(): import("@fishjam-cloud/ts-client").FishjamClient<import("../types/internal").PeerMetadata, import("../types/internal").TrackMetadata>;
 //# sourceMappingURL=useFishjamClient_DO_NOT_USE.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useFishjamClient_DO_NOT_USE.d.ts","sourceRoot":"","sources":["../../src/hooks/useFishjamClient_DO_NOT_USE.ts"],"names":[],"mappings":"AAGA,wBAAgB,2BAA2B,4GAI1C"}
+{"version":3,"file":"useFishjamClient_DO_NOT_USE.d.ts","sourceRoot":"","sources":["../../src/hooks/useFishjamClient_DO_NOT_USE.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,2BAA2B,0IAI1C"}

package/dist/hooks/useFishjamClient_DO_NOT_USE.js

@@ -1,5 +1,10 @@
 import { useFishjamContext } from "./useFishjamContext";
 import { useMemo } from "react";
+/**
+ *
+ * @category Connection
+ * @deprecated
+ */
 export function useFishjamClient_DO_NOT_USE() {
     const client = useFishjamContext().fishjamClientRef.current;
     return useMemo(() => client, [client]);

package/dist/hooks/useFishjamContext.d.ts

@@ -1,16 +1,16 @@
 import type { FishjamClient } from "@fishjam-cloud/ts-client";
 import { type MutableRefObject } from "react";
-import type { PeerMetadata, TrackMetadata, ScreenShareState, TrackManager } from "../types";
+import type { PeerMetadata, TrackMetadata, TrackManager } from "../types/internal";
 import type { DeviceManager } from "../DeviceManager";
-import type { ParticipantStatus } from "../state.types";
 import type { FishjamClientState } from "./useFishjamClientState";
+import type { PeerStatus, ScreenshareApi } from "../types/public";
 export type FishjamContextType = {
     fishjamClientRef: MutableRefObject<FishjamClient<PeerMetadata, TrackMetadata>>;
     videoDeviceManagerRef: MutableRefObject<DeviceManager>;
     audioDeviceManagerRef: MutableRefObject<DeviceManager>;
     hasDevicesBeenInitializedRef: MutableRefObject<boolean>;
-    screenShareState: [ScreenShareState, React.Dispatch<React.SetStateAction<ScreenShareState>>];
-    peerStatus: ParticipantStatus;
+    screenShareManager: ScreenshareApi;
+    peerStatus: PeerStatus;
     videoTrackManager: TrackManager;
     audioTrackManager: TrackManager;
     clientState: FishjamClientState;

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

@@ -1 +1 @@
-{"version":3,"file":"useFishjamContext.d.ts","sourceRoot":"","sources":["../../src/hooks/useFishjamContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAiB,KAAK,gBAAgB,EAAc,MAAM,OAAO,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gBAAgB,EAAE,gBAAgB,CAAC,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;IAC/E,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACvD,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACvD,4BAA4B,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACxD,gBAAgB,EAAE,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7F,UAAU,EAAE,iBAAiB,CAAC;IAC9B,iBAAiB,EAAE,YAAY,CAAC;IAChC,iBAAiB,EAAE,YAAY,CAAC;IAChC,WAAW,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,cAAc,oDAAiD,CAAC;AAE7E,wBAAgB,iBAAiB,IAGb,kBAAkB,CACrC"}
+{"version":3,"file":"useFishjamContext.d.ts","sourceRoot":"","sources":["../../src/hooks/useFishjamContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAiB,KAAK,gBAAgB,EAAc,MAAM,OAAO,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAElE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gBAAgB,EAAE,gBAAgB,CAAC,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;IAC/E,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACvD,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACvD,4BAA4B,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACxD,kBAAkB,EAAE,cAAc,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC;IACvB,iBAAiB,EAAE,YAAY,CAAC;IAChC,iBAAiB,EAAE,YAAY,CAAC;IAChC,WAAW,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,cAAc,oDAAiD,CAAC;AAE7E,wBAAgB,iBAAiB,IAGb,kBAAkB,CACrC"}

package/dist/hooks/usePeerStatus.d.ts

@@ -0,0 +1,8 @@
+import type { FishjamClient } from "@fishjam-cloud/ts-client";
+import type { PeerMetadata, TrackMetadata } from "../types/internal";
+import type { PeerStatus } from "../types/public";
+export declare const usePeerStatus: (client: FishjamClient<PeerMetadata, TrackMetadata>) => {
+    readonly peerStatus: PeerStatus;
+    readonly getCurrentPeerStatus: () => PeerStatus;
+};
+//# sourceMappingURL=usePeerStatus.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"usePeerStatus.d.ts","sourceRoot":"","sources":["../../src/hooks/usePeerStatus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,eAAO,MAAM,aAAa,WAAY,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC;;;CA8C/E,CAAC"}

package/dist/hooks/{useParticipantStatus.js → usePeerStatus.js}

@@ -1,24 +1,24 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-export const useParticipantStatus = (client) => {
-    const [peerStatus, setParticipantStatusState] = useState("idle");
+export const usePeerStatus = (client) => {
+    const [peerStatus, setPeerStatusState] = useState("idle");
     const peerStatusRef = useRef("idle");
-    const setParticipantStatus = useCallback((status) => {
+    const setPeerStatus = useCallback((status) => {
         peerStatusRef.current = status;
-        setParticipantStatusState(status);
-    }, [setParticipantStatusState]);
-    const getCurrentParticipantStatus = useCallback(() => peerStatusRef.current, []);
+        setPeerStatusState(status);
+    }, [setPeerStatusState]);
+    const getCurrentPeerStatus = useCallback(() => peerStatusRef.current, []);
     useEffect(() => {
         const setConnecting = () => {
-            setParticipantStatus("connecting");
+            setPeerStatus("connecting");
         };
         const setError = () => {
-            setParticipantStatus("error");
+            setPeerStatus("error");
         };
         const setJoined = () => {
-            setParticipantStatus("connected");
+            setPeerStatus("connected");
         };
         const setDisconnected = () => {
-            setParticipantStatus("idle");
+            setPeerStatus("idle");
         };
         client.on("connectionStarted", setConnecting);
         client.on("joined", setJoined);
@@ -34,6 +34,6 @@ export const useParticipantStatus = (client) => {
             client.off("connectionError", setError);
             client.off("disconnected", setDisconnected);
         };
-    }, [client, setParticipantStatus]);
-    return { peerStatus, getCurrentParticipantStatus };
+    }, [client, setPeerStatus]);
+    return { peerStatus, getCurrentPeerStatus };
 };

package/dist/hooks/usePeers.d.ts

@@ -0,0 +1,10 @@
+import type { PeerWithTracks } from "../types/public";
+/**
+ *
+ * @category Connection
+ */
+export declare function usePeers(): {
+    localPeer: PeerWithTracks | null;
+    peers: PeerWithTracks[];
+};
+//# sourceMappingURL=usePeers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"usePeers.d.ts","sourceRoot":"","sources":["../../src/hooks/usePeers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AActD;;;GAGG;AACH,wBAAgB,QAAQ;;;EAOvB"}

package/dist/hooks/{useParticipants.js → usePeers.js}

@@ -7,10 +7,13 @@ function getPeerWithDistinguishedTracks(peerState) {
     const screenShareAudioTrack = peerTracks.find(({ metadata }) => metadata?.type === "screenShareAudio");
     return { ...peerState, cameraTrack, microphoneTrack, screenShareVideoTrack, screenShareAudioTrack };
 }
-export function useParticipants() {
+/**
+ *
+ * @category Connection
+ */
+export function usePeers() {
     const { clientState } = useFishjamContext();
-    const { localPeer, peers } = clientState;
-    const localParticipant = localPeer ? getPeerWithDistinguishedTracks(localPeer) : null;
-    const participants = Object.values(peers).map(getPeerWithDistinguishedTracks);
-    return { localParticipant, participants };
+    const localPeer = clientState.localPeer ? getPeerWithDistinguishedTracks(clientState.localPeer) : null;
+    const peers = Object.values(clientState.peers).map(getPeerWithDistinguishedTracks);
+    return { localPeer, peers };
 }

package/dist/hooks/useReconnection.d.ts

@@ -1,3 +1,7 @@
 import type { ReconnectionStatus } from "@fishjam-cloud/ts-client";
+/**
+ *
+ * @category Connection
+ */
 export declare const useReconnection: () => ReconnectionStatus;
 //# sourceMappingURL=useReconnection.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useReconnection.d.ts","sourceRoot":"","sources":["../../src/hooks/useReconnection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,eAAO,MAAM,eAAe,QAAO,kBA6BlC,CAAC"}
+{"version":3,"file":"useReconnection.d.ts","sourceRoot":"","sources":["../../src/hooks/useReconnection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE;;;GAGG;AACH,eAAO,MAAM,eAAe,QAAO,kBA6BlC,CAAC"}

package/dist/hooks/useReconnection.js

@@ -1,5 +1,9 @@
 import { useEffect, useState } from "react";
 import { useFishjamContext } from "./useFishjamContext";
+/**
+ *
+ * @category Connection
+ */
 export const useReconnection = () => {
     const { fishjamClientRef } = useFishjamContext();
     const [reconnectionStatus, setReconnectionStatus] = useState("idle");

package/dist/hooks/useScreenShare.d.ts

@@ -1,3 +1,15 @@
-import type { ScreenshareApi } from "../types";
+import type { FishjamClient } from "@fishjam-cloud/ts-client";
+import type { ScreenshareApi } from "../types/public";
+import type { PeerMetadata, TrackMetadata } from "../types/internal";
+interface ScreenShareManagerProps {
+    fishjamClient: FishjamClient<PeerMetadata, TrackMetadata>;
+}
+/**
+ *
+ * @category Screenshare
+ */
+export declare const useScreenShareManager: ({ fishjamClient }: ScreenShareManagerProps) => ScreenshareApi;
 export declare const useScreenShare: () => ScreenshareApi;
+export declare const getTracksFromStream: (stream: MediaStream) => [MediaStreamTrack, MediaStreamTrack | null];
+export {};
 //# 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":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAoB,MAAM,UAAU,CAAC;AAUjE,eAAO,MAAM,cAAc,QAAO,cA0IjC,CAAC"}
+{"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,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAoB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvF,UAAU,uBAAuB;IAC/B,aAAa,EAAE,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;CAC3D;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,sBAAuB,uBAAuB,KAAG,cAmIlF,CAAC;AAEF,eAAO,MAAM,cAAc,sBAI1B,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAY,WAAW,KAAG,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAKnG,CAAC"}

package/dist/hooks/useScreenShare.js

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

package/dist/hooks/useStatus.d.ts

@@ -1,2 +1,6 @@
-export declare function useStatus(): import("..").ParticipantStatus;
+/**
+ *
+ * @category Connection
+ */
+export declare function useStatus(): import("..").PeerStatus;
 //# sourceMappingURL=useStatus.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useStatus.d.ts","sourceRoot":"","sources":["../../src/hooks/useStatus.ts"],"names":[],"mappings":"AAEA,wBAAgB,SAAS,mCAExB"}
+{"version":3,"file":"useStatus.d.ts","sourceRoot":"","sources":["../../src/hooks/useStatus.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,SAAS,4BAExB"}

package/dist/hooks/useStatus.js

@@ -1,4 +1,8 @@
 import { useFishjamContext } from "./useFishjamContext";
+/**
+ *
+ * @category Connection
+ */
 export function useStatus() {
     return useFishjamContext().peerStatus;
 }

package/dist/hooks/useTrackManager.d.ts

@@ -1,11 +1,11 @@
 import type { FishjamClient } from "@fishjam-cloud/ts-client";
-import type { MediaManager, PeerMetadata, TrackManager, TrackMetadata } from "../types";
-import type { ParticipantStatus } from "../state.types";
+import type { MediaManager, PeerMetadata, TrackManager, TrackMetadata } from "../types/internal";
+import type { PeerStatus } from "../types/public";
 interface TrackManagerConfig {
     mediaManager: MediaManager;
     tsClient: FishjamClient<PeerMetadata, TrackMetadata>;
-    getCurrentParticipantStatus: () => ParticipantStatus;
+    getCurrentPeerStatus: () => PeerStatus;
 }
-export declare const useTrackManager: ({ mediaManager, tsClient, getCurrentParticipantStatus, }: TrackManagerConfig) => TrackManager;
+export declare const useTrackManager: ({ mediaManager, tsClient, getCurrentPeerStatus }: TrackManagerConfig) => TrackManager;
 export {};
 //# sourceMappingURL=useTrackManager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useTrackManager.d.ts","sourceRoot":"","sources":["../../src/hooks/useTrackManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAwC,MAAM,0BAA0B,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAc,YAAY,EAAE,aAAa,EAAmB,MAAM,UAAU,CAAC;AAGrH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,UAAU,kBAAkB;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACrD,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;CACtD;AAOD,eAAO,MAAM,eAAe,6DAIzB,kBAAkB,KAAG,YA2MvB,CAAC"}
+{"version":3,"file":"useTrackManager.d.ts","sourceRoot":"","sources":["../../src/hooks/useTrackManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAwC,MAAM,0BAA0B,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGjG,OAAO,KAAK,EAAE,UAAU,EAAmB,MAAM,iBAAiB,CAAC;AAEnE,UAAU,kBAAkB;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACrD,oBAAoB,EAAE,MAAM,UAAU,CAAC;CACxC;AASD,eAAO,MAAM,eAAe,qDAAsD,kBAAkB,KAAG,YA0LtG,CAAC"}