From 19d5c039561013521433eeb93fc3dbb59e5e37c8 Mon Sep 17 00:00:00 2001
From: karl0ss <karl@k-world.me.uk>
Date: Tue, 16 Jul 2019 19:51:22 +0100
Subject: [PATCH] working :)

---
 server.js             | 25 ++++++++-----------------
 server/utils/Utils.js | 25 ++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/server.js b/server.js
index 77be05e..eecb84e 100644
--- a/server.js
+++ b/server.js
@@ -44,26 +44,17 @@ orvibo.on('plugDisconnectedWithError', ({uid, name }) => {
 orvibo.startServer();
 
 app.get('/', (req, res) => {
-    // let sockets = orvibo.getConnectedSocket();
-    let sockets = [{name: "Plug1", state: 1, uid: "222222"},{name: "Plug2", state: 0, uid: "111111"}]
+    let sockets = orvibo.getConnectedSocket();
+    // let sockets = [{name: "Plug1", state: 1, uid: "222222"},{name: "Plug2", state: 0, uid: "111111"}]
     
-    sockets.forEach(socket => {
-        switch(socket.state) {
-            case 1:
-              socket.state = 'OFF'
-              break;
-            case 0:
-              socket.state = 'ON'
-            break;
-            default:
-          }
-    });
-
-    const q = req.query
-    if (q.uid != undefined) {
-        orvibo.toggleSocket(q.uid);
+    if (req.query.uid != undefined) {
+        orvibo.toggleSocket(req.query.uid);
     }
 
+    sockets = orvibo.getConnectedSocket();
+
+    utils.setState(sockets)
+
     res.render('index', {
         title: 'Orvibo b25 Server',
         sockets
diff --git a/server/utils/Utils.js b/server/utils/Utils.js
index 3532ba6..90f03db 100644
--- a/server/utils/Utils.js
+++ b/server/utils/Utils.js
@@ -35,4 +35,27 @@ module.exports.generatePlugArray = function(str) {
           pairs.push(o);
         }
         return pairs;
-      }    
\ No newline at end of file
+      }    
+
+module.exports.sleep = function(milliseconds) {
+    var start = new Date().getTime();
+    for (var i = 0; i < 1e7; i++) {
+      if ((new Date().getTime() - start) > milliseconds){
+        break;
+      }
+    }
+  }      
+
+module.exports.setState = function(sockets) {
+    sockets.forEach(socket => {
+        switch(socket.state) {
+            case 1:
+              socket.state = 'OFF'
+              break;
+            case 0:
+              socket.state = 'ON'
+            break;
+            default:
+          }
+    });
+}  
\ No newline at end of file