Merge pull request #499 from whereby/kevinhanna/cob-1331-mediasoup-sa…

…fari-handler-not-using-simulcast-bandwidth media: add Safari17 device handler
whereby · Jan 6, 2025 · 67c8ea2 · 67c8ea2
2 parents 40e2d27 + 8124373
commit 67c8ea2
Show file tree

Hide file tree

Showing 15 changed files with 1,196 additions and 79 deletions.
diff --git a/.changeset/dry-crabs-agree.md b/.changeset/dry-crabs-agree.md
@@ -0,0 +1,5 @@
+---
+"@whereby.com/media": patch
+---
+
+Add custom Safari17 mediasoup device hanlder
diff --git a/packages/core/src/redux/slices/rtcConnection/index.ts b/packages/core/src/redux/slices/rtcConnection/index.ts
@@ -13,7 +13,7 @@ import { createReactor, startAppListening } from "../../listenerMiddleware";
 import { selectRemoteClients, streamStatusUpdated } from "../remoteParticipants";
 import { StreamState } from "../../../RoomParticipant";
 import { selectAppIsNodeSdk, selectAppIsActive, doAppStop } from "../app";
-import { Safari12 as MediasoupDeviceHandler } from "mediasoup-client/lib/handlers/Safari12.js";
+
 import {
     selectIsCameraEnabled,
     selectIsMicrophoneEnabled,
@@ -197,7 +197,6 @@ export const doConnectRtc = createAppThunk(() => (dispatch, getState) => {
             vp9On: false,
             h264On: false,
             simulcastScreenshareOn: false,
-            deviceHandlerFactory: isNodeSdk ? MediasoupDeviceHandler.createFactory() : undefined,
         },
     });
 

diff --git a/packages/core/src/redux/tests/store/rtcConnection.spec.ts b/packages/core/src/redux/tests/store/rtcConnection.spec.ts
@@ -72,7 +72,7 @@ describe("actions", () => {
         });
 
         describe("when isNodeSdk is true", () => {
-            it("uses a custom mediasoup device", () => {
+            it("initializes the RtcManagerDispatcher with that feature", () => {
                 const store = createStore({
                     withSignalConnection: true,
                     initialState: {
@@ -97,7 +97,7 @@ describe("actions", () => {
                 expect(RtcManagerDispatcher).toHaveBeenCalledTimes(1);
                 expect(RtcManagerDispatcher).toHaveBeenCalledWith(
                     expect.objectContaining({
-                        features: expect.objectContaining({ deviceHandlerFactory: expect.any(Function) }),
+                        features: expect.objectContaining({ isNodeSdk: true }),
                     }),
                 );
                 expect(diff(before, after)).toEqual({

diff --git a/packages/media/package.json b/packages/media/package.json
@@ -49,6 +49,7 @@
         "dist/**/*.d.cts"
     ],
     "dependencies": {
+        "@types/ua-parser-js": "^0.7.39",
         "check-ip": "^1.1.1",
         "events": "^3.3.0",
         "ip-address": "^9.0.5",
@@ -58,6 +59,7 @@
         "sdp-transform": "^2.14.2",
         "socket.io-client": "4.7.2",
         "typescript": "^5.3.3",
+        "ua-parser-js": "^1.0.38",
         "uuid": "^9.0.1",
         "uuid-validate": "^0.0.3",
         "webrtc-adapter": "^9.0.1"