@stream-io/video-client 0.1.4 → 0.1.6

package/src/__tests__/server-side/create-token.test.ts

@@ -0,0 +1,44 @@
+import 'dotenv/config';
+import jwt from 'jsonwebtoken';
+import { beforeAll, describe, expect, it } from 'vitest';
+import { StreamVideoServerClient } from '../../StreamVideoServerClient';
+
+const apiKey = process.env.STREAM_API_KEY!;
+const secret = process.env.STREAM_SECRET!;
+
+describe('creating tokens', () => {
+  let client: StreamVideoServerClient;
+  const userId = 'john';
+
+  beforeAll(() => {
+    client = new StreamVideoServerClient(apiKey, {
+      secret,
+      logLevel: 'error',
+    });
+  });
+
+  it('with no expiration', () => {
+    const token = client.createToken(userId);
+    const decodedToken = jwt.verify(token, secret) as any;
+
+    expect(decodedToken.user_id).toBe(userId);
+  });
+
+  it('with expiration and issued at provided', () => {
+    const exp = Math.round(new Date().getTime() / 1000) + 60 * 60;
+    const iat = Math.round(new Date().getTime() / 1000);
+    const token = client.createToken(userId, exp, iat);
+    const decodedToken = jwt.verify(token, secret) as any;
+
+    expect(decodedToken.exp).toBe(exp);
+    expect(decodedToken.iat).toBe(iat);
+  });
+
+  it('with call IDs provided', () => {
+    const call_cids = ['default:call1', 'livestream:call2'];
+    const token = client.createToken(userId, undefined, undefined, call_cids);
+    const decodedToken = jwt.verify(token, secret) as any;
+
+    expect(decodedToken.call_cids).toEqual(call_cids);
+  });
+});

package/src/__tests__/server-side/server-side-user.test.ts

@@ -0,0 +1,28 @@
+import 'dotenv/config';
+import { beforeEach, describe, expect, it } from 'vitest';
+import { StreamVideoServerClient } from '../../StreamVideoServerClient';
+
+const apiKey = process.env.STREAM_API_KEY!;
+const secret = process.env.STREAM_SECRET!;
+
+describe('server side user connect', () => {
+  let client: StreamVideoServerClient;
+
+  beforeEach(() => {
+    client = new StreamVideoServerClient(apiKey, {
+      browser: false,
+      secret,
+      allowServerSideConnect: true,
+    });
+  });
+
+  it('hold up API requests until connect is ready', async () => {
+    const userId = 'server-side-test';
+    const token = client.createToken(userId);
+    client.connectUser({ id: userId }, token);
+
+    const response = await client.queryCalls({});
+
+    expect(response).toBeDefined();
+  });
+});

package/src/coordinator/connection/client.ts

@@ -71,8 +71,6 @@ export class StreamClient {
   rejectConnectionId?: Function;
   connectionIdPromise?: Promise<string | undefined>;
   private nextRequestAbortController: AbortController | null = null;
-  private waitForConnectPromise?: Promise<void>;
-  private resolveConnectPromise?: Function;
 
   /**
    * Initialize a client.
@@ -201,15 +199,6 @@ export class StreamClient {
 
   _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`
-   */
-  startWaitingForConnection = () => {
-    this.waitForConnectPromise = new Promise((resolve) => {
-      this.resolveConnectPromise = resolve;
-    });
-  };
-
   /**
    * connectUser - Set the current user and open a WebSocket connection
    *
@@ -271,12 +260,6 @@ export class StreamClient {
       (result) => result[1], // We only return connection promise;
     );
 
-    if (this.resolveConnectPromise) {
-      this.resolveConnectPromise();
-      this.waitForConnectPromise = undefined;
-      this.resolveConnectPromise = undefined;
-    }
-
     try {
       return await this.setUserPromise;
     } catch (err) {
@@ -436,11 +419,6 @@ export class StreamClient {
     this.anonymous = true;
     await 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
@@ -526,9 +504,6 @@ export class StreamClient {
         response,
       },
     );
-    this.logger('trace', `client:${type} - Response payload`, {
-      response,
-    });
   };
 
   _logApiError = (type: string, url: string, error: unknown) => {
@@ -547,9 +522,6 @@ export class StreamClient {
     } & { publicEndpoint?: boolean } = {},
   ): Promise<T> => {
     if (!options.publicEndpoint) {
-      if (this.waitForConnectPromise) {
-        await this.waitForConnectPromise;
-      }
       await Promise.all([
         this.tokenManager.tokenReady(),
         this.connectionIdPromise,
@@ -587,9 +559,9 @@ export class StreamClient {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any /**TODO: generalize error types  */) {
       e.client_request_id = requestConfig.headers?.['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 &&
@@ -603,6 +575,7 @@ export class StreamClient {
         }
         return this.handleResponse(e.response);
       } else {
+        this._logApiError(type, url, e);
         // eslint-disable-next-line no-throw-literal
         throw e as AxiosError<APIErrorResponse>;
       }

package/src/__tests__/StreamVideoServerClient.test.ts

@@ -1,110 +0,0 @@
-import { StreamVideoServerClient } from '../StreamVideoServerClient';
-import 'dotenv/config';
-import jwt from 'jsonwebtoken';
-import { beforeEach, describe, expect, it } from 'vitest';
-import { generateUUIDv4 } from '../coordinator/connection/utils';
-
-const apiKey = process.env.STREAM_API_KEY!;
-const secret = process.env.STREAM_SECRET!;
-
-describe('StreamVideoServerClient - docs snippets', () => {
-  let client: StreamVideoServerClient;
-
-  beforeEach(() => {
-    client = new StreamVideoServerClient(apiKey, {
-      secret,
-      // turn off
-      logger: () => {},
-    });
-  });
-
-  describe('creating tokens', () => {
-    const userId = 'john';
-
-    it('with no expiration', () => {
-      const token = client.createToken(userId);
-      const decodedToken = jwt.verify(token, secret) as any;
-
-      expect(decodedToken.user_id).toBe(userId);
-    });
-
-    it('with expiration and issued at provided', () => {
-      const exp = Math.round(new Date().getTime() / 1000) + 60 * 60;
-      const iat = Math.round(new Date().getTime() / 1000);
-      const token = client.createToken(userId, exp, iat);
-      const decodedToken = jwt.verify(token, secret) as any;
-
-      expect(decodedToken.exp).toBe(exp);
-      expect(decodedToken.iat).toBe(iat);
-    });
-
-    it('with call IDs provided', () => {
-      const call_cids = ['default:call1', 'livestream:call2'];
-      const token = client.createToken(userId, undefined, undefined, call_cids);
-      const decodedToken = jwt.verify(token, secret) as any;
-
-      expect(decodedToken.call_cids).toEqual(call_cids);
-    });
-  });
-
-  describe('call type CRUD API', () => {
-    const callTypeName = `calltype${generateUUIDv4()}`;
-
-    it('create', async () => {
-      const createResponse = await client.createCallType({
-        name: callTypeName,
-      });
-
-      expect(createResponse.name).toBe(callTypeName);
-    });
-
-    it('read', async () => {
-      const readResponse = await client.getCallTypes();
-
-      expect(readResponse.call_types[callTypeName]).toContain({
-        name: callTypeName,
-      });
-    });
-
-    it('update', async () => {
-      const updateResponse = await client.updateCallType(callTypeName, {
-        settings: {
-          audio: { mic_default_on: false, default_device: 'earpiece' },
-        },
-      });
-
-      expect(updateResponse.settings.audio.mic_default_on).toBeFalsy();
-      expect(updateResponse.settings.audio.default_device).toBe('earpiece');
-    });
-
-    it('delete', async () => {
-      await client.deleteCallType(callTypeName);
-
-      await expect(() =>
-        client.getCallType(callTypeName),
-      ).rejects.toThrowError();
-    });
-  });
-});
-
-describe('StreamVideoServerClient - server side user connect', () => {
-  let client: StreamVideoServerClient;
-
-  beforeEach(() => {
-    client = new StreamVideoServerClient(apiKey, {
-      browser: false,
-      secret,
-      allowServerSideConnect: true,
-    });
-  });
-
-  it('hold up API requests until connect is ready', async () => {
-    const userId = 'server-side-test';
-    const token = client.createToken(userId);
-    client.connectUser({ id: userId }, token);
-
-    const response = await client.queryCalls({});
-
-    expect(response).toBeDefined();
-  });
-});