Revert "Add header-based access control (#421)"

This reverts commit f056bc3.

examples/_next/package.json

@@ -9,7 +9,6 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@livepeer/core": "^2.0.10",
     "@livepeer/react": "^3.0.10",
     "@rainbow-me/rainbowkit": "^0.8.0",
     "ethers": "^5.7.2",

packages/core-react/src/components/media/player/usePlayer.tsx

@@ -238,19 +238,18 @@ export const usePlayer = <
 ) => {
   const [mediaElement, setMediaElement] = React.useState<TElement | null>(null);
 
-  const { source, uploadStatus, jwtResolved, accessKeyResolved } =
-    useSourceMimeTyped({
-      src,
-      playbackId,
-      jwt,
-      refetchPlaybackInfoInterval,
-      autoUrlUpload,
-      screenWidth: _screenWidth,
-      playbackInfo,
-      accessKey,
-      onAccessKeyRequest,
-      playRecording,
-    });
+  const { source, uploadStatus } = useSourceMimeTyped({
+    src,
+    playbackId,
+    jwt,
+    refetchPlaybackInfoInterval,
+    autoUrlUpload,
+    screenWidth: _screenWidth,
+    playbackInfo,
+    accessKey,
+    onAccessKeyRequest,
+    playRecording,
+  });
 
   const [playbackError, setPlaybackError] =
     React.useState<PlaybackError | null>(null);
@@ -369,8 +368,6 @@ export const usePlayer = <
       viewerId,
       onPlaybackStatusUpdate,
       playbackStatusSelector,
-      jwt: jwtResolved,
-      accessKey: accessKeyResolved,
     }),
     [
       playerRef,
@@ -388,8 +385,6 @@ export const usePlayer = <
       viewerId,
       onPlaybackStatusUpdate,
       playbackStatusSelector,
-      jwtResolved,
-      accessKeyResolved,
     ],
   );
 

packages/core-react/src/components/media/player/useSourceMimeTyped.tsx

@@ -274,57 +274,46 @@ export const useSourceMimeTyped = <
       return defaultValue;
     }
 
-    const mediaSourceTypes = sources
-      .map((s) => (typeof s === 'string' ? getMediaSourceType(s) : null))
-      .filter((s) => s) as Src[];
-
-    const authenticatedSources = mediaSourceTypes.map((source) => {
-      // we use headers for HLS and WebRTC for auth
-      if (source.type === 'hls' || source.type === 'webrtc') {
-        return source;
-      }
-
+    const authenticatedSources = sources.map((source) => {
       // append the JWT to the query params
       if (jwt && source) {
-        const url = new URL(source.src);
+        const url = new URL(source);
         url.searchParams.append('jwt', jwt);
-        return {
-          ...source,
-          src: url.toString(),
-        };
+        return url.toString();
       }
 
       // append the access key to the query params
       if (accessKeyResolved && source) {
-        const url = new URL(source.src);
+        const url = new URL(source);
         url.searchParams.append('accessKey', accessKeyResolved);
-        return {
-          ...source,
-          src: url.toString(),
-        };
+        return url.toString();
       }
 
       return source;
     });
 
+    const mediaSourceTypes = authenticatedSources
+      .map((s) => (typeof s === 'string' ? getMediaSourceType(s) : null))
+      .filter((s) => s) as Src[];
+
     // we filter by either audio or video/hls
-    return authenticatedSources?.[0]?.type === 'audio'
+    return mediaSourceTypes?.[0]?.type === 'audio'
       ? ([
           'audio',
-          authenticatedSources.filter((s) => s.type === 'audio') as AudioSrc[],
+          mediaSourceTypes.filter((s) => s.type === 'audio') as AudioSrc[],
         ] as const)
-      : authenticatedSources?.[0]?.type === 'video' ||
-        authenticatedSources?.[0]?.type === 'hls' ||
-        authenticatedSources?.[0]?.type === 'webrtc'
+      : mediaSourceTypes?.[0]?.type === 'video' ||
+        mediaSourceTypes?.[0]?.type === 'hls' ||
+        mediaSourceTypes?.[0]?.type === 'webrtc'
       ? ([
           'video',
-          authenticatedSources.filter(
+          mediaSourceTypes.filter(
             (s) =>
               s.type === 'video' || s.type === 'hls' || s.type === 'webrtc',
           ) as (VideoSrc | HlsSrc | WebRTCSrc)[],
         ] as const)
       : defaultValue;
-  }, [playbackUrls, src, playRecording]);
+  }, [playbackUrls, src, jwt, accessKeyResolved, playRecording]);
 
   const sourceMimeTypedSorted = React.useMemo(() => {
     // if there is no source mime type and the Player has dstorage fallback enabled,
@@ -372,7 +361,5 @@ export const useSourceMimeTyped = <
   return {
     source: sourceMimeTypedSorted,
     uploadStatus,
-    accessKeyResolved,
-    jwtResolved: jwt,
   } as const;
 };

packages/core-web/src/media/browser/webrtc/shared.ts

@@ -1,7 +1,4 @@
-import {
-  AccessControlParams,
-  NOT_ACCEPTABLE_ERROR_MESSAGE,
-} from '@livepeer/core';
+import { NOT_ACCEPTABLE_ERROR_MESSAGE } from '@livepeer/core';
 import fetch from 'cross-fetch';
 
 import { isClient } from '../utils';
@@ -75,12 +72,6 @@ export type WebRTCVideoConfig = {
    * @default 20000
    */
   sdpTimeout?: number;
-  /**
-   * The timeout of the time to wait for ICE candidates, in ms.
-   *
-   * @default 5000
-   */
-  iceCandidateTimeout?: number;
   /**
    * Disables the speedup/slowdown mechanic in WebRTC, to allow for non-distorted audio.
    */
@@ -106,21 +97,14 @@ export async function negotiateConnectionWithClientOffer(
   ofr: RTCSessionDescription | null,
   controller: AbortController,
   config?: WebRTCVideoConfig,
-  accessControl?: AccessControlParams,
 ): Promise<Date> {
   if (peerConnection && endpoint && ofr) {
     /**
      * This response contains the server's SDP offer.
      * This specifies how the client should communicate,
      * and what kind of media client and server have negotiated to exchange.
      */
-    const response = await postSDPOffer(
-      endpoint,
-      ofr.sdp,
-      controller,
-      config,
-      accessControl,
-    );
+    const response = await postSDPOffer(endpoint, ofr.sdp, controller, config);
     if (response.ok) {
       const answerSDP = await response.text();
       await peerConnection.setRemoteDescription(
@@ -176,7 +160,6 @@ async function postSDPOffer(
   data: string,
   controller: AbortController,
   config?: WebRTCVideoConfig,
-  accessControl?: AccessControlParams,
 ) {
   const id = setTimeout(
     () => controller.abort(),
@@ -194,16 +177,6 @@ async function postSDPOffer(
     mode: 'cors',
     headers: {
       'content-type': 'application/sdp',
-      ...(accessControl?.accessKey
-        ? {
-            'Livepeer-Access-Key': accessControl.accessKey,
-          }
-        : {}),
-      ...(accessControl?.jwt
-        ? {
-            'Livepeer-Jwt': accessControl.jwt,
-          }
-        : {}),
     },
     body: data,
     signal: controller.signal,

packages/core-web/src/media/browser/webrtc/whep.ts

@@ -1,5 +1,3 @@
-import { AccessControlParams } from '@livepeer/core';
-
 import {
   WebRTCVideoConfig,
   constructClientOffer,
@@ -23,7 +21,6 @@ export const createNewWHEP = <TElement extends HTMLMediaElement>(
     onRedirect?: (url: string | null) => void;
   },
   config?: WebRTCVideoConfig,
-  accessControl?: AccessControlParams,
 ): {
   destroy: () => void;
 } => {
@@ -140,7 +137,6 @@ export const createNewWHEP = <TElement extends HTMLMediaElement>(
               ofr,
               abortController,
               config,
-              accessControl,
             );
 
             const currentDate = Date.now();
@@ -154,37 +150,6 @@ export const createNewWHEP = <TElement extends HTMLMediaElement>(
             errorComposed(e as Error);
           }
         });
-
-        let iceCandidatesGenerated = false;
-
-        const iceCandidateTimeout = setTimeout(() => {
-          if (!iceCandidatesGenerated) {
-            errorComposed(new Error('Failed to generate any ICE candidates'));
-          }
-        }, config?.iceCandidateTimeout ?? 5000);
-
-        peerConnection?.addEventListener('icecandidate', (event) => {
-          if (event.candidate) {
-            clearTimeout(iceCandidateTimeout);
-            iceCandidatesGenerated = true;
-          }
-        });
-
-        peerConnection.addEventListener('iceconnectionstatechange', (_e) => {
-          if (peerConnection?.iceConnectionState === 'failed') {
-            errorComposed(new Error('ICE Connection Failed'));
-          }
-        });
-
-        peerConnection.addEventListener('icecandidateerror', (e) => {
-          errorComposed(
-            new Error(
-              `ICE Candidate Error: ${
-                (e as RTCPeerConnectionIceErrorEvent)?.errorText
-              }`,
-            ),
-          );
-        });
       }
     })
     .catch((e) => errorComposed(e as Error));