Merge pull request #83 from GoXLR-on-Linux/dev-1.0.0

Dev 0.12.1

Author: FrostyCoolSlug

README.md

@@ -1,4 +1,4 @@
-[![Support Server](https://img.shields.io/discord/828348446775574548.svg?label=Discord&logo=Discord&colorB=7289da&style=flat)](https://discord.gg/Wbp3UxkX2j)
+[![Support Server](https://img.shields.io/discord/1124010710138106017.svg?label=Discord&logo=Discord&colorB=7289da&style=flat)](https://discord.gg/BRBjkkbvmZ)
 [![GitHub tag (latest SemVer pre-release)](https://img.shields.io/github/v/tag/goxlr-on-linux/goxlr-utility?label=Latest)](http://github.com/goxlr-on-linux/goxlr-utility/releases/latest)
 ![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/goxlr-on-linux/goxlr-utility/build.yml)
 

audio/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-audio"
-version = "0.12.0"
+version = "0.12.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

ci/goxlr-utility.iss

@@ -2,7 +2,7 @@
 
 [Setup]
 AppName=GoXLR Utility
-AppVersion=0.12.0
+AppVersion=0.12.1
 WizardStyle=modern
 DefaultDirName={autopf}\GoXLR Utility
 DefaultGroupName=GoXLR Utility

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-client"
-version = "0.12.0"
+version = "0.12.1"
 edition = "2021"
 build = "build.rs"
 authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]

daemon/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-daemon"
-version = "0.12.0"
+version = "0.12.1"
 edition = "2021"
 authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]
 description = "Allows control of a TC-Helicon GoXLR or GoXLR Mini, by maintaining an interaction with it over USB in the background."

daemon/src/servers/http_server.rs

@@ -14,12 +14,13 @@ use actix_web::middleware::Condition;
 use actix_web::web::Data;
 use actix_web::{get, post, web, App, HttpRequest, HttpResponse, HttpServer};
 use actix_web_actors::ws;
-use actix_web_actors::ws::CloseCode;
+use actix_web_actors::ws::{CloseCode, CloseReason};
 use anyhow::{anyhow, Result};
 use include_dir::{include_dir, Dir};
 use jsonpath_rust::JsonPathQuery;
 use log::{debug, error, info, warn};
 use mime_guess::MimeGuess;
+use serde_json::Value;
 use tokio::sync::broadcast::Sender as BroadcastSender;
 use tokio::sync::oneshot::Sender;
 use tokio::sync::Mutex;
@@ -54,7 +55,7 @@ impl Actor for Websocket {
                 if let Ok(event) = broadcast_rx.recv().await {
                     // We've received a message, attempt to trigger the WsMessage Handle..
                     if let Err(error) = address.clone().try_send(WsResponse(WebsocketResponse {
-                        id: u32::MAX,
+                        id: u64::MAX,
                         data: DaemonResponse::Patch(event.data),
                     })) {
                         error!(
@@ -132,17 +133,55 @@ impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for Websocket {
                         future.into_actor(self).spawn(ctx);
                     }
                     Err(error) => {
-                        warn!("HTTP Error: {}", error);
-                        warn!("Request: {}", text);
-                        ctx.close(Some(CloseCode::Invalid.into()));
-                        ctx.stop();
+                        // Ok, we weren't able to deserialise the request into a proper object, we
+                        // now need to confirm whether it was at least valid JSON with a request id
+                        warn!("Error Deserialising Request to Object: {}", error);
+                        warn!("Original Request: {}", text);
+
+                        debug!("Attempting Low Level request Id Extraction..");
+                        let request: serde_json::Result<Value> =
+                            serde_json::from_str(text.as_ref());
+                        match request {
+                            Ok(value) => {
+                                if let Some(request_id) = value["id"].as_u64() {
+                                    let recipient = ctx.address().recipient();
+                                    recipient.do_send(WsResponse(WebsocketResponse {
+                                        id: request_id,
+                                        data: DaemonResponse::Error(error.to_string()),
+                                    }));
+                                } else {
+                                    warn!("id missing, Cannot continue. Closing connection");
+                                    let error = CloseReason {
+                                        code: CloseCode::Invalid,
+                                        description: Some(String::from(
+                                            "Missing or invalid Request ID",
+                                        )),
+                                    };
+                                    ctx.close(Some(error));
+                                    ctx.stop();
+                                }
+                            }
+                            Err(error) => {
+                                warn!("JSON structure is invalid, closing connection.");
+                                let error = CloseReason {
+                                    code: CloseCode::Invalid,
+                                    description: Some(error.to_string()),
+                                };
+                                ctx.close(Some(error));
+                                ctx.stop();
+                            }
+                        }
                     }
                 }
             }
             Ok(ws::Message::Binary(_bin)) => {
                 ctx.close(Some(CloseCode::Unsupported.into()));
                 ctx.stop();
             }
+            Ok(ws::Message::Close(reason)) => {
+                ctx.close(reason);
+                ctx.stop();
+            }
             _ => (),
         }
     }

daemon/web-content/css/app.4380d8e8.css

@@ -1,4 +1,4 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>GoXLR Utility</title><script defer="defer" src="/js/chunk-vendors.83231974.js"></script><script defer="defer" src="/js/app.017c2267.js"></script><link href="/css/app.4380d8e8.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but goxlr-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><canvas id="wheelCanvas" style="position: absolute; top: -1000px; left: -1000px; width: 130px; height: 130px"></canvas><div id="colourHover" style="position: absolute; top: -1000px; left: -1000px; width: 20px; height: 20px; border: 2px solid #fff; border-radius: 50%; box-shadow: 0 5px 10px rgba(0,0,0,0.5); background-color: #fff; pointer-events: none;"></div><div id="app"></div><script>window.onload = function(){
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>GoXLR Utility</title><script defer="defer" src="/js/chunk-vendors.83231974.js"></script><script defer="defer" src="/js/app.bf28b91b.js"></script><link href="/css/app.dbf86015.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but goxlr-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><canvas id="wheelCanvas" style="position: absolute; top: -1000px; left: -1000px; width: 130px; height: 130px"></canvas><div id="colourHover" style="position: absolute; top: -1000px; left: -1000px; width: 20px; height: 20px; border: 2px solid #fff; border-radius: 50%; box-shadow: 0 5px 10px rgba(0,0,0,0.5); background-color: #fff; pointer-events: none;"></div><div id="app"></div><script>window.onload = function(){
           let canvas = document.getElementById('wheelCanvas');
           let context = canvas.getContext('2d');
           let img = new Image();