Renaming files

src/server.js

@@ -1,17 +1,15 @@
 const http = require('http')
 const WebSocket = require('ws')
-const supernode = require('./supernode')
-const backupProcess = require('./backupProcess')
-const port = 8080;
 
-const server = http.createServer((req, res) => {
+const Server = module.exports = function(port, client, intra){
+    const server =  http.createServer((req, res) => {
         if (req.method === "GET") {
             //GET request (requesting data)
             req.on('end', () => {
                 let i = req.url.indexOf("?");
                 if (i) {
                     var request = JSON.parse(req.url.substring(i));
-                supernode.processRequestFromUser(request)
+                    client.processRequestFromUser(request)
                         .then(result => res.end(JSON.parse(result[0])))
                         .catch(error => res.end(error))
                 }
@@ -23,43 +21,59 @@ const server = http.createServer((req, res) => {
             req.on('end', () => {
                 console.log(data);
                 //process the data storing
-            supernode.processIncomingData(data).then(result => {
+                client.processIncomingData(data).then(result => {
                     res.end(result[0]);
                     if (result[1]) {
                         if (result[1] === 'DATA')
                             sendToLiveRequests(result[0])
-                    backupProcess.forwardToNextNode(result[1], result[0])
+                        intra.forwardToNextNode(result[1], result[0])
                     }
                 }).catch(error => res.end(error))
             })
         }
-});
+    });
-server.listen(port, () => {
+    server.listen(port, (err) => {
-    console.log(`Server running at port ${port}`)
+        if(!err)
-})
+            console.log(`Server running at port ${port}`);     
-
+    })
-const wsServer = new WebSocket.Server({
+    const wsServer = new WebSocket.Server({
         server
-});
+    });
-wsServer.on('connection', function connection(ws) {
+    wsServer.on('connection', function connection(ws) {
         ws.onmessage = function(evt) {
             let message = evt.data;
-        if (message.startsWith(backupProcess.SUPERNODE_INDICATOR))
+            if (message.startsWith(intra.SUPERNODE_INDICATOR))
-            backupProcess.processTaskFromSupernode(message, ws);
+                intra.processTaskFromSupernode(message, ws);
             else {
                 var request = JSON.parse(message);
-            supernode.processRequestFromUser(JSON.parse(message))
+                client.processRequestFromUser(JSON.parse(message))
                     .then(result => {
                         ws.send(JSON.parse(result[0]))
                         ws._liveReq = request;
                     }).catch(error => ws.send(error))
             }
         }
-});
+    });
+    wsServer.on('connection', function connection(ws) {
+        ws.onmessage = function(evt) {
+            let message = evt.data;
+            if (message.startsWith(intra.SUPERNODE_INDICATOR))
+                intra.processTaskFromSupernode(message, ws);
+            else {
+                var request = JSON.parse(message);
+                client.processRequestFromUser(JSON.parse(message))
+                    .then(result => {
+                        ws.send(JSON.parse(result[0]))
+                        ws._liveReq = request;
+                    }).catch(error => ws.send(error))
+            }
+        }
+    });
 
-function sendToLiveRequests(data) {
+    Object.defineProperty(this, "http", {
-    wsServer.clients.forEach(ws => {
+        get: () => server
-        if (supernode.checkIfRequestSatisfy(ws._liveReq, data))
+    });
-            ws.send(data)
+    Object.defineProperty(this, "webSocket", {
-    })
+        get: () => wsServer
+    });
 }