@stream-io/video-client 1.5.0-0 → 1.6.0-0

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [1.6.0-0](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.5.0...@stream-io/video-client-1.6.0-0) (2024-08-22)
+
+
+### Bug Fixes
+
+* call shall be considered as joined once joinResponse has been received ([1ed5b10](https://github.com/GetStream/stream-video-js/commit/1ed5b1097591604a3bb1884c2c664fb985873c3c))
+* increment the reconnect attempt on every loop ([9fc54ae](https://github.com/GetStream/stream-video-js/commit/9fc54ae355d1c8bf9f474b708657d8d0a077b28b))
+* **migration:** mark call as JOINED only after participantMigrationComplete is emitted ([60e4f28](https://github.com/GetStream/stream-video-js/commit/60e4f2872b5382a24158ffe340d3850190feab36))
+* reduce the timeout to 7 seconds ([1a34c4d](https://github.com/GetStream/stream-video-js/commit/1a34c4da724290f6e4e69bd6070e370fcfbdee29))
+* remove `participantMigrationComplete` workaround ([69ec50b](https://github.com/GetStream/stream-video-js/commit/69ec50b0226a9595bf49681d871e650aa51074a3))
+* revert incorrect RN check ([d4c127b](https://github.com/GetStream/stream-video-js/commit/d4c127b3c5555184497b8b5a29153332094c28f4))
+* shorter sleep time before attempts ([10db68e](https://github.com/GetStream/stream-video-js/commit/10db68ea101684d774561d1b3da1e8927a5eb981))
+
+
+* remove todo ([ac24f43](https://github.com/GetStream/stream-video-js/commit/ac24f43811ede8b37203c5359e1d03e58bb57f2e))
+* remove unused import ([8b2d5c1](https://github.com/GetStream/stream-video-js/commit/8b2d5c1de7263a317320af4834041eecfbb2aa11))
+
 ## [1.5.0-0](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.4.8...@stream-io/video-client-1.5.0-0) (2024-08-19)
 
 
@@ -69,11 +86,10 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/s
 * use symbol per instance ([6d55e68](https://github.com/GetStream/stream-video-js/commit/6d55e687a8189cef00037b7cae3e269fc3ad947b))
 
 
+* **@stream-io/video-client:** release version 1.5.0-0 ([c2c6c08](https://github.com/GetStream/stream-video-js/commit/c2c6c08a89c153ff7f478802eb75ba9dea826ed2))
 * **@stream-io/video-client:** release version 1.5.0-0 ([5357a57](https://github.com/GetStream/stream-video-js/commit/5357a5742e540d530136d3d75cf609250532dd0b))
 * **@stream-io/video-client:** release version 1.5.0-0 ([95f18b8](https://github.com/GetStream/stream-video-js/commit/95f18b8400a625d1abda766f4756b9e6acad1c13))
 * add logs for ice trickle ([990b19a](https://github.com/GetStream/stream-video-js/commit/990b19adcc03808c6b04d9767181a4fa6ceda610))
-* add tests for StreamVideoClient and Call ([#1459](https://github.com/GetStream/stream-video-js/issues/1459)) ([e11d234](https://github.com/GetStream/stream-video-js/commit/e11d234cd032b61d0079a4fec62de9605b92f375))
-* **client:** inform WS connect errors ([#1463](https://github.com/GetStream/stream-video-js/issues/1463)) ([bb75351](https://github.com/GetStream/stream-video-js/commit/bb753512a78e9105a7a3b7b76f0037bf985be0f2))
 * fix bad implicit default ([d076f00](https://github.com/GetStream/stream-video-js/commit/d076f006aab55ff9033619825a2bf64900577c53))
 * refactor the code a bit ([e56a668](https://github.com/GetStream/stream-video-js/commit/e56a668b7190483924c85f6053cabd614ab2fe54))
 * remove commented out code ([02cdfa2](https://github.com/GetStream/stream-video-js/commit/02cdfa23542bb49cb04541c1d423aca9f3be7cd3))
@@ -133,6 +149,7 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/s
 * recovering from failed SFU WS connection attempts ([2e00740](https://github.com/GetStream/stream-video-js/commit/2e00740079fa27c87d142824d9b1414525de21e6))
 * remove ended orphaned tracks from the call state ([d68529d](https://github.com/GetStream/stream-video-js/commit/d68529de4b2f4821da91d153377244dd3b7ffc64))
 * remove outdated migration tests ([4b57b19](https://github.com/GetStream/stream-video-js/commit/4b57b197352d6660a7737413f46e526193f9cf74))
+* remove pre-releases ([ba9cf49](https://github.com/GetStream/stream-video-js/commit/ba9cf4968a80ec07831304ee8a791d9681ddc605))
 * reorganize restorePublishedTracks impl ([eaa8072](https://github.com/GetStream/stream-video-js/commit/eaa80723a5355ee4195e92530d74188ba98678fb))
 * restore IceTrickleBuffer ([47be308](https://github.com/GetStream/stream-video-js/commit/47be308ece0360dff66fff415f4f39e821ca2daf))
 * restore logging ([923fa74](https://github.com/GetStream/stream-video-js/commit/923fa74dc1c634a116b1a52ed5d466902d20d915))
@@ -147,6 +164,7 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/s
 * use symbol per instance ([6d55e68](https://github.com/GetStream/stream-video-js/commit/6d55e687a8189cef00037b7cae3e269fc3ad947b))
 
 
+* **@stream-io/video-client:** release version 1.5.0-0 ([5357a57](https://github.com/GetStream/stream-video-js/commit/5357a5742e540d530136d3d75cf609250532dd0b))
 * **@stream-io/video-client:** release version 1.5.0-0 ([95f18b8](https://github.com/GetStream/stream-video-js/commit/95f18b8400a625d1abda766f4756b9e6acad1c13))
 * add logs for ice trickle ([990b19a](https://github.com/GetStream/stream-video-js/commit/990b19adcc03808c6b04d9767181a4fa6ceda610))
 * add tests for StreamVideoClient and Call ([#1459](https://github.com/GetStream/stream-video-js/issues/1459)) ([e11d234](https://github.com/GetStream/stream-video-js/commit/e11d234cd032b61d0079a4fec62de9605b92f375))
@@ -158,80 +176,13 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/s
 * specify baseBranch ([cc9b2fd](https://github.com/GetStream/stream-video-js/commit/cc9b2fd6d88f6aff7d8fdd8333c7aa33fdbb6857))
 * update log statement ([2245db7](https://github.com/GetStream/stream-video-js/commit/2245db7c362d1819e22e5e5831e82c251aff6117))
 
-## [1.5.0-0](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.4.8...@stream-io/video-client-1.5.0-0) (2024-08-19)
-
 
-### Features
+## [1.5.0](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.4.8...@stream-io/video-client-1.5.0) (2024-08-21)
 
-* break down the reconnect/join flows ([883d0ee](https://github.com/GetStream/stream-video-js/commit/883d0ee3b54e9b5704364d0c34e466c23aca631a))
-* don't trigger ice restart on the subscriber after a fast reconnect ([c7e2d6f](https://github.com/GetStream/stream-video-js/commit/c7e2d6f964e779f988b29d12763b1ee4d4859111))
-* fast-reconnect strategy ([e4e01d5](https://github.com/GetStream/stream-video-js/commit/e4e01d5dd8185a21652bb2dca2a88217b498c9b7))
-* handle `callEnded` ([7f93307](https://github.com/GetStream/stream-video-js/commit/7f933079193084ac58a93a961e035ddfd7616f67))
-* handle goAway ([d717f1a](https://github.com/GetStream/stream-video-js/commit/d717f1af00a87cf636396c4e0dc33ad106c9377e))
-* handle network change events ([f980f0b](https://github.com/GetStream/stream-video-js/commit/f980f0b93235f1923c06e2e8694c4ce8ff10abc0))
-* improved/linear code flow, clean reconnects ([a210365](https://github.com/GetStream/stream-video-js/commit/a210365dd83fb0e544b543c7144104ece80ac317))
-* migration ([9099a51](https://github.com/GetStream/stream-video-js/commit/9099a51d5cd29282a050bba196ba5a4f646f4341))
-* migration - wip ([3ad96b6](https://github.com/GetStream/stream-video-js/commit/3ad96b6a7d38c7e82effd26889a2fbbad20847b7))
-* Reconnects v2 ([d9f98dc](https://github.com/GetStream/stream-video-js/commit/d9f98dcd6237f7fc9eca263832e6d68753bb2ee1))
-* remove CLEAN strategy ([7e9544b](https://github.com/GetStream/stream-video-js/commit/7e9544b8beb29af4125f2e607865f0415426afcc))
-* send `muted` info about announced tracks ([ccd95c4](https://github.com/GetStream/stream-video-js/commit/ccd95c411650b44816b18d2e6562f9409b35faf2))
-* setup rc release flow ([f183232](https://github.com/GetStream/stream-video-js/commit/f18323254a43fe11c768656e10cd1b915f6ce607))
-
-
-### Bug Fixes
-
-* add missing bracket ([1687722](https://github.com/GetStream/stream-video-js/commit/16877221f98ff277bb41cc04b26d0cdaebd4f22a))
-* adjust to the recent changes made in [#1451](https://github.com/GetStream/stream-video-js/issues/1451) ([9e47834](https://github.com/GetStream/stream-video-js/commit/9e4783480e7f29c9d102824a37fa9db19dda4fc1))
-* always respect local state for the local participant ([6b9cd1d](https://github.com/GetStream/stream-video-js/commit/6b9cd1de37b7f31426e83090b97c56f83062e31b))
-* attempt closing only open sockets ([2d6a388](https://github.com/GetStream/stream-video-js/commit/2d6a3888af9c697c5bcca0bf257cde63700f743a))
-* attempt reconnect after setPublisher fails to return valid SDP ([71ff58e](https://github.com/GetStream/stream-video-js/commit/71ff58e5e9f4a41db714ad39f0ad8a1f22cb8e85))
-* bubble migration errors, check for network availability before attempts, break the reconnect loop on leave ([e3cb2b0](https://github.com/GetStream/stream-video-js/commit/e3cb2b0dda8b34f03214cbdd1aa8f2cd1bb793b0))
-* clean joinData after migration ([16d186a](https://github.com/GetStream/stream-video-js/commit/16d186a6da0af1bfdcee447c4b2b4485604fb49d))
-* decouple network events from coordinator socket healthiness ([e453581](https://github.com/GetStream/stream-video-js/commit/e453581da6f8d4d07678636d7a520609b4486948))
-* disable excessive logging ([f8c63bf](https://github.com/GetStream/stream-video-js/commit/f8c63bf98a1a22c0f39668d723d4c69d841b13b5))
-* don't apply device settings after rejoining ([18a6a3c](https://github.com/GetStream/stream-video-js/commit/18a6a3c9d8e71d8e1ca8222df7319096d9f6bc54))
-* don't apply device settings after rejoining, improve the handling of own capabilities ([8ce0f1a](https://github.com/GetStream/stream-video-js/commit/8ce0f1a82181bf21f4c90b9b1e18b5390e983766))
-* failed test ([f78c943](https://github.com/GetStream/stream-video-js/commit/f78c943912e2292be8e31b575de1742e5c08a0cb))
-* failing tests ([5c0209b](https://github.com/GetStream/stream-video-js/commit/5c0209b46f931f47e439e6f3339d13d34765ba3c))
-* fast reconnect after network switch ([a49539c](https://github.com/GetStream/stream-video-js/commit/a49539c8a21988dfad04af5b7303412cef41c292))
-* handle errors ([5cf999d](https://github.com/GetStream/stream-video-js/commit/5cf999d018a17c0dd7cb92cf45808e070c69fc58))
-* handle orphaned tracks for the subscriber ([10fb269](https://github.com/GetStream/stream-video-js/commit/10fb26983589ee962fc14b464e13350bc17e9105))
-* handle screen share in remote mutes ([6255d36](https://github.com/GetStream/stream-video-js/commit/6255d366d65d4e8641cecb9f42a47876a8cd5e3b))
-* improve handing of ice trickles ([a2ae6b1](https://github.com/GetStream/stream-video-js/commit/a2ae6b105fde51f6cd9de36af9face0e69bca6ff))
-* improve ice trickling ([2fdb932](https://github.com/GetStream/stream-video-js/commit/2fdb9328d138d7067af225ae526fd06e9fe960d1))
-* improve logging ([a3ea1d9](https://github.com/GetStream/stream-video-js/commit/a3ea1d916cf50b445ecf1be7cd01c40f87a2db98))
-* improve logging, mark call as joined earlier ([2722e4d](https://github.com/GetStream/stream-video-js/commit/2722e4dd2a40fb7d3c30e1b4051fc32aa64cf629))
-* improve the migration ([c2495dd](https://github.com/GetStream/stream-video-js/commit/c2495dd01bf462d099214df711fe353001228ffb))
-* increase the migration end deadline ([6d56644](https://github.com/GetStream/stream-video-js/commit/6d566443d22b18ec50fba3752120f5eefd68a8bd))
-* incremental sfu client tag ([ce4432d](https://github.com/GetStream/stream-video-js/commit/ce4432d82256cff9868d91f01bb83daf8b256f55))
-* perform ice restart when state goes to disconnected ([2517625](https://github.com/GetStream/stream-video-js/commit/251762528641cea09a7d7c77e2c2be113ae82bac))
-* prevent assigning ice candidates to closed PC; prevent muting the publisher after migration; don't trigger fast reconnect after goAway migration ([5769097](https://github.com/GetStream/stream-video-js/commit/576909764b387da247bd48c721015cfbc7884e4a))
-* recovering from failed SFU WS connection attempts ([2e00740](https://github.com/GetStream/stream-video-js/commit/2e00740079fa27c87d142824d9b1414525de21e6))
-* remove ended orphaned tracks from the call state ([d68529d](https://github.com/GetStream/stream-video-js/commit/d68529de4b2f4821da91d153377244dd3b7ffc64))
-* remove outdated migration tests ([4b57b19](https://github.com/GetStream/stream-video-js/commit/4b57b197352d6660a7737413f46e526193f9cf74))
-* reorganize restorePublishedTracks impl ([eaa8072](https://github.com/GetStream/stream-video-js/commit/eaa80723a5355ee4195e92530d74188ba98678fb))
-* restore IceTrickleBuffer ([47be308](https://github.com/GetStream/stream-video-js/commit/47be308ece0360dff66fff415f4f39e821ca2daf))
-* restore logging ([923fa74](https://github.com/GetStream/stream-video-js/commit/923fa74dc1c634a116b1a52ed5d466902d20d915))
-* restore the original addIceCandidate behavior ([36245df](https://github.com/GetStream/stream-video-js/commit/36245df430ebb524ef99d7b07120e017b5fd4280))
-* restore tracks from the local state after reconnecting ([8204598](https://github.com/GetStream/stream-video-js/commit/820459800c8cd87635d020955f6f853d985c92c2))
-* retry failed rpc requests ([8c10922](https://github.com/GetStream/stream-video-js/commit/8c1092292d3b4657ee1ef4bb683bafeeea6568fb))
-* simplify updateParticipants ([d01367d](https://github.com/GetStream/stream-video-js/commit/d01367d1ff21d1c4d69bb5013ec6f967a1138199))
-* stats reporting ([cff501f](https://github.com/GetStream/stream-video-js/commit/cff501f8c6da22c9ccc4f98f8c688e573de94037))
-* stop sending healthcheck events when WS closes ([1c452df](https://github.com/GetStream/stream-video-js/commit/1c452dfa4d1eafe7a7dd46788691b46efc7b853a))
-* tidy up the codebase ([53674c2](https://github.com/GetStream/stream-video-js/commit/53674c294ff2e8ee0be64a3e2a8b6b1ccf34da1f))
-* use 30fps for all layers ([df393b0](https://github.com/GetStream/stream-video-js/commit/df393b07f2ec978b3f7ef2a2da9f319cd3efd477))
-* use symbol per instance ([6d55e68](https://github.com/GetStream/stream-video-js/commit/6d55e687a8189cef00037b7cae3e269fc3ad947b))
 
+### Features
 
-* add logs for ice trickle ([990b19a](https://github.com/GetStream/stream-video-js/commit/990b19adcc03808c6b04d9767181a4fa6ceda610))
-* add tests for StreamVideoClient and Call ([#1459](https://github.com/GetStream/stream-video-js/issues/1459)) ([e11d234](https://github.com/GetStream/stream-video-js/commit/e11d234cd032b61d0079a4fec62de9605b92f375))
-* **client:** inform WS connect errors ([#1463](https://github.com/GetStream/stream-video-js/issues/1463)) ([bb75351](https://github.com/GetStream/stream-video-js/commit/bb753512a78e9105a7a3b7b76f0037bf985be0f2))
-* fix bad implicit default ([d076f00](https://github.com/GetStream/stream-video-js/commit/d076f006aab55ff9033619825a2bf64900577c53))
-* refactor the code a bit ([e56a668](https://github.com/GetStream/stream-video-js/commit/e56a668b7190483924c85f6053cabd614ab2fe54))
-* remove commented out code ([02cdfa2](https://github.com/GetStream/stream-video-js/commit/02cdfa23542bb49cb04541c1d423aca9f3be7cd3))
-* remove the legacy migration code ([12c181b](https://github.com/GetStream/stream-video-js/commit/12c181be861030334f4e2555a432a8167242cf63))
-* specify baseBranch ([cc9b2fd](https://github.com/GetStream/stream-video-js/commit/cc9b2fd6d88f6aff7d8fdd8333c7aa33fdbb6857))
-* update log statement ([2245db7](https://github.com/GetStream/stream-video-js/commit/2245db7c362d1819e22e5e5831e82c251aff6117))
+* **client:** add a instance getter ([#1461](https://github.com/GetStream/stream-video-js/issues/1461)) ([7f4d836](https://github.com/GetStream/stream-video-js/commit/7f4d836511d9afdcd61bf5c6317611d3725953a6))
 
 ### [1.4.8](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.4.7...@stream-io/video-client-1.4.8) (2024-07-31)
 

package/dist/index.browser.es.js

@@ -4,7 +4,7 @@ import { ServiceType, stackIntercept, RpcError } from '@protobuf-ts/runtime-rpc'
 import axios, { AxiosHeaders } from 'axios';
 export { AxiosError } from 'axios';
 import { TwirpFetchTransport, TwirpErrorCode } from '@protobuf-ts/twirp-transport';
-import { ReplaySubject, combineLatest, BehaviorSubject, map as map$1, shareReplay, distinctUntilChanged, takeWhile, distinctUntilKeyChanged, fromEventPattern, startWith, concatMap, merge, from, fromEvent, debounceTime, pairwise, of, filter, debounce, timer } from 'rxjs';
+import { ReplaySubject, combineLatest, BehaviorSubject, map as map$1, shareReplay, distinctUntilChanged, takeWhile, distinctUntilKeyChanged, fromEventPattern, startWith, concatMap, merge, from, fromEvent, debounceTime, pairwise, of, debounce, timer } from 'rxjs';
 import * as SDP from 'sdp-transform';
 import { UAParser } from 'ua-parser-js';
 import WebSocket$1 from 'isomorphic-ws';
@@ -8711,7 +8711,7 @@ const enableHighQualityAudio = (sdp, trackMid, maxBitrate = 510000) => {
     return SDP.write(parsedSdp);
 };
 
-const version = "1.5.0-0" ;
+const version = "1.6.0-0" ;
 const [major, minor, patch] = version.split('.');
 let sdkInfo = {
     type: SdkType.PLAIN_JAVASCRIPT,
@@ -9587,8 +9587,6 @@ class Subscriber {
         this.pc = this.createPeerConnection(connectionConfig);
         const subscriberOfferConcurrencyTag = Symbol('subscriberOffer');
         this.unregisterOnSubscriberOffer = dispatcher.on('subscriberOffer', (subscriberOffer) => {
-            // TODO: use queue per peer connection, otherwise
-            //  it could happen we consume an offer for a different peer connection
             withoutConcurrency(subscriberOfferConcurrencyTag, () => {
                 return this.negotiate(subscriberOffer);
             }).catch((err) => {
@@ -9809,10 +9807,9 @@ class StreamSfuClient {
         };
         this.enterMigration = async (opts = {}) => {
             this.isLeaving = true;
-            const { timeout = 10000 } = opts;
+            const { timeout = 7 * 1000 } = opts;
             this.migrationTask?.reject(new Error('Cancelled previous migration'));
-            this.migrationTask = promiseWithResolvers();
-            const task = this.migrationTask;
+            const task = (this.migrationTask = promiseWithResolvers());
             const unsubscribe = this.dispatcher.on('participantMigrationComplete', () => {
                 unsubscribe();
                 clearTimeout(this.migrateAwayTimeout);
@@ -9820,12 +9817,9 @@ class StreamSfuClient {
             });
             this.migrateAwayTimeout = setTimeout(() => {
                 unsubscribe();
-                // task.reject(new Error('Migration timeout'));
-                // FIXME OL: temporary, switch to `task.reject()` once the SFU starts sending
-                //  the participantMigrationComplete event.
-                task.resolve();
+                task.reject(new Error(`Migration (${this.logTag}) failed to complete in ${timeout}ms`));
             }, timeout);
-            return this.migrationTask.promise;
+            return task.promise;
         };
         this.join = async (data) => {
             // wait for the signal web socket to be ready before sending "joinRequest"
@@ -11244,13 +11238,9 @@ class BrowserPermission {
         const signal = this.disposeController.signal;
         this.ready = (async () => {
             const assumeGranted = (error) => {
-                this.logger('warn', "Can't query permissions, assuming granted", {
-                    permission,
-                    error,
-                });
                 this.setState('granted');
             };
-            if (!canQueryPermissions() && !isReactNative()) {
+            if (!canQueryPermissions()) {
                 return assumeGranted();
             }
             try {
@@ -11265,7 +11255,7 @@ class BrowserPermission {
                 }
             }
             catch (err) {
-                assumeGranted(err);
+                assumeGranted();
             }
         })();
     }
@@ -13212,7 +13202,10 @@ class Call {
                     this.state.updateFromSfuCallState(callState, sfuClient.sessionId, reconnectDetails);
                 }
             }
-            this.state.setCallingState(CallingState.JOINED);
+            if (!performingMigration) {
+                // in MIGRATION, `JOINED` state is set in `this.reconnectMigrate()`
+                this.state.setCallingState(CallingState.JOINED);
+            }
             this.hasJoinedOnce = true;
             // when performing fast reconnect, or when we reuse the same SFU client,
             // (ws remained healthy), we just need to restore the ICE connection
@@ -13392,6 +13385,7 @@ class Call {
                 this.logger('info', `[Reconnect] Reconnecting with strategy ${WebsocketReconnectStrategy[strategy]}`);
                 this.reconnectStrategy = strategy;
                 do {
+                    this.reconnectAttempts++;
                     const current = WebsocketReconnectStrategy[this.reconnectStrategy];
                     try {
                         // wait until the network is available
@@ -13418,9 +13412,8 @@ class Call {
                     }
                     catch (error) {
                         this.logger('warn', `[Reconnect] ${current}(${this.reconnectAttempts}) failed. Attempting with REJOIN`, error);
-                        await sleep(retryInterval(this.reconnectAttempts));
+                        await sleep(500);
                         this.reconnectStrategy = WebsocketReconnectStrategy.REJOIN;
-                        this.reconnectAttempts++;
                     }
                 } while (this.state.callingState !== CallingState.JOINED &&
                     this.state.callingState !== CallingState.LEFT);
@@ -13478,6 +13471,10 @@ class Call {
                 // and the peer connection instances. In case of failure, the migration
                 // task would throw an error and REJOIN would be attempted.
                 await migrationTask;
+                // in MIGRATE, we can consider the call as joined only after
+                // `participantMigrationComplete` event is received, signaled by
+                // the `migrationTask`
+                this.state.setCallingState(CallingState.JOINED);
             }
             finally {
                 currentSubscriber?.close();
@@ -13836,9 +13833,14 @@ class Call {
             return this.publisher?.updateVideoPublishQuality(enabledLayers);
         };
         this.waitUntilCallJoined = () => {
+            if (this.sfuClient) {
+                // if we have an SFU client, we can wait for the join response
+                return this.sfuClient.joinResponseTask.promise;
+            }
+            // otherwise, fall back to the calling state
             return new Promise((resolve) => {
                 this.state.callingState$
-                    .pipe(takeWhile((state) => state !== CallingState.JOINED, true), filter((state) => state === CallingState.JOINED))
+                    .pipe(takeWhile((state) => state !== CallingState.JOINED, true))
                     .subscribe(() => resolve());
             });
         };
@@ -15367,7 +15369,7 @@ class TokenManager {
             if (this.user && !this.token) {
                 return this.token;
             }
-            throw new Error(`Both secret and user tokens are not set. Either client.connectUser wasn't called or client.disconnect was called`);
+            throw new Error(`User token is not set. Either client.connectUser wasn't called or client.disconnect was called`);
         };
         this.isStatic = () => this.type === 'static';
         this.loadTokenPromise = null;
@@ -16063,7 +16065,7 @@ class StreamClient {
             });
         };
         this.getUserAgent = () => {
-            const version = "1.5.0-0" ;
+            const version = "1.6.0-0" ;
             return (this.userAgent ||
                 `stream-video-javascript-client-${this.node ? 'node' : 'browser'}-${version}`);
         };
@@ -16314,12 +16316,16 @@ class StreamVideoClient {
             if (!this.streamClient.user && !this.connectionPromise) {
                 return;
             }
+            const userId = this.streamClient.user?.id;
             const disconnectUser = () => this.streamClient.disconnectUser(timeout);
             this.disconnectionPromise = this.connectionPromise
                 ? this.connectionPromise.then(() => disconnectUser())
                 : disconnectUser();
             this.disconnectionPromise.finally(() => (this.disconnectionPromise = undefined));
             await this.disconnectionPromise;
+            if (userId) {
+                StreamVideoClient._instanceMap.delete(userId);
+            }
             this.eventHandlersToUnregister.forEach((unregister) => unregister());
             this.eventHandlersToUnregister = [];
             this.writeableStateStore.setConnectedUser(undefined);
@@ -16539,12 +16545,44 @@ class StreamVideoClient {
             const user = apiKeyOrArgs.user;
             const token = apiKeyOrArgs.token || apiKeyOrArgs.tokenProvider;
             if (user) {
+                let id = user.id;
+                if (user.type === 'anonymous') {
+                    id = '!anon';
+                }
+                if (id) {
+                    if (StreamVideoClient._instanceMap.has(apiKeyOrArgs.apiKey + id)) {
+                        this.logger('warn', `A StreamVideoClient already exists for ${user.type === 'anonymous' ? 'an anyonymous user' : id}; Prefer using getOrCreateInstance method`);
+                    }
+                    user.id = id;
+                    StreamVideoClient._instanceMap.set(apiKeyOrArgs.apiKey + id, this);
+                }
                 this.connectUser(user, token).catch((err) => {
                     this.logger('error', 'Failed to connect', err);
                 });
             }
         }
     }
+    static getOrCreateInstance(args) {
+        const user = args.user;
+        if (!user.id) {
+            if (args.user.type === 'anonymous') {
+                user.id = '!anon';
+            }
+            else {
+                throw new Error('User ID is required for a non-anonymous user');
+            }
+        }
+        if (!args.token && !args.tokenProvider) {
+            if (args.user.type !== 'anonymous' && args.user.type !== 'guest') {
+                throw new Error('TokenProvider or token is required for a user that is not a guest or anonymous');
+            }
+        }
+        let instance = StreamVideoClient._instanceMap.get(args.apiKey + user.id);
+        if (!instance) {
+            instance = new StreamVideoClient({ ...args, user });
+        }
+        return instance;
+    }
     /**
      * Return the reactive state store, use this if you want to be notified about changes to the client state
      */
@@ -16552,6 +16590,7 @@ class StreamVideoClient {
         return this.readOnlyStateStore;
     }
 }
+StreamVideoClient._instanceMap = new Map();
 
 export { AudioSettingsRequestDefaultDeviceEnum, AudioSettingsResponseDefaultDeviceEnum, BlockListOptionsBehaviorEnum, browsers as Browsers, Call, CallState, CallType, CallTypes, CallingState, CameraManager, CameraManagerState, ChannelConfigWithInfoAutomodBehaviorEnum, ChannelConfigWithInfoAutomodEnum, ChannelConfigWithInfoBlocklistBehaviorEnum, CreateDeviceRequestPushProviderEnum, DebounceType, DynascaleManager, ErrorFromResponse, InputMediaDeviceManager, InputMediaDeviceManagerState, MicrophoneManager, MicrophoneManagerState, NoiseCancellationSettingsModeEnum, OwnCapability, RecordSettingsRequestModeEnum, RecordSettingsRequestQualityEnum, rxUtils as RxUtils, ScreenShareManager, ScreenShareState, events as SfuEvents, models as SfuModels, SpeakerManager, SpeakerState, StreamSfuClient, StreamVideoClient, StreamVideoReadOnlyStateStore, StreamVideoWriteableStateStore, TranscriptionSettingsRequestModeEnum, TranscriptionSettingsResponseModeEnum, VideoSettingsRequestCameraFacingEnum, VideoSettingsResponseCameraFacingEnum, ViewportTracker, VisibilityState, checkIfAudioOutputChangeSupported, combineComparators, conditional, createSoundDetector, defaultSortPreset, descending, deviceIds$, disposeOfMediaStream, dominantSpeaker, getAudioBrowserPermission, getAudioDevices, getAudioOutputDevices, getAudioStream, getClientDetails, getDeviceInfo, getLogLevel, getLogger, getOSInfo, getScreenShareStream, getSdkInfo, getVideoBrowserPermission, getVideoDevices, getVideoStream, getWebRTCInfo, hasAudio, hasScreenShare, hasScreenShareAudio, hasVideo, isPinned, livestreamOrAudioRoomSortPreset, logLevels, logToConsole, name, noopComparator, paginatedLayoutSortPreset, pinned, publishingAudio, publishingVideo, reactionType, role, screenSharing, setDeviceInfo, setLogLevel, setLogger, setOSInfo, setSdkInfo, setWebRTCInfo, speakerLayoutSortPreset, speaking };
 //# sourceMappingURL=index.browser.es.js.map