@whereby.com/core 1.2.9 → 1.3.0

package/dist/index.cjs

@@ -1147,9 +1147,9 @@ const createReactor = (selectors, callback) => {
     });
 };
 
-const coreVersion = "1.2.9";
+const coreVersion = "1.3.0";
 
-const initialState = {
+const initialState$1 = {
     isNodeSdk: false,
     isActive: false,
     isDialIn: false,
@@ -1163,7 +1163,7 @@ const initialState = {
 };
 const appSlice = toolkit.createSlice({
     name: "app",
-    initialState,
+    initialState: initialState$1,
     reducers: {
         doAppStart: (state, action) => {
             const url = new URL(action.payload.roomUrl);
@@ -1690,6 +1690,12 @@ const localMediaSlice = toolkit.createSlice({
         builder.addCase(doSwitchLocalStream.rejected, (state) => {
             return Object.assign(Object.assign({}, state), { isSwitchingStream: false });
         });
+        builder.addCase(doLocalStreamEffect.fulfilled, (state, { payload }) => {
+            if (!payload) {
+                return state;
+            }
+            return Object.assign(Object.assign({}, state), { beforeEffectTracks: Object.assign(Object.assign({}, state.beforeEffectTracks), payload.beforeEffectTracks) });
+        });
     },
 });
 const { deviceBusy, setCurrentCameraDeviceId, setCurrentMicrophoneDeviceId, setCurrentSpeakerDeviceId, toggleCameraEnabled, toggleMicrophoneEnabled, toggleLowDataModeEnabled, setLocalMediaOptions, setLocalMediaStream, localMediaStopped, localStreamMetadataUpdated, } = localMediaSlice.actions;
@@ -1819,6 +1825,15 @@ const doSwitchLocalStream = createAppAsyncThunk("localMedia/doSwitchLocalStream"
     if (!replaceStream) {
         return;
     }
+    const beforeEffectTracks = selectLocalMediaBeforeEffectTracks(state);
+    if (audioId !== undefined && (beforeEffectTracks === null || beforeEffectTracks === void 0 ? void 0 : beforeEffectTracks.audio)) {
+        beforeEffectTracks.audio.stop();
+        beforeEffectTracks.audio = undefined;
+    }
+    if (videoId !== undefined && (beforeEffectTracks === null || beforeEffectTracks === void 0 ? void 0 : beforeEffectTracks.video)) {
+        beforeEffectTracks.video.stop();
+        beforeEffectTracks.video = undefined;
+    }
     try {
         const { replacedTracks } = yield media.getStream(Object.assign(Object.assign({}, constraintsOptions), { audioId: audioId === undefined ? false : audioId, videoId: videoId === undefined ? false : videoId, type: "exact" }), { replaceStream });
         const deviceId = audioId || videoId;
@@ -1827,7 +1842,7 @@ const doSwitchLocalStream = createAppAsyncThunk("localMedia/doSwitchLocalStream"
                 deviceId,
             }));
         }
-        return { replacedTracks };
+        return { replacedTracks, beforeEffectTracks };
     }
     catch (error) {
         console.error(error);
@@ -1878,6 +1893,46 @@ const doStopLocalMedia = createAppThunk(() => (dispatch, getState) => {
     }
     dispatch(localMediaStopped());
 });
+const doLocalStreamEffect = createAppAsyncThunk("localMedia/doLocalStreamEffect", (_a, _b) => __awaiter(void 0, [_a, _b], void 0, function* ({ effectStream, only, stopBeforeTrack, }, { getState }) {
+    var _c;
+    const state = getState();
+    let beforeEffectTracks = selectLocalMediaBeforeEffectTracks(state);
+    const beforeTrack = beforeEffectTracks === null || beforeEffectTracks === void 0 ? void 0 : beforeEffectTracks[only];
+    if (!effectStream && !beforeTrack)
+        return;
+    try {
+        const stream = selectLocalMediaStream(state);
+        let replacedTracks = null;
+        if (!stream) {
+            throw new Error("No local media stream");
+        }
+        if (effectStream) {
+            if (!beforeTrack) {
+                beforeEffectTracks = {
+                    [only]: (_c = (only === "audio" ? stream === null || stream === void 0 ? void 0 : stream.getAudioTracks() : stream === null || stream === void 0 ? void 0 : stream.getVideoTracks())) === null || _c === void 0 ? void 0 : _c[0],
+                };
+            }
+            replacedTracks = media.replaceTracksInStream(stream, effectStream, only);
+        }
+        else if (!stopBeforeTrack) {
+            replacedTracks = media.replaceTracksInStream(stream, beforeTrack ? new MediaStream([beforeTrack]) : new MediaStream(), only);
+            beforeEffectTracks = {
+                [only]: undefined,
+            };
+        }
+        else if (beforeTrack) {
+            beforeEffectTracks = {
+                [only]: undefined,
+            };
+            beforeTrack.stop();
+        }
+        return { effectStream, beforeEffectTracks, replacedTracks };
+    }
+    catch (error) {
+        console.error("Error applying local stream effect", error);
+        return;
+    }
+}));
 const selectBusyDeviceIds = (state) => state.localMedia.busyDeviceIds;
 const selectCameraDeviceError = (state) => state.localMedia.cameraDeviceError;
 const selectCurrentCameraDeviceId = (state) => state.localMedia.currentCameraDeviceId;
@@ -1898,6 +1953,7 @@ const selectLocalMediaStream = (state) => state.localMedia.stream;
 const selectMicrophoneDeviceError = (state) => state.localMedia.microphoneDeviceError;
 const selectLocalMediaStartError = (state) => state.localMedia.startError;
 const selectLocalMediaIsSwitchingStream = (state) => state.localMedia.isSwitchingStream;
+const selectLocalMediaBeforeEffectTracks = (state) => state.localMedia.beforeEffectTracks;
 const selectLocalMediaConstraintsOptions = toolkit.createSelector(selectLocalMediaDevices, selectCurrentCameraDeviceId, selectCurrentMicrophoneDeviceId, selectIsLowDataModeEnabled, (devices, videoId, audioId, lowDataMode) => ({
     devices,
     videoId,
@@ -1994,7 +2050,7 @@ startAppListening({
     },
 });
 startAppListening({
-    matcher: toolkit.isAnyOf(doStartLocalMedia.fulfilled, doUpdateDeviceList.fulfilled, doSwitchLocalStream.fulfilled, doSwitchLocalStream.rejected),
+    matcher: toolkit.isAnyOf(doStartLocalMedia.fulfilled, doUpdateDeviceList.fulfilled, doSwitchLocalStream.fulfilled, doSwitchLocalStream.rejected, doLocalStreamEffect.fulfilled),
     effect: (_action, { dispatch, getState }) => {
         const state = getState();
         const stream = selectLocalMediaStream(state);
@@ -3045,7 +3101,7 @@ startAppListening({
     },
 });
 startAppListening({
-    actionCreator: doSwitchLocalStream.fulfilled,
+    matcher: toolkit.isAnyOf(doSwitchLocalStream.fulfilled, doLocalStreamEffect.fulfilled),
     effect: ({ payload }, { getState }) => {
         var _a;
         const stream = selectLocalMediaStream(getState());
@@ -4061,11 +4117,107 @@ const doRejectWaitingParticipant = createRoomConnectedThunk((payload) => (dispat
 });
 const selectWaitingParticipants = (state) => state.waitingParticipants.waitingParticipants;
 
+const initialState = {
+    isSwitching: false,
+    raw: {},
+};
+const cameraEffectsSlice = toolkit.createSlice({
+    name: "cameraEffects",
+    initialState,
+    reducers: {
+        cameraEffectsSwitching(state, action) {
+            state.isSwitching = action.payload.isSwitching;
+        },
+        cameraEffectsCleared(state) {
+            state.currentEffectId = null;
+            state.setup = undefined;
+            state.params = undefined;
+            state.raw = {};
+            state.error = undefined;
+            state.isSwitching = false;
+        },
+        cameraEffectsUpdated(state, action) {
+            const { effectId, setup, params, raw } = action.payload;
+            state.currentEffectId = effectId;
+            state.setup = setup;
+            state.params = params;
+            if (raw)
+                state.raw = raw;
+            state.error = undefined;
+            state.isSwitching = false;
+        },
+        cameraEffectsError(state, action) {
+            state.error = action.payload.error;
+            state.isSwitching = false;
+        },
+    },
+});
+const { cameraEffectsSwitching, cameraEffectsCleared, cameraEffectsUpdated, cameraEffectsError } = cameraEffectsSlice.actions;
+const selectCameraEffectsRaw = (state) => state.cameraEffects.raw;
+const doCameraEffectsSwitchPreset = createAppAsyncThunk("cameraEffects/switchPreset", (_a, _b) => __awaiter(void 0, [_a, _b], void 0, function* ({ effectId, setup, params, allowSafari, }, { getState, dispatch, rejectWithValue }) {
+    var _c, _d, _e;
+    const state = getState();
+    if (selectLocalMediaIsSwitchingStream(state)) {
+        return;
+    }
+    dispatch(cameraEffectsSwitching({ isSwitching: true }));
+    try {
+        const raw = selectCameraEffectsRaw(state);
+        const localStream = selectLocalMediaStream(state);
+        if (!((_c = localStream === null || localStream === void 0 ? void 0 : localStream.getVideoTracks()) === null || _c === void 0 ? void 0 : _c[0])) {
+            dispatch(cameraEffectsCleared());
+            return;
+        }
+        if (!effectId) {
+            if (raw.effectStream) {
+                yield dispatch(doLocalStreamEffect({ effectStream: undefined, only: "video" }));
+            }
+            (_d = raw.stop) === null || _d === void 0 ? void 0 : _d.call(raw);
+            dispatch(cameraEffectsCleared());
+            return;
+        }
+        if (raw.tryUpdate) {
+            const ok = yield raw.tryUpdate(effectId, Object.assign({}, (setup || {})), Object.assign({}, (params || {})));
+            if (ok) {
+                dispatch(cameraEffectsUpdated({ effectId, setup, params }));
+                return;
+            }
+        }
+        if (raw.effectStream) {
+            yield dispatch(doLocalStreamEffect({ effectStream: undefined, only: "video" }));
+            (_e = raw.stop) === null || _e === void 0 ? void 0 : _e.call(raw);
+        }
+        let mod;
+        try {
+            mod = yield import('@whereby.com/camera-effects');
+        }
+        catch (_f) {
+            throw new Error("@whereby.com/camera-effects is not installed. Add it as a dependency to enable camera effects.");
+        }
+        const { createEffectStream, getUsablePresets } = mod;
+        const usable = getUsablePresets({ filter: () => true, options: { allowSafari } });
+        if (!usable.includes(effectId)) {
+            throw new Error(`Unknown or unsupported effect preset: ${effectId}`);
+        }
+        const { stream: effectStream, stop, tryUpdate, } = yield createEffectStream(localStream, effectId, setup, params);
+        yield dispatch(doLocalStreamEffect({ effectStream, only: "video" }));
+        dispatch(cameraEffectsUpdated({ effectId, setup, params, raw: { stop, tryUpdate, effectStream } }));
+    }
+    catch (error) {
+        dispatch(cameraEffectsError({ error }));
+        return rejectWithValue(error);
+    }
+}));
+createAppAsyncThunk("cameraEffects/clear", (_1, _a) => __awaiter(void 0, [_1, _a], void 0, function* (_, { dispatch }) {
+    yield dispatch(doCameraEffectsSwitchPreset({ effectId: null }));
+}));
+
 const IS_DEV = undefined === "true";
 const appReducer = toolkit.combineReducers({
     app: appSlice.reducer,
     authorization: authorizationSlice.reducer,
     breakout: breakoutSlice.reducer,
+    cameraEffects: cameraEffectsSlice.reducer,
     chat: chatSlice.reducer,
     cloudRecording: cloudRecordingSlice.reducer,
     connectionMonitor: connectionMonitorSlice.reducer,
@@ -4735,6 +4887,28 @@ class RoomConnectionClient extends BaseClient {
     reportStreamResolution(streamId, width, height) {
         this.store.dispatch(doRtcReportStreamResolution({ streamId, width, height }));
     }
+    switchCameraEffect(effectId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.store.dispatch(doCameraEffectsSwitchPreset({ effectId }));
+            }
+            catch (error) {
+                return Promise.reject(error);
+            }
+            return Promise.resolve();
+        });
+    }
+    clearCameraEffect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.store.dispatch(doCameraEffectsSwitchPreset({ effectId: null }));
+            }
+            catch (error) {
+                return Promise.reject(error);
+            }
+            return Promise.resolve();
+        });
+    }
     destroy() {
         super.destroy();
         this.store.dispatch(doAppStop());

package/dist/index.d.cts

@@ -5,6 +5,7 @@ export { RoomJoinedSuccess } from '@whereby.com/media';
 import * as redux_thunk from 'redux-thunk';
 import * as _reduxjs_toolkit from '@reduxjs/toolkit';
 import * as redux from 'redux';
+import { Setup, Params } from '@whereby.com/camera-effects';
 
 type Json = string | number | boolean | null | Array<Json> | {
     [key: string]: Json;
@@ -586,6 +587,21 @@ interface CloudRecordingState$1 {
     startedAt?: number;
 }
 
+type TryUpdateFn = (presetId: string, setup: Setup, params: Params) => Promise<boolean>;
+type StopFn = () => void;
+interface CameraEffectsState {
+    currentEffectId?: string | null;
+    setup?: Setup;
+    params?: Params;
+    isSwitching: boolean;
+    error?: unknown;
+    raw: {
+        stop?: StopFn;
+        tryUpdate?: TryUpdateFn;
+        effectStream?: MediaStream;
+    };
+}
+
 interface AuthorizationState {
     roomKey: string | null;
     assistantKey?: string | null;
@@ -663,6 +679,10 @@ interface LocalMediaState$1 {
     stream?: MediaStream;
     isSwitchingStream: boolean;
     onDeviceChange?: () => void;
+    beforeEffectTracks?: {
+        audio?: MediaStreamTrack;
+        video?: MediaStreamTrack;
+    };
 }
 
 interface AppConfig {
@@ -738,6 +758,7 @@ declare const appReducer: redux.Reducer<{
     app: AppState;
     authorization: AuthorizationState;
     breakout: BreakoutState$1;
+    cameraEffects: CameraEffectsState;
     chat: ChatState;
     cloudRecording: CloudRecordingState$1;
     connectionMonitor: ConnectionMonitorState;
@@ -760,6 +781,7 @@ declare const appReducer: redux.Reducer<{
     app: AppState | undefined;
     authorization: AuthorizationState | undefined;
     breakout: BreakoutState$1 | undefined;
+    cameraEffects: CameraEffectsState | undefined;
     chat: ChatState | undefined;
     cloudRecording: CloudRecordingState$1 | undefined;
     connectionMonitor: ConnectionMonitorState | undefined;
@@ -786,6 +808,7 @@ declare const createStore: ({ preloadedState, injectServices, }: {
     app: AppState;
     authorization: AuthorizationState;
     breakout: BreakoutState$1;
+    cameraEffects: CameraEffectsState;
     chat: ChatState;
     cloudRecording: CloudRecordingState$1;
     connectionMonitor: ConnectionMonitorState;
@@ -809,6 +832,7 @@ declare const createStore: ({ preloadedState, injectServices, }: {
         app: AppState;
         authorization: AuthorizationState;
         breakout: BreakoutState$1;
+        cameraEffects: CameraEffectsState;
         chat: ChatState;
         cloudRecording: CloudRecordingState$1;
         connectionMonitor: ConnectionMonitorState;
@@ -1160,6 +1184,8 @@ declare class RoomConnectionClient extends BaseClient<RoomConnectionState, RoomC
     joinBreakoutGroup(group: string): void;
     joinBreakoutMainRoom(): void;
     reportStreamResolution(streamId: string, width: number, height: number): void;
+    switchCameraEffect(effectId: string): Promise<void>;
+    clearCameraEffect(): Promise<void>;
     destroy(): void;
 }
 

package/dist/index.d.mts

@@ -5,6 +5,7 @@ export { RoomJoinedSuccess } from '@whereby.com/media';
 import * as redux_thunk from 'redux-thunk';
 import * as _reduxjs_toolkit from '@reduxjs/toolkit';
 import * as redux from 'redux';
+import { Setup, Params } from '@whereby.com/camera-effects';
 
 type Json = string | number | boolean | null | Array<Json> | {
     [key: string]: Json;
@@ -586,6 +587,21 @@ interface CloudRecordingState$1 {
     startedAt?: number;
 }
 
+type TryUpdateFn = (presetId: string, setup: Setup, params: Params) => Promise<boolean>;
+type StopFn = () => void;
+interface CameraEffectsState {
+    currentEffectId?: string | null;
+    setup?: Setup;
+    params?: Params;
+    isSwitching: boolean;
+    error?: unknown;
+    raw: {
+        stop?: StopFn;
+        tryUpdate?: TryUpdateFn;
+        effectStream?: MediaStream;
+    };
+}
+
 interface AuthorizationState {
     roomKey: string | null;
     assistantKey?: string | null;
@@ -663,6 +679,10 @@ interface LocalMediaState$1 {
     stream?: MediaStream;
     isSwitchingStream: boolean;
     onDeviceChange?: () => void;
+    beforeEffectTracks?: {
+        audio?: MediaStreamTrack;
+        video?: MediaStreamTrack;
+    };
 }
 
 interface AppConfig {
@@ -738,6 +758,7 @@ declare const appReducer: redux.Reducer<{
     app: AppState;
     authorization: AuthorizationState;
     breakout: BreakoutState$1;
+    cameraEffects: CameraEffectsState;
     chat: ChatState;
     cloudRecording: CloudRecordingState$1;
     connectionMonitor: ConnectionMonitorState;
@@ -760,6 +781,7 @@ declare const appReducer: redux.Reducer<{
     app: AppState | undefined;
     authorization: AuthorizationState | undefined;
     breakout: BreakoutState$1 | undefined;
+    cameraEffects: CameraEffectsState | undefined;
     chat: ChatState | undefined;
     cloudRecording: CloudRecordingState$1 | undefined;
     connectionMonitor: ConnectionMonitorState | undefined;
@@ -786,6 +808,7 @@ declare const createStore: ({ preloadedState, injectServices, }: {
     app: AppState;
     authorization: AuthorizationState;
     breakout: BreakoutState$1;
+    cameraEffects: CameraEffectsState;
     chat: ChatState;
     cloudRecording: CloudRecordingState$1;
     connectionMonitor: ConnectionMonitorState;
@@ -809,6 +832,7 @@ declare const createStore: ({ preloadedState, injectServices, }: {
         app: AppState;
         authorization: AuthorizationState;
         breakout: BreakoutState$1;
+        cameraEffects: CameraEffectsState;
         chat: ChatState;
         cloudRecording: CloudRecordingState$1;
         connectionMonitor: ConnectionMonitorState;
@@ -1160,6 +1184,8 @@ declare class RoomConnectionClient extends BaseClient<RoomConnectionState, RoomC
     joinBreakoutGroup(group: string): void;
     joinBreakoutMainRoom(): void;
     reportStreamResolution(streamId: string, width: number, height: number): void;
+    switchCameraEffect(effectId: string): Promise<void>;
+    clearCameraEffect(): Promise<void>;
     destroy(): void;
 }
 

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export { RoomJoinedSuccess } from '@whereby.com/media';
 import * as redux_thunk from 'redux-thunk';
 import * as _reduxjs_toolkit from '@reduxjs/toolkit';
 import * as redux from 'redux';
+import { Setup, Params } from '@whereby.com/camera-effects';
 
 type Json = string | number | boolean | null | Array<Json> | {
     [key: string]: Json;
@@ -586,6 +587,21 @@ interface CloudRecordingState$1 {
     startedAt?: number;
 }
 
+type TryUpdateFn = (presetId: string, setup: Setup, params: Params) => Promise<boolean>;
+type StopFn = () => void;
+interface CameraEffectsState {
+    currentEffectId?: string | null;
+    setup?: Setup;
+    params?: Params;
+    isSwitching: boolean;
+    error?: unknown;
+    raw: {
+        stop?: StopFn;
+        tryUpdate?: TryUpdateFn;
+        effectStream?: MediaStream;
+    };
+}
+
 interface AuthorizationState {
     roomKey: string | null;
     assistantKey?: string | null;
@@ -663,6 +679,10 @@ interface LocalMediaState$1 {
     stream?: MediaStream;
     isSwitchingStream: boolean;
     onDeviceChange?: () => void;
+    beforeEffectTracks?: {
+        audio?: MediaStreamTrack;
+        video?: MediaStreamTrack;
+    };
 }
 
 interface AppConfig {
@@ -738,6 +758,7 @@ declare const appReducer: redux.Reducer<{
     app: AppState;
     authorization: AuthorizationState;
     breakout: BreakoutState$1;
+    cameraEffects: CameraEffectsState;
     chat: ChatState;
     cloudRecording: CloudRecordingState$1;
     connectionMonitor: ConnectionMonitorState;
@@ -760,6 +781,7 @@ declare const appReducer: redux.Reducer<{
     app: AppState | undefined;
     authorization: AuthorizationState | undefined;
     breakout: BreakoutState$1 | undefined;
+    cameraEffects: CameraEffectsState | undefined;
     chat: ChatState | undefined;
     cloudRecording: CloudRecordingState$1 | undefined;
     connectionMonitor: ConnectionMonitorState | undefined;
@@ -786,6 +808,7 @@ declare const createStore: ({ preloadedState, injectServices, }: {
     app: AppState;
     authorization: AuthorizationState;
     breakout: BreakoutState$1;
+    cameraEffects: CameraEffectsState;
     chat: ChatState;
     cloudRecording: CloudRecordingState$1;
     connectionMonitor: ConnectionMonitorState;
@@ -809,6 +832,7 @@ declare const createStore: ({ preloadedState, injectServices, }: {
         app: AppState;
         authorization: AuthorizationState;
         breakout: BreakoutState$1;
+        cameraEffects: CameraEffectsState;
         chat: ChatState;
         cloudRecording: CloudRecordingState$1;
         connectionMonitor: ConnectionMonitorState;
@@ -1160,6 +1184,8 @@ declare class RoomConnectionClient extends BaseClient<RoomConnectionState, RoomC
     joinBreakoutGroup(group: string): void;
     joinBreakoutMainRoom(): void;
     reportStreamResolution(streamId: string, width: number, height: number): void;
+    switchCameraEffect(effectId: string): Promise<void>;
+    clearCameraEffect(): Promise<void>;
     destroy(): void;
 }