Update error-handling, versions, and styles

neuralinterfaces · Oct 9, 2023 · cf78a4e · cf78a4e
1 parent f38e76e
commit cf78a4e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 21 deletions.
diff --git a/index.html b/index.html
@@ -22,6 +22,7 @@
   <body>
     <div class="container">
       <h1>Solidarity ✊</h1>
+      <hr/>
       <main>
         <div id="console">
           <ul id="messages"></ul>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,6 +40,6 @@
     "@commoners/bluetooth": "0.0.0",
     "@commoners/serial": "0.0.0",
     "@commoners/local-services": "0.0.0",
-    "commoners":  "0.0.16"
+    "commoners":  "0.0.17"
   }
 }
diff --git a/src/frontend/main.ts b/src/frontend/main.ts
@@ -88,20 +88,24 @@ if (COMMONERS.services.remote && COMMONERS.services.dynamic) {
 if (COMMONERS.services.node) {
   const url = new URL(COMMONERS.services.node.url)
 
-  const ws = new WebSocket(`ws://${url.host}`)
+  try {
+    const ws = new WebSocket(`ws://${url.host}`)
 
-  ws.onmessage = (o) => {
-    const data = JSON.parse(o.data)
-    onData({source: 'Node', ...data})
-  }
+    ws.onmessage = (o) => {
+      const data = JSON.parse(o.data)
+      onData({source: 'Node', ...data})
+    }
 
-  let send = (o: any) => {
-    ws.send(JSON.stringify(o))
-  }
+    let send = (o: any) => {
+      ws.send(JSON.stringify(o))
+    }
 
-  ws.onopen = () => {
-    send({ command: 'platform' })
-    send({ command: 'version' })
+    ws.onopen = () => {
+      send({ command: 'platform' })
+      send({ command: 'version' })
+    }
+  } catch (e) {
+    console.error('Failed to connect to Node.js server', e)
   }
 }
 
@@ -112,9 +116,11 @@ if (COMMONERS.services.python) {
   const pythonUrl = new URL(COMMONERS.services.python.url) // Equivalent to commoners://python
 
   setTimeout(async () => {
-      fetch(new URL('version', pythonUrl)).then(res => res.json()).then(payload => {
-        onData({ source: 'Python', command: 'version', payload })
-      });
+    try {
+        fetch(new URL('version', pythonUrl)).then(res => res.json()).then(payload => onData({ source: 'Python', command: 'version', payload }));
+    } catch (e) {
+      console.error('Failed to connect to Python server', e)
+    }
   })
 }
 

diff --git a/src/frontend/styles.css b/src/frontend/styles.css
@@ -30,7 +30,7 @@ main {
   flex-direction: row-reverse;
 }
 
-#sidebar {
+main > * {
   flex-grow: 1
 }
 
@@ -97,8 +97,12 @@ a:hover {
   color: #535bf2;
 }
 
+
 h1 {
-  text-align: center;
+  margin: 0;
+  margin-bottom: 10px; 
+  padding-bottom: 20px;
+  border-bottom: 1px solid gainsboro;
 }
 
 input,