clean up server and show simpler logs

1 files changed, 4 insertions, 16 deletions

diff --git a/server.js b/server.js
index 290130c..f462fe7 100644
--- a/server.js
+++ b/server.js
@@ -22,37 +22,30 @@ var wserver = new WebSocket.Server({ port: 8080 })
 wserver.on('connection', function (ws) {
   ws.on('message', function (message) {
     var req = JSON.parse(message)
-    console.log(req)
     if (req.seq) {
       if (fs.existsSync(__dirname + '/bogs/' + req.src)) {
         fs.readFile(__dirname + '/bogs/' + req.src, 'UTF-8', function (err, data) {
           if (data) {
             var log = JSON.parse(data)
-            console.log(log[0])
             var pubkey = nacl.util.decodeBase64(req.src.substring(1))
             var sig = nacl.util.decodeBase64(log[0].signature)
             var opened = JSON.parse(nacl.util.encodeUTF8(nacl.sign.open(sig, pubkey)))
 
-            console.log(opened)
             var res = {
               feed: req.src,
               seq: opened.seq
             }
             ws.send(JSON.stringify(res))
             if(res.seq > req.seq) {
-              console.log('SEND DIFF TO CLIENT')
+              console.log('Sending diff of' + req.src + ' to ' + req.requester)
               var diff = res.seq - req.seq
-              console.log(diff)
               var sendlog = log.slice(0, diff)
               var send = {
                 src: req.src,
                 log: sendlog
               }
-              console.log(send)
               ws.send(JSON.stringify(send))
             }
-
-            // COMPARE SEQ
           }
         })
       } else {
@@ -60,7 +53,6 @@ wserver.on('connection', function (ws) {
           feed: req.src,
           seq: null
         }
-        console.log(res)
         ws.send(JSON.stringify(res))
       }
     } else if (req.seq === null) {
@@ -71,14 +63,12 @@ wserver.on('connection', function (ws) {
             src: req.src,
             log
           }
-          console.log('SENDING FULL LOG')
+          console.log('Sending full log of ' + req.src + ' to ' + req.requester )
           ws.send(JSON.stringify(res))
         })
       }
     }
     if (req.log) {
-      console.log('LOG')
-      console.log(req.log)
       if (fs.existsSync(__dirname + '/bogs/' + req.src)) {
         fs.readFile(__dirname + '/bogs/' + req.src, 'UTF-8', function (err, data) {
           var serverlog = JSON.parse(data)
@@ -86,17 +76,15 @@ wserver.on('connection', function (ws) {
           var newlog = req.log.concat(serverlog)
 
           fs.writeFile(__dirname + '/bogs/' + req.src, JSON.stringify(newlog), 'UTF-8', function (err, success) {
-            console.log('APPENDED DIFF AND WROTE LOG')
+            console.log('Appending diff of ' + req.src + ' from ' + req.requester + ' and saved to server')
           })
 
-          console.log('TRY APPENDING')
-          // read bogfile, append received data, and then save again
         })
       } else {
         fs.writeFile(__dirname + '/bogs/' + req.src, JSON.stringify(req.log), 'UTF-8', function (err, success) {
           if (err) throw err
           else
-            console.log('WROTE LOG')
+            console.log('Saved new log of ' + req.src + ' that was sent from ' + req.requester )
         })
       }
     }