From 33d188659920b8074b460164dea85444cc746bc1 Mon Sep 17 00:00:00 2001 From: Josh Burman Date: Sun, 22 Dec 2019 01:31:21 -0500 Subject: [PATCH] oops missed these things --- src/clientManager.ts | 2 +- src/clients/types/customClient.ts | 3 --- src/server.ts | 7 ++++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/clientManager.ts b/src/clientManager.ts index be5ce06..0701716 100644 --- a/src/clientManager.ts +++ b/src/clientManager.ts @@ -69,7 +69,7 @@ class ClientManager { getClientType(data: any, channelManager: ChannelManager, ws: WebSocket) { var client_type = data.client_type + 'Client' - + try { var Client = require(`./clients/types/${client_type}`); logger.accessLog.info(`attempting to create client of type ${data.client_type}, client id: ${data.user_id}...`); diff --git a/src/clients/types/customClient.ts b/src/clients/types/customClient.ts index 19b938b..72b562c 100644 --- a/src/clients/types/customClient.ts +++ b/src/clients/types/customClient.ts @@ -7,9 +7,6 @@ class CustomClient extends ClientBase { // test: Joi.alternatives().try(Joi.string(), Joi.object()) // } // } - validations() { - return { what: "test"} - } }; module.exports = CustomClient; diff --git a/src/server.ts b/src/server.ts index 5037181..4a9f6e3 100755 --- a/src/server.ts +++ b/src/server.ts @@ -12,8 +12,9 @@ var app = require('./config/app'); var logger = require('./logger'); import ClientManager from './clientManager'; import ChannelManager from './channelManager'; -import ClientBase from './clients/clientBase'; +import PublicClient from './clients/types/publicClient'; import PrivateClient from './clients/types/privateClient'; +import CustomClient from './clients/types/customClient'; // if (app.environment == 'development') { @@ -55,13 +56,13 @@ function connectionManager() { } if (clientManager.clientExists(data.user_id)) { - var client: ClientBase|PrivateClient|null = clientManager.getClient(data.user_id); + var client: PublicClient|PrivateClient|CustomClient|null = clientManager.getClient(data.user_id); if (client != null) { client.replaceWebSocket(ws); } } else { - var client: ClientBase|PrivateClient|null = clientManager.addClient(data, channelManager, ws); + var client: PublicClient|PrivateClient|CustomClient|null = clientManager.addClient(data, channelManager, ws); } if (client != null) {