livekit-client 1.1.4 → 1.1.5

package/dist/livekit-client.esm.mjs

@@ -10070,7 +10070,7 @@ function computeBitrate(currentStats, prevStats) {
   return (bytesNow - bytesPrev) * 8 * 1000 / (currentStats.timestamp - prevStats.timestamp);
 }
 
-var version$1 = "1.1.4";
+var version$1 = "1.1.5";
 
 const version = version$1;
 const protocolVersion = 8;
@@ -10180,6 +10180,15 @@ function getEmptyAudioStreamTrack() {
 
   return emptyAudioStreamTrack;
 }
+class Future {
+  constructor() {
+    this.promise = new Promise((resolve, reject) => {
+      this.resolve = resolve;
+      this.reject = reject;
+    });
+  }
+
+}
 
 const defaultId = 'default';
 class DeviceManager {
@@ -19427,14 +19436,18 @@ class Room extends events.exports.EventEmitter {
     this.audioEnabled = true;
 
     this.connect = async (url, token, opts) => {
-      var _a, _b; // guard against calling connect
+      var _a, _b, _c, _d;
 
-
-      if (this.state !== ConnectionState.Disconnected) {
+      if (this.state === ConnectionState.Connected) {
+        // when the state is reconnecting or connected, this function returns immediately
         livekitLogger.warn("already connected to room ".concat(this.name));
         return;
       }
 
+      if (this.connectFuture) {
+        return this.connectFuture.promise;
+      }
+
       this.setAndEmitConnectionState(ConnectionState.Connecting);
 
       if (!this.abortController || this.abortController.signal.aborted) {
@@ -19501,49 +19514,47 @@ class Room extends events.exports.EventEmitter {
         this.emit(RoomEvent.SignalConnected);
       } catch (err) {
         this.recreateEngine();
-        this.setAndEmitConnectionState(ConnectionState.Disconnected);
+        this.setAndEmitConnectionState(ConnectionState.Disconnected, new ConnectionError('could not establish signal connection'));
         throw err;
       } // don't return until ICE connected
 
 
-      return new Promise((resolve, reject) => {
-        var _a, _b;
+      const connectTimeout = setTimeout(() => {
+        // timeout
+        this.recreateEngine();
+        this.setAndEmitConnectionState(ConnectionState.Disconnected, new ConnectionError('could not connect PeerConnection after timeout'));
+      }, maxICEConnectTimeout);
 
-        const connectTimeout = setTimeout(() => {
-          // timeout
-          this.recreateEngine();
-          this.setAndEmitConnectionState(ConnectionState.Disconnected);
-          reject(new ConnectionError('could not connect after timeout'));
-        }, maxICEConnectTimeout);
-
-        const abortHandler = () => {
-          livekitLogger.warn('closing engine');
-          clearTimeout(connectTimeout);
-          this.recreateEngine();
-          this.setAndEmitConnectionState(ConnectionState.Disconnected);
-          reject(new ConnectionError('room connection has been cancelled'));
-        };
+      const abortHandler = () => {
+        livekitLogger.warn('closing engine');
+        clearTimeout(connectTimeout);
+        this.recreateEngine();
+        this.setAndEmitConnectionState(ConnectionState.Disconnected, new ConnectionError('room connection has been cancelled'));
+      };
 
-        if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
-          abortHandler();
-        }
+      if ((_c = this.abortController) === null || _c === void 0 ? void 0 : _c.signal.aborted) {
+        abortHandler();
+      }
 
-        (_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.addEventListener('abort', abortHandler);
-        this.engine.once(EngineEvent.Connected, () => {
-          var _a, _b;
+      (_d = this.abortController) === null || _d === void 0 ? void 0 : _d.signal.addEventListener('abort', abortHandler);
+      this.engine.once(EngineEvent.Connected, () => {
+        var _a, _b;
 
-          clearTimeout(connectTimeout);
-          (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.removeEventListener('abort', abortHandler); // also hook unload event
+        clearTimeout(connectTimeout);
+        (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.removeEventListener('abort', abortHandler); // also hook unload event
 
-          if (isWeb()) {
-            window.addEventListener('beforeunload', this.onBeforeUnload);
-            (_b = navigator.mediaDevices) === null || _b === void 0 ? void 0 : _b.addEventListener('devicechange', this.handleDeviceChange);
-          }
+        if (isWeb()) {
+          window.addEventListener('beforeunload', this.onBeforeUnload);
+          (_b = navigator.mediaDevices) === null || _b === void 0 ? void 0 : _b.addEventListener('devicechange', this.handleDeviceChange);
+        }
 
-          this.setAndEmitConnectionState(ConnectionState.Connected);
-          resolve(this);
-        });
+        this.setAndEmitConnectionState(ConnectionState.Connected);
       });
+
+      if (this.connectFuture) {
+        /** @ts-ignore */
+        return this.connectFuture.promise;
+      }
     };
     /**
      * disconnects the room, emits [[RoomEvent.Disconnected]]
@@ -20277,12 +20288,41 @@ class Room extends events.exports.EventEmitter {
     }
   }
 
-  setAndEmitConnectionState(state) {
+  setAndEmitConnectionState(state, error) {
     if (state === this.state) {
       // unchanged
       return false;
     }
 
+    switch (state) {
+      case ConnectionState.Connecting:
+      case ConnectionState.Reconnecting:
+        if (!this.connectFuture) {
+          // reuse existing connect future if possible
+          this.connectFuture = new Future();
+        }
+
+        break;
+
+      case ConnectionState.Connected:
+        if (this.connectFuture) {
+          this.connectFuture.resolve();
+          this.connectFuture = undefined;
+        }
+
+        break;
+
+      case ConnectionState.Disconnected:
+        if (this.connectFuture) {
+          error !== null && error !== void 0 ? error : error = new Error('disconnected from Room');
+          this.connectFuture.reject(error);
+          this.connectFuture = undefined;
+        }
+
+        break;
+
+    }
+
     this.state = state;
     this.emit(RoomEvent.ConnectionStateChanged, this.state);
     return true;