jshbrmn/braid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added unit testing, and started implementing unit tests...phew

Browse Source
This commit is contained in:
Josh Burman
2019-03-12 22:28:02 -04:00
parent 74aad4a957
commit e8c2539f1b
3489 changed files with 464813 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dist/server/server.js vendored
View File

@ -18,6 +18,7 @@ const url = require("url");
//internal imports
var routes = require('./routes');
var app = require('./config/app');
var logger = require('./logger');
const clientManager_1 = require("./clientManager");
const channelManager_1 = require("./channelManager");
var privateKey = fs.readFileSync('certs/key.pem', 'utf8');
@ -31,8 +32,8 @@ 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;
logger.accessLog.info(`Client Connected: ${data.user_id}`);
if (!channelManager.channelExists(data.channel)) {
channelManager.createChannel(data);
}
@ -48,22 +49,6 @@ wss.on('connection', (ws, request, args) => {
if (client != null) {
channelManager.addClientToChannel(client, data.channel);
}
// ws.on('message', (message: string) => {
// console.log('received: %s', message);
// const broadcastRegex = /^broadcast\:/;
// if (broadcastRegex.test(message)) {
// message = message.replace(broadcastRegex, '');
// //send back the message to the other clients
// wss.clients
// .forEach(client => {
// if (client != ws) {
// client.send(`Hello, broadcast message -> ${message}`);
// }
// });
// } else {
// ws.send(`Hello, you sent -> ${message}`);
// }
// });
ws.send('Hi there, welcome to braid, Measures Web Socket server.\nConnecting all our services!');
});
server.on('upgrade', function upgrade(request, socket, head) {
@ -74,7 +59,7 @@ server.on('upgrade', function upgrade(request, socket, head) {
}
catch (e) {
socket.destroy();
console.log('connection terminated.');
logger.accessLog.info('Connection Terminated');
return;
}
function verifyConnection() {
@ -100,5 +85,6 @@ server.on('upgrade', function upgrade(request, socket, head) {
});
server.listen(app.port, () => {
console.log(`Braid v${app.version} is running!\n`);
logger.accessLog.info(`Braid v${app.version} is running!\n`);
});
//# sourceMappingURL=server.js.map