Clean up backend

.eslintrc.js

@@ -0,0 +1,19 @@
+module.exports = {
+  env: {
+    browser: true,
+    commonjs: true,
+    es2021: true,
+  },
+  overrides: [],
+  parserOptions: {
+    ecmaVersion: 'latest',
+  },
+  ignorePatterns: ['public/*'],
+  rules: {
+    'quotes': ['error', 'single'],
+    'space-before-blocks': ['error', 'always'],
+    'space-before-function-paren': ['error', 'always'],
+    'keyword-spacing': ['error', { 'before': true, 'after': true }],
+    'no-var': 'error'
+  },
+};

app.js

@@ -1,15 +1,15 @@
-var express = require('express');
-var path = require('path');
-var favicon = require('serve-favicon');
-var logger = require('morgan');
-var cookieParser = require('cookie-parser');
-var bodyParser = require('body-parser');
-const { WebSocketServer } = require('ws');
+let express = require('express');
+let path = require('path');
+let favicon = require('serve-favicon');
+let logger = require('morgan');
+let cookieParser = require('cookie-parser');
+let bodyParser = require('body-parser');
 const fs = require('fs');
-const {createServer} = require("http");
 const sessions = require('express-session');
 const _ = require('lodash');
 
+global.l = console.log;
+
 // Check if the .env file exists
 if (!fs.existsSync('.env')) {
   // If the .env file does not exist, copy the .env.sample file to .env
@@ -19,204 +19,66 @@ if (!fs.existsSync('.env')) {
 // Load the .env file
 require('dotenv').config();
 
-var routes = require('./routes/index');
-var users = require('./routes/users');
-var api = require('./routes/api');
-const WebSocket = require("ws");
-
-var app = express();
+const { server , app  } = require('./lib/websockets');
 
-const isProd = process.NODE_ENV === 'production';
+let routes = require('./routes/index');
+let users = require('./routes/users');
+let api = require('./routes/api');
 
-l = console.log;
-
-// l = function(l){
-//   var stack = (new Error()).stack.split(/\n/);
-//   // Chrome includes a single "Error" line, FF doesn't.
-//   if(stack[0].indexOf('Error') === 0){
-//     stack = stack.slice(1);
-//   }
-//   var args = [].slice.apply(arguments).concat([stack[1].trim()]);
-//   return console.log(console, args);
-// }
-var port = process.env.PORT || '3000';
+let port = process.env.PORT || '3000';
 app.set('port', port);
 
-// TODO: pull out into a different file
-/** BEGIN WEBSOCKETS **/
-const server = createServer(app);
-const wss = new WebSocketServer({ server });
-
-global['webSocketData'] = []
-
-function heartbeat() {
-  // l('checking heartbeat');
-  this.isAlive = true;
-}
-
-wss.on('connection', function (websocketConnection, request, client) {
-
-  // chart that it exists for first time (add to global.ws)
-  websocketConnection.isAlive = true;
-  // set up an event, when it receives pong it marks itself alive (overwriting the dead)
-  websocketConnection.on('pong', heartbeat);
-
-  const websocketNumber = request.url.split('/')[1];
-
-  global['webSocketData'].push({
-    websocketNumber,
-    websocket: websocketConnection,
-    status: 'alive',
-  })
-
-  l(`websocket connected: ${websocketNumber}`);
-
-
-  websocketConnection.on('close', function (ws) {
-    l(`websocket closed: ${websocketNumber}`);
-  });
-});
-
-// setInterval(function(){
-//   const process = global['transcriptions'][0].spawnedProcess;
-//   l(process)
-//   if(process) process.kill('SIGINT');
-//
-// }, 1000 * 15) // 20 seconds
-
-function checkForDeath(){
-  const totalAmountOfWebsockets = global.webSocketData.length;
-  l(`Disconnect Check for ${totalAmountOfWebsockets}`);
-  // l(totalAmountOfWebsockets);
-  // loop through array of objects of websockets
-  for(let [index, websocket] of global['webSocketData'].entries() ){
-    // the actual websocket
-    // l(websocket.websocketNumber)
-    const websocketNumber = websocket.websocketNumber
-    const websocketConnection = websocket.websocket;
-
-
-    /** DEAD WEBSOCKET FUNCTIONALITY **/
-    // destroy killed websockets and cancel their transcriptions
-    if (websocketConnection.isAlive === false){
-      l(`Disconnected user found: ${websocketNumber}`);
-      websocketConnection.terminate();
-      global.webSocketData.splice(index, 1);
-
-
-      const closerTranscription = global['transcriptions'].find(function(transcription){
-        return transcription.websocketNumber === websocket.websocketNumber;
-      })
-
-      // l(`Checking transcriptions for ${websocketNumber}`)
-
-      const existingProcess = closerTranscription && closerTranscription.spawnedProcess;
-
-      // kill the process
-      if(existingProcess){
-        // l('found transcription process to kill')
-        // l(websocketNumber);
-        // l(closerTranscription)
-        //
-        // l('found spawned process');
-
-        // TODO: save processing info and conditionally kill
-        closerTranscription.spawnedProcess.kill('SIGINT');
-        l(`Found and killed process: ${websocketNumber}`);
-
-        const transcriptionIndex = global.transcriptions.indexOf(closerTranscription);
-        if (index > -1) { // only splice array when item is found
-          global.transcriptions.splice(transcriptionIndex, 1); // 2nd parameter means remove one item only
-        }
-      }
-
-      const queueIndex =  global.queueData.indexOf(websocketNumber);
-
-      const queueHasThing = queueIndex > 1;
-
-      if(queueHasThing){
-          global.queueData.splice(queueIndex, 1);
-       }
-
-      if(queueHasThing || existingProcess){
-        if(queueHasThing) l(`${websocketNumber} Deleted from global.queueData`)
-        if(existingProcess) l(`\`${websocketNumber} Whisper process killed, deleted from global.transcriptions`)
-
-        // loop through websockets and tell them one less is processing
-        for(let [, websocket] of global['webSocketData'].entries() ) {
-          // the actual websocket
-          // l(websocket.websocketNumber)
-          const websocketConnection = websocket.websocket;
-          if (websocketConnection.readyState === WebSocket.OPEN) {
-            // TODO: redo this to use an object
-            websocketConnection.send(JSON.stringify('finishedProcessing'));
-          }
-        }
-      }
-    }
-
-    /** END ON DEATH FUNCTION **/
-
-    /** TEST FOR ALIVENESS */
-    // mark them as dead, but then check immediately after for redemption chance
-    websocketConnection.isAlive = false;
-    // trigger their pong event
-    websocketConnection.ping();
-  }
-}
-
 // check every 5 seconds for dead sockets (still takes 10s)
-setInterval(checkForDeath, 1000 * 5);
-
+//setInterval(checkForDeath, 1000 * 5);
 
 /** END WEBSOCKETS **/
 
-
 // create folders if they don't exist yet
 // fs.mkdirSync('uploads', { recursive: true })
-fs.mkdirSync('uploads', { recursive: true })
-fs.mkdirSync('transcriptions', { recursive: true })
+fs.mkdirSync('uploads', { recursive: true });
+fs.mkdirSync('transcriptions', { recursive: true });
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-app.use(favicon(path.join(__dirname,'public','images','favicon.ico')));
+app.use(favicon(path.join(__dirname, 'public', 'images', 'favicon.ico')));
 app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 // assumes nginx
 // if(!isProd){
-  app.use(express.static(__dirname));
+app.use(express.static(__dirname));
 // }
 
-
 const oneWeek = 1000 * 60 * 60 * 24 * 7;
 
 //session middleware
-app.use(sessions({
-  secret: (Math.random() * 1000000000).toString(),
-  cookie: { maxAge: oneWeek },
-  saveUninitialized: false,
-  resave: false
-}));
-
-app.use(function(req, res, next){
+app.use(
+  sessions({
+    secret: (Math.random() * 1000000000).toString(),
+    cookie: { maxAge: oneWeek },
+    saveUninitialized: false,
+    resave: false,
+  })
+);
+
+app.use(function (req, res, next) {
   const ipAddress = req.headers['x-forwarded-for'] || req.socket.remoteAddress;
-  l('IP Address')
+  l('IP Address');
   l(ipAddress);
   next();
-})
+});
 
 app.use('/', routes);
 app.use('/', api);
 app.use('/users', users);
 
 // catch 404 and forward to error handler
-app.use(function(req, res, next) {
-  var err = new Error('Not Found');
+app.use(function (req, res, next) {
+  let err = new Error('Not Found');
   err.status = 404;
   next(err);
 });
@@ -226,29 +88,29 @@ app.use(function(req, res, next) {
 // development error handler
 // will print stacktrace
 if (app.get('env') === 'development') {
-  app.use(function(err, req, res, next) {
+  app.use(function (err, req, res, next) {
     l(err);
 
     res.status(err.status || 500);
     res.render('error', {
       message: err.message,
-      error: err
+      error: err,
     });
   });
 }
 
 // production error handler
 // no stacktraces leaked to user
-app.use(function(err, req, res, next) {
+app.use(function (err, req, res, next) {
   l(err);
   res.status(err.status || 500);
   res.render('error', {
     message: err.message,
-    error: {}
+    error: {},
   });
 });
 
-l(`Server listening on port ${port}`)
+l(`Server listening on port ${port}`);
 
 server.listen(port);