update to types

This commit is contained in:
Josh Burman
2019-03-11 14:35:33 -04:00
parent 8fa7f98493
commit cdd6179992
28 changed files with 518 additions and 39 deletions

23
dist/server/server.js vendored
View File

@ -18,6 +18,8 @@ const url = require("url");
//internal imports
var routes = require('./routes');
var app = require('./config/app');
const clientManager_1 = require("./clientManager");
const channelManager_1 = require("./channelManager");
var privateKey = fs.readFileSync('certs/key.pem', 'utf8');
var certificate = fs.readFileSync('certs/cert.pem', 'utf8');
var options = { key: privateKey, cert: certificate, hostname: app.hostname };
@ -26,11 +28,26 @@ const server = https.createServer(options, application);
const wss = new WebSocket.Server({ noServer: true, maxPayload: 250000, host: app.hostname });
application.use(express.json());
application.use('', routes);
let clientManager = new clientManager_1.default();
let channelManager = new channelManager_1.default();
wss.on('connection', (ws, request, args) => {
console.log('client connected');
var data = JSON.parse(args).data;
var ClientManager = require('./clientManager');
let clientManager = new ClientManager(data, ws);
if (!channelManager.channelExists(data.channel)) {
channelManager.createChannel(data);
}
if (clientManager.clientExists(data.user_id)) {
var client = clientManager.getClient(data.user_id);
if (client != null) {
client.replaceWebSocket(ws);
}
}
else {
var client = clientManager.addClient(data, ws);
}
if (client != null) {
channelManager.addClientToChannel(client, data.channel);
}
// ws.on('message', (message: string) => {
// console.log('received: %s', message);
// const broadcastRegex = /^broadcast\:/;
@ -63,7 +80,7 @@ server.on('upgrade', function upgrade(request, socket, head) {
function verifyConnection() {
return new Promise((resolve, reject) => {
var data = url.parse(request.url, true).query;
var token = data["token"] || (app.environment == 'development' ? app.devToken : '');
var token = data.token || (app.environment == 'development' ? app.devToken : '');
var accepted = true;
var result;
jwt.verify(token, app.secret, app.signOptions, function (err, decoded) {