livekit-client 2.0.5 → 2.0.6

package/dist/ts4.2/src/room/track/Track.d.ts

@@ -1,8 +1,7 @@
+import { StreamState as ProtoStreamState, TrackSource, TrackType } from '@livekit/protocol';
 import type TypedEventEmitter from 'typed-emitter';
 import type { SignalClient } from '../../api/SignalClient';
 import { StructuredLogger } from '../../logger';
-import { TrackSource, TrackType } from '../../proto/livekit_models_pb';
-import { StreamState as ProtoStreamState } from '../../proto/livekit_rtc_pb';
 import type { LoggerOptions } from '../types';
 import type { TrackProcessor } from './processor/types';
 export declare enum VideoQuality {

package/dist/ts4.2/src/room/track/TrackPublication.d.ts

@@ -1,7 +1,6 @@
+import { Encryption_Type } from '@livekit/protocol';
+import type { SubscriptionError, TrackInfo, UpdateSubscription, UpdateTrackSettings } from '@livekit/protocol';
 import type TypedEventEmitter from 'typed-emitter';
-import { Encryption_Type } from '../../proto/livekit_models_pb';
-import type { SubscriptionError, TrackInfo } from '../../proto/livekit_models_pb';
-import type { UpdateSubscription, UpdateTrackSettings } from '../../proto/livekit_rtc_pb';
 import type { LoggerOptions } from '../types';
 import LocalAudioTrack from './LocalAudioTrack';
 import LocalVideoTrack from './LocalVideoTrack';

package/dist/ts4.2/src/room/track/utils.d.ts

@@ -1,4 +1,4 @@
-import { TrackPublishedResponse } from '../../proto/livekit_rtc_pb';
+import { TrackPublishedResponse } from '@livekit/protocol';
 import { Track } from './Track';
 import type { TrackPublication } from './TrackPublication';
 import type { AudioCaptureOptions, CreateLocalTracksOptions, ScreenShareCaptureOptions, VideoCaptureOptions } from './options';

package/dist/ts4.2/src/room/utils.d.ts

@@ -1,4 +1,4 @@
-import { ClientInfo } from '../proto/livekit_models_pb';
+import { ClientInfo } from '@livekit/protocol';
 import type LocalAudioTrack from './track/LocalAudioTrack';
 import type RemoteAudioTrack from './track/RemoteAudioTrack';
 import { VideoCodec } from './track/options';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livekit-client",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "JavaScript/TypeScript client SDK for LiveKit",
   "main": "./dist/livekit-client.umd.js",
   "unpkg": "./dist/livekit-client.umd.js",
@@ -36,7 +36,7 @@
   "author": "David Zhao <david@davidzhao.com>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@bufbuild/protobuf": "^1.3.0",
+    "@livekit/protocol": "1.10.4",
     "events": "^3.3.0",
     "loglevel": "^1.8.0",
     "sdp-transform": "^2.14.1",

package/src/api/SignalClient.ts

@@ -1,27 +1,22 @@
-import { protoInt64 } from '@bufbuild/protobuf';
-import log, { LoggerNames, getLogger } from '../logger';
-import {
-  ClientInfo,
-  DisconnectReason,
-  ParticipantInfo,
-  ReconnectReason,
-  Room,
-  SpeakerInfo,
-  VideoLayer,
-} from '../proto/livekit_models_pb';
 import {
   AddTrackRequest,
+  ClientInfo,
   ConnectionQualityUpdate,
+  DisconnectReason,
   JoinResponse,
   LeaveRequest,
   MuteTrackRequest,
+  ParticipantInfo,
   Ping,
+  ReconnectReason,
   ReconnectResponse,
+  Room,
   SessionDescription,
   SignalRequest,
   SignalResponse,
   SignalTarget,
   SimulateScenario,
+  SpeakerInfo,
   StreamStateUpdate,
   SubscribedQualityUpdate,
   SubscriptionPermission,
@@ -36,7 +31,10 @@ import {
   UpdateSubscription,
   UpdateTrackSettings,
   UpdateVideoLayers,
-} from '../proto/livekit_rtc_pb';
+  VideoLayer,
+  protoInt64,
+} from '@livekit/protocol';
+import log, { LoggerNames, getLogger } from '../logger';
 import { ConnectionError, ConnectionErrorReason } from '../room/errors';
 import CriticalTimers from '../room/timers';
 import type { LoggerOptions } from '../room/types';

package/src/connectionHelper/checks/websocket.ts

@@ -1,5 +1,5 @@
+import { ServerInfo_Edition } from '@livekit/protocol';
 import { SignalClient } from '../../api/SignalClient';
-import { ServerInfo_Edition } from '../../proto/livekit_models_pb';
 import { Checker } from './Checker';
 
 export class WebSocketCheck extends Checker {

package/src/e2ee/E2eeManager.ts

@@ -1,7 +1,7 @@
+import { Encryption_Type, TrackInfo } from '@livekit/protocol';
 import { EventEmitter } from 'events';
 import type TypedEventEmitter from 'typed-emitter';
 import log, { LogLevel, workerLogger } from '../logger';
-import { Encryption_Type, TrackInfo } from '../proto/livekit_models_pb';
 import type RTCEngine from '../room/RTCEngine';
 import type Room from '../room/Room';
 import { ConnectionState } from '../room/Room';

package/src/index.ts

@@ -1,5 +1,5 @@
+import { DataPacket_Kind, DisconnectReason } from '@livekit/protocol';
 import { LogLevel, LoggerNames, getLogger, setLogExtension, setLogLevel } from './logger';
-import { DataPacket_Kind, DisconnectReason } from './proto/livekit_models_pb';
 import DefaultReconnectPolicy from './room/DefaultReconnectPolicy';
 import Room, { ConnectionState } from './room/Room';
 import LocalParticipant from './room/participant/LocalParticipant';

package/src/room/PCTransportManager.ts

@@ -1,5 +1,5 @@
+import { SignalTarget } from '@livekit/protocol';
 import log, { LoggerNames, getLogger } from '../logger';
-import { SignalTarget } from '../proto/livekit_rtc_pb';
 import PCTransport, { PCEvents } from './PCTransport';
 import { roomConnectOptionDefaults } from './defaults';
 import { ConnectionError, ConnectionErrorReason } from './errors';

package/src/room/RTCEngine.ts

@@ -1,44 +1,42 @@
-import { EventEmitter } from 'events';
-import type { MediaAttributes } from 'sdp-transform';
-import type TypedEventEmitter from 'typed-emitter';
-import type { SignalOptions } from '../api/SignalClient';
-import {
-  SignalClient,
-  SignalConnectionState,
-  toProtoSessionDescription,
-} from '../api/SignalClient';
-import log, { LoggerNames, getLogger } from '../logger';
-import type { InternalRoomOptions } from '../options';
 import {
+  type AddTrackRequest,
   ClientConfigSetting,
   ClientConfiguration,
+  type ConnectionQualityUpdate,
+  DataChannelInfo,
   DataPacket,
   DataPacket_Kind,
   DisconnectReason,
-  ParticipantInfo,
-  ReconnectReason,
-  Room as RoomModel,
-  SpeakerInfo,
-  TrackInfo,
-  UserPacket,
-} from '../proto/livekit_models_pb';
-import {
-  type AddTrackRequest,
-  type ConnectionQualityUpdate,
-  DataChannelInfo,
   type JoinResponse,
   type LeaveRequest,
+  ParticipantInfo,
+  ReconnectReason,
   type ReconnectResponse,
+  Room as RoomModel,
   SignalTarget,
+  SpeakerInfo,
   type StreamStateUpdate,
   SubscribedQualityUpdate,
   type SubscriptionPermissionUpdate,
   type SubscriptionResponse,
   SyncState,
+  TrackInfo,
   type TrackPublishedResponse,
   TrackUnpublishedResponse,
   UpdateSubscription,
-} from '../proto/livekit_rtc_pb';
+  UserPacket,
+} from '@livekit/protocol';
+import { EventEmitter } from 'events';
+import type { MediaAttributes } from 'sdp-transform';
+import type TypedEventEmitter from 'typed-emitter';
+import type { SignalOptions } from '../api/SignalClient';
+import {
+  SignalClient,
+  SignalConnectionState,
+  toProtoSessionDescription,
+} from '../api/SignalClient';
+import log, { LoggerNames, getLogger } from '../logger';
+import type { InternalRoomOptions } from '../options';
 import PCTransport, { PCEvents } from './PCTransport';
 import { PCTransportManager, PCTransportState } from './PCTransportManager';
 import type { ReconnectContext, ReconnectPolicy } from './ReconnectPolicy';

package/src/room/RegionUrlProvider.ts

@@ -1,5 +1,5 @@
+import type { RegionInfo, RegionSettings } from '@livekit/protocol';
 import log from '../logger';
-import type { RegionInfo, RegionSettings } from '../proto/livekit_rtc_pb';
 import { ConnectionError, ConnectionErrorReason } from './errors';
 import { isCloud } from './utils';
 

package/src/room/Room.ts

@@ -1,40 +1,38 @@
-import { protoInt64 } from '@bufbuild/protobuf';
-import { EventEmitter } from 'events';
-import type TypedEmitter from 'typed-emitter';
-import 'webrtc-adapter';
-import { EncryptionEvent } from '../e2ee';
-import { E2EEManager } from '../e2ee/E2eeManager';
-import log, { LoggerNames, getLogger } from '../logger';
-import type {
-  InternalRoomConnectOptions,
-  InternalRoomOptions,
-  RoomConnectOptions,
-  RoomOptions,
-} from '../options';
 import {
+  ConnectionQualityUpdate,
   DataPacket_Kind,
   DisconnectReason,
+  JoinResponse,
+  LeaveRequest,
   ParticipantInfo,
   ParticipantInfo_State,
   ParticipantPermission,
   Room as RoomModel,
   ServerInfo,
+  SimulateScenario,
   SpeakerInfo,
+  StreamStateUpdate,
   SubscriptionError,
+  SubscriptionPermissionUpdate,
+  SubscriptionResponse,
   TrackInfo,
   TrackSource,
   TrackType,
   UserPacket,
-} from '../proto/livekit_models_pb';
-import {
-  ConnectionQualityUpdate,
-  JoinResponse,
-  LeaveRequest,
-  SimulateScenario,
-  StreamStateUpdate,
-  SubscriptionPermissionUpdate,
-  SubscriptionResponse,
-} from '../proto/livekit_rtc_pb';
+  protoInt64,
+} from '@livekit/protocol';
+import { EventEmitter } from 'events';
+import type TypedEmitter from 'typed-emitter';
+import 'webrtc-adapter';
+import { EncryptionEvent } from '../e2ee';
+import { E2EEManager } from '../e2ee/E2eeManager';
+import log, { LoggerNames, getLogger } from '../logger';
+import type {
+  InternalRoomConnectOptions,
+  InternalRoomOptions,
+  RoomConnectOptions,
+  RoomOptions,
+} from '../options';
 import { getBrowser } from '../utils/browserParser';
 import DeviceManager from './DeviceManager';
 import RTCEngine from './RTCEngine';

package/src/room/participant/LocalParticipant.ts

@@ -1,18 +1,16 @@
-import type { InternalRoomOptions } from '../../options';
 import {
+  AddTrackRequest,
   DataPacket,
   DataPacket_Kind,
   Encryption_Type,
   ParticipantInfo,
   ParticipantPermission,
-  UserPacket,
-} from '../../proto/livekit_models_pb';
-import {
-  AddTrackRequest,
   SimulcastCodec,
   SubscribedQualityUpdate,
   TrackUnpublishedResponse,
-} from '../../proto/livekit_rtc_pb';
+  UserPacket,
+} from '@livekit/protocol';
+import type { InternalRoomOptions } from '../../options';
 import { PCTransportState } from '../PCTransportManager';
 import type RTCEngine from '../RTCEngine';
 import { defaultVideoCodec } from '../defaults';

package/src/room/participant/Participant.ts

@@ -1,13 +1,13 @@
-import { EventEmitter } from 'events';
-import type TypedEmitter from 'typed-emitter';
-import log, { LoggerNames, StructuredLogger, getLogger } from '../../logger';
 import {
   DataPacket_Kind,
   ParticipantInfo,
   ParticipantPermission,
   ConnectionQuality as ProtoQuality,
   SubscriptionError,
-} from '../../proto/livekit_models_pb';
+} from '@livekit/protocol';
+import { EventEmitter } from 'events';
+import type TypedEmitter from 'typed-emitter';
+import log, { LoggerNames, StructuredLogger, getLogger } from '../../logger';
 import { ParticipantEvent, TrackEvent } from '../events';
 import LocalAudioTrack from '../track/LocalAudioTrack';
 import type LocalTrackPublication from '../track/LocalTrackPublication';

package/src/room/participant/ParticipantTrackPermission.ts

@@ -1,4 +1,4 @@
-import { TrackPermission } from '../../proto/livekit_rtc_pb';
+import { TrackPermission } from '@livekit/protocol';
 
 export interface ParticipantTrackPermission {
   /**

package/src/room/participant/RemoteParticipant.ts

@@ -1,6 +1,10 @@
+import type {
+  ParticipantInfo,
+  SubscriptionError,
+  UpdateSubscription,
+  UpdateTrackSettings,
+} from '@livekit/protocol';
 import type { SignalClient } from '../../api/SignalClient';
-import type { ParticipantInfo, SubscriptionError } from '../../proto/livekit_models_pb';
-import type { UpdateSubscription, UpdateTrackSettings } from '../../proto/livekit_rtc_pb';
 import { ParticipantEvent, TrackEvent } from '../events';
 import RemoteAudioTrack from '../track/RemoteAudioTrack';
 import type RemoteTrack from '../track/RemoteTrack';

package/src/room/track/LocalAudioTrack.ts

@@ -36,7 +36,10 @@ export default class LocalAudioTrack extends LocalTrack<Track.Kind.Audio> {
   }
 
   async setDeviceId(deviceId: ConstrainDOMString): Promise<boolean> {
-    if (this._constraints.deviceId === deviceId) {
+    if (
+      this._constraints.deviceId === deviceId &&
+      this._mediaStreamTrack.getSettings().deviceId === unwrapConstraint(deviceId)
+    ) {
       return true;
     }
     this._constraints.deviceId = deviceId;
@@ -44,7 +47,7 @@ export default class LocalAudioTrack extends LocalTrack<Track.Kind.Audio> {
       await this.restartTrack();
     }
     return (
-      this.isMuted || unwrapConstraint(deviceId) === this.mediaStreamTrack.getSettings().deviceId
+      this.isMuted || unwrapConstraint(deviceId) === this._mediaStreamTrack.getSettings().deviceId
     );
   }
 

package/src/room/track/LocalTrackPublication.ts

@@ -1,4 +1,4 @@
-import type { TrackInfo } from '../../proto/livekit_models_pb';
+import type { TrackInfo } from '@livekit/protocol';
 import { TrackEvent } from '../events';
 import type { LoggerOptions } from '../types';
 import type LocalAudioTrack from './LocalAudioTrack';

package/src/room/track/LocalVideoTrack.ts

@@ -1,7 +1,11 @@
+import {
+  VideoQuality as ProtoVideoQuality,
+  SubscribedCodec,
+  SubscribedQuality,
+  VideoLayer,
+} from '@livekit/protocol';
 import type { SignalClient } from '../../api/SignalClient';
 import type { StructuredLogger } from '../../logger';
-import { VideoQuality as ProtoVideoQuality, VideoLayer } from '../../proto/livekit_models_pb';
-import { SubscribedCodec, SubscribedQuality } from '../../proto/livekit_rtc_pb';
 import { ScalabilityMode } from '../participant/publishUtils';
 import type { VideoSenderStats } from '../stats';
 import { computeBitrate, monitorFrequency } from '../stats';

package/src/room/track/RemoteTrackPublication.ts

@@ -1,5 +1,10 @@
-import { ParticipantTracks, SubscriptionError, TrackInfo } from '../../proto/livekit_models_pb';
-import { UpdateSubscription, UpdateTrackSettings } from '../../proto/livekit_rtc_pb';
+import {
+  ParticipantTracks,
+  SubscriptionError,
+  TrackInfo,
+  UpdateSubscription,
+  UpdateTrackSettings,
+} from '@livekit/protocol';
 import { TrackEvent } from '../events';
 import type { LoggerOptions } from '../types';
 import type RemoteTrack from './RemoteTrack';

package/src/room/track/Track.ts

@@ -1,13 +1,13 @@
-import { EventEmitter } from 'events';
-import type TypedEventEmitter from 'typed-emitter';
-import type { SignalClient } from '../../api/SignalClient';
-import log, { LoggerNames, StructuredLogger, getLogger } from '../../logger';
 import {
   VideoQuality as ProtoQuality,
+  StreamState as ProtoStreamState,
   TrackSource,
   TrackType,
-} from '../../proto/livekit_models_pb';
-import { StreamState as ProtoStreamState } from '../../proto/livekit_rtc_pb';
+} from '@livekit/protocol';
+import { EventEmitter } from 'events';
+import type TypedEventEmitter from 'typed-emitter';
+import type { SignalClient } from '../../api/SignalClient';
+import log, { LoggerNames, StructuredLogger, getLogger } from '../../logger';
 import { TrackEvent } from '../events';
 import type { LoggerOptions } from '../types';
 import { isFireFox, isSafari, isWeb } from '../utils';

package/src/room/track/TrackPublication.ts

@@ -1,9 +1,13 @@
+import { Encryption_Type } from '@livekit/protocol';
+import type {
+  SubscriptionError,
+  TrackInfo,
+  UpdateSubscription,
+  UpdateTrackSettings,
+} from '@livekit/protocol';
 import { EventEmitter } from 'events';
 import type TypedEventEmitter from 'typed-emitter';
 import log, { LoggerNames, getLogger } from '../../logger';
-import { Encryption_Type } from '../../proto/livekit_models_pb';
-import type { SubscriptionError, TrackInfo } from '../../proto/livekit_models_pb';
-import type { UpdateSubscription, UpdateTrackSettings } from '../../proto/livekit_rtc_pb';
 import { TrackEvent } from '../events';
 import type { LoggerOptions } from '../types';
 import LocalAudioTrack from './LocalAudioTrack';

package/src/room/track/facingMode.ts

@@ -47,7 +47,7 @@ export function facingModeFromLocalTrack(
   // 1. Try to get facingMode from track settings.
   if ('facingMode' in trackSettings) {
     const rawFacingMode = trackSettings.facingMode;
-    log.debug('rawFacingMode', { rawFacingMode });
+    log.trace('rawFacingMode', { rawFacingMode });
     if (rawFacingMode && typeof rawFacingMode === 'string' && isFacingModeValue(rawFacingMode)) {
       result = { facingMode: rawFacingMode, confidence: 'high' };
     }
@@ -55,7 +55,7 @@ export function facingModeFromLocalTrack(
 
   // 2. If we don't have a high confidence we try to get the facing mode from the device label.
   if (['low', 'medium'].includes(result.confidence)) {
-    log.debug(`Try to get facing mode from device label: (${track.label})`);
+    log.trace(`Try to get facing mode from device label: (${track.label})`);
     const labelAnalysisResult = facingModeFromDeviceLabel(track.label);
     if (labelAnalysisResult !== undefined) {
       result = labelAnalysisResult;

package/src/room/track/utils.ts

@@ -1,4 +1,4 @@
-import { TrackPublishedResponse } from '../../proto/livekit_rtc_pb';
+import { TrackPublishedResponse } from '@livekit/protocol';
 import { cloneDeep } from '../../utils/cloneDeep';
 import { isSafari, sleep } from '../utils';
 import { Track } from './Track';

package/src/room/utils.ts

@@ -1,4 +1,4 @@
-import { ClientInfo, ClientInfo_SDK } from '../proto/livekit_models_pb';
+import { ClientInfo, ClientInfo_SDK } from '@livekit/protocol';
 import type { DetectableBrowser } from '../utils/browserParser';
 import { getBrowser } from '../utils/browserParser';
 import { protocolVersion, version } from '../version';