From 35230cd021df07517ae55f5451df7caf434863dc Mon Sep 17 00:00:00 2001 From: Aadarsha Acharya Date: Sat, 7 Aug 2021 07:39:39 +0545 Subject: [PATCH] refactor: sockets constant values --- .../Room/RoomCodeExec/RoomCodeExec.tsx | 7 +- client/src/constants/sockets.ts | 41 +++++------ server/constants/sockets.ts | 68 +++++++------------ server/controllers/room.controller.ts | 4 +- 4 files changed, 56 insertions(+), 64 deletions(-) diff --git a/client/src/components/Room/RoomCodeExec/RoomCodeExec.tsx b/client/src/components/Room/RoomCodeExec/RoomCodeExec.tsx index 27117d2..cffbfc8 100755 --- a/client/src/components/Room/RoomCodeExec/RoomCodeExec.tsx +++ b/client/src/components/Room/RoomCodeExec/RoomCodeExec.tsx @@ -1,7 +1,12 @@ import { CaretRightOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import socket from 'config/socket/socket'; -import { SOCKETS_EVENTS_REALTIME_LOADING, SOCKETS_EVENTS_REALTIME_RUN, SOCKETS_EVENTS_UPDATE_LOADING, SOCKETS_EVENTS_UPDATE_OUTPUT } from 'constants/sockets'; +import { + SOCKETS_EVENTS_REALTIME_LOADING, + SOCKETS_EVENTS_REALTIME_RUN, + SOCKETS_EVENTS_UPDATE_LOADING, + SOCKETS_EVENTS_UPDATE_OUTPUT, +} from 'constants/sockets'; import React from 'react'; import { useRoomContext } from '_context/room/room.context'; import { IOutput } from '_context/room/room.type'; diff --git a/client/src/constants/sockets.ts b/client/src/constants/sockets.ts index 02b2b54..c223af1 100644 --- a/client/src/constants/sockets.ts +++ b/client/src/constants/sockets.ts @@ -1,23 +1,26 @@ -export const SOCKETS_EVENT_CONNECTED = `connection`; -export const SOCKETS_EVENT_DISCONNECTED = 'disconnect'; +export const SOCKETS_EVENT = `socket.event`; -export const SOCKETS_EVENT_USER_JOINED = 'join:room'; -export const SOCKETS_EVENT_USER_LEFT = 'leave:room'; +export const SOCKETS_EVENT_CONNECTED = `${SOCKETS_EVENT}.connection`; +export const SOCKETS_EVENT_DISCONNECTED = `${SOCKETS_EVENT}.disconnect`; +export const SOCKETS_EVENT_CONNECTION_ERROR = `${SOCKETS_EVENT}.connection.error`; -export const SOCKETS_EVENT_CREATE_ROOM = 'create:room'; -export const SOCKETS_EVENT_UPDATE_ROOM = 'update:room'; +export const SOCKETS_EVENT_USER_JOINED = `${SOCKETS_EVENT}.join.room`; +export const SOCKETS_EVENT_USER_LEFT = `${SOCKETS_EVENT}.leave.room`; -export const SOCKETS_EVENT_REALTIME_LANGUAGE = 'realtime:lang'; -export const SOCKETS_EVENT_REALTIME_CODE = 'realtime:code'; -export const SOCKETS_EVENT_REALTIME_INPUT = 'realtime:input'; -export const SOCKETS_EVENTS_REALTIME_OUTPUT = 'realtime:output'; -export const SOCKETS_EVENTS_REALTIME_RUN = 'realtime:run'; -export const SOCKETS_EVENTS_REALTIME_MESSAGE = 'realtime:message'; -export const SOCKETS_EVENTS_REALTIME_LOADING = 'realtime:loading'; +export const SOCKETS_EVENT_CREATE_ROOM = `${SOCKETS_EVENT}.create.room`; +export const SOCKETS_EVENT_UPDATE_ROOM = `${SOCKETS_EVENT}.update.room`; -export const SOCKETS_EVENT_UPDATE_LANGUAGE = 'update:lang'; -export const SOCKETS_EVENT_UPDATE_CODE = 'update:code'; -export const SOCKETS_EVENT_UPDATE_INPUT = 'update:input'; -export const SOCKETS_EVENTS_UPDATE_OUTPUT = 'update:output'; -export const SOCKETS_EVENTS_UPDATE_LOADING = 'update:loading'; -export const SOCKETS_EVENT_UPDATE_MESSAGE = 'update:message'; +export const SOCKETS_EVENT_REALTIME_LANGUAGE = `${SOCKETS_EVENT}.realtime.lang`; +export const SOCKETS_EVENT_REALTIME_CODE = `${SOCKETS_EVENT}.realtime.code`; +export const SOCKETS_EVENT_REALTIME_INPUT = `${SOCKETS_EVENT}.realtime.input`; +export const SOCKETS_EVENTS_REALTIME_OUTPUT = `${SOCKETS_EVENT}.realtime.output`; +export const SOCKETS_EVENTS_REALTIME_RUN = `${SOCKETS_EVENT}.realtime.run`; +export const SOCKETS_EVENTS_REALTIME_MESSAGE = `${SOCKETS_EVENT}.realtime.message`; +export const SOCKETS_EVENTS_REALTIME_LOADING = `${SOCKETS_EVENT}.realtime.loading`; + +export const SOCKETS_EVENT_UPDATE_LANGUAGE = `${SOCKETS_EVENT}.update.lang`; +export const SOCKETS_EVENT_UPDATE_CODE = `${SOCKETS_EVENT}.update.code`; +export const SOCKETS_EVENT_UPDATE_INPUT = `${SOCKETS_EVENT}.update.input`; +export const SOCKETS_EVENTS_UPDATE_OUTPUT = `${SOCKETS_EVENT}.update.output`; +export const SOCKETS_EVENTS_UPDATE_LOADING = `${SOCKETS_EVENT}.update.loading`; +export const SOCKETS_EVENT_UPDATE_MESSAGE = `${SOCKETS_EVENT}.update.message`; diff --git a/server/constants/sockets.ts b/server/constants/sockets.ts index e665ee5..c223af1 100644 --- a/server/constants/sockets.ts +++ b/server/constants/sockets.ts @@ -1,42 +1,26 @@ -/** - * sockets name - */ -export const SOCKETS_EVENT = 'socket:event'; - -/** - * sockets event: user joined - */ -// export const SOCKETS_EVENT_USER_JOINED = `${SOCKETS_EVENT}.user.joined`; - -/** - * sockets event: user left - */ -// export const SOCKETS_EVENT_USER_LEFT = `${SOCKETS_EVENT}.user.left`; - -// export const SOCKETS_EVENT_CONNECTED = `${SOCKETS_EVENT}.connected`; -// export const SOCKETS_EVENT_DISCONNECTED = `${SOCKETS_EVENT}.disconnected`; -// export const SOCKETS_EVENT_CONNECTION_ERROR = `${SOCKETS_EVENT}.connection.error`; - -export const SOCKETS_EVENT_CONNECTED = `connection`; -export const SOCKETS_EVENT_DISCONNECTED = 'disconnect'; - -export const SOCKETS_EVENT_USER_JOINED = 'join:room'; -export const SOCKETS_EVENT_USER_LEFT = 'leave:room'; - -export const SOCKETS_EVENT_CREATE_ROOM = 'create:room'; -export const SOCKETS_EVENT_UPDATE_ROOM = 'update:room'; - -export const SOCKETS_EVENT_REALTIME_LANGUAGE = 'realtime:lang'; -export const SOCKETS_EVENT_REALTIME_CODE = 'realtime:code'; -export const SOCKETS_EVENT_REALTIME_INPUT = 'realtime:input'; -export const SOCKETS_EVENTS_REALTIME_OUTPUT = 'realtime:output'; -export const SOCKETS_EVENTS_REALTIME_RUN = 'realtime:run'; -export const SOCKETS_EVENTS_REALTIME_MESSAGE = 'realtime:message'; -export const SOCKETS_EVENTS_REALTIME_LOADING = 'realtime:loading'; - -export const SOCKETS_EVENT_UPDATE_LANGUAGE = 'update:lang'; -export const SOCKETS_EVENT_UPDATE_CODE = 'update:code'; -export const SOCKETS_EVENT_UPDATE_INPUT = 'update:input'; -export const SOCKETS_EVENTS_UPDATE_OUTPUT = 'update:output'; -export const SOCKETS_EVENTS_UPDATE_LOADING = 'update:loading'; -export const SOCKETS_EVENT_UPDATE_MESSAGE = 'update:message'; +export const SOCKETS_EVENT = `socket.event`; + +export const SOCKETS_EVENT_CONNECTED = `${SOCKETS_EVENT}.connection`; +export const SOCKETS_EVENT_DISCONNECTED = `${SOCKETS_EVENT}.disconnect`; +export const SOCKETS_EVENT_CONNECTION_ERROR = `${SOCKETS_EVENT}.connection.error`; + +export const SOCKETS_EVENT_USER_JOINED = `${SOCKETS_EVENT}.join.room`; +export const SOCKETS_EVENT_USER_LEFT = `${SOCKETS_EVENT}.leave.room`; + +export const SOCKETS_EVENT_CREATE_ROOM = `${SOCKETS_EVENT}.create.room`; +export const SOCKETS_EVENT_UPDATE_ROOM = `${SOCKETS_EVENT}.update.room`; + +export const SOCKETS_EVENT_REALTIME_LANGUAGE = `${SOCKETS_EVENT}.realtime.lang`; +export const SOCKETS_EVENT_REALTIME_CODE = `${SOCKETS_EVENT}.realtime.code`; +export const SOCKETS_EVENT_REALTIME_INPUT = `${SOCKETS_EVENT}.realtime.input`; +export const SOCKETS_EVENTS_REALTIME_OUTPUT = `${SOCKETS_EVENT}.realtime.output`; +export const SOCKETS_EVENTS_REALTIME_RUN = `${SOCKETS_EVENT}.realtime.run`; +export const SOCKETS_EVENTS_REALTIME_MESSAGE = `${SOCKETS_EVENT}.realtime.message`; +export const SOCKETS_EVENTS_REALTIME_LOADING = `${SOCKETS_EVENT}.realtime.loading`; + +export const SOCKETS_EVENT_UPDATE_LANGUAGE = `${SOCKETS_EVENT}.update.lang`; +export const SOCKETS_EVENT_UPDATE_CODE = `${SOCKETS_EVENT}.update.code`; +export const SOCKETS_EVENT_UPDATE_INPUT = `${SOCKETS_EVENT}.update.input`; +export const SOCKETS_EVENTS_UPDATE_OUTPUT = `${SOCKETS_EVENT}.update.output`; +export const SOCKETS_EVENTS_UPDATE_LOADING = `${SOCKETS_EVENT}.update.loading`; +export const SOCKETS_EVENT_UPDATE_MESSAGE = `${SOCKETS_EVENT}.update.message`; diff --git a/server/controllers/room.controller.ts b/server/controllers/room.controller.ts index de9a0ee..9ac7f8a 100755 --- a/server/controllers/room.controller.ts +++ b/server/controllers/room.controller.ts @@ -20,7 +20,7 @@ import { SOCKETS_EVENT_USER_LEFT, } from '../constants/sockets'; import mongoose from 'mongoose'; -import socketIO from 'socket.io'; +import socketIO, { Socket } from 'socket.io'; import Room from '../models/room.model'; import getExtension from '../utils/lang-to-extension'; @@ -28,7 +28,7 @@ const socketio = (server: any) => { const io = socketIO(server); // socket config - io.on(SOCKETS_EVENT_CONNECTED, socket => { + io.on(SOCKETS_EVENT_CONNECTED, (socket : Socket) => { console.log('✅ Connected to room.'); // create new room