From 26baf6cef136971b247bfd2b2f69261ebf0e0159 Mon Sep 17 00:00:00 2001
From: Alex Wohlbruck <alexwohlbruck@gmail.com>
Date: Tue, 17 May 2022 02:21:53 -0400
Subject: [PATCH] Attempt network fix

---
 micro/app/server.py               |  3 ++-
 micro/app/uwebsockets/protocol.py | 11 ++++++-----
 server/routes/lamps.ts            |  4 ++--
 server/services/lamps.ts          |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/micro/app/server.py b/micro/app/server.py
index 87301c9..10735f9 100644
--- a/micro/app/server.py
+++ b/micro/app/server.py
@@ -121,4 +121,5 @@ def start_server():
         run_setup()
         # run_startup()
 
-    return Server('www.projectcovalent.app', lamp_id)
\ No newline at end of file
+    return Server('www.projectcovalent.app', lamp_id)
+    # return Server('192.168.1.17:3000', lamp_id)
\ No newline at end of file
diff --git a/micro/app/uwebsockets/protocol.py b/micro/app/uwebsockets/protocol.py
index a381e54..d9c11fe 100644
--- a/micro/app/uwebsockets/protocol.py
+++ b/micro/app/uwebsockets/protocol.py
@@ -7,6 +7,7 @@
 import urandom as random
 import usocket as socket
 from ucollections import namedtuple
+import machine
 
 
 # Opcodes
@@ -41,10 +42,9 @@ def urlparse(uri):
     """Parse ws:// URLs"""
     try:
         match = URL_RE.match(uri)
-    except:
-        print('Failed to parse URL')
-        return
-
+    except: 
+        machine.reset()
+    
     if match:
         protocol = match.group(1)
         host = match.group(2)
@@ -246,4 +246,5 @@ def close(self, code=CLOSE_OK, reason=''):
     def _close(self):
         if __debug__: print("Connection closed")
         self.open = False
-        self.sock.close()
\ No newline at end of file
+        self.sock.close()
+        machine.reset()
\ No newline at end of file
diff --git a/server/routes/lamps.ts b/server/routes/lamps.ts
index 8322223..a5a8254 100644
--- a/server/routes/lamps.ts
+++ b/server/routes/lamps.ts
@@ -48,8 +48,8 @@ router.post('/', isAuthenticated, async (req, res) => {
 })
 
 router.get('/:id/config', isAuthenticated, async (req, res) => {
-  // const config = await getLampConfig(req.params.id)
-  const config = {"deviceId":"4091519b56b8","readingLightColorTemperature":2001,"nightMode":false,"minimumLightLevel":0.8,"wifi":[{"ssid":"asu-visitor","password":""}],"brightness":0.5,"lampId":"626df507d6756882f166942c"}
+  const config = await getLampConfig(req.params.id)
+  // const config = {"deviceId":"4091519b56b8","readingLightColorTemperature":2001,"nightMode":false,"minimumLightLevel":0.8,"wifi":[{"ssid":"asu-visitor","password":""}],"brightness":0.5,"lampId":"626df507d6756882f166942c"}
   return res.status(200).json(config)
 })
 
diff --git a/server/services/lamps.ts b/server/services/lamps.ts
index 12ad3d1..fa986b2 100644
--- a/server/services/lamps.ts
+++ b/server/services/lamps.ts
@@ -105,7 +105,7 @@ export const createLamp = async (
       color: '#ff0000',
       touching: false,
     },
-    deviceData: deviceData,
+    deviceData,
     group: new Types.ObjectId(group._id),
     user: new Types.ObjectId(userId),
   })