@stream-io/video-client 0.0.11 → 0.0.13

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+### [0.0.13](https://github.com/GetStream/stream-video-js/compare/client0.0.12...client0.0.13) (2023-06-15)
+
+
+### Bug Fixes
+
+* do not send ring to backend if call was not created by the user ([#645](https://github.com/GetStream/stream-video-js/issues/645)) ([1fa8ffb](https://github.com/GetStream/stream-video-js/commit/1fa8ffbb7373e9eff497bfe1ce48a970aedc0d9d))
+
+### [0.0.12](https://github.com/GetStream/stream-video-js/compare/client0.0.11...client0.0.12) (2023-06-13)
+
+
+### Features
+
+* Make it possible to provide user and token in StreamVideoClient… ([#631](https://github.com/GetStream/stream-video-js/issues/631)) ([93f9b03](https://github.com/GetStream/stream-video-js/commit/93f9b03313ac74179f1d93b513ea4de306312291))
+
 ### [0.0.11](https://github.com/GetStream/stream-video-js/compare/client0.0.10...client0.0.11) (2023-06-13)
 
 

package/dist/index.browser.es.js

@@ -5,7 +5,7 @@ export { AxiosError } from 'axios';
 import { TwirpFetchTransport } from '@protobuf-ts/twirp-transport';
 import { ServiceType, stackIntercept } from '@protobuf-ts/runtime-rpc';
 import { ReplaySubject, BehaviorSubject, Subject, takeWhile, pairwise, tap, debounce, of, timer, map as map$2, Observable, debounceTime, concatMap, from, shareReplay, merge, combineLatest, filter } from 'rxjs';
-import { take, map as map$1, distinctUntilChanged, combineLatestWith } from 'rxjs/operators';
+import { take, map as map$1, distinctUntilChanged } from 'rxjs/operators';
 import { UAParser } from 'ua-parser-js';
 import WebSocket$1 from 'isomorphic-ws';
 import { fromByteArray } from 'base64-js';
@@ -6362,6 +6362,130 @@ var rxUtils = /*#__PURE__*/Object.freeze({
     setCurrentValue: setCurrentValue
 });
 
+class StreamVideoWriteableStateStore {
+    constructor() {
+        /**
+         * A store keeping data of a successfully connected user over WS to the coordinator server.
+         */
+        this.connectedUserSubject = new BehaviorSubject(undefined);
+        /**
+         * A list of {@link Call} objects created/tracked by this client.
+         */
+        this.callsSubject = new BehaviorSubject([]);
+        /**
+         * Gets the current value of an observable, or undefined if the observable has
+         * not emitted a value yet.
+         *
+         * @param observable$ the observable to get the value from.
+         */
+        this.getCurrentValue = getCurrentValue;
+        /**
+         * Updates the value of the provided Subject.
+         * An `update` can either be a new value or a function which takes
+         * the current value and returns a new value.
+         *
+         * @param subject the subject to update.
+         * @param update the update to apply to the subject.
+         * @return the updated value.
+         */
+        this.setCurrentValue = setCurrentValue;
+        /**
+         * Sets the currently connected user.
+         *
+         * @internal
+         * @param user the user to set as connected.
+         */
+        this.setConnectedUser = (user) => {
+            return this.setCurrentValue(this.connectedUserSubject, user);
+        };
+        /**
+         * Sets the list of {@link Call} objects created/tracked by this client.
+         * @param calls
+         */
+        this.setCalls = (calls) => {
+            return this.setCurrentValue(this.callsSubject, calls);
+        };
+        /**
+         * Adds a {@link Call} object to the list of {@link Call} objects created/tracked by this client.
+         *
+         * @param call the call to add.
+         */
+        this.registerCall = (call) => {
+            if (!this.calls.find((c) => c.cid === call.cid)) {
+                this.setCalls((calls) => [...calls, call]);
+            }
+        };
+        /**
+         * Removes a {@link Call} object from the list of {@link Call} objects created/tracked by this client.
+         *
+         * @param call the call to remove
+         */
+        this.unregisterCall = (call) => {
+            return this.setCalls((calls) => calls.filter((c) => c !== call));
+        };
+        /**
+         * Finds a {@link Call} object in the list of {@link Call} objects created/tracked by this client.
+         *
+         * @param type the type of call to find.
+         * @param id the id of the call to find.
+         */
+        this.findCall = (type, id) => {
+            return this.calls.find((c) => c.type === type && c.id === id);
+        };
+        this.connectedUserSubject.subscribe((user) => __awaiter(this, void 0, void 0, function* () {
+            // leave all calls when the user disconnects.
+            if (!user) {
+                for (const call of this.calls) {
+                    yield call.leave();
+                }
+            }
+        }));
+    }
+    /**
+     * The currently connected user.
+     */
+    get connectedUser() {
+        return this.getCurrentValue(this.connectedUserSubject);
+    }
+    /**
+     * A list of {@link Call} objects created/tracked by this client.
+     */
+    get calls() {
+        return this.getCurrentValue(this.callsSubject);
+    }
+}
+/**
+ * A reactive store that exposes state variables in a reactive manner.
+ * You can subscribe to changes of the different state variables.
+ * This central store contains all the state variables related to [`StreamVideoClient`](./StreamVideClient.md) and [`Call`](./Call.md).
+ */
+class StreamVideoReadOnlyStateStore {
+    constructor(store) {
+        /**
+         * This method allows you the get the current value of a state variable.
+         *
+         * @param observable the observable to get the current value of.
+         * @returns the current value of the observable.
+         */
+        this.getCurrentValue = getCurrentValue;
+        // convert and expose subjects as observables
+        this.connectedUser$ = store.connectedUserSubject.asObservable();
+        this.calls$ = store.callsSubject.asObservable();
+    }
+    /**
+     * The current user connected over WS to the backend.
+     */
+    get connectedUser() {
+        return getCurrentValue(this.connectedUser$);
+    }
+    /**
+     * A list of {@link Call} objects created/tracked by this client.
+     */
+    get calls() {
+        return getCurrentValue(this.calls$);
+    }
+}
+
 /**
  * Creates a new combined {@link Comparator<T>} which sorts items by the given comparators.
  * The comparators are applied in the order they are given (left -> right).
@@ -7021,171 +7145,6 @@ class CallState {
     }
 }
 
-class StreamVideoWriteableStateStore {
-    constructor() {
-        /**
-         * A store keeping data of a successfully connected user over WS to the coordinator server.
-         */
-        this.connectedUserSubject = new BehaviorSubject(undefined);
-        /**
-         * A list of {@link Call} objects created/tracked by this client.
-         */
-        this.callsSubject = new BehaviorSubject([]);
-        /**
-         * Gets the current value of an observable, or undefined if the observable has
-         * not emitted a value yet.
-         *
-         * @param observable$ the observable to get the value from.
-         */
-        this.getCurrentValue = getCurrentValue;
-        /**
-         * Updates the value of the provided Subject.
-         * An `update` can either be a new value or a function which takes
-         * the current value and returns a new value.
-         *
-         * @param subject the subject to update.
-         * @param update the update to apply to the subject.
-         * @return the updated value.
-         */
-        this.setCurrentValue = setCurrentValue;
-        /**
-         * Sets the currently connected user.
-         *
-         * @internal
-         * @param user the user to set as connected.
-         */
-        this.setConnectedUser = (user) => {
-            return this.setCurrentValue(this.connectedUserSubject, user);
-        };
-        /**
-         * Sets the list of {@link Call} objects created/tracked by this client.
-         * @param calls
-         */
-        this.setCalls = (calls) => {
-            return this.setCurrentValue(this.callsSubject, calls);
-        };
-        /**
-         * Adds a {@link Call} object to the list of {@link Call} objects created/tracked by this client.
-         *
-         * @param call the call to add.
-         */
-        this.registerCall = (call) => {
-            if (!this.calls.find((c) => c.cid === call.cid)) {
-                this.setCalls((calls) => [...calls, call]);
-            }
-        };
-        /**
-         * Removes a {@link Call} object from the list of {@link Call} objects created/tracked by this client.
-         *
-         * @param call the call to remove
-         */
-        this.unregisterCall = (call) => {
-            return this.setCalls((calls) => calls.filter((c) => c !== call));
-        };
-        /**
-         * Finds a {@link Call} object in the list of {@link Call} objects created/tracked by this client.
-         *
-         * @param type the type of call to find.
-         * @param id the id of the call to find.
-         */
-        this.findCall = (type, id) => {
-            return this.calls.find((c) => c.type === type && c.id === id);
-        };
-        this.connectedUserSubject.subscribe((user) => __awaiter(this, void 0, void 0, function* () {
-            // leave all calls when the user disconnects.
-            if (!user) {
-                for (const call of this.calls) {
-                    yield call.leave();
-                }
-            }
-        }));
-        this.incomingCalls$ = this.callsSubject.pipe(combineLatestWith(this.connectedUserSubject), map$1(([calls, connectedUser]) => calls.filter((call) => {
-            const { metadata, callingState } = call.state;
-            return ((metadata === null || metadata === void 0 ? void 0 : metadata.created_by.id) !== (connectedUser === null || connectedUser === void 0 ? void 0 : connectedUser.id) &&
-                callingState === CallingState.RINGING);
-        })));
-        this.outgoingCalls$ = this.callsSubject.pipe(combineLatestWith(this.connectedUserSubject), map$1(([calls, connectedUser]) => calls.filter((call) => {
-            const { metadata, callingState } = call.state;
-            return ((metadata === null || metadata === void 0 ? void 0 : metadata.created_by.id) === (connectedUser === null || connectedUser === void 0 ? void 0 : connectedUser.id) &&
-                callingState === CallingState.RINGING);
-        })));
-    }
-    /**
-     * The currently connected user.
-     */
-    get connectedUser() {
-        return this.getCurrentValue(this.connectedUserSubject);
-    }
-    /**
-     * A list of {@link Call} objects created/tracked by this client.
-     */
-    get calls() {
-        return this.getCurrentValue(this.callsSubject);
-    }
-    /**
-     * A list of objects describing incoming calls.
-     * @deprecated derive from calls$ instead.
-     */
-    get incomingCalls() {
-        return this.getCurrentValue(this.incomingCalls$);
-    }
-    /**
-     * A list of objects describing calls initiated by the current user.
-     * @deprecated derive from calls$ instead.
-     */
-    get outgoingCalls() {
-        return this.getCurrentValue(this.outgoingCalls$);
-    }
-}
-/**
- * A reactive store that exposes state variables in a reactive manner.
- * You can subscribe to changes of the different state variables.
- * This central store contains all the state variables related to [`StreamVideoClient`](./StreamVideClient.md) and [`Call`](./Call.md).
- */
-class StreamVideoReadOnlyStateStore {
-    constructor(store) {
-        /**
-         * This method allows you the get the current value of a state variable.
-         *
-         * @param observable the observable to get the current value of.
-         * @returns the current value of the observable.
-         */
-        this.getCurrentValue = getCurrentValue;
-        // convert and expose subjects as observables
-        this.connectedUser$ = store.connectedUserSubject.asObservable();
-        this.calls$ = store.callsSubject.asObservable();
-        // re-expose observables
-        this.incomingCalls$ = store.incomingCalls$;
-        this.outgoingCalls$ = store.outgoingCalls$;
-    }
-    /**
-     * The current user connected over WS to the backend.
-     */
-    get connectedUser() {
-        return getCurrentValue(this.connectedUser$);
-    }
-    /**
-     * A list of {@link Call} objects created/tracked by this client.
-     */
-    get calls() {
-        return getCurrentValue(this.calls$);
-    }
-    /**
-     * A list of objects describing incoming calls.
-     * @deprecated derive from calls$ instead.
-     */
-    get incomingCalls() {
-        return getCurrentValue(this.incomingCalls$);
-    }
-    /**
-     * A list of objects describing calls initiated by the current user.
-     * @deprecated derive from calls$ instead.
-     */
-    get outgoingCalls() {
-        return getCurrentValue(this.outgoingCalls$);
-    }
-}
-
 /**
  * Event handler that watched the delivery of `call.accepted`.
  * Once the event is received, the call is joined.
@@ -10527,6 +10486,14 @@ class StreamClient {
         this.nextRequestAbortController = null;
         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
          *
@@ -10561,6 +10528,11 @@ 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;
             }
@@ -10659,6 +10631,11 @@ class StreamClient {
         this.connectAnonymousUser = (user, tokenOrProvider) => __awaiter(this, void 0, void 0, function* () {
             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
@@ -10668,6 +10645,9 @@ class StreamClient {
         this.doAxiosRequest = (type, url, data, options = {}) => __awaiter(this, void 0, void 0, function* () {
             var _g;
             if (!options.publicEndpoint || this.user) {
+                if (this.waitForConnectPromise) {
+                    yield this.waitForConnectPromise;
+                }
                 yield this.tokenManager.tokenReady();
             }
             const requestConfig = this._enrichAxiosOptions(options);
@@ -11022,7 +11002,7 @@ class StreamClient {
     }
     getUserAgent() {
         return (this.userAgent ||
-            `stream-video-javascript-client-${this.node ? 'node' : 'browser'}-${"0.0.10"}`);
+            `stream-video-javascript-client-${this.node ? 'node' : 'browser'}-${"0.0.12"}`);
     }
     setUserAgent(userAgent) {
         this.userAgent = userAgent;
@@ -11090,12 +11070,7 @@ class StreamClient {
  * A `StreamVideoClient` instance lets you communicate with our API, and authenticate users.
  */
 class StreamVideoClient {
-    /**
-     * You should create only one instance of `StreamVideoClient`.
-     * @param apiKey your Stream API key
-     * @param opts the options for the client.
-     */
-    constructor(apiKey, opts) {
+    constructor(apiKeyOrArgs, opts) {
         this.eventHandlersToUnregister = [];
         /**
          * Disconnects the currently connected user from the client.
@@ -11106,6 +11081,9 @@ 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) {
+                return;
+            }
             const disconnectUser = () => this.streamClient.disconnectUser(timeout);
             this.disconnectionPromise = this.connectionPromise
                 ? this.connectionPromise.then(() => disconnectUser())
@@ -11252,7 +11230,17 @@ class StreamVideoClient {
             this.connectionPromise.finally(() => (this.connectionPromise = undefined));
             return this.connectionPromise;
         });
-        this.streamClient = new StreamClient(apiKey, Object.assign({ persistUserOnConnectionFailure: true }, opts));
+        if (typeof apiKeyOrArgs === 'string') {
+            this.streamClient = new StreamClient(apiKeyOrArgs, Object.assign({ persistUserOnConnectionFailure: true }, opts));
+        }
+        else {
+            this.streamClient = new StreamClient(apiKeyOrArgs.apiKey, Object.assign({ persistUserOnConnectionFailure: true }, apiKeyOrArgs.options));
+            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);
     }
@@ -11262,23 +11250,28 @@ class StreamVideoClient {
      * If the connection is successful, the connected user [state variable](#readonlystatestore) will be updated accordingly.
      *
      * @param user the user to connect.
-     * @param tokenOrProvider a token or a function that returns a token.
+     * @param token a token or a function that returns a token.
      */
     connectUser(user, token) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (user.type === 'anonymous') {
-                user.id = '!anon';
-                return this.connectAnonymousUser(user, token);
+            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 (user.type === 'guest') {
+            if (userToConnect.type === 'guest') {
                 const response = yield this.createGuestUser({
-                    user: Object.assign(Object.assign({}, user), { role: 'guest' }),
+                    user: Object.assign(Object.assign({}, userToConnect), { role: 'guest' }),
                 });
                 return this.connectUser(response.user, response.access_token);
             }
             const connectUser = () => {
-                return this.streamClient.connectUser(user, token);
+                return this.streamClient.connectUser(userToConnect, tokenToUse);
             };
             this.connectionPromise = this.disconnectionPromise
                 ? this.disconnectionPromise.then(() => connectUser())
@@ -11312,7 +11305,7 @@ class StreamVideoClient {
                 if (event.type !== 'call.created')
                     return;
                 const { call, members } = event;
-                if (user.id === call.created_by.id) {
+                if (userToConnect.id === call.created_by.id) {
                     console.warn('Received `call.created` sent by the current user');
                     return;
                 }
@@ -11329,27 +11322,26 @@ class StreamVideoClient {
                 if (event.type !== 'call.ring')
                     return;
                 const { call, members } = event;
-                if (user.id === call.created_by.id) {
+                if (userToConnect.id === call.created_by.id) {
                     console.warn('Received `call.ring` sent by the current user');
                     return;
                 }
                 // The call might already be tracked by the client,
                 // if `call.created` was received before `call.ring`.
-                // In that case, we just reuse the already tracked call.
-                let theCall = this.writeableStateStore.findCall(call.type, call.id);
-                if (!theCall) {
-                    // otherwise, we create a new call
-                    theCall = new Call({
-                        streamClient: this.streamClient,
-                        type: call.type,
-                        id: call.id,
-                        members,
-                        clientStore: this.writeableStateStore,
-                        ringing: true,
-                    });
-                }
+                // In that case, we cleanup the already tracked call.
+                const prevCall = this.writeableStateStore.findCall(call.type, call.id);
+                yield (prevCall === null || prevCall === void 0 ? void 0 : prevCall.leave());
+                // we create a new call
+                const theCall = new Call({
+                    streamClient: this.streamClient,
+                    type: call.type,
+                    id: call.id,
+                    members,
+                    clientStore: this.writeableStateStore,
+                    ringing: true,
+                });
                 // we fetch the latest metadata for the call from the server
-                yield theCall.get({ ring: true });
+                yield theCall.get();
                 this.writeableStateStore.registerCall(theCall);
             })));
             return connectUserResponse;