Production release PR (#2237)

* Hotfix backmerge to main * fix: active speaker sorting * feat: leaderboard for quizzes * feat: handle polls via timed metadata * fix: low volume on mweb * fix: count for total quiz questions * fix: cta text for quiz, title for interaction * fix: peers with write permissions should be able to see leaderboard (#2243) * fix: quiz response ui * feat: added caption for hls stream * fix: poll notifs in stream (#2244) * fix: update env * fix: live streaming black screen for hls viewer (#2246) * fix: live streaming black screen for hls viewer * fix: update react icons size validation * fix: response ui, participation summary (#2247) * fix: response ui, part. summary * fix: clean up * fix: new msg pill padding * fix: refactor getpeerresponse * fix: closed captions design parity (#2248) * fix: closed captions design parity * fix: captions opacity * fix: hide shadow * fix: alignment (#2249) * fix: index for weight (#2250) * build: update versions for release Co-authored-by: eswarclynn <[email protected]> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Ravi theja <[email protected]> Co-authored-by: Kaustubh Kumar <[email protected]> Co-authored-by: Amar Bathwal <[email protected]> Co-authored-by: Saikat Mitra <[email protected]> Co-authored-by: eswarclynn <[email protected]>
100mslive · Dec 8, 2023 · 648c4ff · 648c4ff · vercel · Dec 8, 2023
1 parent 7221b6b
commit 648c4ff
Show file tree

Hide file tree

Showing 70 changed files with 921 additions and 222 deletions.
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -32,6 +32,7 @@ jobs:
       REACT_APP_ZIPY_KEY: ${{ secrets.PROD_ZIPY_KEY }}
       REACT_APP_ENV: 'prod'
       REACT_APP_ENABLE_BEAM_SPEAKERS_LOGGING: 'true'
+      REACT_APP_DASHBOARD_LINK: https://dashboard.100ms.live/
 
     steps:
       - name: log inputs

diff --git a/.github/workflows/deploy-qa.yml b/.github/workflows/deploy-qa.yml
@@ -46,6 +46,7 @@ jobs:
       REACT_APP_ROOM_LAYOUT_ENDPOINT: https://api-nonprod.100ms.live/v2/layouts/ui
       REACT_APP_TOKEN_BY_ROOM_CODE_ENDPOINT: https://auth-nonprod.100ms.live/v2/token
       REACT_APP_DASHBOARD_BASE_ENDPOINT: https://qa-in2-ipv6.100ms.live/hmsapi/
+      REACT_APP_DASHBOARD_LINK: https://app-qa.100ms.live/
 
     steps:
       - name: log inputs

diff --git a/apps/100ms-custom-app/package.json b/apps/100ms-custom-app/package.json
diff --git a/apps/100ms-custom-app/src/App.jsx b/apps/100ms-custom-app/src/App.jsx
@@ -36,7 +36,11 @@ const App = () => {
     if ((authToken || roomCode) && hmsPrebuiltRef.current && isHeadless) {
       const { hmsActions } = hmsPrebuiltRef.current;
       hmsActions?.enableBeamSpeakerLabelsLogging?.();
-      hmsActions?.ignoreMessageTypes?.(['chat', 'EMOJI_REACTION']);
+      hmsActions?.ignoreMessageTypes?.([
+        'chat',
+        'EMOJI_REACTION',
+        'POLL_STARTED',
+      ]);
       hmsActions?.setAppData?.('disableNotifications', true);
     }
   }, [authToken, roomCode, isHeadless]);

diff --git a/apps/100ms-web/package.json b/apps/100ms-web/package.json
diff --git a/apps/100ms-web/src/components/Polls/Voting/Voting.jsx b/apps/100ms-web/src/components/Polls/Voting/Voting.jsx
@@ -42,7 +42,7 @@ export const Voting = ({ id, toggleVoting }) => {
             borderBottom: "1px solid $border_default",
           }}
         >
-          <Text variant="h6">{poll?.type?.toUpperCase()}</Text>
+          <Text variant="h6">{poll.title}</Text>
           <StatusIndicator
             isLive={isLive}
             shouldShowTimer={isLive && isTimed}

diff --git a/package.json b/package.json
diff --git a/packages/hls-player/package.json b/packages/hls-player/package.json
diff --git a/packages/hls-player/src/controllers/HMSHLSPlayer.ts b/packages/hls-player/src/controllers/HMSHLSPlayer.ts
@@ -60,6 +60,7 @@ export class HMSHLSPlayer implements IHMSHLSPlayer, IHMSHLSPlayerEventEmitter {
     video.autoplay = true;
     return video;
   }
+
   /**
    * @returns get html video element
    */
@@ -194,6 +195,19 @@ export class HMSHLSPlayer implements IHMSHLSPlayer, IHMSHLSPlayerEventEmitter {
     this._videoEl.currentTime = seekValue;
   };
 
+  hasCaptions = () => {
+    return this._hls.subtitleTracks.length > 0;
+  };
+
+  toggleCaption = () => {
+    // no subtitles, do nothing
+    if (!this.hasCaptions()) {
+      return;
+    }
+    this._hls.subtitleDisplay = !this._hls.subtitleDisplay;
+    this.emitEvent(HMSHLSPlayerEvents.CAPTION_ENABLED, this._hls.subtitleDisplay);
+  };
+
   private playVideo = async () => {
     try {
       if (this._videoEl.paused) {

diff --git a/packages/hls-player/src/interfaces/events.ts b/packages/hls-player/src/interfaces/events.ts
@@ -9,6 +9,7 @@ type HMSHLSListenerDataMapping = {
   [HMSHLSPlayerEvents.TIMED_METADATA_LOADED]: HMSHLSCue;
   [HMSHLSPlayerEvents.STATS]: HlsPlayerStats;
   [HMSHLSPlayerEvents.PLAYBACK_STATE]: HMSHLSPlaybackState;
+  [HMSHLSPlayerEvents.CAPTION_ENABLED]: boolean;
 
   [HMSHLSPlayerEvents.ERROR]: HMSHLSException;
   [HMSHLSPlayerEvents.CURRENT_TIME]: number;

diff --git a/packages/hls-player/src/utilies/constants.ts b/packages/hls-player/src/utilies/constants.ts
@@ -9,6 +9,7 @@ export enum HMSHLSPlayerEvents {
 
   MANIFEST_LOADED = 'manifest-loaded',
   LAYER_UPDATED = 'layer-updated',
+  CAPTION_ENABLED = 'caption-enabled',
 
   ERROR = 'error',
   PLAYBACK_STATE = 'playback-state',

diff --git a/packages/hls-stats/package.json b/packages/hls-stats/package.json
diff --git a/packages/hms-noise-suppression/package.json b/packages/hms-noise-suppression/package.json
diff --git a/packages/hms-video-store/package.json b/packages/hms-video-store/package.json
diff --git a/packages/hms-video-store/src/core/hmsSDKStore/HMSInteractivityCenter.ts b/packages/hms-video-store/src/core/hmsSDKStore/HMSInteractivityCenter.ts
@@ -1,4 +1,5 @@
 import {
+  HMSPoll,
   HMSPollCreateParams,
   HMSPollQuestionCreateParams,
   HMSPollQuestionResponseCreateParams,
@@ -32,4 +33,8 @@ export class HMSInteractivityCenter implements IHMSInteractivityCenter {
   addResponsesToPoll(pollID: string, responses: HMSPollQuestionResponseCreateParams[]) {
     return this.sdkInteractivityCenter.addResponsesToPoll(pollID, responses);
   }
+
+  fetchLeaderboard(poll: HMSPoll, offset: number, count: number) {
+    return this.sdkInteractivityCenter.fetchLeaderboard(poll, offset, count);
+  }
 }
diff --git a/packages/hms-video-store/src/core/hmsSDKStore/common/mapping.ts b/packages/hms-video-store/src/core/hmsSDKStore/common/mapping.ts
@@ -30,4 +30,5 @@ export const POLL_NOTIFICATION_TYPES: PollNotificationMap = {
   [sdkTypes.HMSPollsUpdate.POLL_STARTED]: HMSNotificationTypes.POLL_STARTED,
   [sdkTypes.HMSPollsUpdate.POLL_STOPPED]: HMSNotificationTypes.POLL_STOPPED,
   [sdkTypes.HMSPollsUpdate.POLL_STATS_UPDATED]: HMSNotificationTypes.POLL_VOTES_UPDATED,
+  // [sdkTypes.HMSPollsUpdate.POLL_LEADERBOARD_SHARED]: HMSNotificationTypes.POLL_LEADERBOARD_SHARED,
 };
diff --git a/packages/hms-video-store/src/core/hmsSDKStore/sdkTypes.ts b/packages/hms-video-store/src/core/hmsSDKStore/sdkTypes.ts
@@ -28,6 +28,7 @@ import {
   HMSPlaylistSettings,
   HMSPoll,
   HMSPollCreateParams,
+  HMSPollLeaderboardResponse,
   HMSPollQuestionAnswer,
   HMSPollQuestionCreateParams,
   HMSPollQuestionType,
@@ -124,6 +125,7 @@ export type {
   TokenRequest,
   TokenRequestOptions,
   HMSPoll,
+  HMSPollLeaderboardResponse,
   HMSPollCreateParams,
   HMSPollQuestionAnswer,
   HMSPollQuestionCreateParams,

diff --git a/packages/hms-video-store/src/core/index.ts b/packages/hms-video-store/src/core/index.ts
@@ -43,4 +43,5 @@ export type {
   HMSPollCreateParams,
   HMSPollQuestionCreateParams,
   HMSPollQuestionAnswer,
+  HMSPollLeaderboardResponse,
 } from './hmsSDKStore/sdkTypes';
diff --git a/packages/hms-video-store/src/core/schema/interactivity-center.ts b/packages/hms-video-store/src/core/schema/interactivity-center.ts
@@ -1,5 +1,7 @@
 import {
+  HMSPoll,
   HMSPollCreateParams,
+  HMSPollLeaderboardResponse,
   HMSPollQuestionCreateParams,
   HMSPollQuestionResponseCreateParams,
 } from '@100mslive/hms-video';
@@ -10,4 +12,5 @@ export interface IHMSInteractivityCenter {
   stopPoll(poll: string): Promise<void>;
   addQuestionsToPoll(pollID: string, questions: HMSPollQuestionCreateParams[]): Promise<void>;
   addResponsesToPoll(pollID: string, responses: HMSPollQuestionResponseCreateParams[]): Promise<void>;
+  fetchLeaderboard(poll: HMSPoll, offset: number, count: number): Promise<HMSPollLeaderboardResponse>;
 }
diff --git a/packages/hms-video-store/src/core/schema/notification.ts b/packages/hms-video-store/src/core/schema/notification.ts
@@ -75,6 +75,7 @@ export interface HMSReconnectionNotification extends BaseNotification {
 
 export interface HMSPollNotification extends BaseNotification {
   type: HMSNotificationTypes.POLL_STARTED | HMSNotificationTypes.POLL_STOPPED | HMSNotificationTypes.POLL_VOTES_UPDATED;
+  // | HMSNotificationTypes.POLL_LEADERBOARD_SHARED;
   data: HMSPoll;
 }
 
@@ -124,6 +125,7 @@ export enum HMSNotificationTypes {
   POLL_STARTED = 'POLL_STARTED',
   POLL_STOPPED = 'POLL_STOPPED',
   POLL_VOTES_UPDATED = 'POLL_VOTES_UPDATED',
+  // POLL_LEADERBOARD_SHARED = 'POLL_LEADERBOARD_SHARED',
   HAND_RAISE_CHANGED = 'HAND_RAISE_CHANGED',
 }
 
@@ -155,6 +157,7 @@ export type HMSNotificationMapping<T extends HMSNotificationTypes, C = any> = {
   [HMSNotificationTypes.POLL_STARTED]: HMSPollNotification;
   [HMSNotificationTypes.POLL_STOPPED]: HMSPollNotification;
   [HMSNotificationTypes.POLL_VOTES_UPDATED]: HMSPollNotification;
+  // [HMSNotificationTypes.POLL_LEADERBOARD_SHARED]: HMSPollNotification;
   [HMSNotificationTypes.POLL_CREATED]: HMSPollNotification;
   [HMSNotificationTypes.HAND_RAISE_CHANGED]: HMSPeerNotification;
 }[T];

diff --git a/packages/hms-video-web/package.json b/packages/hms-video-web/package.json
diff --git a/packages/hms-video-web/src/audio-sink-manager/AudioSinkManager.ts b/packages/hms-video-web/src/audio-sink-manager/AudioSinkManager.ts
@@ -157,6 +157,7 @@ export class AudioSinkManager {
     track.setVolume(this.volume);
     HMSLogger.d(this.TAG, 'Audio track added', `${track}`);
     this.init(); // call to create sink element if not already created
+    await this.autoSelectAudioOutput();
     this.audioSink?.append(audioEl);
     this.outputDevice && (await track.setOutputDevice(this.outputDevice));
     audioEl.srcObject = new MediaStream([track.nativeTrack]);
@@ -259,4 +260,18 @@ export class AudioSinkManager {
       track.setAudioElement(null);
     }
   };
+
+  /**
+   * Mweb is not able to play via call channel by default, this is to switch from media channel to call channel
+   */
+  private autoSelectAudioOutput = async () => {
+    if (this.audioSink?.children.length === 0) {
+      const device = this.deviceManager.audioInput?.find(device => device.label.includes('earpiece'));
+      const localAudioTrack = this.store.getLocalPeer()?.audioTrack;
+      if (localAudioTrack && device) {
+        await localAudioTrack.setSettings({ deviceId: device?.deviceId });
+        await localAudioTrack.setSettings({ deviceId: 'default' });
+      }
+    }
+  };
 }
diff --git a/packages/hms-video-web/src/interfaces/session-store/polls.ts b/packages/hms-video-web/src/interfaces/session-store/polls.ts
@@ -63,6 +63,7 @@ export interface HMSPollQuestion {
 export interface HMSPollQuestionCreateParams extends Pick<HMSPollQuestion, 'text' | 'skippable' | 'type' | 'answer'> {
   index?: number;
   options?: HMSPollQuestionOptionCreateParams[];
+  weight?: number;
 }
 
 export interface HMSPollQuestionAnswer {
@@ -81,6 +82,12 @@ export enum HMSPollQuestionType {
   LONG_ANSWER = 'long-answer',
 }
 
+export enum HMSPollStates {
+  CREATED = 'created',
+  STARTED = 'started',
+  STOPPED = 'stopped',
+}
+
 export interface HMSPollQuestionOption {
   index: number;
   text: string;
@@ -101,9 +108,9 @@ export interface HMSPollQuestionResponse {
   option?: number;
   options?: number[];
   text?: string;
-  update?: boolean; // SDK Needs to track wether we previously answered and set accordingly
+  update?: boolean; // SDK Needs to track whether we previously answered and set accordingly
   duration?: number; // Time it took to answer the question for leaderboard
-  responseFinal?: boolean; // Indicates wether this is last update when fetching responses
+  responseFinal?: boolean; // Indicates whether this is last update when fetching responses
 }
 
 export type HMSPollQuestionResponseCreateParams = Omit<
@@ -135,3 +142,17 @@ export interface HMSPollQuestionResult {
   skippedCount?: number;
   totalResponses?: number;
 }
+
+export interface HMSPollLeaderboardEntry {
+  position: number;
+  score: number;
+  totalResponses: number;
+  correctResponses: number;
+  duration: number;
+  peer: HMSPollResponsePeerInfo;
+}
+
+export interface HMSPollLeaderboardResponse {
+  entries: HMSPollLeaderboardEntry[];
+  hasNext: boolean;
+}
diff --git a/packages/hms-video-web/src/interfaces/update-listener.ts b/packages/hms-video-web/src/interfaces/update-listener.ts
@@ -53,6 +53,7 @@ export enum HMSPollsUpdate {
   POLL_STARTED,
   POLL_STOPPED,
   POLL_STATS_UPDATED,
+  // POLL_LEADERBOARD_SHARED,
 }
 
 export interface HMSAudioListener {

diff --git a/packages/hms-video-web/src/session-store/interactivity-center/HMSInteractivityCenter.ts b/packages/hms-video-web/src/session-store/interactivity-center/HMSInteractivityCenter.ts
@@ -3,11 +3,13 @@ import { HMSInteractivityCenter } from '../../interfaces/session-store/interacti
 import {
   HMSPoll,
   HMSPollCreateParams,
+  HMSPollLeaderboardResponse,
   HMSPollQuestionAnswer,
   HMSPollQuestionOption,
   HMSPollQuestionResponse,
   HMSPollQuestionResponseCreateParams,
   HMSPollQuestionType,
+  HMSPollStates,
   HMSPollUserTrackingMode,
 } from '../../interfaces/session-store/polls';
 import { IStore } from '../../sdk/store';
@@ -170,6 +172,32 @@ export class InteractivityCenter implements HMSInteractivityCenter {
 
     return question;
   }
+
+  async fetchLeaderboard(poll: HMSPoll, offset: number, count: number): Promise<HMSPollLeaderboardResponse> {
+    const canReadPolls = this.store.getLocalPeer()?.role?.permissions.pollRead || false;
+
+    if (poll.anonymous || poll.state !== HMSPollStates.STOPPED || !canReadPolls) {
+      return { entries: [], hasNext: false };
+    }
+    const pollLeaderboard = await this.transport.fetchLeaderboard({
+      poll_id: poll.id,
+      count,
+      offset,
+    });
+
+    const leaderboardEntries = pollLeaderboard.questions.map(question => {
+      return {
+        position: question.position,
+        totalResponses: question.total_responses,
+        correctResponses: question.correct_responses,
+        duration: question.duration,
+        peer: question.peer,
+        score: question.score,
+      };
+    });
+
+    return { entries: leaderboardEntries, hasNext: !pollLeaderboard.last };
+  }
 }
 
 export const createHMSPollFromPollParams = (pollParams: PollInfoParams): HMSPoll => {