@stream-io/video-client 1.16.7 → 1.17.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [1.17.0](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.16.7...@stream-io/video-client-1.17.0) (2025-02-17)
+
+
+### Features
+
+* support static token and token provider at the same time ([#1685](https://github.com/GetStream/stream-video-js/issues/1685)) ([4365a3d](https://github.com/GetStream/stream-video-js/commit/4365a3dd0a14c98041982bde8be21258b8cfd571))
+
 ## [1.16.7](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.16.6...@stream-io/video-client-1.16.7) (2025-02-12)
 
 

package/dist/index.browser.es.js

@@ -4,7 +4,7 @@ import { ServiceType, stackIntercept, RpcError } from '@protobuf-ts/runtime-rpc'
 import axios from 'axios';
 export { AxiosError } from 'axios';
 import { TwirpFetchTransport, TwirpErrorCode } from '@protobuf-ts/twirp-transport';
-import { ReplaySubject, combineLatest, BehaviorSubject, map, shareReplay, distinctUntilChanged, takeWhile, distinctUntilKeyChanged, fromEventPattern, startWith, concatMap, from, fromEvent, debounceTime, merge, pairwise, of } from 'rxjs';
+import { ReplaySubject, combineLatest, BehaviorSubject, map, shareReplay, distinctUntilChanged, takeWhile, distinctUntilKeyChanged, fromEventPattern, startWith, concatMap, merge, from, fromEvent, debounceTime, pairwise, of } from 'rxjs';
 import { parse } from 'sdp-transform';
 import { UAParser } from 'ua-parser-js';
 
@@ -3302,10 +3302,7 @@ function isFunction(value) {
  */
 const KnownCodes = {
     TOKEN_EXPIRED: 40,
-    WS_CLOSED_SUCCESS: 1000,
-    WS_CLOSED_ABRUPTLY: 1006,
-    WS_POLICY_VIOLATION: 1008,
-};
+    WS_CLOSED_SUCCESS: 1000};
 /**
  * retryInterval - A retry interval which increases acc to number of failures
  *
@@ -7464,7 +7461,7 @@ const aggregate = (stats) => {
     return report;
 };
 
-const version = "1.16.7";
+const version = "1.17.0";
 const [major, minor, patch] = version.split('.');
 let sdkInfo = {
     type: SdkType.PLAIN_JAVASCRIPT,
@@ -12581,9 +12578,6 @@ const decodeBase64 = (s) => {
  * Handles all the operations around user token.
  */
 class TokenManager {
-    /**
-     * Constructor
-     */
     constructor(secret) {
         /**
          * Set the static string token or token provider.
@@ -12594,8 +12588,9 @@ class TokenManager {
          * @param {boolean} isAnonymous - whether the user is anonymous or not.
          */
         this.setTokenOrProvider = async (tokenOrProvider, user, isAnonymous) => {
-            this.validateToken(tokenOrProvider, user, isAnonymous);
             this.user = user;
+            this.isAnonymous = isAnonymous;
+            this.validateToken(tokenOrProvider);
             if (isFunction(tokenOrProvider)) {
                 this.tokenProvider = tokenOrProvider;
                 this.type = 'provider';
@@ -12618,28 +12613,28 @@ class TokenManager {
             this.loadTokenPromise = null;
         };
         // Validates the user token.
-        this.validateToken = (tokenOrProvider, user, isAnonymous) => {
+        this.validateToken = (tokenOrProvider) => {
             // allow empty token for anon user
-            if (user && isAnonymous && !tokenOrProvider)
+            if (this.user && this.isAnonymous && !tokenOrProvider)
                 return;
             // Don't allow empty token for non-server side client.
             if (!this.secret && !tokenOrProvider) {
-                throw new Error('UserWithId token can not be empty');
+                throw new Error('User token can not be empty');
             }
             if (tokenOrProvider &&
                 typeof tokenOrProvider !== 'string' &&
                 !isFunction(tokenOrProvider)) {
-                throw new Error('user token should either be a string or a function');
+                throw new Error('User token should either be a string or a function');
             }
             if (typeof tokenOrProvider === 'string') {
                 // Allow empty token for anonymous users
-                if (isAnonymous && tokenOrProvider === '')
+                if (this.isAnonymous && tokenOrProvider === '')
                     return;
                 const tokenUserId = getUserFromToken(tokenOrProvider);
                 if (tokenOrProvider != null &&
                     (tokenUserId == null ||
                         tokenUserId === '' ||
-                        (!isAnonymous && tokenUserId !== user.id))) {
+                        (!this.isAnonymous && tokenUserId !== this.user.id))) {
                     throw new Error('userToken does not have a user_id or is not matching with user.id');
                 }
             }
@@ -12656,7 +12651,9 @@ class TokenManager {
                 }
                 if (this.tokenProvider && typeof this.tokenProvider !== 'string') {
                     try {
-                        this.token = await this.tokenProvider();
+                        const token = await this.tokenProvider();
+                        this.validateToken(token);
+                        this.token = token;
                     }
                     catch (e) {
                         return reject(new Error(`Call to tokenProvider failed with message: ${e}`));
@@ -13077,7 +13074,7 @@ class StreamClient {
             return await this.wsConnection.connect(this.defaultWSTimeout);
         };
         this.getUserAgent = () => {
-            const version = "1.16.7";
+            const version = "1.17.0";
             return (this.userAgent ||
                 `stream-video-javascript-client-${this.node ? 'node' : 'browser'}-${version}`);
         };
@@ -13194,14 +13191,68 @@ class StreamClient {
     }
 }
 
+/**
+ * Utility function to get the instance key.
+ */
+const getInstanceKey = (apiKey, user) => {
+    return `${apiKey}/${user.id}`;
+};
+/**
+ * Creates a coordinator client.
+ */
+const createCoordinatorClient = (apiKey, options) => {
+    const coordinatorLogger = getLogger(['coordinator']);
+    const streamClient = new StreamClient(apiKey, {
+        persistUserOnConnectionFailure: true,
+        ...options,
+        logger: coordinatorLogger,
+    });
+    const sdkInfo = getSdkInfo();
+    if (sdkInfo) {
+        const sdkName = SdkType[sdkInfo.type].toLowerCase();
+        const sdkVersion = `${sdkInfo.major}.${sdkInfo.minor}.${sdkInfo.patch}`;
+        const userAgent = streamClient.getUserAgent();
+        streamClient.setUserAgent(`${userAgent}-video-${sdkName}-sdk-${sdkVersion}`);
+    }
+    return streamClient;
+};
+/**
+ * Creates a token provider and allows integrators to provide
+ * a static token and a token provider at the same time.
+ *
+ * When both of them are provided, this function will create an internal
+ * token provider that will use the static token on the first invocation
+ * and the token provider on the later invocations.
+ */
+const createTokenOrProvider = (options) => {
+    const { token, tokenProvider } = options;
+    if (token && tokenProvider) {
+        let initialTokenUsed = false;
+        return async function wrappedTokenProvider() {
+            if (!initialTokenUsed) {
+                initialTokenUsed = true;
+                return token;
+            }
+            return tokenProvider();
+        };
+    }
+    return token || tokenProvider;
+};
+
 /**
  * A `StreamVideoClient` instance lets you communicate with our API, and authenticate users.
  */
 class StreamVideoClient {
     constructor(apiKeyOrArgs, opts) {
-        this.logLevel = 'warn';
         this.eventHandlersToUnregister = [];
         this.connectionConcurrencyTag = Symbol('connectionConcurrencyTag');
+        this.registerClientInstance = (apiKey, user) => {
+            const instanceKey = getInstanceKey(apiKey, user);
+            if (StreamVideoClient._instances.has(instanceKey)) {
+                this.logger('warn', `A StreamVideoClient already exists for ${user.id}; Prefer using getOrCreateInstance method`);
+            }
+            StreamVideoClient._instances.set(instanceKey, this);
+        };
         /**
          * Connects the given user to the client.
          * Only one user can connect at a time, if you want to change users, call `disconnectUser` before connecting a new user.
@@ -13215,37 +13266,30 @@ class StreamVideoClient {
                 user.id = '!anon';
                 return this.connectAnonymousUser(user, token);
             }
-            let connectUser = () => {
-                return this.streamClient.connectUser(user, token);
-            };
-            if (user.type === 'guest') {
-                connectUser = async () => {
-                    return this.streamClient.connectGuestUser(user);
-                };
-            }
+            const connectUser = user.type === 'guest'
+                ? () => this.streamClient.connectGuestUser(user)
+                : () => this.streamClient.connectUser(user, token);
             const connectUserResponse = await withoutConcurrency(this.connectionConcurrencyTag, () => connectUser());
             // connectUserResponse will be void if connectUser called twice for the same user
             if (connectUserResponse?.me) {
                 this.writeableStateStore.setConnectedUser(connectUserResponse.me);
             }
             this.eventHandlersToUnregister.push(this.on('connection.changed', (event) => {
-                if (event.online) {
-                    const callsToReWatch = this.writeableStateStore.calls
-                        .filter((call) => call.watching)
-                        .map((call) => call.cid);
-                    this.logger('info', `Rewatching calls after connection changed ${callsToReWatch.join(', ')}`);
-                    if (callsToReWatch.length > 0) {
-                        this.queryCalls({
-                            watch: true,
-                            filter_conditions: {
-                                cid: { $in: callsToReWatch },
-                            },
-                            sort: [{ field: 'cid', direction: 1 }],
-                        }).catch((err) => {
-                            this.logger('error', 'Failed to re-watch calls', err);
-                        });
-                    }
-                }
+                if (!event.online)
+                    return;
+                const callsToReWatch = this.writeableStateStore.calls
+                    .filter((call) => call.watching)
+                    .map((call) => call.cid);
+                if (callsToReWatch.length <= 0)
+                    return;
+                this.logger('info', `Rewatching calls ${callsToReWatch.join(', ')}`);
+                this.queryCalls({
+                    watch: true,
+                    filter_conditions: { cid: { $in: callsToReWatch } },
+                    sort: [{ field: 'cid', direction: 1 }],
+                }).catch((err) => {
+                    this.logger('error', 'Failed to re-watch calls', err);
+                });
             }));
             this.eventHandlersToUnregister.push(this.on('call.created', (event) => {
                 const { call, members } = event;
@@ -13301,15 +13345,12 @@ class StreamVideoClient {
          *                https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
          */
         this.disconnectUser = async (timeout) => {
-            if (!this.streamClient.user) {
+            const { user, key } = this.streamClient;
+            if (!user)
                 return;
-            }
-            const userId = this.streamClient.user?.id;
-            const apiKey = this.streamClient.key;
-            const disconnectUser = () => this.streamClient.disconnectUser(timeout);
-            await withoutConcurrency(this.connectionConcurrencyTag, () => disconnectUser());
-            if (userId) {
-                StreamVideoClient._instanceMap.delete(apiKey + userId);
+            await withoutConcurrency(this.connectionConcurrencyTag, () => this.streamClient.disconnectUser(timeout));
+            if (user.id) {
+                StreamVideoClient._instances.delete(getInstanceKey(key, user));
             }
             this.eventHandlersToUnregister.forEach((unregister) => unregister());
             this.eventHandlersToUnregister = [];
@@ -13490,92 +13531,46 @@ class StreamVideoClient {
          * @param tokenOrProvider a token or a function that returns a token.
          */
         this.connectAnonymousUser = async (user, tokenOrProvider) => {
-            const connectAnonymousUser = () => this.streamClient.connectAnonymousUser(user, tokenOrProvider);
-            return await withoutConcurrency(this.connectionConcurrencyTag, () => connectAnonymousUser());
-        };
-        let logger = logToConsole;
-        let logLevel = 'warn';
-        if (typeof apiKeyOrArgs === 'string') {
-            logLevel = opts?.logLevel || logLevel;
-            logger = opts?.logger || logger;
-            if (opts?.enableTimerWorker)
-                enableTimerWorker();
-        }
-        else {
-            logLevel = apiKeyOrArgs.options?.logLevel || logLevel;
-            logger = apiKeyOrArgs.options?.logger || logger;
-            if (apiKeyOrArgs.options?.enableTimerWorker)
-                enableTimerWorker();
-        }
-        setLogger(logger, logLevel);
+            return withoutConcurrency(this.connectionConcurrencyTag, () => this.streamClient.connectAnonymousUser(user, tokenOrProvider));
+        };
+        const apiKey = typeof apiKeyOrArgs === 'string' ? apiKeyOrArgs : apiKeyOrArgs.apiKey;
+        const clientOptions = typeof apiKeyOrArgs === 'string' ? opts : apiKeyOrArgs.options;
+        if (clientOptions?.enableTimerWorker)
+            enableTimerWorker();
+        const rootLogger = clientOptions?.logger || logToConsole;
+        setLogger(rootLogger, clientOptions?.logLevel || 'warn');
         this.logger = getLogger(['client']);
-        const coordinatorLogger = getLogger(['coordinator']);
-        if (typeof apiKeyOrArgs === 'string') {
-            this.streamClient = new StreamClient(apiKeyOrArgs, {
-                persistUserOnConnectionFailure: true,
-                ...opts,
-                logLevel,
-                logger: coordinatorLogger,
-            });
-        }
-        else {
-            this.streamClient = new StreamClient(apiKeyOrArgs.apiKey, {
-                persistUserOnConnectionFailure: true,
-                ...apiKeyOrArgs.options,
-                logLevel,
-                logger: coordinatorLogger,
-            });
-            const sdkInfo = getSdkInfo();
-            if (sdkInfo) {
-                const sdkName = SdkType[sdkInfo.type].toLowerCase();
-                const sdkVersion = `${sdkInfo.major}.${sdkInfo.minor}.${sdkInfo.patch}`;
-                const userAgent = this.streamClient.getUserAgent();
-                this.streamClient.setUserAgent(`${userAgent}-video-${sdkName}-sdk-${sdkVersion}`);
-            }
-        }
+        this.streamClient = createCoordinatorClient(apiKey, clientOptions);
         this.writeableStateStore = new StreamVideoWriteableStateStore();
         this.readOnlyStateStore = new StreamVideoReadOnlyStateStore(this.writeableStateStore);
-        if (typeof apiKeyOrArgs !== 'string') {
+        if (typeof apiKeyOrArgs !== 'string' && apiKeyOrArgs.user) {
             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 anonymous 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);
-                });
-            }
+            if (user.type === 'anonymous')
+                user.id = '!anon';
+            if (user.id)
+                this.registerClientInstance(apiKey, user);
+            const tokenOrProvider = createTokenOrProvider(apiKeyOrArgs);
+            this.connectUser(user, tokenOrProvider).catch((err) => {
+                this.logger('error', 'Failed to connect', err);
+            });
         }
     }
+    /**
+     * Gets or creates a StreamVideoClient instance based on the given options.
+     */
     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');
-            }
+        const { apiKey, user, token, tokenProvider } = args;
+        if (!user.id && user.type !== 'anonymous') {
+            throw new Error('user.id is required for a non-anonymous user');
         }
-        let instance = StreamVideoClient._instanceMap.get(args.apiKey + user.id);
-        if (!instance) {
-            instance = new StreamVideoClient({ ...args, user });
+        if (!token &&
+            !tokenProvider &&
+            user.type !== 'anonymous' &&
+            user.type !== 'guest') {
+            throw new Error('tokenProvider or token is required for a authenticated users');
         }
-        return instance;
+        return (StreamVideoClient._instances.get(getInstanceKey(apiKey, user)) ||
+            new StreamVideoClient(args));
     }
     /**
      * Return the reactive state store, use this if you want to be notified about changes to the client state
@@ -13584,7 +13579,7 @@ class StreamVideoClient {
         return this.readOnlyStateStore;
     }
 }
-StreamVideoClient._instanceMap = new Map();
+StreamVideoClient._instances = new Map();
 
 export { AudioSettingsRequestDefaultDeviceEnum, AudioSettingsResponseDefaultDeviceEnum, browsers as Browsers, Call, CallState, CallType, CallTypes, CallingState, CameraManager, CameraManagerState, CreateDeviceRequestPushProviderEnum, DebounceType, DynascaleManager, ErrorFromResponse, FrameRecordingSettingsRequestModeEnum, FrameRecordingSettingsResponseModeEnum, InputMediaDeviceManager, InputMediaDeviceManagerState, LayoutSettingsRequestNameEnum, MicrophoneManager, MicrophoneManagerState, NoiseCancellationSettingsModeEnum, OwnCapability, RTMPBroadcastRequestQualityEnum, RTMPSettingsRequestQualityEnum, RecordSettingsRequestModeEnum, RecordSettingsRequestQualityEnum, rxUtils as RxUtils, ScreenShareManager, ScreenShareState, events as SfuEvents, models as SfuModels, SpeakerManager, SpeakerState, StreamSfuClient, StreamVideoClient, StreamVideoReadOnlyStateStore, StreamVideoWriteableStateStore, TranscriptionSettingsRequestClosedCaptionModeEnum, TranscriptionSettingsRequestLanguageEnum, TranscriptionSettingsRequestModeEnum, TranscriptionSettingsResponseClosedCaptionModeEnum, TranscriptionSettingsResponseLanguageEnum, TranscriptionSettingsResponseModeEnum, VideoSettingsRequestCameraFacingEnum, VideoSettingsResponseCameraFacingEnum, ViewportTracker, VisibilityState, checkIfAudioOutputChangeSupported, combineComparators, conditional, createSoundDetector, defaultSortPreset, descending, deviceIds$, disposeOfMediaStream, dominantSpeaker, getAudioBrowserPermission, getAudioDevices, getAudioOutputDevices, getAudioStream, getClientDetails, getDeviceInfo, getDeviceState, 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, setPowerState, setSdkInfo, setThermalState, setWebRTCInfo, speakerLayoutSortPreset, speaking };
 //# sourceMappingURL=index.browser.es.js.map