@stream-io/video-client 0.1.4 → 0.1.6

package/dist/index.es.js

@@ -4,7 +4,7 @@ import { ServiceType, stackIntercept } from '@protobuf-ts/runtime-rpc';
 import axios, { AxiosHeaders } from 'axios';
 export { AxiosError } from 'axios';
 import { TwirpFetchTransport } from '@protobuf-ts/twirp-transport';
-import { ReplaySubject, BehaviorSubject, takeWhile, pairwise, tap, debounce, timer, map as map$2, Observable, debounceTime, concatMap, from, shareReplay, merge, combineLatest, filter } from 'rxjs';
+import { ReplaySubject, BehaviorSubject, takeWhile, filter, pairwise, tap, debounce, timer, map as map$2, Observable, debounceTime, concatMap, from, shareReplay, merge, combineLatest } from 'rxjs';
 import * as SDP from 'sdp-transform';
 import WebSocket from 'isomorphic-ws';
 import { take, map as map$1, distinctUntilChanged } from 'rxjs/operators';
@@ -9468,11 +9468,13 @@ class Call {
          */
         this.leave = ({ reject = false } = {}) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
-            // TODO: handle case when leave is called during JOINING
             const callingState = this.state.callingState;
             if (callingState === CallingState.LEFT) {
                 throw new Error('Cannot leave call that has already been left.');
             }
+            if (callingState === CallingState.JOINING) {
+                yield this.assertCallJoined();
+            }
             if (this.ringing) {
                 // I'm the one who started the call, so I should cancel it.
                 const hasOtherParticipants = this.state.remoteParticipants.length > 0;
@@ -9878,13 +9880,6 @@ class Call {
                 }, timeout);
             });
         };
-        this.assertCallJoined = () => {
-            return new Promise((resolve) => {
-                this.state.callingState$
-                    .pipe(takeWhile((state) => state !== CallingState.JOINED, true))
-                    .subscribe(() => resolve());
-            });
-        };
         /**
          * Starts publishing the given video stream to the call.
          * The stream will be stopped if the user changes an input device, or if the user leaves the call.
@@ -10115,6 +10110,13 @@ class Call {
             var _h;
             return (_h = this.publisher) === null || _h === void 0 ? void 0 : _h.updateVideoPublishQuality(enabledRids);
         });
+        this.assertCallJoined = () => {
+            return new Promise((resolve) => {
+                this.state.callingState$
+                    .pipe(takeWhile((state) => state !== CallingState.JOINED, true), filter((s) => s === CallingState.JOINED))
+                    .subscribe(() => resolve());
+            });
+        };
         /**
          * Sends a reaction to the other call participants.
          *
@@ -10326,7 +10328,7 @@ class Call {
          * @returns
          */
         this.queryMembers = (request) => {
-            return this.streamClient.post('/call/members', Object.assign(Object.assign({}, request), { id: this.id, type: this.type }));
+            return this.streamClient.post('/call/members', Object.assign(Object.assign({}, (request || {})), { id: this.id, type: this.type }));
         };
         /**
          * Will update the call members.
@@ -11638,7 +11640,7 @@ class WSConnectionFallback {
     }
 }
 
-const version = '0.1.4';
+const version = '0.1.6';
 
 const logger = getLogger(['location']);
 const HINT_URL = `https://hint.stream-io-video.com/`;
@@ -11701,14 +11703,6 @@ class StreamClient {
         });
         this._getConnectionID = () => { var _a, _b; return ((_a = this.wsConnection) === null || _a === void 0 ? void 0 : _a.connectionID) || ((_b = this.wsFallback) === null || _b === void 0 ? void 0 : _b.connectionID); };
         this._hasConnectionID = () => Boolean(this._getConnectionID());
-        /**
-         * This will start a promise to hold API calls until `connectUser` is called, useful when user is set in `StreamVideoClient constructor`
-         */
-        this.startWaitingForConnection = () => {
-            this.waitForConnectPromise = new Promise((resolve) => {
-                this.resolveConnectPromise = resolve;
-            });
-        };
         /**
          * connectUser - Set the current user and open a WebSocket connection
          *
@@ -11743,11 +11737,6 @@ class StreamClient {
             this._setUser(user);
             const wsPromise = this.openConnection();
             this.setUserPromise = Promise.all([setTokenPromise, wsPromise]).then((result) => result[1]);
-            if (this.resolveConnectPromise) {
-                this.resolveConnectPromise();
-                this.waitForConnectPromise = undefined;
-                this.resolveConnectPromise = undefined;
-            }
             try {
                 return yield this.setUserPromise;
             }
@@ -11862,11 +11851,6 @@ class StreamClient {
             });
             this.anonymous = true;
             yield this._setToken(user, tokenOrProvider, this.anonymous);
-            if (this.resolveConnectPromise) {
-                this.resolveConnectPromise();
-                this.waitForConnectPromise = undefined;
-                this.resolveConnectPromise = undefined;
-            }
             this._setUser(user);
             // some endpoints require a connection_id to be resolved.
             // as anonymous users aren't allowed to open WS connections, we just
@@ -11923,9 +11907,6 @@ class StreamClient {
             this.logger('trace', `client:${type} - Response - url: ${url} > status ${response.status}`, {
                 response,
             });
-            this.logger('trace', `client:${type} - Response payload`, {
-                response,
-            });
         };
         this._logApiError = (type, url, error) => {
             this.logger('error', `client:${type} - Error - url: ${url}`, {
@@ -11936,9 +11917,6 @@ class StreamClient {
         this.doAxiosRequest = (type, url, data, options = {}) => __awaiter(this, void 0, void 0, function* () {
             var _h;
             if (!options.publicEndpoint) {
-                if (this.waitForConnectPromise) {
-                    yield this.waitForConnectPromise;
-                }
                 yield Promise.all([
                     this.tokenManager.tokenReady(),
                     this.connectionIdPromise,
@@ -11977,9 +11955,9 @@ class StreamClient {
             }
             catch (e /**TODO: generalize error types  */) {
                 e.client_request_id = (_h = requestConfig.headers) === null || _h === void 0 ? void 0 : _h['x-client-request-id'];
-                this._logApiError(type, url, e);
                 this.consecutiveFailures += 1;
                 if (e.response) {
+                    this._logApiError(type, url, e.response);
                     /** connection_fallback depends on this token expiration logic */
                     if (e.response.data.code === KnownCodes.TOKEN_EXPIRED &&
                         !this.tokenManager.isStatic()) {
@@ -11992,6 +11970,7 @@ class StreamClient {
                     return this.handleResponse(e.response);
                 }
                 else {
+                    this._logApiError(type, url, e);
                     // eslint-disable-next-line no-throw-literal
                     throw e;
                 }
@@ -12276,6 +12255,7 @@ class StreamClient {
 class StreamVideoClient {
     constructor(apiKeyOrArgs, opts) {
         var _a, _b;
+        this.logLevel = 'warn';
         this.eventHandlersToUnregister = [];
         /**
          * Disconnects the currently connected user from the client.
@@ -12286,7 +12266,7 @@ class StreamVideoClient {
          *                https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
          */
         this.disconnectUser = (timeout) => __awaiter(this, void 0, void 0, function* () {
-            if (!this.streamClient.user) {
+            if (!this.streamClient.user && !this.connectionPromise) {
                 return;
             }
             const disconnectUser = () => this.streamClient.disconnectUser(timeout);
@@ -12347,7 +12327,7 @@ class StreamVideoClient {
          *
          * @param data the query data.
          */
-        this.queryCalls = (data) => __awaiter(this, void 0, void 0, function* () {
+        this.queryCalls = (data = {}) => __awaiter(this, void 0, void 0, function* () {
             const response = yield this.streamClient.post('/calls', data);
             const calls = response.calls.map((c) => {
                 const call = new Call({
@@ -12463,14 +12443,16 @@ class StreamVideoClient {
                 this.streamClient.setUserAgent(this.streamClient.getUserAgent() +
                     `-video-${SdkType[sdkInfo.type].toLowerCase()}-sdk-${sdkInfo.major}.${sdkInfo.minor}.${sdkInfo.patch}`);
             }
-            this.user = apiKeyOrArgs.user;
-            this.token = apiKeyOrArgs.token || apiKeyOrArgs.tokenProvider;
-            if (this.user) {
-                this.streamClient.startWaitingForConnection();
-            }
         }
         this.writeableStateStore = new StreamVideoWriteableStateStore();
         this.readOnlyStateStore = new StreamVideoReadOnlyStateStore(this.writeableStateStore);
+        if (typeof apiKeyOrArgs !== 'string') {
+            const user = apiKeyOrArgs.user;
+            const token = apiKeyOrArgs.token || apiKeyOrArgs.tokenProvider;
+            if (user) {
+                this.connectUser(user, token);
+            }
+        }
     }
     /**
      * Connects the given user to the client.
@@ -12483,24 +12465,21 @@ class StreamVideoClient {
     connectUser(user, token) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const userToConnect = user || this.user;
-            const tokenToUse = token || this.token;
-            if (!userToConnect) {
-                throw new Error('Connect user is called without user');
-            }
-            if (userToConnect.type === 'anonymous') {
-                userToConnect.id = '!anon';
-                return this.connectAnonymousUser(userToConnect, tokenToUse);
-            }
-            if (userToConnect.type === 'guest') {
-                const response = yield this.createGuestUser({
-                    user: Object.assign(Object.assign({}, userToConnect), { role: 'guest' }),
-                });
-                return this.connectUser(response.user, response.access_token);
+            if (user.type === 'anonymous') {
+                user.id = '!anon';
+                return this.connectAnonymousUser(user, token);
             }
-            const connectUser = () => {
-                return this.streamClient.connectUser(userToConnect, tokenToUse);
+            let connectUser = () => {
+                return this.streamClient.connectUser(user, token);
             };
+            if (user.type === 'guest') {
+                connectUser = () => __awaiter(this, void 0, void 0, function* () {
+                    const response = yield this.createGuestUser({
+                        user: Object.assign(Object.assign({}, user), { role: 'guest' }),
+                    });
+                    return this.streamClient.connectUser(response.user, response.access_token);
+                });
+            }
             this.connectionPromise = this.disconnectionPromise
                 ? this.disconnectionPromise.then(() => connectUser())
                 : connectUser();
@@ -12534,7 +12513,7 @@ class StreamVideoClient {
                 if (event.type !== 'call.created')
                     return;
                 const { call, members } = event;
-                if (userToConnect.id === call.created_by.id) {
+                if (user.id === call.created_by.id) {
                     this.logger('warn', 'Received `call.created` sent by the current user');
                     return;
                 }
@@ -12552,7 +12531,7 @@ class StreamVideoClient {
                 if (event.type !== 'call.ring')
                     return;
                 const { call, members } = event;
-                if (userToConnect.id === call.created_by.id) {
+                if (user.id === call.created_by.id) {
                     this.logger('debug', 'Received `call.ring` sent by the current user so ignoring the event');
                     return;
                 }