Release PR

examples/prebuilt-react-integration/src/App.jsx

@@ -4,5 +4,9 @@ import { getRoomCodeFromUrl } from './utils';
 export default function App() {
   const roomCode = getRoomCodeFromUrl();
 
-  return <HMSPrebuilt roomCode={roomCode} />;
+  return (
+    <HMSPrebuilt
+      roomCode={roomCode}
+    />
+  );
 }

packages/hms-video-store/src/analytics/stats/PublishStatsAnalytics.ts

@@ -133,8 +133,8 @@ class RunningLocalTrackAnalytics extends RunningTrackAnalytics {
       avg_available_outgoing_bitrate_bps: this.calculateAverage('availableOutgoingBitrate'),
       avg_bitrate_bps: this.calculateAverage('bitrate'),
       avg_fps: this.calculateAverage('framesPerSecond'),
-      total_packets_lost: this.calculateDifferenceForSample('packetsLost'),
-      total_packets_sent: this.calculateDifferenceForSample('packetsSent'),
+      total_packets_lost: this.getLatestStat().packetsLost,
+      total_packets_sent: this.getLatestStat().packetsSent,
       total_packet_sent_delay_sec: parseFloat(this.calculateDifferenceForSample('totalPacketSendDelay').toFixed(4)),
       total_fir_count: this.calculateDifferenceForSample('firCount'),
       total_pli_count: this.calculateDifferenceForSample('pliCount'),

packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts

@@ -41,6 +41,7 @@ export class AudioSinkManager {
   private state = { ...INITIAL_STATE };
   private listener?: HMSUpdateListener;
   private timer: ReturnType<typeof setInterval> | null = null;
+  private earpieceSelected = false;
 
   constructor(private store: Store, private deviceManager: DeviceManager, private eventBus: EventBus) {
     this.eventBus.audioTrackAdded.subscribe(this.handleTrackAdd);
@@ -285,42 +286,45 @@ export class AudioSinkManager {
    */
   // eslint-disable-next-line complexity
   private autoSelectAudioOutput = async () => {
-    if (this.audioSink?.children.length === 0) {
-      let bluetoothDevice: InputDeviceInfo | null = null;
-      let speakerPhone: InputDeviceInfo | null = null;
-      let wired: InputDeviceInfo | null = null;
-      let earpiece: InputDeviceInfo | null = null;
+    if (!this.audioSink?.children.length) {
+      HMSLogger.d(this.TAG, 'No remote audio added yet');
+      return;
+    }
+    let bluetoothDevice: InputDeviceInfo | null = null;
+    let speakerPhone: InputDeviceInfo | null = null;
+    let wired: InputDeviceInfo | null = null;
+    let earpiece: InputDeviceInfo | null = null;
 
-      for (const device of this.deviceManager.audioInput) {
-        if (device.label.toLowerCase().includes('speakerphone')) {
-          speakerPhone = device;
-        }
-        if (device.label.toLowerCase().includes('wired')) {
-          wired = device;
-        }
-        if (device.label.toLowerCase().includes('bluetooth')) {
-          bluetoothDevice = device;
-        }
-        if (device.label.toLowerCase().includes('earpiece')) {
-          earpiece = device;
-        }
+    for (const device of this.deviceManager.audioInput) {
+      const label = device.label.toLowerCase();
+      if (label.includes('speakerphone')) {
+        speakerPhone = device;
+      } else if (label.includes('wired')) {
+        wired = device;
+      } else if (label.includes('bluetooth')) {
+        bluetoothDevice = device;
+      } else if (label.includes('earpiece')) {
+        earpiece = device;
       }
-      const localAudioTrack = this.store.getLocalPeer()?.audioTrack;
-      if (localAudioTrack && earpiece) {
-        const externalDeviceID = bluetoothDevice?.deviceId || wired?.deviceId || speakerPhone?.deviceId;
-        HMSLogger.d(this.TAG, 'externalDeviceID', externalDeviceID);
-        // already selected appropriate device
-        if (localAudioTrack.settings.deviceId === externalDeviceID) {
-          return;
-        }
+    }
+    const localAudioTrack = this.store.getLocalPeer()?.audioTrack;
+    if (localAudioTrack && earpiece) {
+      const externalDeviceID = bluetoothDevice?.deviceId || wired?.deviceId || speakerPhone?.deviceId;
+      HMSLogger.d(this.TAG, 'externalDeviceID', externalDeviceID);
+      // already selected appropriate device
+      if (localAudioTrack.settings.deviceId === externalDeviceID) {
+        return;
+      }
+      if (!this.earpieceSelected) {
         await localAudioTrack.setSettings({ deviceId: earpiece?.deviceId }, true);
-        await localAudioTrack.setSettings(
-          {
-            deviceId: externalDeviceID,
-          },
-          true,
-        );
+        this.earpieceSelected = true;
       }
+      await localAudioTrack.setSettings(
+        {
+          deviceId: externalDeviceID,
+        },
+        true,
+      );
     }
   };
 }

packages/hms-video-store/src/error/ErrorFactory.ts

@@ -36,7 +36,7 @@ export const ErrorFactory = {
         ErrorCodes.WebSocketConnectionErrors.WEBSOCKET_CONNECTION_LOST,
         'WebSocketConnectionLost',
         action,
-        `Network connection lost `,
+        `Network connection lost`,
         description,
       );
     },

packages/hms-video-store/src/index.ts

@@ -18,6 +18,7 @@ export {
   parsedUserAgent,
   simulcastMapping,
   DeviceType,
+  HMSPeerType,
 } from './internal';
 
 export type {

packages/hms-video-store/src/interfaces/peer/hms-peer.ts

@@ -1,6 +1,11 @@
 import { HMSAudioTrack, HMSTrack, HMSVideoTrack } from '../../media/tracks';
 import { HMSRole } from '../role';
 
+export enum HMSPeerType {
+  SIP = 'sip',
+  REGULAR = 'regular',
+}
+
 export interface HMSPeer {
   peerId: string;
   name: string;
@@ -16,6 +21,7 @@ export interface HMSPeer {
   groups?: string[];
   realtime?: boolean;
   isHandRaised: boolean;
+  type: HMSPeerType;
 
   updateRole(newRole: HMSRole): void;
   updateName(newName: string): void;

packages/hms-video-store/src/interfaces/peer/index.ts

@@ -2,3 +2,4 @@ export type { HMSPeer } from './hms-peer';
 export type { HMSLocalPeer } from './hms-local-peer';
 export type { HMSRemotePeer } from './hms-remote-peer';
 export type { HMSConnectionQuality } from './connection-quality';
+export { HMSPeerType } from './hms-peer';

packages/hms-video-store/src/interfaces/session-store/whiteboard.ts

@@ -15,9 +15,21 @@ export interface HMSWhiteboard {
   open?: boolean; // whether whiteboard is open or not
   title?: string;
   owner?: string; // user id for whiteboard owner
-  addr?: string; // address to be used to connect to whiteboard service
-  token?: string; // security token to be used for whiteboard API
   permissions?: Array<HMSPermissionType>;
   presence?: boolean;
   attributes?: Array<{ name: string; value: unknown }>;
+  /**
+   * the URL that needs to be used as the iframe src
+   */
+  url?: string;
+  /**
+   * address to be used to connect to whiteboard grpc communication service
+   * @internal
+   */
+  addr?: string;
+  /**
+   *  security token to be used for whiteboard API
+   * @internal
+   */
+  token?: string;
 }

packages/hms-video-store/src/notification-manager/HMSNotifications.ts

@@ -1,4 +1,5 @@
 import { VideoTrackLayerUpdate } from '../connection/channel-messages';
+import { HMSPeerType } from '../interfaces/peer/hms-peer';
 import { HMSRole } from '../interfaces/role';
 import { HMSLocalTrack } from '../media/tracks';
 import { HMSTrack, HMSTrackSource } from '../media/tracks/HMSTrack';
@@ -39,6 +40,7 @@ export interface Info {
   name: string;
   data: string;
   user_id: string;
+  type: HMSPeerType;
 }
 
 export enum HMSRecordingState {

packages/hms-video-store/src/notification-manager/fixtures.ts

@@ -1,10 +1,11 @@
 import { MessageNotification, PeerListNotification, PeerNotification, SpeakerList } from './HMSNotifications';
+import { HMSPeerType } from '../interfaces';
 
 export const FAKE_PEER_ID = 'peer_id_1';
 
 export const fakePeer: PeerNotification = {
   peer_id: 'peer_id_0',
-  info: { data: 'data', name: 'Sarvesh0', user_id: 'customer_user_id' },
+  info: { data: 'data', name: 'Sarvesh0', user_id: 'customer_user_id', type: HMSPeerType.REGULAR },
   role: 'host',
   tracks: {},
   groups: [],
@@ -17,6 +18,7 @@ export const fakePeerList: PeerListNotification = {
         name: 'Sarvesh1',
         data: 'data',
         user_id: 'customer_user_id',
+        type: HMSPeerType.REGULAR,
       },
       role: 'host',
       peer_id: FAKE_PEER_ID,
@@ -32,7 +34,7 @@ export const fakePeerList: PeerListNotification = {
         track_id_2: {
           mute: false,
           type: 'video',
-          source: 'regular',
+          source: HMSPeerType.REGULAR,
           description: '',
           track_id: 'track_id_2',
           stream_id: 'stream_id_1',
@@ -45,6 +47,7 @@ export const fakePeerList: PeerListNotification = {
         name: 'Sarvesh3',
         data: 'data',
         user_id: 'customer_user_id',
+        type: HMSPeerType.REGULAR,
       },
       peer_id: 'peer_id_3',
       role: 'viewer',
@@ -85,6 +88,7 @@ export const fakeReconnectPeerList: PeerListNotification = {
         name: 'Sarvesh1',
         data: 'data',
         user_id: 'customer_user_id',
+        type: HMSPeerType.REGULAR,
       },
       role: 'host',
       peer_id: FAKE_PEER_ID,
@@ -100,7 +104,7 @@ export const fakeReconnectPeerList: PeerListNotification = {
         track_id_2: {
           mute: false,
           type: 'video',
-          source: 'regular',
+          source: HMSPeerType.REGULAR,
           description: '',
           track_id: 'track_id_2',
           stream_id: 'stream_id_1',
@@ -113,6 +117,7 @@ export const fakeReconnectPeerList: PeerListNotification = {
         name: 'Sarvesh2',
         data: 'data',
         user_id: 'customer_user_id',
+        type: HMSPeerType.REGULAR,
       },
       peer_id: 'peer_id_2',
       role: 'viewer',

packages/hms-video-store/src/notification-manager/managers/PeerListManager.ts

@@ -98,6 +98,7 @@ export class PeerListManager {
           name: peer.name,
           data: peer.metadata || '',
           user_id: peer.customerUserId || '',
+          type: peer.type,
         },
         tracks: {},
         groups: [],

packages/hms-video-store/src/notification-manager/managers/WhiteboardManager.ts

@@ -1,6 +1,7 @@
 import { HMSUpdateListener, HMSWhiteboard } from '../../interfaces';
 import { Store } from '../../sdk/store';
 import HMSTransport from '../../transport';
+import { constructWhiteboardURL } from '../../utils/whiteboard';
 import { HMSNotificationMethod } from '../HMSNotificationMethod';
 import { WhiteboardInfo } from '../HMSNotifications';
 
@@ -31,11 +32,19 @@ export class WhiteboardManager {
     whiteboard.open = isOwner ? prev?.open : open;
     whiteboard.owner = whiteboard.open ? notification.owner : undefined;
 
-    if (!isOwner && whiteboard.open) {
-      const response = await this.transport.signal.getWhiteboard({ id: notification.id });
-      whiteboard.token = response.token;
-      whiteboard.addr = response.addr;
-      whiteboard.permissions = response.permissions;
+    if (whiteboard.open) {
+      if (isOwner) {
+        whiteboard.url = prev?.url;
+        whiteboard.token = prev?.token;
+        whiteboard.addr = prev?.addr;
+        whiteboard.permissions = prev?.permissions;
+      } else {
+        const response = await this.transport.signal.getWhiteboard({ id: notification.id });
+        whiteboard.url = constructWhiteboardURL(response.token, response.addr, this.store.getEnv());
+        whiteboard.token = response.token;
+        whiteboard.addr = response.addr;
+        whiteboard.permissions = response.permissions;
+      }
     }
 
     this.store.setWhiteboard(whiteboard);

packages/hms-video-store/src/notification-manager/managers/utils.ts

@@ -10,5 +10,6 @@ export const createRemotePeer = (notifPeer: PeerNotificationInfo, store: Store)
     customerUserId: notifPeer.info.user_id,
     metadata: notifPeer.info.data,
     groups: notifPeer.groups,
+    type: notifPeer.info.type,
   });
 };

packages/hms-video-store/src/reactive-store/HMSSDKActions.ts

@@ -415,6 +415,10 @@ export class HMSSDKActions<T extends HMSGenericTypes = { sessionStore: Record<st
       HMSLogger.w('sendMessage', 'Failed to send message', messageInput);
       throw Error(`sendMessage Failed - ${JSON.stringify(messageInput)}`);
     }
+    const ignoreMessage = !!messageInput.type && this.ignoredMessageTypes.includes(messageInput.type);
+    if (ignoreMessage) {
+      return;
+    }
     const localPeer = this.sdk.getLocalPeer();
     const hmsMessage: HMSMessage = {
       read: true,
@@ -427,9 +431,13 @@ export class HMSSDKActions<T extends HMSGenericTypes = { sessionStore: Record<st
       senderName: localPeer?.name,
       sender: localPeer?.peerId,
       senderRole: localPeer?.role?.name,
-      ignored: !!messageInput.type && this.ignoredMessageTypes.includes(messageInput.type),
+      ignored: false,
     };
-    this.putMessageInStore(hmsMessage);
+    // update directly to store without batch
+    this.setState(store => {
+      store.messages.byID[hmsMessage.id] = hmsMessage;
+      store.messages.allIDs.push(hmsMessage.id);
+    }, 'newMessage');
   }
 
   setMessageRead(readStatus: boolean, messageId?: string) {

packages/hms-video-store/src/reactive-store/adapter.ts

@@ -51,6 +51,7 @@ export class SDKToHMS {
       joinedAt: sdkPeer.joinedAt,
       groups: sdkPeer.groups,
       isHandRaised: sdkPeer.isHandRaised,
+      type: sdkPeer.type,
     };
   }
 

packages/hms-video-store/src/schema/peer.ts

@@ -5,6 +5,7 @@ import {
   HMSSimulcastLayerDefinition,
   ScreenCaptureHandle,
 } from '../interfaces';
+import { HMSPeerType } from '../interfaces/peer/hms-peer';
 
 export type HMSPeerID = string;
 export type HMSTrackID = string;
@@ -42,6 +43,7 @@ export interface HMSPeer {
   joinedAt?: Date;
   groups?: HMSGroupName[];
   isHandRaised: boolean;
+  type: HMSPeerType;
 }
 
 /**