chore: fix multiple login attempt (#40)

Co-authored-by: Diego Sampaio <[email protected]>
RocketChat · Jul 7, 2023 · d50a3ae · d50a3ae
1 parent 9f46753
commit d50a3ae
Show file tree

Hide file tree

Showing 6 changed files with 192 additions and 136 deletions.
diff --git a/src/client/Client.ts b/src/client/Client.ts
@@ -31,7 +31,9 @@ const useSsl = typeof SSL_ENABLED !== 'undefined' ? ['yes', 'true'].includes(SSL
 export type ClientType = 'web' | 'android' | 'ios';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-interface ClientLoadTest {
+export interface ClientLoadTest {
+	status: 'logged' | 'not-logged' | 'logging';
+
 	joinRoom(rid: string): Promise<void>;
 
 	setStatus(): Promise<void>;
@@ -84,8 +86,6 @@ export class Client implements ClientLoadTest {
 
 	subscribedToLivechat = false;
 
-	loggedIn = false;
-
 	constructor(
 		host: string,
 		type: 'web' | 'android' | 'ios',
@@ -116,6 +116,8 @@ export class Client implements ClientLoadTest {
 		this.subscribe = prom.promWrapperSubscribe((...args) => this.client.subscribe(...args));
 	}
 
+	status: 'logged' | 'not-logged' | 'logging' = 'not-logged';
+
 	get: IAPIRequest;
 
 	post: IAPIRequest;
@@ -220,7 +222,7 @@ export class Client implements ClientLoadTest {
 
 		await Promise.all(this.getLoginMethods().map((params) => this.client.methodCall(...params)));
 
-		this.loggedIn = true;
+		this.status = 'logged';
 	}
 
 	async listenPresence(_userIds: string[]): Promise<void> {

diff --git a/src/client/Omnichannel.ts b/src/client/Omnichannel.ts
@@ -13,7 +13,7 @@ export class OmnichannelClient extends Client {
 	}
 
 	async getRoutingConfig(): Promise<{ [k: string]: string } | undefined> {
-		if (!this.loggedIn) {
+		if (this.status === 'logging') {
 			await this.login();
 		}
 
@@ -29,7 +29,7 @@ export class OmnichannelClient extends Client {
 	}
 
 	async getAgentDepartments(): Promise<{ departments: Department[] } | undefined> {
-		if (!this.loggedIn) {
+		if (this.status === 'logging') {
 			await this.login();
 		}
 
@@ -45,7 +45,7 @@ export class OmnichannelClient extends Client {
 	}
 
 	async getQueuedInquiries(): Promise<{ inquiries: Inquiry[] } | undefined> {
-		if (!this.loggedIn) {
+		if (this.status === 'logging') {
 			await this.login();
 		}
 
@@ -65,7 +65,7 @@ export class OmnichannelClient extends Client {
 			return;
 		}
 
-		if (!this.loggedIn) {
+		if (this.status === 'logging') {
 			await this.login();
 		}
 
@@ -86,7 +86,7 @@ export class OmnichannelClient extends Client {
 	}
 
 	async takeInquiry(id: string): Promise<void> {
-		if (!this.loggedIn) {
+		if (this.status === 'logging') {
 			await this.login();
 		}
 
@@ -105,7 +105,7 @@ export class OmnichannelClient extends Client {
 	}
 
 	async getInquiry(id: string): Promise<Inquiry | undefined> {
-		if (!this.loggedIn) {
+		if (this.status === 'logging') {
 			await this.login();
 		}
 
@@ -123,7 +123,7 @@ export class OmnichannelClient extends Client {
 	}
 
 	async getVisitorInfo(vid: string): Promise<Visitor | undefined> {
-		if (!this.loggedIn) {
+		if (this.status === 'logging') {
 			await this.login();
 		}
 
@@ -140,7 +140,7 @@ export class OmnichannelClient extends Client {
 	}
 
 	async openLivechatRoom(rid: string, vid: string): Promise<void> {
-		if (!this.loggedIn) {
+		if (this.status === 'logging') {
 			await this.login();
 		}
 

diff --git a/src/client/WebClient.ts b/src/client/WebClient.ts
@@ -26,82 +26,79 @@ export class WebClient extends Client {
 	@suppressError
 	@action
 	async login(): Promise<void> {
-		if (this.loginPromise) {
-			return this.loginPromise;
+		if (this.status === 'logged') {
+			throw new Error('Already logged in');
 		}
 
-		this.loginPromise = new Promise(async (resolve, reject) => {
-			const { credentials } = this;
-
-			try {
-				await this.beforeLogin();
-
-				const user = await this.client.login(credentials);
-
-				// await this.subscribeLoggedNotify();
-				await Promise.all(
-					[
-						'deleteCustomSound',
-						'updateCustomSound',
-						'updateEmojiCustom',
-						'deleteEmojiCustom',
-						'deleteCustomUserStatus',
-						'updateCustomUserStatus',
-						'banner-changed',
-						'updateAvatar',
-						'Users:NameChanged',
-						'Users:Deleted',
-						'roles-change',
-						'voip.statuschanged',
-						'permissions-changed',
-					].map((event) => this.subscribe('stream-notify-logged', event, false)),
-				);
-
-				// await subscribeNotifyUser();
-				await Promise.all(
-					[
-						'uiInteraction',
-						'video-conference',
-						'force_logout',
-						'message',
-						'subscriptions-changed',
-						'notification',
-						'otr',
-						'rooms-changed',
-						'webrtc',
-						'userData',
-					].map((event) => this.subscribe('stream-notify-user', `${user.id}/${event}`, false)),
-				);
-
-				await Promise.all(
-					[
-						'app/added',
-						'app/removed',
-						'app/updated',
-						'app/settingUpdated',
-						'command/added',
-						'command/disabled',
-						'command/updated',
-						'command/removed',
-						'actions/changed',
-					].map((event) => this.subscribe('stream-apps', event, false)),
-				);
-
-				await Promise.all(this.getLoginMethods().map((params) => this.methodViaRest(...params)));
-
-				const subscriptions = await this.methodViaRest('subscriptions/get', {});
-
-				this.subscriptions = subscriptions as unknown as Subscription[];
-
-				this.loggedIn = true;
-
-				resolve();
-			} catch (error) {
-				reject({ error, credentials });
-			}
-		});
-
-		return this.loginPromise;
+		if (this.status === 'logging') {
+			throw new Error('Already logging in');
+		}
+
+		// TODO if an error happens, we should rollback the status to not-logged
+		this.status = 'logging';
+
+		const { credentials } = this;
+
+		await this.beforeLogin();
+
+		const user = await this.client.login(credentials);
+
+		// await this.subscribeLoggedNotify();
+		await Promise.all(
+			[
+				'deleteCustomSound',
+				'updateCustomSound',
+				'updateEmojiCustom',
+				'deleteEmojiCustom',
+				'deleteCustomUserStatus',
+				'updateCustomUserStatus',
+				'banner-changed',
+				'updateAvatar',
+				'Users:NameChanged',
+				'Users:Deleted',
+				'roles-change',
+				'voip.statuschanged',
+				'permissions-changed',
+			].map((event) => this.subscribe('stream-notify-logged', event, false)),
+		);
+
+		// await subscribeNotifyUser();
+		await Promise.all(
+			[
+				'uiInteraction',
+				'video-conference',
+				'force_logout',
+				'message',
+				'subscriptions-changed',
+				'notification',
+				'otr',
+				'rooms-changed',
+				'webrtc',
+				'userData',
+			].map((event) => this.subscribe('stream-notify-user', `${user.id}/${event}`, false)),
+		);
+
+		await Promise.all(
+			[
+				'app/added',
+				'app/removed',
+				'app/updated',
+				'app/settingUpdated',
+				'command/added',
+				'command/disabled',
+				'command/updated',
+				'command/removed',
+				'actions/changed',
+			].map((event) => this.subscribe('stream-apps', event, false)),
+		);
+
+		await Promise.all(this.getLoginMethods().map((params) => this.methodViaRest(...params)));
+
+		const subscriptions = await this.methodViaRest('subscriptions/get', {});
+
+		this.subscriptions = subscriptions as unknown as Subscription[];
+
+		this.status = 'logged';
 	}
 
 	@suppressError

diff --git a/src/errors/AlreadyLoggingError.ts b/src/errors/AlreadyLoggingError.ts
@@ -0,0 +1,5 @@
+export class AlreadyLoggingError extends Error {
+	constructor() {
+		super('Already logging');
+	}
+}
diff --git a/src/lib/prom.ts b/src/lib/prom.ts
@@ -75,6 +75,24 @@ export default client;
 
 export { client };
 
+const promWrapperBase =
+	<P extends client.Summary>(prom: P) =>
+	<F extends (...args: any[]) => Promise<any>>(action: string, fn: F): F => {
+		return (async (...args: any[]) => {
+			const endTimer = prom.startTimer({ action });
+			try {
+				const result = await fn(...args);
+				endTimer({ status: 'success' });
+				return result;
+			} catch (e) {
+				endTimer({ status: 'error' });
+				throw e;
+			}
+		}) as unknown as F;
+	};
+
+export const promWrapperAction = promWrapperBase(actions);
+
 export const promWrapperRest = <F extends (endpoint: string, ...args: any[]) => Promise<any>>(method: string, fn: F): F => {
 	return (async (url: string, ...args: any[]) => {
 		const [endpoint] = url.split('?');