Skip to content
This repository has been archived by the owner on Nov 10, 2022. It is now read-only.

Commit

Permalink
refactor: separate events to the server and to the client
Browse files Browse the repository at this point in the history
  • Loading branch information
severo committed Jan 21, 2020
1 parent 4922148 commit cae7315
Show file tree
Hide file tree
Showing 19 changed files with 54 additions and 47 deletions.
5 changes: 0 additions & 5 deletions src/domain/events/connection.event.ts

This file was deleted.

16 changes: 2 additions & 14 deletions src/domain/events/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,2 @@
export * from './connection.event'
// export * from './disconnection.event'

// export * from './join.room.event'
// export * from "./leave.room.event";
// export * from "./list.room.guests.event";
// export * from "./kick.room.guest.event";

// export * from "./list.rooms.event";
export * from './update.user.name.event'
export * from './update.user.color.event'

export * from './internal.server.error.event'
// export * from "./guests.list.event";
export * from './toclient/index'
export * from './toserver/index'
6 changes: 0 additions & 6 deletions src/domain/events/internal.server.error.event.ts

This file was deleted.

7 changes: 7 additions & 0 deletions src/domain/events/toclient/event.to.client.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export class EventToClient {
// static readonly RoomGuestsList = 'room-guests-list'

// static readonly UsersList = 'users-list'

static readonly InternalServerError = 'internal-server-error'
}
5 changes: 5 additions & 0 deletions src/domain/events/toclient/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// export * from "./room.guests.list.event";

// export * from "./users.list.event";

export * from './internal.server.error.event'
6 changes: 6 additions & 0 deletions src/domain/events/toclient/internal.server.error.event.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { EventToClient } from './event.to.client'

export class InternalServerErrorEvent {
static eventName: string = EventToClient.InternalServerError
constructor(public readonly error: Error) {}
}
5 changes: 5 additions & 0 deletions src/domain/events/toserver/connection.event.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { EventToServer } from './event.to.server'

export class ConnectionEvent {
static readonly eventName: string = EventToServer.Connection
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
export class Event {
export class EventToServer {
static readonly Connection = 'connection'
// static readonly Disconnection = 'disconnection'

// static readonly JoinRoom = 'join-room'
// static readonly LeaveRoom = 'leave-room'
// static readonly ListRoomGuests = 'list-room-guests'
// static readonly KickRoomGuest = 'kick-room-guest'

// static readonly ListRooms = 'list-rooms'

static readonly UpdateUserName = 'update-user-name'
static readonly UpdateUserColor = 'update-user-color'

static readonly InternalServerError = 'internal-server-error'
// static readonly GuestsList = 'guests-list'
// static readonly ListUsers = 'list-users'
}
12 changes: 12 additions & 0 deletions src/domain/events/toserver/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export * from './connection.event'
// export * from './disconnection.event'

// export * from './join.room.event'
// export * from "./leave.room.event";
// export * from "./list.room.guests.event";
// export * from "./kick.room.guest.event";
// export * from "./list.rooms.event";

export * from './update.user.name.event'
export * from './update.user.color.event'
// export * from "./list.users.event";
6 changes: 6 additions & 0 deletions src/domain/events/toserver/update.user.color.event.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { EventToServer } from './event.to.server'

export class UpdateUserColorEvent {
static readonly eventName: string = EventToServer.UpdateUserColor
constructor(public readonly data: { color: string }) {}
}
6 changes: 6 additions & 0 deletions src/domain/events/toserver/update.user.name.event.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { EventToServer } from './event.to.server'

export class UpdateUserNameEvent {
static readonly eventName: string = EventToServer.UpdateUserName
constructor(public readonly data: { name: string }) {}
}
6 changes: 0 additions & 6 deletions src/domain/events/update.user.color.event.ts

This file was deleted.

6 changes: 0 additions & 6 deletions src/domain/events/update.user.name.event.ts

This file was deleted.

4 changes: 1 addition & 3 deletions src/socket.io/socket.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ chai.use(chaiThings)
import { MockLogger } from '../shared/index'
import { Socket } from './socket'
import {
// ConnectionEvent,
// InternalServerErrorEvent,
UpdateUserNameEvent,
UpdateUserColorEvent,
} from '../domain/events'
} from '../domain/events/toserver'

const socketUrl: string = 'http://localhost:5000'
const options: SocketIOClient.ConnectOpts = {
Expand Down
3 changes: 1 addition & 2 deletions src/socket.io/socket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import { Constants } from './constants'
import { Guard, ConsoleLogger } from '../shared/index'
import {
ConnectionEvent,
// InternalServerErrorEvent,
UpdateUserNameEvent,
UpdateUserColorEvent,
} from '../domain/events'
} from '../domain/events/toserver'
import { User } from '../domain'

class Socket {
Expand Down

0 comments on commit cae7315

Please sign in to comment.