test for snyk

src/helpers/clientHelpers.ts

@@ -0,0 +1,11 @@
+module.exports = {
+  clientExists: function (id: number) {
+    for (let client of this.clients) {
+      if (client.id == id) {
+        return client;
+      }
+    }
+
+    return null;
+  }
+}

src/logger.ts

@@ -5,12 +5,10 @@ var path = require('path');
 var logPath = './logs/';
 
 const tsFormat = () => (new Date().toISOString());
+const logFormat = format.combine(format.timestamp(), format.json())
 
 const errorLog = createLogger({
-  format: format.combine(
-    format.timestamp(),
-    format.json()
-  ),
+  format: logFormat,
   transports: [
     new transports.File({
       filename: path.join(logPath, 'errors.log'),
@@ -21,10 +19,7 @@ const errorLog = createLogger({
 });
 
 const accessLog = createLogger({
-  format: format.combine(
-    format.timestamp(),
-    format.json()
-  ),
+  format: logFormat,
   transports: [
     new transports.File({
       filename: path.join(logPath, 'access.log'),

src/server.ts

@@ -29,7 +29,7 @@ application.use('', routes);
 let clientManager = new ClientManager();
 let channelManager = new ChannelManager();
 
-function startServer() {
+function connectionListener() {
   wss.on('connection', (ws: WebSocket, request: object, args: string) => {
     var data = JSON.parse(args).data
     logger.accessLog.info(`Client Connected: ${data.user_id}`);
@@ -54,19 +54,9 @@ function startServer() {
 
     ws.send('Hi there, welcome to braid, Measures Web Socket server.\nConnecting all our services!');
   });
-
-  server.on('upgrade', async function upgrade(request, socket, head) {
-    let args: {};
-
-    try {
-      args = await verifyConnection()
-    } catch (e) {
-      socket.destroy();
-      logger.accessLog.info('Connection Terminated');
-      return;
 }
 
-    function verifyConnection() {
+function verifyConnection(request: any) {
   return new Promise((resolve, reject) => {
     var data = url.parse(request.url, true).query;
     var token = data.token || (app.environment == 'development' ? app.devToken : '');
@@ -85,17 +75,37 @@ function startServer() {
   });
 }
 
+function serverUpgrade() {
+  server.on('upgrade', async function upgrade(request, socket, head) {
+    let args: {};
+
+    try {
+      args = await verifyConnection(request);
+    } catch (e) {
+      socket.destroy();
+      logger.accessLog.info('Connection Terminated');
+      return;
+    }
+
     wss.handleUpgrade(request, socket, head, function done(ws) {
       wss.emit('connection', ws, request, args);
     });
   });
+}
 
+function listenForConnection() {
   server.listen(app.port, () => {
     console.log(`Braid v${app.version} is running!\n`);
     logger.accessLog.info(`Braid v${app.version} is running!\n`);
   });
 }
 
+function startServer() {
+  connectionListener();
+  serverUpgrade();
+  listenForConnection();
+}
+
 startServer();
 
 module.exports = {