Extract createSdpOfferEvent to a separte file

fishjam-cloud · Jun 27, 2024 · b887386 · b887386
1 parent 7d53c21
commit b887386
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 31 deletions.
diff --git a/packages/ts-client/src/webrtc/sdpEvents.ts b/packages/ts-client/src/webrtc/sdpEvents.ts
@@ -0,0 +1,38 @@
+import { generateCustomEvent } from './mediaEvent';
+import { getTrackIdToTrackBitrates } from './bitrate';
+import { getMidToTrackId } from './transciever';
+import { RemoteTrackId, TrackContext } from './types';
+import { TrackContextImpl } from './internal';
+
+export const createSdpOfferEvent = <EndpointMetadata, TrackMetadata>(
+  offer: RTCSessionDescriptionInit,
+  connection: RTCPeerConnection | undefined,
+  localTrackIdToTrack: Map<
+    RemoteTrackId,
+    TrackContextImpl<EndpointMetadata, TrackMetadata>
+  >,
+  tracks: Map<string, TrackContext<EndpointMetadata, TrackMetadata>>,
+) =>
+  generateCustomEvent({
+    type: 'sdpOffer',
+    data: {
+      sdpOffer: offer,
+      trackIdToTrackMetadata: getTrackIdToMetadata(tracks),
+      trackIdToTrackBitrates: getTrackIdToTrackBitrates(
+        connection,
+        localTrackIdToTrack,
+        tracks,
+      ),
+      midToTrackId: getMidToTrackId(connection, localTrackIdToTrack),
+    },
+  });
+
+const getTrackIdToMetadata = <EndpointMetadata, TrackMetadata>(
+  tracks: Map<string, TrackContext<EndpointMetadata, TrackMetadata>>,
+): Record<string, TrackMetadata | undefined> => {
+  const trackIdToMetadata: Record<string, TrackMetadata | undefined> = {};
+  Array.from(tracks.entries()).forEach(([trackId, { metadata }]) => {
+    trackIdToMetadata[trackId] = metadata;
+  });
+  return trackIdToMetadata;
+};
diff --git a/packages/ts-client/src/webrtc/webRTCEndpoint.ts b/packages/ts-client/src/webrtc/webRTCEndpoint.ts
@@ -34,12 +34,10 @@ import { applyBandwidthLimitation } from './bandwidth';
 import {
   createTrackVariantBitratesEvent,
   getTrackBitrates,
-  getTrackIdToTrackBitrates,
 } from './bitrate';
 import {
   addTrackToConnection,
   addTransceiversIfNeeded,
-  getMidToTrackId,
   setTransceiverDirection,
   setTransceiversToReadOnly,
 } from './transciever';
@@ -48,6 +46,7 @@ import {
   findSenderByTrack,
   isTrackInUse,
 } from './RTCPeerConnectionUtils';
+import { createSdpOfferEvent } from './sdpEvents';
 
 /**
  * Main class that is responsible for connecting to the RTC Engine, sending and receiving media.
@@ -1314,22 +1313,12 @@ export class WebRTCEndpoint<
         return;
       }
 
-      const mediaEvent = generateCustomEvent({
-        type: 'sdpOffer',
-        data: {
-          sdpOffer: offer,
-          trackIdToTrackMetadata: this.getTrackIdToMetadata(),
-          trackIdToTrackBitrates: getTrackIdToTrackBitrates(
-            this.connection,
-            this.localTrackIdToTrack,
-            this.localEndpoint.tracks,
-          ),
-          midToTrackId: getMidToTrackId(
-            this.connection,
-            this.localTrackIdToTrack,
-          ),
-        },
-      });
+      const mediaEvent = createSdpOfferEvent(
+        offer,
+        this.connection,
+        this.localTrackIdToTrack,
+        this.localEndpoint.tracks,
+      );
       this.sendMediaEvent(mediaEvent);
 
       for (const track of this.localTrackIdToTrack.values()) {
@@ -1340,19 +1329,6 @@ export class WebRTCEndpoint<
     }
   }
 
-  private getTrackIdToMetadata = (): Record<
-    string,
-    TrackMetadata | undefined
-  > => {
-    const trackIdToMetadata: Record<string, TrackMetadata | undefined> = {};
-    Array.from(this.localEndpoint.tracks.entries()).forEach(
-      ([trackId, { metadata }]) => {
-        trackIdToMetadata[trackId] = metadata;
-      },
-    );
-    return trackIdToMetadata;
-  };
-
   private checkIfTrackBelongToEndpoint = (
     trackId: string,
     endpoint: EndpointWithTrackContext<EndpointMetadata, TrackMetadata>,