Merge pull request #726 from SuperViz/feat/same-account-error-ioc

feat: add same account validation

Author: carlossantos74

src/core/launcher/index.test.ts

@@ -50,6 +50,9 @@ describe('Launcher', () => {
     localParticipant.value = MOCK_LOCAL_PARTICIPANT;
 
     LauncherInstance = new Launcher(DEFAULT_INITIALIZATION_MOCK);
+
+    const { hasJoinedRoom } = useStore(StoreType.GLOBAL);
+    hasJoinedRoom.publish(true);
   });
 
   test('should be defined', () => {

src/core/launcher/index.ts

@@ -184,6 +184,7 @@ export class Launcher extends Observable implements DefaultLauncher {
     this.room?.presence.off(Socket.PresenceEvents.JOINED_ROOM);
     this.room?.presence.off(Socket.PresenceEvents.LEAVE);
     this.room?.presence.off(Socket.PresenceEvents.UPDATE);
+    this.ioc.stateSubject.unsubscribe();
     this.ioc?.destroy();
 
     this.isDestroyed = true;
@@ -294,13 +295,8 @@ export class Launcher extends Observable implements DefaultLauncher {
   private startIOC = (): void => {
     this.logger.log('launcher service @ startIOC');
     const { participants } = useStore(StoreType.GLOBAL);
-    // retrieve the current participants in the room
 
-    this.ioc.stateSubject.subscribe((state) => {
-      if (state === IOCState.AUTH_ERROR) {
-        this.onAuthentication(false);
-      }
-    });
+    this.ioc.stateSubject.subscribe(this.onConnectionStateChange);
     this.room.presence.get((presences) => {
       const participantsMap: Record<string, Participant> = {};
 
@@ -327,9 +323,24 @@ export class Launcher extends Observable implements DefaultLauncher {
     );
     this.room.presence.on<Participant>(Socket.PresenceEvents.LEAVE, this.onParticipantLeaveIOC);
     this.room.presence.on<Participant>(Socket.PresenceEvents.UPDATE, this.onParticipantUpdatedIOC);
+  };
 
-    const { hasJoinedRoom } = useStore(StoreType.GLOBAL);
-    hasJoinedRoom.publish(true);
+  /**
+   * @function onConnectionStateChange
+   * @description on connection state change
+   * @param state - connection state
+   * @returns {void}
+   */
+  private onConnectionStateChange = (state: IOCState): void => {
+    if (state === IOCState.AUTH_ERROR) {
+      this.onAuthentication(false);
+      return;
+    }
+
+    if (state === IOCState.SAME_ACCOUNT_ERROR) {
+      this.onSameAccount();
+      return;
+    }
   };
 
   /**
@@ -347,6 +358,9 @@ export class Launcher extends Observable implements DefaultLauncher {
 
     this.logger.log('launcher service @ onParticipantJoined - local participant joined');
 
+    const { hasJoinedRoom } = useStore(StoreType.GLOBAL);
+    hasJoinedRoom.publish(true);
+
     this.attachComponentsAfterJoin();
     this.publish(ParticipantEvent.LOCAL_JOINED, this.participant);
     this.publish(ParticipantEvent.JOINED, this.participant);

src/lib/socket/connection/index.ts

@@ -3,7 +3,6 @@ import type { Socket } from 'socket.io-client';
 
 import { ErrorCallback } from '../common/types/callbacks.types';
 
-
 import { ClientState, ConnectionState, SocketErrorEvent, SocketEvent } from './types';
 import { Logger } from '../../../common/utils';
 
@@ -116,13 +115,19 @@ export class ClientConnection {
   private onCustomError = (error: SocketErrorEvent) => {
     if (error.needsToDisconnect) {
       this.socket.disconnect();
+      this.changeState(ClientState.DISCONNECTED, error.errorType);
     }
 
+    const logMessage = `[SuperViz] 
+    - Error: ${error.errorType}
+    - Message: ${error.message}
+    `;
+
     if (error.level === 'error') {
-      console.error('[SuperViz - Error]', 'Type: ', error.errorType, 'Message :', error.message);
+      console.error(logMessage);
       return;
     }
 
-    console.warn('[SuperViz - Warning]', 'Type: ', error.errorType, 'Message :', error.message);
+    console.warn(logMessage);
   };
 }

src/lib/socket/connection/types.ts

@@ -29,7 +29,11 @@ export interface ConnectionState {
 }
 
 export type SocketErrorEvent = {
-  errorType: 'message-size-limit' | 'rate-limit' | 'room-connections-limit';
+  errorType:
+    | 'message-size-limit'
+    | 'rate-limit'
+    | 'room-connections-limit'
+    | 'user-already-in-room';
   message: string;
   connectionId: string;
   needsToDisconnect: boolean;

src/services/io/index.ts

@@ -35,18 +35,6 @@ export class IOC {
   }
 
   private handleConnectionState = (state: Socket.ConnectionState): void => {
-    // const needsToReconnectStates = [
-    //   Socket.ClientState.DISCONNECTED,
-    //   Socket.ClientState.RECONNECT_ERROR,
-    // ];
-
-    // if (
-    //   needsToReconnectStates.includes(state.state) &&
-    //   !['io client disconnect', 'Unauthorized connection'].includes(state.reason)
-    // ) {
-    //   this.forceReconnect();
-    // }
-
     if (state.reason === 'Unauthorized connection') {
       console.error(
         '[Superviz] Unauthorized connection. Please check your API key and if your domain is white listed.',
@@ -62,22 +50,16 @@ export class IOC {
       return;
     }
 
+    if (state.reason === 'user-already-in-room') {
+      this.state = state;
+      this.stateSubject.next(IOCState.SAME_ACCOUNT_ERROR);
+      return;
+    }
+
     this.state = state;
     this.stateSubject.next(state.state as unknown as IOCState);
   };
 
-  /**
-   * @function forceReconnect
-   * @description force the socket to reconnect
-   * @returns {void}
-   */
-  private forceReconnect(): void {
-    this.client?.destroy();
-    this.client = null;
-
-    this.createClient();
-  }
-
   /**
    * @function createClient
    * @description create a new socket client

src/services/io/types.ts

@@ -6,4 +6,5 @@ export enum IOCState {
   RECONNECTING = 'RECONNECTING',
   RECONNECT_ERROR = 'RECONNECT_ERROR',
   AUTH_ERROR = 'AUTH_ERROR',
+  SAME_ACCOUNT_ERROR = 'SAME_ACCOUNT_ERROR',
 }