@fishjam-cloud/react-client 0.6.0 → 0.7.1

package/dist/DeviceManager.d.ts

@@ -1,5 +1,6 @@
-import type { DeviceManagerConfig, DeviceState, MediaManager, StorageConfig, DeviceError } from "./types";
+import type { DeviceState, MediaManager, DeviceError, DeviceManagerStatus } from "./types/internal";
 import type TypedEmitter from "typed-emitter";
+import type { PersistLastDeviceHandlers } from "./types/public";
 export type DeviceManagerEvents = {
     managerStarted: (event: DeviceState & {
         constraints: MediaTrackConstraints | undefined;
@@ -7,7 +8,7 @@ export type DeviceManagerEvents = {
     managerInitialized: (state: DeviceState) => void;
     devicesStarted: (event: {
         restarting: boolean;
-        constraints?: string | boolean;
+        constraints?: MediaTrackConstraints | boolean;
     }, state: DeviceState) => void;
     deviceReady: (event: {
         stream: MediaStream;
@@ -20,31 +21,35 @@ export type DeviceManagerEvents = {
     deviceDisabled: (state: DeviceState) => void;
     error: (event: any, state: DeviceState) => void;
 };
-export type DeviceManagerStatus = "uninitialized" | "initializing" | "initialized" | "error";
+export type DeviceManagerConfig = {
+    deviceType: "audio" | "video";
+    defaultConstraints: MediaTrackConstraints;
+    userConstraints?: boolean | MediaTrackConstraints;
+    storage?: boolean | PersistLastDeviceHandlers;
+};
 declare const DeviceManager_base: new () => TypedEmitter<DeviceManagerEvents>;
 export declare class DeviceManager extends DeviceManager_base implements MediaManager {
-    private constraints;
-    private storageConfig;
+    private readonly constraints;
+    private readonly storageConfig;
     private status;
     private readonly deviceType;
     deviceState: DeviceState;
-    constructor(deviceType: "audio" | "video", defaultConfig?: DeviceManagerConfig);
+    constructor({ deviceType, storage, userConstraints, defaultConstraints }: DeviceManagerConfig);
     private createStorageConfig;
     getStatus(): DeviceManagerStatus;
-    getConstraints(currentConstraints: boolean | MediaTrackConstraints | undefined): MediaTrackConstraints | undefined;
-    getMedia: () => import("./types").Media | null;
+    getConstraints(): MediaTrackConstraints | boolean;
+    getMedia: () => import("./types/internal").Media | null;
     getTracks: () => MediaStreamTrack[];
     initialize: (stream: MediaStream | null, track: MediaStreamTrack | null, devices: MediaDeviceInfo[], requestedMedia: boolean, error?: DeviceError | null) => DeviceState;
     private setupOnEndedCallback;
     private onTrackEnded;
     getLastDevice(): MediaDeviceInfo | null;
     private saveLastDevice;
-    start(deviceId?: string | boolean): Promise<void>;
+    start(deviceId?: string): Promise<void>;
     stop(): Promise<void>;
     disable(): void;
     enable(): void;
     getDeviceType: () => "audio" | "video";
-    setConfig(storage?: boolean | StorageConfig, constraints?: boolean | MediaTrackConstraints): void;
 }
 export {};
 //# sourceMappingURL=DeviceManager.d.ts.map

package/dist/DeviceManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceManager.d.ts","sourceRoot":"","sources":["../src/DeviceManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAK1G,OAAO,KAAK,YAAY,MAAM,eAAe,CAAC;AAI9C,MAAM,MAAM,mBAAmB,GAAG;IAChC,cAAc,EAAE,CACd,KAAK,EAAE,WAAW,GAAG;QACnB,WAAW,EAAE,qBAAqB,GAAG,SAAS,CAAC;KAChD,EACD,KAAK,EAAE,WAAW,KACf,IAAI,CAAC;IACV,kBAAkB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC7G,WAAW,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC1E,YAAY,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACxF,aAAa,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC5C,aAAa,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC5C,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAE7C,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,eAAe,GAAG,cAAc,GAAG,aAAa,GAAG,OAAO,CAAC;4CAGxD,YAAY,CAAC,mBAAmB,CAAC;AADtE,qBAAa,aACX,SAAQ,kBACR,YAAW,YAAY;IAEvB,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,aAAa,CAAuB;IAE5C,OAAO,CAAC,MAAM,CAAwC;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoB;IAExC,WAAW,EAAE,WAAW,CAM7B;gBAEU,UAAU,EAAE,OAAO,GAAG,OAAO,EAAE,aAAa,CAAC,EAAE,mBAAmB;IAS9E,OAAO,CAAC,mBAAmB;IAMpB,SAAS,IAAI,mBAAmB;IAIhC,cAAc,CACnB,kBAAkB,EAAE,OAAO,GAAG,qBAAqB,GAAG,SAAS,GAC9D,qBAAqB,GAAG,SAAS;IAO7B,QAAQ,uCAAgC;IAExC,SAAS,2BAKd;IAEK,UAAU,WACP,WAAW,GAAG,IAAI,SACnB,gBAAgB,GAAG,IAAI,WACrB,eAAe,EAAE,kBACV,OAAO,UAChB,WAAW,GAAG,IAAI,iBAWzB;IAEF,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,YAAY,CAIlB;IAEK,aAAa,IAAI,eAAe,GAAG,IAAI;IAI9C,OAAO,CAAC,cAAc;IAMT,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IA4EjC,IAAI;IAOV,OAAO;IAWP,MAAM;IAWN,aAAa,0BAElB;IAEK,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,aAAa,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,qBAAqB;CAIlG"}
+{"version":3,"file":"DeviceManager.d.ts","sourceRoot":"","sources":["../src/DeviceManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAKpG,OAAO,KAAK,YAAY,MAAM,eAAe,CAAC;AAG9C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,MAAM,MAAM,mBAAmB,GAAG;IAChC,cAAc,EAAE,CACd,KAAK,EAAE,WAAW,GAAG;QACnB,WAAW,EAAE,qBAAqB,GAAG,SAAS,CAAC;KAChD,EACD,KAAK,EAAE,WAAW,KACf,IAAI,CAAC;IACV,kBAAkB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,CACd,KAAK,EAAE;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAA;KAAE,EAC7E,KAAK,EAAE,WAAW,KACf,IAAI,CAAC;IACV,WAAW,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC1E,YAAY,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACxF,aAAa,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC5C,aAAa,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC5C,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAE7C,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC;IAC9B,kBAAkB,EAAE,qBAAqB,CAAC;IAC1C,eAAe,CAAC,EAAE,OAAO,GAAG,qBAAqB,CAAC;IAClD,OAAO,CAAC,EAAE,OAAO,GAAG,yBAAyB,CAAC;CAC/C,CAAC;4CAGmC,YAAY,CAAC,mBAAmB,CAAC;AADtE,qBAAa,aACX,SAAQ,kBACR,YAAW,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAkC;IAC9D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmC;IAEjE,OAAO,CAAC,MAAM,CAAwC;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoB;IAExC,WAAW,EAAE,WAAW,CAM7B;gBAEU,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,EAAE,mBAAmB;IAO7F,OAAO,CAAC,mBAAmB;IASpB,SAAS,IAAI,mBAAmB;IAIhC,cAAc,IAAI,qBAAqB,GAAG,OAAO;IAIjD,QAAQ,gDAAgC;IAExC,SAAS,2BAMd;IAEK,UAAU,WACP,WAAW,GAAG,IAAI,SACnB,gBAAgB,GAAG,IAAI,WACrB,eAAe,EAAE,kBACV,OAAO,UAChB,WAAW,GAAG,IAAI,iBAazB;IAEF,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,YAAY,CAIlB;IAEK,aAAa,IAAI,eAAe,GAAG,IAAI;IAI9C,OAAO,CAAC,cAAc;IAIT,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM;IAgFvB,IAAI;IAOV,OAAO;IAWP,MAAM;IAWN,aAAa,0BAElB;CACH"}

package/dist/DeviceManager.js

@@ -1,4 +1,4 @@
-import { prepareMediaTrackConstraints, toMediaTrackConstraints } from "./constraints";
+import { prepareMediaTrackConstraints } from "./constraints";
 import EventEmitter from "events";
 import { getDeviceInfo, getLocalStorageConfig, prepareDeviceState } from "./utils/media";
 import { parseUserMediaError } from "./utils/errors";
@@ -14,35 +14,32 @@ export class DeviceManager extends EventEmitter {
         devicesStatus: "Not requested",
         error: null,
     };
-    constructor(deviceType, defaultConfig) {
+    constructor({ deviceType, storage, userConstraints, defaultConstraints }) {
         super();
-        this.storageConfig = this.createStorageConfig(defaultConfig?.storage);
+        this.storageConfig = this.createStorageConfig(deviceType, storage);
         this.deviceType = deviceType;
-        this.constraints = toMediaTrackConstraints(defaultConfig?.trackConstraints ?? true);
+        this.constraints = userConstraints ?? defaultConstraints;
     }
-    createStorageConfig(storage) {
+    createStorageConfig(deviceType, storage) {
         if (storage === false)
             return null;
         if (storage === true || storage === undefined)
-            return getLocalStorageConfig(this.deviceType);
+            return getLocalStorageConfig(deviceType);
         return storage;
     }
     getStatus() {
         return this.status;
     }
-    getConstraints(currentConstraints) {
-        if (currentConstraints === false)
-            return undefined;
-        if (currentConstraints === undefined || currentConstraints === true)
-            return this.constraints;
-        return currentConstraints ?? this.constraints;
+    getConstraints() {
+        return this.constraints;
     }
     getMedia = () => this.deviceState.media;
     getTracks = () => {
+        const stream = this.deviceState.media?.stream;
         if (this.deviceType === "audio") {
-            return this.deviceState.media?.stream?.getAudioTracks() ?? [];
+            return stream?.getAudioTracks() ?? [];
         }
-        return this.deviceState.media?.stream?.getVideoTracks() ?? [];
+        return stream?.getVideoTracks() ?? [];
     };
     initialize = (stream, track, devices, requestedMedia, error = null) => {
         this.deviceState = prepareDeviceState(stream, track, devices, error, requestedMedia);
@@ -51,6 +48,7 @@ export class DeviceManager extends EventEmitter {
             this.saveLastDevice(deviceInfo);
         this.status = "initialized";
         this.setupOnEndedCallback();
+        this.emit("managerInitialized", this.deviceState);
         return this.deviceState;
     };
     setupOnEndedCallback() {
@@ -67,27 +65,27 @@ export class DeviceManager extends EventEmitter {
         return this.storageConfig?.getLastDevice?.() ?? null;
     }
     saveLastDevice(info) {
-        if (!this.storageConfig)
-            console.warn("Device manager storage has been disabled");
         this.storageConfig?.saveLastDevice(info);
     }
-    // todo `audioDeviceId / videoDeviceId === true` means use last device
     async start(deviceId) {
-        const shouldRestart = !!deviceId && deviceId !== this.deviceState.media?.deviceInfo?.deviceId;
-        const newDevice = deviceId === true ? this.getLastDevice()?.deviceId || true : deviceId;
-        const trackConstraints = this.constraints;
-        const exactConstraints = shouldRestart && prepareMediaTrackConstraints(newDevice, trackConstraints);
+        const newDeviceId = deviceId ?? this.getLastDevice()?.deviceId;
+        const currentDeviceId = this.deviceState.media?.deviceInfo?.deviceId;
+        const shouldReplaceDevice = Boolean(currentDeviceId && currentDeviceId !== newDeviceId);
+        const isDeviceStopped = currentDeviceId === undefined;
+        const shouldProceed = isDeviceStopped || shouldReplaceDevice;
+        const exactConstraints = shouldProceed && prepareMediaTrackConstraints(newDeviceId, this.constraints);
         if (!exactConstraints)
             return;
         this.deviceState.mediaStatus = "Requesting";
-        this.emit("devicesStarted", { ...this.deviceState, restarting: shouldRestart, constraints: newDevice }, this.deviceState);
+        this.emit("devicesStarted", { ...this.deviceState, restarting: shouldReplaceDevice, constraints: exactConstraints }, this.deviceState);
         try {
             const stream = await navigator.mediaDevices.getUserMedia({ [this.deviceType]: exactConstraints });
             const getTrack = () => {
                 const tracks = this.deviceType === "audio" ? stream.getAudioTracks() : stream.getVideoTracks();
                 return tracks[0] ?? null;
             };
-            const currentDeviceId = getTrack()?.getSettings()?.deviceId;
+            const track = getTrack();
+            const currentDeviceId = track?.getSettings()?.deviceId;
             const deviceInfo = currentDeviceId ? getDeviceInfo(currentDeviceId, this.deviceState.devices ?? []) : null;
             if (deviceInfo) {
                 this.saveLastDevice?.(deviceInfo);
@@ -104,18 +102,18 @@ export class DeviceManager extends EventEmitter {
             // Manually stopping tracks on its own does not generate the `ended` event.
             // The ended event in Safari has already been emitted and will be handled in the future.
             // Therefore, in the `onTrackEnded` method, events for already stopped tracks are filtered out to prevent the state from being damaged.
-            if (shouldRestart) {
+            if (shouldReplaceDevice) {
                 this.deviceState?.media?.track?.stop();
-                this.deviceState.media = {
-                    stream: stream,
-                    track: getTrack(),
-                    deviceInfo,
-                    enabled: true,
-                };
             }
+            this.deviceState.media = {
+                stream,
+                track,
+                deviceInfo,
+                enabled: true,
+            };
             this.setupOnEndedCallback();
             this.deviceState.mediaStatus = "OK";
-            this.emit("devicesReady", { ...this.deviceState, restarted: shouldRestart }, this.deviceState);
+            this.emit("devicesReady", { ...this.deviceState, restarted: shouldReplaceDevice }, this.deviceState);
         }
         catch (err) {
             const parsedError = parseUserMediaError(err);
@@ -153,8 +151,4 @@ export class DeviceManager extends EventEmitter {
     getDeviceType = () => {
         return this.deviceType;
     };
-    setConfig(storage, constraints) {
-        this.storageConfig = this.createStorageConfig(storage);
-        this.constraints = constraints ? toMediaTrackConstraints(constraints) : undefined;
-    }
 }

package/dist/constraints.d.ts

@@ -1,26 +1,6 @@
 export declare const AUDIO_TRACK_CONSTRAINTS: MediaTrackConstraints;
 export declare const VIDEO_TRACK_CONSTRAINTS: MediaTrackConstraints;
 export declare const SCREEN_SHARING_MEDIA_CONSTRAINTS: MediaStreamConstraints;
-export declare const toMediaTrackConstraints: (constraint?: boolean | MediaTrackConstraints) => MediaTrackConstraints | undefined;
-export declare const prepareMediaTrackConstraints: (deviceId: string | undefined | boolean, constraints: MediaTrackConstraints | undefined) => MediaTrackConstraints | boolean;
-export declare const getExactDeviceConstraint: (constraints: MediaTrackConstraints | undefined, deviceId: string | undefined) => {
-    deviceId: {
-        exact: string | undefined;
-    };
-    advanced?: MediaTrackConstraintSet[];
-    aspectRatio?: ConstrainDouble;
-    autoGainControl?: ConstrainBoolean;
-    channelCount?: ConstrainULong;
-    displaySurface?: ConstrainDOMString;
-    echoCancellation?: ConstrainBoolean;
-    facingMode?: ConstrainDOMString;
-    frameRate?: ConstrainDouble;
-    groupId?: ConstrainDOMString;
-    height?: ConstrainULong;
-    noiseSuppression?: ConstrainBoolean;
-    sampleRate?: ConstrainULong;
-    sampleSize?: ConstrainULong;
-    width?: ConstrainULong;
-};
-export declare const prepareConstraints: (deviceIdToStart: string | undefined, constraints: MediaTrackConstraints | undefined) => MediaTrackConstraints | undefined | boolean;
+export declare const prepareMediaTrackConstraints: (deviceId: string | undefined, constraints: MediaTrackConstraints | undefined | boolean) => MediaTrackConstraints | boolean;
+export declare const prepareConstraints: (deviceIdToStart: string | undefined, constraints: MediaTrackConstraints | undefined | boolean) => MediaTrackConstraints | undefined | boolean;
 //# sourceMappingURL=constraints.d.ts.map

package/dist/constraints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../src/constraints.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,EAAE,qBAErC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,qBAerC,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,sBAM9C,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBACrB,OAAO,GAAG,qBAAqB,KAC3C,qBAAqB,GAAG,SAK1B,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAC7B,MAAM,GAAG,SAAS,GAAG,OAAO,eACzB,qBAAqB,GAAG,SAAS,KAC7C,qBAAqB,GAAG,OAK1B,CAAC;AAEF,eAAO,MAAM,wBAAwB,gBACtB,qBAAqB,GAAG,SAAS,YACpC,MAAM,GAAG,SAAS;;;;;;;;;;;;;;;;;;CAI5B,CAAC;AAEH,eAAO,MAAM,kBAAkB,oBACZ,MAAM,GAAG,SAAS,eACtB,qBAAqB,GAAG,SAAS,KAC7C,qBAAqB,GAAG,SAAS,GAAG,OAEtC,CAAC"}
+{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../src/constraints.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,EAAE,qBAErC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,qBAerC,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,sBAM9C,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAC7B,MAAM,GAAG,SAAS,eACf,qBAAqB,GAAG,SAAS,GAAG,OAAO,KACvD,qBAAqB,GAAG,OAM1B,CAAC;AAEF,eAAO,MAAM,kBAAkB,oBACZ,MAAM,GAAG,SAAS,eACtB,qBAAqB,GAAG,SAAS,GAAG,OAAO,KACvD,qBAAqB,GAAG,SAAS,GAAG,OAUtC,CAAC"}

package/dist/constraints.js

@@ -24,24 +24,19 @@ export const SCREEN_SHARING_MEDIA_CONSTRAINTS = {
         height: { max: 1080, ideal: 1080 },
     },
 };
-export const toMediaTrackConstraints = (constraint) => {
-    if (typeof constraint === "boolean") {
-        return constraint ? {} : undefined;
-    }
-    return constraint;
-};
 export const prepareMediaTrackConstraints = (deviceId, constraints) => {
+    const trackConstraints = typeof constraints === "boolean" ? {} : constraints;
     if (!deviceId)
-        return false;
-    if (deviceId === true)
-        return { ...constraints };
-    const exactId = deviceId ? { deviceId: { exact: deviceId } } : {};
-    return { ...constraints, ...exactId };
+        return { ...trackConstraints };
+    return { ...trackConstraints, deviceId: { exact: deviceId } };
 };
-export const getExactDeviceConstraint = (constraints, deviceId) => ({
-    ...constraints,
-    deviceId: { exact: deviceId },
-});
 export const prepareConstraints = (deviceIdToStart, constraints) => {
-    return deviceIdToStart ? getExactDeviceConstraint(constraints, deviceIdToStart) : constraints;
+    if (!deviceIdToStart)
+        return constraints;
+    // The resulting stream will not contain a track of this type,
+    // which means that the device will not be activated.
+    if (constraints === false)
+        return false;
+    const constraintsObj = constraints === true ? {} : constraints;
+    return { ...constraintsObj, deviceId: { ideal: deviceIdToStart } };
 };

package/dist/fishjamProvider.d.ts

@@ -1,12 +1,14 @@
-import type { PropsWithChildren } from "react";
-import type { DeviceManagerConfig } from "./types";
-import type { ReconnectConfig } from "@fishjam-cloud/ts-client";
+import { type PropsWithChildren } from "react";
+import { type ReconnectConfig } from "@fishjam-cloud/ts-client";
+import type { PersistLastDeviceHandlers } from "./types/public";
 interface FishjamProviderProps extends PropsWithChildren {
-    config?: {
-        reconnect?: ReconnectConfig | boolean;
-    };
-    deviceManagerDefaultConfig?: DeviceManagerConfig;
+    reconnect?: ReconnectConfig | boolean;
+    constraints?: Pick<MediaStreamConstraints, "audio" | "video">;
+    persistLastDevice?: boolean | PersistLastDeviceHandlers;
 }
-export declare function FishjamProvider({ children, config, deviceManagerDefaultConfig }: FishjamProviderProps): import("react/jsx-runtime").JSX.Element;
+/**
+ * @category Components
+ */
+export declare function FishjamProvider({ children, reconnect, constraints, persistLastDevice }: FishjamProviderProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=fishjamProvider.d.ts.map

package/dist/fishjamProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fishjamProvider.d.ts","sourceRoot":"","sources":["../src/fishjamProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAI/C,OAAO,KAAK,EAAE,mBAAmB,EAAoB,MAAM,SAAS,CAAC;AAErE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,UAAU,oBAAqB,SAAQ,iBAAiB;IACtD,MAAM,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,eAAe,GAAG,OAAO,CAAA;KAAE,CAAC;IACnD,0BAA0B,CAAC,EAAE,mBAAmB,CAAC;CAClD;AAED,wBAAgB,eAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,oBAAoB,2CAmCrG"}
+{"version":3,"file":"fishjamProvider.d.ts","sourceRoot":"","sources":["../src/fishjamProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAGjE,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAO/E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,UAAU,oBAAqB,SAAQ,iBAAiB;IACtD,SAAS,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC;IACtC,WAAW,CAAC,EAAE,IAAI,CAAC,sBAAsB,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAC9D,iBAAiB,CAAC,EAAE,OAAO,GAAG,yBAAyB,CAAC;CACzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,EAAE,oBAAoB,2CAsD5G"}

package/dist/fishjamProvider.js

@@ -1,30 +1,54 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useRef, useState } from "react";
-import { Client } from "./Client";
-import { useTrackManager } from "./trackManager";
-import { useClientState } from "./hooks/clientState";
-import { FishjamContext } from "./hooks/fishjamContext";
-export function FishjamProvider({ children, config, deviceManagerDefaultConfig }) {
-    const client = useRef(new Client({
-        clientConfig: config,
-        deviceManagerDefaultConfig,
+import { useRef, useState } from "react";
+import { useTrackManager } from "./hooks/useTrackManager";
+import { FishjamClient } from "@fishjam-cloud/ts-client";
+import { FishjamContext } from "./hooks/useFishjamContext";
+import { DeviceManager } from "./DeviceManager";
+import { usePeerStatus } from "./hooks/usePeerStatus";
+import { useFishjamClientState } from "./hooks/useFishjamClientState";
+import { AUDIO_TRACK_CONSTRAINTS, VIDEO_TRACK_CONSTRAINTS } from "./constraints";
+/**
+ * @category Components
+ */
+export function FishjamProvider({ children, reconnect, constraints, persistLastDevice }) {
+    const fishjamClientRef = useRef(new FishjamClient({ reconnect }));
+    const hasDevicesBeenInitializedRef = useRef(false);
+    const storage = persistLastDevice;
+    const videoDeviceManagerRef = useRef(new DeviceManager({
+        deviceType: "video",
+        defaultConstraints: VIDEO_TRACK_CONSTRAINTS,
+        userConstraints: constraints?.video,
+        storage,
     }));
-    // TODO: do the same for client config or just remove the Client class
-    useEffect(() => {
-        if (!deviceManagerDefaultConfig)
-            return;
-        client.current.setDeviceManagerConfig(deviceManagerDefaultConfig);
-    }, [deviceManagerDefaultConfig]);
-    const state = useClientState(client.current);
-    const tsClient = client.current.getTsClient();
-    const screenshareState = useState(null);
+    const audioDeviceManagerRef = useRef(new DeviceManager({
+        deviceType: "audio",
+        defaultConstraints: AUDIO_TRACK_CONSTRAINTS,
+        userConstraints: constraints?.audio,
+        storage,
+    }));
+    const screenShareState = useState({ stream: null, trackIds: null });
+    const { peerStatus, getCurrentPeerStatus } = usePeerStatus(fishjamClientRef.current);
     const videoTrackManager = useTrackManager({
-        mediaManager: client.current.videoDeviceManager,
-        tsClient,
+        mediaManager: videoDeviceManagerRef.current,
+        tsClient: fishjamClientRef.current,
+        getCurrentPeerStatus,
     });
     const audioTrackManager = useTrackManager({
-        mediaManager: client.current.audioDeviceManager,
-        tsClient,
+        mediaManager: audioDeviceManagerRef.current,
+        tsClient: fishjamClientRef.current,
+        getCurrentPeerStatus,
     });
-    return (_jsx(FishjamContext.Provider, { value: { state, screenshareState, videoTrackManager, audioTrackManager }, children: children }));
+    const clientState = useFishjamClientState(fishjamClientRef.current);
+    const context = {
+        fishjamClientRef,
+        peerStatus,
+        screenShareState,
+        videoTrackManager,
+        audioTrackManager,
+        videoDeviceManagerRef,
+        audioDeviceManagerRef,
+        hasDevicesBeenInitializedRef,
+        clientState,
+    };
+    return _jsx(FishjamContext.Provider, { value: context, children: children });
 }

package/dist/hooks/deviceManagers/useAudioDeviceManager.d.ts

@@ -0,0 +1,6 @@
+/**
+ *
+ * @category Devices
+ */
+export declare const useAudioDeviceManager: () => import("../../types/internal").DeviceManagerState;
+//# sourceMappingURL=useAudioDeviceManager.d.ts.map

package/dist/hooks/deviceManagers/useAudioDeviceManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAudioDeviceManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/deviceManagers/useAudioDeviceManager.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,eAAO,MAAM,qBAAqB,yDAKjC,CAAC"}

package/dist/hooks/deviceManagers/useAudioDeviceManager.js

@@ -0,0 +1,11 @@
+import { useFishjamContext } from "../useFishjamContext";
+import { useDeviceManager } from "./useDeviceManager";
+/**
+ *
+ * @category Devices
+ */
+export const useAudioDeviceManager = () => {
+    const { audioDeviceManagerRef } = useFishjamContext();
+    const audioDeviceState = useDeviceManager(audioDeviceManagerRef.current);
+    return audioDeviceState;
+};

package/dist/hooks/deviceManagers/useDeviceManager.d.ts

@@ -0,0 +1,4 @@
+import type { DeviceManagerState } from "../../types/internal";
+import type { DeviceManager } from "../../DeviceManager";
+export declare const useDeviceManager: (deviceManager: DeviceManager) => DeviceManagerState;
+//# sourceMappingURL=useDeviceManager.d.ts.map

package/dist/hooks/deviceManagers/useDeviceManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useDeviceManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/deviceManagers/useDeviceManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAuB,MAAM,qBAAqB,CAAC;AAc9E,eAAO,MAAM,gBAAgB,kBAAmB,aAAa,uBAoC5D,CAAC"}

package/dist/hooks/deviceManagers/useDeviceManager.js

@@ -0,0 +1,39 @@
+import { useCallback, useRef, useSyncExternalStore } from "react";
+const eventNames = [
+    "deviceDisabled",
+    "deviceEnabled",
+    "managerStarted",
+    "deviceStopped",
+    "deviceReady",
+    "devicesStarted",
+    "devicesReady",
+    "managerInitialized",
+    "error",
+];
+export const useDeviceManager = (deviceManager) => {
+    const mutationRef = useRef(false);
+    const subscribe = useCallback((subscribeCallback) => {
+        const callback = () => {
+            mutationRef.current = true;
+            subscribeCallback();
+        };
+        eventNames.forEach((eventName) => deviceManager.on(eventName, callback));
+        return () => {
+            eventNames.forEach((eventName) => deviceManager.removeListener(eventName, callback));
+        };
+    }, [deviceManager]);
+    const lastSnapshotRef = useRef(null);
+    const getSnapshot = useCallback(() => {
+        if (mutationRef.current || lastSnapshotRef.current === null) {
+            lastSnapshotRef.current = {
+                deviceState: deviceManager.deviceState,
+                status: deviceManager.getStatus(),
+                tracks: deviceManager.getTracks(),
+            };
+            mutationRef.current = false;
+        }
+        return lastSnapshotRef.current;
+    }, [deviceManager]);
+    const deviceState = useSyncExternalStore(subscribe, getSnapshot);
+    return deviceState;
+};

package/dist/hooks/deviceManagers/useVideoDeviceManager.d.ts

@@ -0,0 +1,6 @@
+/**
+ *
+ * @category Devices
+ */
+export declare const useVideoDeviceManager: () => import("../../types/internal").DeviceManagerState;
+//# sourceMappingURL=useVideoDeviceManager.d.ts.map

package/dist/hooks/deviceManagers/useVideoDeviceManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useVideoDeviceManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/deviceManagers/useVideoDeviceManager.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,eAAO,MAAM,qBAAqB,yDAIjC,CAAC"}

package/dist/hooks/deviceManagers/useVideoDeviceManager.js

@@ -0,0 +1,11 @@
+import { useFishjamContext } from "../useFishjamContext";
+import { useDeviceManager } from "./useDeviceManager";
+/**
+ *
+ * @category Devices
+ */
+export const useVideoDeviceManager = () => {
+    const { videoDeviceManagerRef } = useFishjamContext();
+    const videoDeviceState = useDeviceManager(videoDeviceManagerRef.current);
+    return videoDeviceState;
+};

package/dist/hooks/internal.d.ts

@@ -0,0 +1,2 @@
+export { useFishjamClient_DO_NOT_USE } from "./useFishjamClient_DO_NOT_USE";
+//# sourceMappingURL=internal.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/hooks/internal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC"}

package/dist/hooks/internal.js

@@ -0,0 +1 @@
+export { useFishjamClient_DO_NOT_USE } from "./useFishjamClient_DO_NOT_USE";

package/dist/hooks/public.d.ts

@@ -1,7 +1,7 @@
-export { useConnect, useDisconnect, useReconnection } from "./connection";
-export { useCamera, useMicrophone } from "./devices";
-export { useParticipants } from "./participants";
-export { useScreenShare } from "./screenShare";
-export { useSelector, useStatus, useTracks, useClient } from "./state";
-export { useSetupMedia } from "./setupMedia";
+export { useConnect, useDisconnect } from "./useConnection";
+export { useReconnection } from "./useReconnection";
+export { useCamera, useMicrophone, useInitializeDevices } from "./useDevices";
+export { usePeers } from "./usePeers";
+export { useScreenShare } from "./useScreenShare";
+export { useStatus } from "./useStatus";
 //# 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,eAAe,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,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,cAAc,CAAC;AAC9E,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,6 +1,6 @@
-export { useConnect, useDisconnect, useReconnection } from "./connection";
-export { useCamera, useMicrophone } from "./devices";
-export { useParticipants } from "./participants";
-export { useScreenShare } from "./screenShare";
-export { useSelector, useStatus, useTracks, useClient } from "./state";
-export { useSetupMedia } from "./setupMedia";
+export { useConnect, useDisconnect } from "./useConnection";
+export { useReconnection } from "./useReconnection";
+export { useCamera, useMicrophone, useInitializeDevices } from "./useDevices";
+export { usePeers } from "./usePeers";
+export { useScreenShare } from "./useScreenShare";
+export { useStatus } from "./useStatus";

package/dist/hooks/useConnection.d.ts

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,20 @@
+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(() => {
+        client.disconnect();
+    }, [client]);
+}

package/dist/hooks/useDevices.d.ts

@@ -0,0 +1,19 @@
+import type { AudioDevice, Device } from "../types/public";
+/**
+ *
+ * @category Devices
+ */
+export declare function useCamera(): Device;
+/**
+ *
+ * @category Devices
+ */
+export declare function useMicrophone(): AudioDevice;
+/**
+ *
+ * @category Devices
+ */
+export declare const useInitializeDevices: () => {
+    initializeDevices: () => Promise<void>;
+};
+//# sourceMappingURL=useDevices.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useDevices.d.ts","sourceRoot":"","sources":["../../src/hooks/useDevices.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE3D;;;GAGG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAuBlC;AAED;;;GAGG;AACH,wBAAgB,aAAa,IAAI,WAAW,CA2B3C;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;CAqDhC,CAAC"}