@cloudflare/realtimekit-react-native 1.2.0-staging.4 → 2.0.0-staging.6

package/lib/commonjs/LocalMediaHandler.js

@@ -11,14 +11,8 @@ var _BackgroundHandler = _interopRequireDefault(require("./BackgroundHandler"));
 var _NativeAudioManager = _interopRequireDefault(require("./NativeAudioManager"));
 var _PermissionHandler = require("./PermissionHandler");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
-function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
-function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
-function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
-function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); } /* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
 const {
   RTKHelper,
   BroadcastEventEmitter
@@ -37,8 +31,6 @@ let _meetingServiceConfig = {
   channelId: 'rtk_meeting',
   channelName: 'Ongoing Meeting'
 };
-
-// eslint-disable-next-line no-shadow
 let MediaEvents = exports.MediaEvents = /*#__PURE__*/function (MediaEvents) {
   MediaEvents[MediaEvents["AUDIO_TRACK_CHANGE"] = 0] = "AUDIO_TRACK_CHANGE";
   MediaEvents[MediaEvents["VIDEO_TRACK_CHANGE"] = 1] = "VIDEO_TRACK_CHANGE";
@@ -54,76 +46,50 @@ function checkIfAudioTrackIsSilent(track) {
   //TODO
   return !!track;
 }
-var _localMediaUtils = /*#__PURE__*/new WeakMap();
-var _appState = /*#__PURE__*/new WeakMap();
-var _appStateSubscription = /*#__PURE__*/new WeakMap();
-var _interval = /*#__PURE__*/new WeakMap();
-var _screenShareState = /*#__PURE__*/new WeakMap();
-var _deviceRemovalTimeout = /*#__PURE__*/new WeakMap();
-var _broadcastEmitter = /*#__PURE__*/new WeakMap();
-var _broadcastStartedSubscription = /*#__PURE__*/new WeakMap();
-var _broadcastStoppedSubscription = /*#__PURE__*/new WeakMap();
 class LocalMediaHandler extends _events.EventEmitter {
+  #localMediaUtils;
+  #appState;
+  #appStateSubscription;
+  #interval;
+  #screenShareState;
+  _pendingScreenShare = false;
+  #deviceRemovalTimeout = null;
+  #broadcastEmitter;
+  #broadcastStartedSubscription;
+  #broadcastStoppedSubscription;
+  _handleAppStateChange = nextAppState => {
+    const prevAppState = this.#appState;
+    this.#appState = nextAppState;
+    if (prevAppState.match(/inactive|background/) && nextAppState === 'active') {
+      // App returned to foreground — stop the background keep-alive timer
+      // and kick the video track to recover the camera feed.
+      if (this.#interval !== null) {
+        _BackgroundHandler.default.clearInterval(this.#interval);
+        this.#interval = null;
+      }
+      if (this.videoTrack) {
+        this.videoTrack.enabled = false;
+        setTimeout(() => {
+          if (this.videoTrack) {
+            this.videoTrack.enabled = true;
+          }
+        }, 100);
+      }
+    } else if (nextAppState.match(/inactive|background/)) {
+      // App moved to background — start a recurring no-op timer to keep the
+      // JS thread alive so WebRTC/native events continue to be processed.
+      // Clear any existing interval first to avoid accumulation.
+      if (this.#interval !== null) {
+        _BackgroundHandler.default.clearInterval(this.#interval);
+      }
+      this.#interval = _BackgroundHandler.default.setInterval(() => {}, 1000);
+    }
+  };
   constructor(localMediaUtils) {
     super();
-    _classPrivateFieldInitSpec(this, _localMediaUtils, void 0);
-    _classPrivateFieldInitSpec(this, _appState, void 0);
-    _classPrivateFieldInitSpec(this, _appStateSubscription, void 0);
-    _classPrivateFieldInitSpec(this, _interval, void 0);
-    _classPrivateFieldInitSpec(this, _screenShareState, void 0);
-    _defineProperty(this, "audioTrack", void 0);
-    _defineProperty(this, "rawAudioTrack", void 0);
-    _defineProperty(this, "videoTrack", void 0);
-    _defineProperty(this, "rawVideoTrack", void 0);
-    _defineProperty(this, "screenShareTracks", void 0);
-    _defineProperty(this, "audioEnabled", void 0);
-    _defineProperty(this, "videoEnabled", void 0);
-    _defineProperty(this, "screenShareEnabled", void 0);
-    _defineProperty(this, "_pendingScreenShare", false);
-    _defineProperty(this, "currentDevices", void 0);
-    _defineProperty(this, "permissions", void 0);
-    _classPrivateFieldInitSpec(this, _deviceRemovalTimeout, null);
-    _classPrivateFieldInitSpec(this, _broadcastEmitter, void 0);
-    _classPrivateFieldInitSpec(this, _broadcastStartedSubscription, void 0);
-    _classPrivateFieldInitSpec(this, _broadcastStoppedSubscription, void 0);
-    _defineProperty(this, "_handleAppStateChange", nextAppState => {
-      const prevAppState = _classPrivateFieldGet(_appState, this);
-      _classPrivateFieldSet(_appState, this, nextAppState);
-      if (prevAppState.match(/inactive|background/) && nextAppState === 'active') {
-        // App returned to foreground — stop the background keep-alive timer
-        // and kick the video track to recover the camera feed.
-        if (_classPrivateFieldGet(_interval, this) !== null) {
-          _BackgroundHandler.default.clearInterval(_classPrivateFieldGet(_interval, this));
-          _classPrivateFieldSet(_interval, this, null);
-        }
-        if (this.videoTrack) {
-          this.videoTrack.enabled = false;
-          setTimeout(() => {
-            if (this.videoTrack) {
-              this.videoTrack.enabled = true;
-            }
-          }, 100);
-        }
-      } else if (nextAppState.match(/inactive|background/)) {
-        // App moved to background — start a recurring no-op timer to keep the
-        // JS thread alive so WebRTC/native events continue to be processed.
-        // Clear any existing interval first to avoid accumulation.
-        if (_classPrivateFieldGet(_interval, this) !== null) {
-          _BackgroundHandler.default.clearInterval(_classPrivateFieldGet(_interval, this));
-        }
-        _classPrivateFieldSet(_interval, this, _BackgroundHandler.default.setInterval(() => {}, 1000));
-      }
-    });
-    // Arrow function so `this` is stable — the same reference is used in both
-    // addEventListener (setScreenShareTracks) and removeEventListener
-    // (removeScreenShareTracks).  A regular method + .bind(this) creates a new
-    // function object on every call, making removeEventListener a no-op.
-    _defineProperty(this, "onScreenShareEnded", () => {
-      this.emit('SCREENSHARE_ENDED');
-    });
-    _classPrivateFieldSet(_localMediaUtils, this, localMediaUtils);
-    _classPrivateFieldSet(_broadcastEmitter, this, broadcastEmitter);
-    _classPrivateFieldSet(_appState, this, '');
+    this.#localMediaUtils = localMediaUtils;
+    this.#broadcastEmitter = broadcastEmitter;
+    this.#appState = '';
     this.audioEnabled = true;
     this.videoEnabled = true;
     this.screenShareEnabled = false;
@@ -141,16 +107,16 @@ class LocalMediaHandler extends _events.EventEmitter {
       speaker: undefined
     };
     // LocalMediaUtils onDeviceChange with callback from native onAudioDeviceChanged events
-    _classPrivateFieldGet(_localMediaUtils, this).onDeviceChange(async changedDevices => {
+    this.#localMediaUtils.onDeviceChange(async changedDevices => {
       await this.onDeviceChange(changedDevices, false);
     });
     if (_reactNative.Platform.OS === 'ios') {
-      _classPrivateFieldSet(_broadcastStartedSubscription, this, _classPrivateFieldGet(_broadcastEmitter, this).addListener('iOS_BroadcastStarted', () => {
+      this.#broadcastStartedSubscription = this.#broadcastEmitter.addListener('iOS_BroadcastStarted', () => {
         this.oniOSBroadcastStart();
-      }));
-      _classPrivateFieldSet(_broadcastStoppedSubscription, this, _classPrivateFieldGet(_broadcastEmitter, this).addListener('iOS_BroadcastStopped', () => {
+      });
+      this.#broadcastStoppedSubscription = this.#broadcastEmitter.addListener('iOS_BroadcastStopped', () => {
         this.oniOSBroadcastStop();
-      }));
+      });
     }
     _NativeAudioManager.default.start({
       media: 'video'
@@ -160,27 +126,20 @@ class LocalMediaHandler extends _events.EventEmitter {
     if (!this.currentDevices.audio || !this.audioEnabled) {
       return;
     }
-    await Promise.race([new Promise(resolve => {
-      var _this$audioTrack;
-      return (_this$audioTrack = this.audioTrack) === null || _this$audioTrack === void 0 ? void 0 : _this$audioTrack.addEventListener('unmute', e => {
-        resolve(e);
-      });
-    }), new Promise(resolve => setTimeout(resolve, 50))]);
+    await Promise.race([new Promise(resolve => this.audioTrack?.addEventListener('unmute', e => {
+      resolve(e);
+    })), new Promise(resolve => setTimeout(resolve, 50))]);
     const reacquireTrack = await this.shouldReacquireTrack('audio');
     if (reacquireTrack) {
-      var _this$currentDevices$;
       this.removeMediaStreamTrackListeners(this.audioTrack);
-      await this.setupAudioStream((_this$currentDevices$ = this.currentDevices.audio) === null || _this$currentDevices$ === void 0 ? void 0 : _this$currentDevices$.deviceId);
+      await this.setupAudioStream(this.currentDevices.audio?.deviceId);
       this.addMediaStreamTrackListeners(this.audioTrack);
       this.emit('AUDIO_TRACK_CHANGE');
     }
   }
   async conditionallyRestartVideo() {
     if (!this.currentDevices.video || !this.videoEnabled) return;
-    await Promise.race([new Promise(resolve => {
-      var _this$videoTrack;
-      return (_this$videoTrack = this.videoTrack) === null || _this$videoTrack === void 0 ? void 0 : _this$videoTrack.addEventListener('unmute', resolve);
-    }), new Promise(resolve => setTimeout(resolve, 50))]);
+    await Promise.race([new Promise(resolve => this.videoTrack?.addEventListener('unmute', resolve)), new Promise(resolve => setTimeout(resolve, 50))]);
     const reacquireTrack = await this.shouldReacquireTrack('video');
     if (reacquireTrack) {
       this.removeMediaStreamTrackListeners(this.videoTrack);
@@ -236,8 +195,7 @@ class LocalMediaHandler extends _events.EventEmitter {
     return mediaStreamTrack;
   }
   async setupAudioStream(deviceId, forceStopTrack = false) {
-    var _this$currentDevices$2;
-    const audioDevices = await _classPrivateFieldGet(_localMediaUtils, this).getAudioDevices();
+    const audioDevices = await this.#localMediaUtils.getAudioDevices();
     if (!audioDevices.length) {
       return;
     }
@@ -245,13 +203,12 @@ class LocalMediaHandler extends _events.EventEmitter {
     if (!audioDeviceId) {
       audioDeviceId = (await this.getOperationalMicDeviceId()).deviceId;
     }
-    if (((_this$currentDevices$2 = this.currentDevices.audio) === null || _this$currentDevices$2 === void 0 ? void 0 : _this$currentDevices$2.deviceId) !== audioDeviceId) {
-      this.currentDevices.audio = _classPrivateFieldGet(_localMediaUtils, this).getDeviceById(audioDeviceId, 'audioinput');
+    if (this.currentDevices.audio?.deviceId !== audioDeviceId) {
+      this.currentDevices.audio = this.#localMediaUtils.getDeviceById(audioDeviceId, 'audioinput');
     }
     if (forceStopTrack) {
-      var _this$audioTrack2, _this$rawAudioTrack;
-      (_this$audioTrack2 = this.audioTrack) === null || _this$audioTrack2 === void 0 || _this$audioTrack2.stop();
-      (_this$rawAudioTrack = this.rawAudioTrack) === null || _this$rawAudioTrack === void 0 || _this$rawAudioTrack.stop();
+      this.audioTrack?.stop();
+      this.rawAudioTrack?.stop();
     }
     try {
       this.rawAudioTrack = await _LocalMediaUtils.default.getAudioTrack();
@@ -269,7 +226,7 @@ class LocalMediaHandler extends _events.EventEmitter {
      * So, we need to repopulate the devices once permission is granted.
      */
     if (this.audioTrack && this.permissions.audio === 'NOT_REQUESTED') {
-      await _classPrivateFieldGet(_localMediaUtils, this).repopulateAvailableDevices();
+      await this.#localMediaUtils.repopulateAvailableDevices();
     }
 
     // Force update audio devices on iOS after audio session is active
@@ -283,8 +240,7 @@ class LocalMediaHandler extends _events.EventEmitter {
     // pass
   }
   async setupVideoStream(deviceId, forceStopTrack = false) {
-    var _this$currentDevices$3;
-    const videoDevices = await _classPrivateFieldGet(_localMediaUtils, this).getVideoDevices();
+    const videoDevices = await this.#localMediaUtils.getVideoDevices();
     if (!videoDevices.length) {
       return;
     }
@@ -292,8 +248,8 @@ class LocalMediaHandler extends _events.EventEmitter {
     if (!videoDeviceId) {
       videoDeviceId = (await this.getOperationalWebcamDeviceId()).deviceId;
     }
-    if (((_this$currentDevices$3 = this.currentDevices.video) === null || _this$currentDevices$3 === void 0 ? void 0 : _this$currentDevices$3.deviceId) !== videoDeviceId) {
-      this.currentDevices.video = _classPrivateFieldGet(_localMediaUtils, this).getDeviceById(videoDeviceId, 'videoinput');
+    if (this.currentDevices.video?.deviceId !== videoDeviceId) {
+      this.currentDevices.video = this.#localMediaUtils.getDeviceById(videoDeviceId, 'videoinput');
     }
 
     /**
@@ -317,24 +273,22 @@ class LocalMediaHandler extends _events.EventEmitter {
       this.emit('VIDEO_TRACK_CHANGE');
     }
     if (forceStopTrack) {
-      var _this$videoTrack2, _this$rawVideoTrack;
-      (_this$videoTrack2 = this.videoTrack) === null || _this$videoTrack2 === void 0 || _this$videoTrack2.stop();
-      (_this$rawVideoTrack = this.rawVideoTrack) === null || _this$rawVideoTrack === void 0 || _this$rawVideoTrack.stop();
+      this.videoTrack?.stop();
+      this.rawVideoTrack?.stop();
     }
     /**
      * NOTE(roerohan): Firefox does not show device labels until permissions are granted.
      * So, we need to repopulate the devices once permission is granted.
      */
     if (this.videoTrack && this.permissions.video === 'NOT_REQUESTED') {
-      await _classPrivateFieldGet(_localMediaUtils, this).repopulateAvailableDevices();
+      await this.#localMediaUtils.repopulateAvailableDevices();
     }
     this.emit('DEVICE_CHANGE', {
       device: this.currentDevices.video
     });
   }
   async setupSpeaker(deviceId) {
-    var _this$currentDevices$5;
-    const speakerDevices = await _classPrivateFieldGet(_localMediaUtils, this).getSpeakerDevices();
+    const speakerDevices = await this.#localMediaUtils.getSpeakerDevices();
     if (!speakerDevices.length) {
       return;
     }
@@ -344,10 +298,7 @@ class LocalMediaHandler extends _events.EventEmitter {
       speakerDeviceId = deviceId;
     } else {
       // Prefer current device if it's still available
-      const currentDeviceStillAvailable = speakerDevices.find(d => {
-        var _this$currentDevices$4;
-        return d.deviceId === ((_this$currentDevices$4 = this.currentDevices.speaker) === null || _this$currentDevices$4 === void 0 ? void 0 : _this$currentDevices$4.deviceId);
-      });
+      const currentDeviceStillAvailable = speakerDevices.find(d => d.deviceId === this.currentDevices.speaker?.deviceId);
       if (currentDeviceStillAvailable) {
         // Keep current device if it's still connected
         speakerDeviceId = this.currentDevices.speaker.deviceId;
@@ -356,12 +307,12 @@ class LocalMediaHandler extends _events.EventEmitter {
         const bluetoothDevice = speakerDevices.find(d => d.deviceId === 'bluetooth');
         const wiredDevice = speakerDevices.find(d => d.deviceId === 'wired');
         const speakerDevice = speakerDevices.find(d => d.deviceId === 'speaker');
-        speakerDeviceId = (bluetoothDevice === null || bluetoothDevice === void 0 ? void 0 : bluetoothDevice.deviceId) ?? (wiredDevice === null || wiredDevice === void 0 ? void 0 : wiredDevice.deviceId) ?? (speakerDevice === null || speakerDevice === void 0 ? void 0 : speakerDevice.deviceId) ?? speakerDevices[0].deviceId;
+        speakerDeviceId = bluetoothDevice?.deviceId ?? wiredDevice?.deviceId ?? speakerDevice?.deviceId ?? speakerDevices[0].deviceId;
       }
     }
-    if (((_this$currentDevices$5 = this.currentDevices.speaker) === null || _this$currentDevices$5 === void 0 ? void 0 : _this$currentDevices$5.deviceId) !== speakerDeviceId) {
+    if (this.currentDevices.speaker?.deviceId !== speakerDeviceId) {
       // Audio Input devices are same as output devices in mobile
-      this.currentDevices.audio = _classPrivateFieldGet(_localMediaUtils, this).getDeviceById(speakerDeviceId, 'audioinput');
+      this.currentDevices.audio = this.#localMediaUtils.getDeviceById(speakerDeviceId, 'audioinput');
       this.currentDevices.speaker = this.currentDevices.audio;
     }
     await this.setDevice(this.currentDevices.audio);
@@ -370,7 +321,7 @@ class LocalMediaHandler extends _events.EventEmitter {
     });
   }
   async getOperationalWebcamDeviceId() {
-    let videoDevices = await _classPrivateFieldGet(_localMediaUtils, this).getVideoDevices();
+    let videoDevices = await this.#localMediaUtils.getVideoDevices();
     if (!videoDevices.length) {
       return {
         isOperational: false,
@@ -401,7 +352,7 @@ class LocalMediaHandler extends _events.EventEmitter {
     };
   }
   async getOperationalMicDeviceId() {
-    let audioDevices = await _classPrivateFieldGet(_localMediaUtils, this).getAudioDevices();
+    let audioDevices = await this.#localMediaUtils.getAudioDevices();
     if (!audioDevices.length) {
       return {
         isOperational: false,
@@ -467,18 +418,18 @@ class LocalMediaHandler extends _events.EventEmitter {
       };
     }
     if (audio) {
-      const audioDevices = await _classPrivateFieldGet(_localMediaUtils, this).getAudioDevices();
+      const audioDevices = await this.#localMediaUtils.getAudioDevices();
       if (audioDevices.length !== 0) {
         const audioDeviceId = (await this.getOperationalMicDeviceId()).deviceId;
-        this.currentDevices.audio = _classPrivateFieldGet(_localMediaUtils, this).getDeviceById(audioDeviceId, 'audioinput');
+        this.currentDevices.audio = this.#localMediaUtils.getDeviceById(audioDeviceId, 'audioinput');
         constraints.audio = true;
       }
     }
     if (video) {
-      const videoDevices = await _classPrivateFieldGet(_localMediaUtils, this).getVideoDevices();
+      const videoDevices = await this.#localMediaUtils.getVideoDevices();
       if (videoDevices.length !== 0) {
         const videoDeviceId = (await this.getOperationalWebcamDeviceId()).deviceId;
-        this.currentDevices.video = _classPrivateFieldGet(_localMediaUtils, this).getDeviceById(videoDeviceId, 'videoinput');
+        this.currentDevices.video = this.#localMediaUtils.getDeviceById(videoDeviceId, 'videoinput');
         const videoConstraints = _LocalMediaUtils.default.getVideoConstraints({
           videoDeviceId
         });
@@ -496,7 +447,7 @@ class LocalMediaHandler extends _events.EventEmitter {
 
     // Setup Foreground Service after handling permissions
     if (_reactNative.Platform.OS === 'android') {
-      _classPrivateFieldSet(_appStateSubscription, this, _reactNative.AppState.addEventListener('change', this._handleAppStateChange));
+      this.#appStateSubscription = _reactNative.AppState.addEventListener('change', this._handleAppStateChange);
     }
 
     // Start the meeting foreground service so Android keeps the app alive
@@ -510,22 +461,19 @@ class LocalMediaHandler extends _events.EventEmitter {
       video = true
     } = tracks;
     if (audio) {
-      var _this$screenShareTrac, _this$screenShareTrac2;
-      (_this$screenShareTrac = this.screenShareTracks) === null || _this$screenShareTrac === void 0 || (_this$screenShareTrac = _this$screenShareTrac.audio) === null || _this$screenShareTrac === void 0 || _this$screenShareTrac.stop();
-      (_this$screenShareTrac2 = this.screenShareTracks) === null || _this$screenShareTrac2 === void 0 || (_this$screenShareTrac2 = _this$screenShareTrac2.audio) === null || _this$screenShareTrac2 === void 0 || _this$screenShareTrac2.release();
+      this.screenShareTracks?.audio?.stop();
+      this.screenShareTracks?.audio?.release();
     }
     if (video) {
-      var _this$screenShareTrac3, _this$screenShareTrac4;
-      (_this$screenShareTrac3 = this.screenShareTracks) === null || _this$screenShareTrac3 === void 0 || (_this$screenShareTrac3 = _this$screenShareTrac3.video) === null || _this$screenShareTrac3 === void 0 || _this$screenShareTrac3.stop();
-      (_this$screenShareTrac4 = this.screenShareTracks) === null || _this$screenShareTrac4 === void 0 || (_this$screenShareTrac4 = _this$screenShareTrac4.video) === null || _this$screenShareTrac4 === void 0 || _this$screenShareTrac4.release();
+      this.screenShareTracks?.video?.stop();
+      this.screenShareTracks?.video?.release();
     }
     if (audio && video) {
       this.screenShareEnabled = false;
     }
   }
   removeScreenShareTracks(tracks) {
-    var _this$screenShareTrac5;
-    (_this$screenShareTrac5 = this.screenShareTracks.video) === null || _this$screenShareTrac5 === void 0 || _this$screenShareTrac5.removeEventListener('ended', this.onScreenShareEnded);
+    this.screenShareTracks.video?.removeEventListener('ended', this.onScreenShareEnded);
     this.stopScreenShareTracks(tracks);
     this.screenShareTracks = {
       audio: undefined,
@@ -537,9 +485,8 @@ class LocalMediaHandler extends _events.EventEmitter {
       return;
     }
     if (audioTrack === undefined) {
-      var _this$rawAudioTrack2, _this$rawAudioTrack3;
-      (_this$rawAudioTrack2 = this.rawAudioTrack) === null || _this$rawAudioTrack2 === void 0 || _this$rawAudioTrack2.stop();
-      (_this$rawAudioTrack3 = this.rawAudioTrack) === null || _this$rawAudioTrack3 === void 0 || _this$rawAudioTrack3.release();
+      this.rawAudioTrack?.stop();
+      this.rawAudioTrack?.release();
       this.rawAudioTrack = undefined;
     }
     this.audioTrack = audioTrack;
@@ -549,15 +496,13 @@ class LocalMediaHandler extends _events.EventEmitter {
       return;
     }
     if (videoTrack === undefined) {
-      var _this$rawVideoTrack2, _this$rawVideoTrack3;
-      (_this$rawVideoTrack2 = this.rawVideoTrack) === null || _this$rawVideoTrack2 === void 0 || _this$rawVideoTrack2.stop();
-      (_this$rawVideoTrack3 = this.rawVideoTrack) === null || _this$rawVideoTrack3 === void 0 || _this$rawVideoTrack3.release();
+      this.rawVideoTrack?.stop();
+      this.rawVideoTrack?.release();
       this.rawVideoTrack = undefined;
     }
     this.videoTrack = videoTrack;
   }
   setScreenShareTracks(tracks) {
-    var _this$screenShareTrac6;
     const {
       audio,
       video
@@ -569,8 +514,16 @@ class LocalMediaHandler extends _events.EventEmitter {
       });
     }
     this.screenShareTracks = tracks;
-    (_this$screenShareTrac6 = this.screenShareTracks.video) === null || _this$screenShareTrac6 === void 0 || _this$screenShareTrac6.addEventListener('ended', this.onScreenShareEnded);
+    this.screenShareTracks.video?.addEventListener('ended', this.onScreenShareEnded);
   }
+
+  // Arrow function so `this` is stable — the same reference is used in both
+  // addEventListener (setScreenShareTracks) and removeEventListener
+  // (removeScreenShareTracks).  A regular method + .bind(this) creates a new
+  // function object on every call, making removeEventListener a no-op.
+  onScreenShareEnded = () => {
+    this.emit('SCREENSHARE_ENDED');
+  };
   async disableAudio() {
     await this.toggleAudio();
   }
@@ -611,8 +564,7 @@ class LocalMediaHandler extends _events.EventEmitter {
        */
       this.audioEnabled = true;
       if (!this.audioTrack || this.audioTrack.readyState === 'ended') {
-        var _this$currentDevices$6;
-        await this.setupAudioStream((_this$currentDevices$6 = this.currentDevices.audio) === null || _this$currentDevices$6 === void 0 ? void 0 : _this$currentDevices$6.deviceId);
+        await this.setupAudioStream(this.currentDevices.audio?.deviceId);
       }
       // if we still can't get a track after setting up audio stream
       // do not toggle the audio state
@@ -636,7 +588,6 @@ class LocalMediaHandler extends _events.EventEmitter {
     await this.toggleVideo();
   }
   async toggleVideo() {
-    var _this$currentDevices$7;
     if (this.permissions.video !== 'ACCEPTED') {
       try {
         const permResult = await (0, _PermissionHandler.setupPermissions)(false, true);
@@ -654,9 +605,8 @@ class LocalMediaHandler extends _events.EventEmitter {
       return;
     }
     if (this.videoEnabled) {
-      var _this$rawVideoTrack4, _this$rawVideoTrack5;
-      (_this$rawVideoTrack4 = this.rawVideoTrack) === null || _this$rawVideoTrack4 === void 0 || _this$rawVideoTrack4.stop();
-      (_this$rawVideoTrack5 = this.rawVideoTrack) === null || _this$rawVideoTrack5 === void 0 || _this$rawVideoTrack5.release();
+      this.rawVideoTrack?.stop();
+      this.rawVideoTrack?.release();
       this.rawVideoTrack = undefined;
       this.videoEnabled = false;
       return;
@@ -666,16 +616,15 @@ class LocalMediaHandler extends _events.EventEmitter {
      * hence it must be set to true first.
      */
     this.videoEnabled = true;
-    await this.setupVideoStream((_this$currentDevices$7 = this.currentDevices.video) === null || _this$currentDevices$7 === void 0 ? void 0 : _this$currentDevices$7.deviceId);
+    await this.setupVideoStream(this.currentDevices.video?.deviceId);
   }
   async setAudioDevice(device) {
     await this.setupAudioStream(device.deviceId);
   }
   async setVideoDevice(device) {
     if (this.videoEnabled) {
-      var _this$rawVideoTrack6, _this$rawVideoTrack7;
-      (_this$rawVideoTrack6 = this.rawVideoTrack) === null || _this$rawVideoTrack6 === void 0 || _this$rawVideoTrack6.stop();
-      (_this$rawVideoTrack7 = this.rawVideoTrack) === null || _this$rawVideoTrack7 === void 0 || _this$rawVideoTrack7.release();
+      this.rawVideoTrack?.stop();
+      this.rawVideoTrack?.release();
       this.rawVideoTrack = undefined;
     }
     await this.setupVideoStream(device.deviceId);
@@ -684,15 +633,15 @@ class LocalMediaHandler extends _events.EventEmitter {
     await this.setupSpeaker(device.deviceId);
   }
   async setDevice(route) {
-    await _classPrivateFieldGet(_localMediaUtils, this).chooseAudioRoute(route.deviceId);
+    await this.#localMediaUtils.chooseAudioRoute(route.deviceId);
   }
   async oniOSBroadcastStart() {
     this.setScreenShareTracks(await _LocalMediaUtils.default.getScreenShareTracks());
     this.screenShareEnabled = true;
-    _classPrivateFieldSet(_screenShareState, this, 'STARTED');
+    this.#screenShareState = 'STARTED';
   }
   async oniOSBroadcastStop() {
-    _classPrivateFieldSet(_screenShareState, this, 'STOPPED');
+    this.#screenShareState = 'STOPPED';
     if (this.screenShareEnabled) {
       this.removeScreenShareTracks();
       return;
@@ -716,13 +665,13 @@ class LocalMediaHandler extends _events.EventEmitter {
       }
     }
     if (_reactNative.Platform.OS === 'ios') {
-      _classPrivateFieldSet(_screenShareState, this, 'PENDING');
+      this.#screenShareState = 'PENDING';
       _reactNative.NativeModules.RTKScreensharePickerView.showScreenSharePickerView();
       await new Promise((resolve, reject) => {
         let timeoutId;
         let time = 0;
         timeoutId = setInterval(() => {
-          if (_classPrivateFieldGet(_screenShareState, this) === 'STARTED') {
+          if (this.#screenShareState === 'STARTED') {
             clearInterval(timeoutId);
             resolve();
           }
@@ -745,12 +694,12 @@ class LocalMediaHandler extends _events.EventEmitter {
 
     // iOS: trigger the broadcast picker to stop the extension.
     _reactNative.NativeModules.RTKScreensharePickerView.showScreenSharePickerView();
-    _classPrivateFieldSet(_screenShareState, this, 'PENDING');
+    this.#screenShareState = 'PENDING';
     await new Promise((resolve, reject) => {
       let timeoutId;
       let time = 0;
       timeoutId = setInterval(() => {
-        if (_classPrivateFieldGet(_screenShareState, this) === 'STOPPED') {
+        if (this.#screenShareState === 'STOPPED') {
           clearInterval(timeoutId);
           resolve();
         }
@@ -763,22 +712,22 @@ class LocalMediaHandler extends _events.EventEmitter {
     });
   }
   getAllDevices() {
-    return _classPrivateFieldGet(_localMediaUtils, this).availableDevices;
+    return this.#localMediaUtils.availableDevices;
   }
   getCurrentDevices() {
     return this.currentDevices;
   }
   getDeviceById(deviceId, kind) {
-    return _classPrivateFieldGet(_localMediaUtils, this).getDeviceById(deviceId, kind);
+    return this.#localMediaUtils.getDeviceById(deviceId, kind);
   }
   async getAudioDevices() {
-    const devices = await _classPrivateFieldGet(_localMediaUtils, this).getAudioDevices();
+    const devices = await this.#localMediaUtils.getAudioDevices();
 
     // Update current audio device from native layer
     try {
       const currentDeviceId = await _NativeAudioManager.default.getCurrentAudioDevice();
       if (currentDeviceId) {
-        const currentDevice = _classPrivateFieldGet(_localMediaUtils, this).getDeviceById(currentDeviceId, 'audioinput');
+        const currentDevice = this.#localMediaUtils.getDeviceById(currentDeviceId, 'audioinput');
         if (currentDevice) {
           this.currentDevices.audio = currentDevice;
         }
@@ -789,16 +738,16 @@ class LocalMediaHandler extends _events.EventEmitter {
     return devices;
   }
   async getVideoDevices() {
-    return await _classPrivateFieldGet(_localMediaUtils, this).getVideoDevices();
+    return await this.#localMediaUtils.getVideoDevices();
   }
   async getSpeakerDevices() {
-    const devices = await _classPrivateFieldGet(_localMediaUtils, this).getSpeakerDevices();
+    const devices = await this.#localMediaUtils.getSpeakerDevices();
 
     // Update current speaker device from native layer
     try {
       const currentDeviceId = await _NativeAudioManager.default.getCurrentAudioDevice();
       if (currentDeviceId) {
-        const currentDevice = _classPrivateFieldGet(_localMediaUtils, this).getDeviceById(currentDeviceId, 'audioinput');
+        const currentDevice = this.#localMediaUtils.getDeviceById(currentDeviceId, 'audioinput');
         if (currentDevice) {
           this.currentDevices.speaker = currentDevice;
           this.currentDevices.audio = currentDevice;
@@ -817,7 +766,7 @@ class LocalMediaHandler extends _events.EventEmitter {
 
     // Update currentDevices.speaker when platform reports selected device change
     if (changedDevices.selectedDevice) {
-      const selectedDeviceInfo = _classPrivateFieldGet(_localMediaUtils, this).getDeviceById(changedDevices.selectedDevice, 'audioinput');
+      const selectedDeviceInfo = this.#localMediaUtils.getDeviceById(changedDevices.selectedDevice, 'audioinput');
       if (selectedDeviceInfo) {
         this.currentDevices.speaker = selectedDeviceInfo;
         this.currentDevices.audio = selectedDeviceInfo;
@@ -831,9 +780,9 @@ class LocalMediaHandler extends _events.EventEmitter {
      */
     if (addedDevice) {
       // Clear any pending device removal timeout when a device is added
-      if (_classPrivateFieldGet(_deviceRemovalTimeout, this)) {
-        clearTimeout(_classPrivateFieldGet(_deviceRemovalTimeout, this));
-        _classPrivateFieldSet(_deviceRemovalTimeout, this, null);
+      if (this.#deviceRemovalTimeout) {
+        clearTimeout(this.#deviceRemovalTimeout);
+        this.#deviceRemovalTimeout = null;
       }
       if (addedDevice.kind === 'audioinput') {
         if (this.permissions.audio === 'DENIED' || this.permissions.audio === 'NOT_REQUESTED') {
@@ -871,7 +820,7 @@ class LocalMediaHandler extends _events.EventEmitter {
       };
       if (isBluetoothRemoved) {
         // Wait 500ms before switching away from Bluetooth to allow for reconnection
-        _classPrivateFieldSet(_deviceRemovalTimeout, this, setTimeout(handleRemoval, 500));
+        this.#deviceRemovalTimeout = setTimeout(handleRemoval, 500);
       } else {
         // For other devices, handle removal immediately
         await handleRemoval();
@@ -933,28 +882,25 @@ class LocalMediaHandler extends _events.EventEmitter {
     return super.on(event, listener);
   }
   destruct() {
-    var _classPrivateFieldGet2;
     this.stopAudioTrack();
     this.stopVideoTrack();
     this.stopScreenShareTracks();
-    if (_reactNative.Platform.OS === 'android') (_classPrivateFieldGet2 = _classPrivateFieldGet(_appStateSubscription, this)) === null || _classPrivateFieldGet2 === void 0 || _classPrivateFieldGet2.remove();
+    if (_reactNative.Platform.OS === 'android') this.#appStateSubscription?.remove();
   }
   stopAudioTrack() {
-    var _this$rawAudioTrack4, _this$audioTrack3, _this$rawAudioTrack5, _this$audioTrack4;
-    (_this$rawAudioTrack4 = this.rawAudioTrack) === null || _this$rawAudioTrack4 === void 0 || _this$rawAudioTrack4.stop();
-    (_this$audioTrack3 = this.audioTrack) === null || _this$audioTrack3 === void 0 || _this$audioTrack3.stop();
-    (_this$rawAudioTrack5 = this.rawAudioTrack) === null || _this$rawAudioTrack5 === void 0 || _this$rawAudioTrack5.release();
-    (_this$audioTrack4 = this.audioTrack) === null || _this$audioTrack4 === void 0 || _this$audioTrack4.release();
+    this.rawAudioTrack?.stop();
+    this.audioTrack?.stop();
+    this.rawAudioTrack?.release();
+    this.audioTrack?.release();
     this.audioEnabled = false;
     this.audioTrack = undefined;
     this.rawAudioTrack = undefined;
   }
   stopVideoTrack() {
-    var _this$rawVideoTrack8, _this$videoTrack3, _this$rawVideoTrack9, _this$videoTrack4;
-    (_this$rawVideoTrack8 = this.rawVideoTrack) === null || _this$rawVideoTrack8 === void 0 || _this$rawVideoTrack8.stop();
-    (_this$videoTrack3 = this.videoTrack) === null || _this$videoTrack3 === void 0 || _this$videoTrack3.stop();
-    (_this$rawVideoTrack9 = this.rawVideoTrack) === null || _this$rawVideoTrack9 === void 0 || _this$rawVideoTrack9.release();
-    (_this$videoTrack4 = this.videoTrack) === null || _this$videoTrack4 === void 0 || _this$videoTrack4.release();
+    this.rawVideoTrack?.stop();
+    this.videoTrack?.stop();
+    this.rawVideoTrack?.release();
+    this.videoTrack?.release();
     this.videoTrack = undefined;
     this.rawVideoTrack = undefined;
   }