Skip to content

Commit

Permalink
refactor: sockets constant values
Browse files Browse the repository at this point in the history
  • Loading branch information
@adarshaacharya
adarshaacharya committed Aug 7, 2021
1 parent 222110b commit 35230cd
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 64 deletions.
7 changes: 6 additions & 1 deletion client/src/components/Room/RoomCodeExec/RoomCodeExec.tsx
View file
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
41 changes: 22 additions & 19 deletions client/src/constants/sockets.ts
View file
Original file line number Diff line number Diff line change
@@ -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`;
68 changes: 26 additions & 42 deletions server/constants/sockets.ts
View file
Original file line number Diff line number Diff line change
@@ -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`;
4 changes: 2 additions & 2 deletions server/controllers/room.controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ 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';

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
Expand Down

0 comments on commit 35230cd

Please sign in to comment.