livekit-client 2.5.1 → 2.5.3

package/src/room/track/LocalTrack.ts

@@ -215,7 +215,7 @@ export default abstract class LocalTrack<
   /**
    * @returns DeviceID of the device that is currently being used for this track
    */
-  async getDeviceId(): Promise<string | undefined> {
+  async getDeviceId(normalize = true): Promise<string | undefined> {
     // screen share doesn't have a usable device id
     if (this.source === Track.Source.ScreenShare) {
       return;
@@ -223,7 +223,9 @@ export default abstract class LocalTrack<
     const { deviceId, groupId } = this._mediaStreamTrack.getSettings();
     const kind = this.kind === Track.Kind.Audio ? 'audioinput' : 'videoinput';
 
-    return DeviceManager.getInstance().normalizeDeviceId(kind, deviceId, groupId);
+    return normalize
+      ? DeviceManager.getInstance().normalizeDeviceId(kind, deviceId, groupId)
+      : deviceId;
   }
 
   async mute() {

package/src/room/track/create.ts

@@ -14,13 +14,32 @@ import type {
   VideoCaptureOptions,
 } from './options';
 import { ScreenSharePresets } from './options';
-import type { TrackProcessor } from './processor/types';
+import type {
+  AudioProcessorOptions,
+  TrackProcessor,
+  VideoProcessorOptions,
+} from './processor/types';
 import {
   constraintsForOptions,
   mergeDefaultOptions,
   screenCaptureToDisplayMediaStreamOptions,
 } from './utils';
 
+/** @internal */
+export function extractProcessorsFromOptions(options: CreateLocalTracksOptions) {
+  let audioProcessor: TrackProcessor<Track.Kind.Audio, AudioProcessorOptions> | undefined;
+  let videoProcessor: TrackProcessor<Track.Kind.Video, VideoProcessorOptions> | undefined;
+
+  if (typeof options.audio === 'object' && options.audio.processor) {
+    audioProcessor = options.audio.processor;
+  }
+  if (typeof options.video === 'object' && options.video.processor) {
+    videoProcessor = options.video.processor;
+  }
+
+  return { audioProcessor, videoProcessor };
+}
+
 /**
  * Creates a local video and audio track at the same time. When acquiring both
  * audio and video tracks together, it'll display a single permission prompt to
@@ -35,6 +54,7 @@ export async function createLocalTracks(
   options.audio ??= true;
   options.video ??= true;
 
+  const { audioProcessor, videoProcessor } = extractProcessorsFromOptions(options);
   const opts = mergeDefaultOptions(options, audioDefaults, videoDefaults);
   const constraints = constraintsForOptions(opts);
 
@@ -55,7 +75,7 @@ export async function createLocalTracks(
   return Promise.all(
     stream.getTracks().map(async (mediaStreamTrack) => {
       const isAudio = mediaStreamTrack.kind === 'audio';
-      let trackOptions = isAudio ? options!.audio : options!.video;
+      let trackOptions = isAudio ? opts!.audio : opts!.video;
       if (typeof trackOptions === 'boolean' || !trackOptions) {
         trackOptions = {};
       }
@@ -80,13 +100,12 @@ export async function createLocalTracks(
         track.source = Track.Source.Microphone;
       }
       track.mediaStream = stream;
-      if (trackOptions.processor) {
-        if (track instanceof LocalAudioTrack) {
-          await track.setProcessor(trackOptions.processor as TrackProcessor<Track.Kind.Audio>);
-        } else if (track instanceof LocalVideoTrack) {
-          await track.setProcessor(trackOptions.processor as TrackProcessor<Track.Kind.Video>);
-        }
+      if (track instanceof LocalAudioTrack && audioProcessor) {
+        await track.setProcessor(audioProcessor);
+      } else if (track instanceof LocalVideoTrack && videoProcessor) {
+        await track.setProcessor(videoProcessor);
       }
+
       return track;
     }),
   );

package/src/room/types.ts

@@ -68,3 +68,10 @@ export interface TranscriptionSegment {
   firstReceivedTime: number;
   lastReceivedTime: number;
 }
+
+export interface ChatMessage {
+  id: string;
+  timestamp: number;
+  message: string;
+  editTimestamp?: number;
+}

package/src/room/utils.ts

@@ -1,4 +1,9 @@
-import { ClientInfo, ClientInfo_SDK, Transcription as TranscriptionModel } from '@livekit/protocol';
+import {
+  ChatMessage as ChatMessageModel,
+  ClientInfo,
+  ClientInfo_SDK,
+  Transcription as TranscriptionModel,
+} from '@livekit/protocol';
 import { getBrowser } from '../utils/browserParser';
 import { protocolVersion, version } from '../version';
 import CriticalTimers from './timers';
@@ -6,7 +11,7 @@ import type LocalAudioTrack from './track/LocalAudioTrack';
 import type RemoteAudioTrack from './track/RemoteAudioTrack';
 import { VideoCodec, videoCodecs } from './track/options';
 import { getNewAudioContext } from './track/utils';
-import type { LiveKitReactNativeInfo, TranscriptionSegment } from './types';
+import type { ChatMessage, LiveKitReactNativeInfo, TranscriptionSegment } from './types';
 
 const separator = '|';
 export const ddExtensionURI =
@@ -554,3 +559,13 @@ export function extractTranscriptionSegments(
     };
   });
 }
+
+export function extractChatMessage(msg: ChatMessageModel): ChatMessage {
+  const { id, timestamp, message, editTimestamp } = msg;
+  return {
+    id,
+    timestamp: Number.parseInt(timestamp.toString()),
+    editTimestamp: editTimestamp ? Number.parseInt(editTimestamp.toString()) : undefined,
+    message,
+  };
+}