@100mslive/react-native-hms 1.2.0 → 1.3.0

package/src/classes/HMSEncoder.ts

@@ -30,6 +30,8 @@ import { HMSServerRecordingState } from './HMSServerRecordingState';
 import { HMSMessage } from './HMSMessage';
 import { HMSMessageRecipient } from './HMSMessageRecipient';
 import { HMSException } from './HMSException';
+import { HMSConstants } from './HMSConstants';
+import { HMSPeerUpdateOrdinals } from './HMSPeerUpdate';
 
 const { HMSManager } = NativeModules;
 
@@ -51,7 +53,7 @@ export class HMSEncoder {
       metaData: room?.metaData,
       name: room?.name,
       peerCount: room?.peerCount,
-      peers: HMSEncoder.encodeHmsPeers(room?.peers, id),
+      peers: HMSEncoder.encodeHmsPeers(room?.peers),
       browserRecordingState: HMSEncoder.encodeBrowserRecordingState(
         room?.browserRecordingState
       ),
@@ -73,41 +75,28 @@ export class HMSEncoder {
     return new HMSRoom(encodedObj);
   }
 
-  static encodeHmsPeers(peers: any, id: string) {
+  static encodeHmsPeers(peers: any) {
     const encodedPeers: HMSPeer[] = [];
     peers?.map((peer: any) => {
-      encodedPeers.push(HMSEncoder.encodeHmsPeer(peer, id));
+      encodedPeers.push(HMSEncoder.encodeHmsPeer(peer));
     });
 
     return encodedPeers;
   }
 
-  static encodeHmsPeer(peer: any, id: string) {
+  static encodeHmsPeer(peer: any) {
     const encodedObj = {
       peerID: peer?.peerID,
-      name: peer?.name || '',
-      isLocal: peer?.isLocal,
-      customerUserID: peer?.customerUserID,
       customerDescription: peer?.customerDescription || undefined,
-      metadata: peer?.metadata,
-      role: HMSEncoder.encodeHmsRole(peer?.role),
-      networkQuality: peer?.networkQuality
-        ? HMSEncoder.encodeHMSNetworkQuality(peer?.networkQuality)
-        : undefined,
-      audioTrack: peer?.audioTrack
-        ? HMSEncoder.encodeHmsAudioTrack(peer?.audioTrack, id)
-        : undefined,
-      videoTrack: peer?.videoTrack
-        ? HMSEncoder.encodeHmsVideoTrack(peer?.videoTrack, id)
-        : undefined,
-      auxiliaryTracks: Array.isArray(peer?.auxiliaryTracks)
-        ? HMSEncoder.encodeHmsAuxiliaryTracks(peer?.auxiliaryTracks, id)
-        : undefined,
     };
 
     return new HMSPeer(encodedObj);
   }
 
+  static encodeHmsPeerUpdate(hmsPeerUpdateOrdinal: string) {
+    return HMSPeerUpdateOrdinals.get(hmsPeerUpdateOrdinal);
+  }
+
   static encodeHmsAudioTrack(track: any, id: string) {
     const encodedObj = {
       trackId: track?.trackId,
@@ -159,24 +148,7 @@ export class HMSEncoder {
   static encodeHmsLocalPeer(peer: any, id: string) {
     const encodedObj = {
       peerID: peer?.peerID,
-      name: peer?.name,
-      isLocal: true,
-      customerUserID: peer?.customerUserID,
       customerDescription: peer?.customerDescription || undefined,
-      metadata: peer?.metadata || undefined,
-      role: HMSEncoder.encodeHmsRole(peer?.role),
-      networkQuality: peer?.networkQuality
-        ? HMSEncoder.encodeHMSNetworkQuality(peer?.networkQuality)
-        : undefined,
-      audioTrack: peer?.audioTrack
-        ? HMSEncoder.encodeHmsAudioTrack(peer?.audioTrack, id)
-        : undefined,
-      videoTrack: peer?.videoTrack
-        ? HMSEncoder.encodeHmsVideoTrack(peer?.videoTrack, id)
-        : undefined,
-      auxiliaryTracks: Array.isArray(peer?.auxiliaryTracks)
-        ? HMSEncoder.encodeHmsAuxiliaryTracks(peer?.auxiliaryTracks, id)
-        : undefined,
       localAudioTrackData: peer?.localAudioTrackData?.trackId
         ? {
             id: id,
@@ -289,24 +261,7 @@ export class HMSEncoder {
   static encodeHmsRemotePeer(peer: any, id: string) {
     const encodedObj = {
       peerID: peer?.peerID,
-      name: peer?.name,
-      isLocal: false,
-      customerUserID: peer?.customerUserID,
       customerDescription: peer.customerDescription,
-      metadata: peer.metadata,
-      role: HMSEncoder.encodeHmsRole(peer?.role),
-      networkQuality: peer?.networkQuality
-        ? HMSEncoder.encodeHMSNetworkQuality(peer?.networkQuality)
-        : undefined,
-      audioTrack: peer?.audioTrack
-        ? HMSEncoder.encodeHmsAudioTrack(peer?.audioTrack, id)
-        : undefined,
-      videoTrack: peer?.videoTrack
-        ? HMSEncoder.encodeHmsVideoTrack(peer.videoTrack, id)
-        : undefined,
-      auxiliaryTracks: Array.isArray(peer?.auxiliaryTracks)
-        ? HMSEncoder.encodeHmsAuxiliaryTracks(peer?.auxiliaryTracks, id)
-        : undefined,
       remoteAudioTrackData: peer?.remoteAudioTrackData?.trackId
         ? {
             id: id,
@@ -396,17 +351,20 @@ export class HMSEncoder {
       // If the created HMSRole object is complete,
       // sending notification to Native Side to stop sending data for this role
       if (hmsRole.publishSettings?.allowed) {
-        HMSManager.restrictData({ id: "12345", roleName: hmsRole.name });
+        HMSManager.restrictData({
+          id: HMSConstants.DEFAULT_SDK_ID,
+          roleName: hmsRole.name,
+        });
       }
     }
 
     return rolesCache[role.name];
   }
 
-  static encodeHmsRoleChangeRequest(data: any, id: string) {
+  static encodeHmsRoleChangeRequest(data: any) {
     const encodedRoleChangeRequest = {
       requestedBy: data.requestedBy
-        ? HMSEncoder.encodeHmsPeer(data.requestedBy, id)
+        ? HMSEncoder.encodeHmsPeer(data.requestedBy)
         : undefined,
       suggestedRole: HMSEncoder.encodeHmsRole(data.suggestedRole),
     };
@@ -414,13 +372,10 @@ export class HMSEncoder {
     return new HMSRoleChangeRequest(encodedRoleChangeRequest);
   }
 
-  static encodeHmsChangeTrackStateRequest(
-    data: HMSChangeTrackStateRequest,
-    id: string
-  ) {
+  static encodeHmsChangeTrackStateRequest(data: HMSChangeTrackStateRequest) {
     const encodedChangeTrackStateRequest = {
       requestedBy: data?.requestedBy
-        ? HMSEncoder.encodeHmsPeer(data?.requestedBy, id)
+        ? HMSEncoder.encodeHmsPeer(data?.requestedBy)
         : undefined,
       trackType: data.trackType,
       mute: data.mute,
@@ -462,7 +417,7 @@ export class HMSEncoder {
   static encodeHmsSpeaker(data: any, id: string) {
     return new HMSSpeaker({
       level: data?.level,
-      peer: HMSEncoder.encodeHmsPeer(data?.peer, id),
+      peer: HMSEncoder.encodeHmsPeer(data?.peer),
       track: HMSEncoder.encodeHmsTrack(data?.track, id),
     });
   }
@@ -552,25 +507,25 @@ export class HMSEncoder {
     }
   }
 
-  static encodeHMSMessage(data: any, id: string) {
+  static encodeHMSMessage(data: any) {
     if (data) {
       return new HMSMessage({
         message: data?.message,
         type: data?.type,
         time: new Date(parseInt(data?.time)),
-        sender: this.encodeHmsPeer(data?.sender, id),
-        recipient: this.encodeHMSMessageRecipient(data?.recipient, id),
+        sender: this.encodeHmsPeer(data?.sender),
+        recipient: this.encodeHMSMessageRecipient(data?.recipient),
       });
     } else {
       return undefined;
     }
   }
 
-  static encodeHMSMessageRecipient(data: any, id: string) {
+  static encodeHMSMessageRecipient(data: any) {
     return new HMSMessageRecipient({
       recipientType: data?.recipientType,
       recipientPeer: data?.recipientPeer
-        ? this.encodeHmsPeer(data.recipientPeer, id)
+        ? this.encodeHmsPeer(data.recipientPeer)
         : undefined,
       recipientRoles: Array.isArray(data?.recipientRoles)
         ? this.encodeHmsRoles(data.recipientRoles)

package/src/classes/HMSLocalPeer.ts

@@ -1,14 +1,9 @@
-import type { HMSAudioTrack } from './HMSAudioTrack';
 import { HMSPeer } from './HMSPeer';
-import type { HMSTrack } from './HMSTrack';
-import type { HMSVideoTrack } from './HMSVideoTrack';
 import type { HMSVideoTrackSettings } from './HMSVideoTrackSettings';
 import type { HMSAudioTrackSettings } from './HMSAudioTrackSettings';
 import { HMSLocalAudioTrack } from './HMSLocalAudioTrack';
 import { HMSLocalVideoTrack } from './HMSLocalVideoTrack';
-import type { HMSRole } from './HMSRole';
 import type { HMSTrackType } from './HMSTrackType';
-import type { HMSNetworkQuality } from './HMSNetworkQuality';
 
 export class HMSLocalPeer extends HMSPeer {
   private localAudio?: HMSLocalAudioTrack;
@@ -23,16 +18,7 @@ export class HMSLocalPeer extends HMSPeer {
 
   constructor(params: {
     peerID: string;
-    name: string;
-    isLocal?: boolean;
-    customerUserID?: string;
     customerDescription?: string;
-    metadata?: string;
-    audioTrack?: HMSAudioTrack;
-    videoTrack?: HMSVideoTrack;
-    networkQuality?: HMSNetworkQuality;
-    role?: HMSRole;
-    auxiliaryTracks?: HMSTrack[];
     localAudioTrackData?: {
       id: string;
       trackId: string;
@@ -53,7 +39,6 @@ export class HMSLocalPeer extends HMSPeer {
     };
   }) {
     super(params);
-    this.isLocal = true;
     if (params.localAudioTrackData) {
       this.localAudio = new HMSLocalAudioTrack(params.localAudioTrackData);
     }

package/src/classes/HMSLogger.ts

@@ -15,12 +15,6 @@ export class HMSLogger {
   private _verbose: boolean = false;
   private _warning: boolean = false;
   private _error: boolean = false;
-  private logs: {
-    type: 'verbose' | 'warn' | 'error';
-    message: string;
-    data: any;
-    id: string;
-  }[] = [];
   private onLog?: Function;
 
   constructor(params?: { verbose: boolean; warning: boolean; error: boolean }) {
@@ -33,38 +27,34 @@ export class HMSLogger {
 
   verbose(message: string, data: any) {
     if (this._verbose) {
-      console.log(message, data);
+      const timestamp = this.getTimestamp();
+      console.log(timestamp, message, data);
       if (this.onLog) {
-        this?.onLog({ message, data });
+        this?.onLog({ timestamp, message, data });
       }
-      this.logs.push({ type: 'verbose', message, data, id: data?.id });
     }
   }
 
   warn(message: string, data: any) {
     if (this._warning) {
-      console.warn(message, data);
+      const timestamp = this.getTimestamp();
+      console.warn(timestamp, message, data);
       if (this.onLog) {
-        this?.onLog({ message, data });
+        this?.onLog({ timestamp, message, data });
       }
-      this.logs.push({ type: 'warn', message, data, id: data?.id });
     }
   }
 
   error(message: string, data: any) {
     if (this._error) {
-      console.error(message, data);
+      const timestamp = this.getTimestamp();
+      console.error(timestamp, message, data);
       if (this.onLog) {
-        this?.onLog({ message, data });
+        this?.onLog({ timestamp, message, data });
       }
-      this.logs.push({ type: 'error', message, data, id: data?.id });
     }
   }
 
-  getLogs() {
-    return this.logs;
-  }
-
   setLogListener(callback: Function) {
     this.onLog = callback;
   }
@@ -88,4 +78,15 @@ export class HMSLogger {
       }
     }
   }
+
+  getTimestamp(): string {
+    const d = new Date();
+
+    const hh = d.getHours().toString().padStart(2, '0');
+    const mm = d.getMinutes().toString().padStart(2, '0');
+    const ss = d.getSeconds().toString().padStart(2, '0');
+    const millis = d.getMilliseconds().toString().padStart(3, '0');
+
+    return `${hh}:${mm}:${ss}:${millis}`;
+  }
 }

package/src/classes/HMSNativeEventEmitter.ts

@@ -1,4 +1,4 @@
-import { EventSubscription, NativeEventEmitter } from "react-native";
+import { EventSubscription, NativeEventEmitter } from 'react-native';
 import { logger } from './HMSLogger';
 
 export type HMSEventSubscription = {
@@ -21,31 +21,45 @@ export class HMSNativeEventEmitter {
       // @ts-ignore - typescript is giving error because we are running it with RN types version >= 0.64
       const count = this._nativeEventEmitter.listeners(eventType).length;
 
-      logger?.verbose('#Function HMSNativeEventEmitter.listenerCount', { eventType, count });
+      logger?.verbose('#Function HMSNativeEventEmitter.listenerCount', {
+        eventType,
+        count,
+      });
       return count;
     }
 
     // For RN version >= v0.64
     const count = this._nativeEventEmitter.listenerCount(eventType);
 
-    logger?.verbose('#Function HMSNativeEventEmitter.listenerCount', { eventType, count });
+    logger?.verbose('#Function HMSNativeEventEmitter.listenerCount', {
+      eventType,
+      count,
+    });
     return count;
   }
 
-  addListener(id: string, eventType: string, listener: (...args: any[]) => any): HMSEventSubscription {
-    logger?.verbose('#Function HMSNativeEventEmitter.addListener', { id, eventType, listener });
+  addListener(
+    id: string,
+    eventType: string,
+    listener: (...args: any[]) => any
+  ): HMSEventSubscription {
+    logger?.verbose('#Function HMSNativeEventEmitter.addListener', {
+      id,
+      eventType,
+      listener,
+    });
 
     // enable `eventType` on `HMSSDK`, if no listeners were added before
     // if some listeners were added before, then `eventType` on `HMSSDK` should already be enabled
     if (this.listenerCount(eventType) <= 0) {
       this.enableHMSEventType(id, eventType);
     }
-    
-    let subscription: EventSubscription | null = this._nativeEventEmitter.addListener(eventType, listener);
+
+    let subscription: EventSubscription | null =
+      this._nativeEventEmitter.addListener(eventType, listener);
 
     return {
       remove: () => {
-        console.log('#Function EventSubscription.remove', { id, eventType, listener });
         if (
           subscription &&
           Object.getOwnPropertyNames(subscription).includes('remove') &&
@@ -61,12 +75,15 @@ export class HMSNativeEventEmitter {
         if (this.listenerCount(eventType) <= 0) {
           this.disableHMSEventType(id, eventType);
         }
-      }
+      },
     };
   }
 
   removeAllListeners(id: string, eventType: string) {
-    logger?.verbose('#Function HMSNativeEventEmitter.removeAllListeners', { id, eventType });
+    logger?.verbose('#Function HMSNativeEventEmitter.removeAllListeners', {
+      id,
+      eventType,
+    });
 
     // disable `eventType` on `HMSSDK`
     this.disableHMSEventType(id, eventType);
@@ -75,12 +92,18 @@ export class HMSNativeEventEmitter {
   }
 
   private enableHMSEventType(id: string, eventType: string) {
-    logger?.verbose('#Function HMSNativeEventEmitter.enableHMSEventType', { id, eventType });
+    logger?.verbose('#Function HMSNativeEventEmitter.enableHMSEventType', {
+      id,
+      eventType,
+    });
     this._nativeModule.enableEvent({ id, eventType });
   }
 
   private disableHMSEventType(id: string, eventType: string) {
-    logger?.verbose('#Function HMSNativeEventEmitter.disableHMSEventType', { id, eventType });
+    logger?.verbose('#Function HMSNativeEventEmitter.disableHMSEventType', {
+      id,
+      eventType,
+    });
     this._nativeModule.disableEvent({ id, eventType });
   }
 }

package/src/classes/HMSPeer.ts

@@ -3,47 +3,146 @@ import type { HMSNetworkQuality } from './HMSNetworkQuality';
 import type { HMSRole } from './HMSRole';
 import type { HMSTrack } from './HMSTrack';
 import type { HMSVideoTrack } from './HMSVideoTrack';
+import { getHmsPeersCache, getPeerPropertyFromNative } from './HMSPeersCache';
+import { HMSConstants } from './HMSConstants';
 
 export class HMSPeer {
   peerID: string;
-  name: string;
-  isLocal?: boolean;
-  customerUserID?: string;
-
-  /*
+  /**
    * @deprecated customerDescription has been deprecated in favor of metadata
    */
   customerDescription?: string;
-  metadata?: string;
-  role?: HMSRole;
-  networkQuality?: HMSNetworkQuality;
-  audioTrack?: HMSAudioTrack;
-  videoTrack?: HMSVideoTrack;
-  auxiliaryTracks?: HMSTrack[];
-
-  constructor(params: {
-    peerID: string;
-    name: string;
-    isLocal?: boolean;
-    customerUserID?: string;
-    customerDescription?: string;
-    metadata?: string;
-    role?: HMSRole;
-    networkQuality?: HMSNetworkQuality;
-    audioTrack?: HMSAudioTrack;
-    videoTrack?: HMSVideoTrack;
-    auxiliaryTracks?: HMSTrack[];
-  }) {
+
+  constructor(params: { peerID: string; customerDescription?: string }) {
     this.peerID = params.peerID;
-    this.name = params.name;
-    this.isLocal = params.isLocal;
-    this.customerUserID = params.customerUserID;
     this.customerDescription = params.customerDescription;
-    this.audioTrack = params.audioTrack;
-    this.videoTrack = params.videoTrack;
-    this.auxiliaryTracks = params.auxiliaryTracks;
-    this.role = params.role;
-    this.networkQuality = params.networkQuality;
-    this.metadata = params.metadata;
+  }
+
+  get name(): string {
+    const hmsPeersCache = getHmsPeersCache();
+
+    if (hmsPeersCache) {
+      return hmsPeersCache.getProperty(this.peerID, 'name') || '';
+    }
+
+    return (
+      getPeerPropertyFromNative(
+        HMSConstants.DEFAULT_SDK_ID,
+        this.peerID,
+        'name'
+      ) || ''
+    );
+  }
+
+  get isLocal(): boolean | undefined {
+    const hmsPeersCache = getHmsPeersCache();
+
+    if (hmsPeersCache) {
+      return hmsPeersCache.getProperty(this.peerID, 'isLocal');
+    }
+
+    return getPeerPropertyFromNative(
+      HMSConstants.DEFAULT_SDK_ID,
+      this.peerID,
+      'isLocal'
+    );
+  }
+
+  get networkQuality(): HMSNetworkQuality | undefined {
+    const hmsPeersCache = getHmsPeersCache();
+
+    if (hmsPeersCache) {
+      return hmsPeersCache.getProperty(this.peerID, 'networkQuality');
+    }
+
+    return getPeerPropertyFromNative(
+      HMSConstants.DEFAULT_SDK_ID,
+      this.peerID,
+      'networkQuality'
+    );
+  }
+
+  get customerUserID(): string | undefined {
+    const hmsPeersCache = getHmsPeersCache();
+
+    if (hmsPeersCache) {
+      return hmsPeersCache.getProperty(this.peerID, 'customerUserID');
+    }
+
+    return getPeerPropertyFromNative(
+      HMSConstants.DEFAULT_SDK_ID,
+      this.peerID,
+      'customerUserID'
+    );
+  }
+
+  get metadata(): string | undefined {
+    const hmsPeersCache = getHmsPeersCache();
+
+    if (hmsPeersCache) {
+      return hmsPeersCache.getProperty(this.peerID, 'metadata');
+    }
+
+    return getPeerPropertyFromNative(
+      HMSConstants.DEFAULT_SDK_ID,
+      this.peerID,
+      'metadata'
+    );
+  }
+
+  get role(): HMSRole | undefined {
+    const hmsPeersCache = getHmsPeersCache();
+
+    if (hmsPeersCache) {
+      return hmsPeersCache.getProperty(this.peerID, 'role');
+    }
+
+    return getPeerPropertyFromNative(
+      HMSConstants.DEFAULT_SDK_ID,
+      this.peerID,
+      'role'
+    );
+  }
+
+  get audioTrack(): HMSAudioTrack | undefined {
+    const hmsPeersCache = getHmsPeersCache();
+
+    if (hmsPeersCache) {
+      return hmsPeersCache.getProperty(this.peerID, 'audioTrack');
+    }
+
+    return getPeerPropertyFromNative(
+      HMSConstants.DEFAULT_SDK_ID,
+      this.peerID,
+      'audioTrack'
+    );
+  }
+
+  get videoTrack(): HMSVideoTrack | undefined {
+    const hmsPeersCache = getHmsPeersCache();
+
+    if (hmsPeersCache) {
+      return hmsPeersCache.getProperty(this.peerID, 'videoTrack');
+    }
+
+    return getPeerPropertyFromNative(
+      HMSConstants.DEFAULT_SDK_ID,
+      this.peerID,
+      'videoTrack'
+    );
+  }
+
+  get auxiliaryTracks(): HMSTrack[] | undefined {
+    const hmsPeersCache = getHmsPeersCache();
+
+    if (hmsPeersCache) {
+      return hmsPeersCache.getProperty(this.peerID, 'auxiliaryTracks');
+    }
+
+    return getPeerPropertyFromNative(
+      HMSConstants.DEFAULT_SDK_ID,
+      this.peerID,
+      'auxiliaryTracks'
+    );
   }
 }

package/src/classes/HMSPeerUpdate.ts

@@ -6,3 +6,12 @@ export enum HMSPeerUpdate {
   NAME_CHANGED = 'NAME_CHANGED',
   NETWORK_QUALITY_UPDATED = 'NETWORK_QUALITY_UPDATED',
 }
+
+export const HMSPeerUpdateOrdinals = new Map([
+  ['0', HMSPeerUpdate.PEER_JOINED],
+  ['1', HMSPeerUpdate.PEER_LEFT],
+  ['9', HMSPeerUpdate.ROLE_CHANGED],
+  ['10', HMSPeerUpdate.NAME_CHANGED],
+  ['11', HMSPeerUpdate.METADATA_CHANGED],
+  ['12', HMSPeerUpdate.NETWORK_QUALITY_UPDATED],
+]);