From 3c209d84f2fed368c522a3f3265b26de52971179 Mon Sep 17 00:00:00 2001 From: joshuashoemaker Date: Fri, 22 Jan 2021 22:06:14 -0600 Subject: [PATCH] fix: server start ans socket connection --- src/Server/{ => Entities}/EventManager.ts | 2 +- src/Server/{ => Entities}/Server.ts | 14 +++++++------- src/Server/UseCases/Factories/makeEventManager.ts | 2 +- src/Server/UseCases/Factories/makeServer.ts | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename src/Server/{ => Entities}/EventManager.ts (90%) rename src/Server/{ => Entities}/Server.ts (86%) diff --git a/src/Server/EventManager.ts b/src/Server/Entities/EventManager.ts similarity index 90% rename from src/Server/EventManager.ts rename to src/Server/Entities/EventManager.ts index 42f8449..367b16f 100644 --- a/src/Server/EventManager.ts +++ b/src/Server/Entities/EventManager.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'events' -import IEventManager from './Interfaces/IEventManager' +import IEventManager from '../Interfaces/IEventManager' let instance: EventManager | null = null diff --git a/src/Server/Server.ts b/src/Server/Entities/Server.ts similarity index 86% rename from src/Server/Server.ts rename to src/Server/Entities/Server.ts index bdd6c89..5cf419a 100644 --- a/src/Server/Server.ts +++ b/src/Server/Entities/Server.ts @@ -3,8 +3,8 @@ import path from 'path' import bodyParser from 'body-parser' import http from 'http' import { Socket } from 'socket.io' -import IEventManager from './Interfaces/IEventManager' -import EventManager from './EventManager' +import IEventManager from '../Interfaces/IEventManager' +import EventManager from '../Entities/EventManager' class Server { public app = express() @@ -50,12 +50,12 @@ class Server { } openSockets = (socketService: any) => { - socketService.on('connection', () => { + socketService.on('connection', (socket: Socket) => { console.log('client connected') - }) - - socketService.on('message', (message: any) => { - console.log(message) + + socket.on('offsets', (offsets: any[]) => { + this.onReceiveOffsets(offsets) + }) }) } diff --git a/src/Server/UseCases/Factories/makeEventManager.ts b/src/Server/UseCases/Factories/makeEventManager.ts index bc1570a..8a5e8c9 100644 --- a/src/Server/UseCases/Factories/makeEventManager.ts +++ b/src/Server/UseCases/Factories/makeEventManager.ts @@ -1,4 +1,4 @@ -import EventManager from "../../EventManager" +import EventManager from "../../Entities/EventManager" function makeEventManager () { return new EventManager() diff --git a/src/Server/UseCases/Factories/makeServer.ts b/src/Server/UseCases/Factories/makeServer.ts index cde7929..4eccd44 100644 --- a/src/Server/UseCases/Factories/makeServer.ts +++ b/src/Server/UseCases/Factories/makeServer.ts @@ -1,4 +1,4 @@ -import { Server } from "socket.io"; +import Server from "../../Entities/Server" function makeServer (port: number) { const defaultPort = 5005