chore: Convert options to use ButtplugServerOptions

Read server options into the new argument struct, add more error
checking on device/user config loading.

Author: qdot

src/main.rs

@@ -33,6 +33,7 @@ use buttplug::{
       DeviceCommunicationManager, DeviceCommunicationManagerCreator,
     },
     ButtplugRemoteServer,
+    ButtplugServerOptions,
     remote_server::ButtplugRemoteServerEvent,
   },
   util::logging::ChannelWriter
@@ -48,8 +49,7 @@ use std::{error::Error, fmt};
 
 #[derive(Default, Clone)]
 pub struct ConnectorOptions {
-  server_name: String,
-  max_ping_time: u64,
+  server_options: ButtplugServerOptions,
   stay_open: bool,
   use_frontend_pipe: bool,
   ws_listen_on_all_interfaces: bool,
@@ -254,7 +254,7 @@ async fn main() -> Result<(), IntifaceCLIErrorEnum> {
   if connector_opts.stay_open {  
     task::block_on(async move {
       let (server, event_receiver) =
-        ButtplugRemoteServer::new(&connector_opts.server_name, connector_opts.max_ping_time);
+        ButtplugRemoteServer::new_with_options(&connector_opts.server_options).unwrap();
       if frontend_sender_clone.is_some() {
         let fscc = frontend_sender_clone.clone().unwrap();
         task::spawn(async move {
@@ -292,7 +292,7 @@ async fn main() -> Result<(), IntifaceCLIErrorEnum> {
   } else {
     task::block_on(async move {
       let (server, event_receiver) =
-      ButtplugRemoteServer::new(&connector_opts.server_name, connector_opts.max_ping_time);
+        ButtplugRemoteServer::new_with_options(&connector_opts.server_options).unwrap();
       let fscc = frontend_sender_clone.clone();
       if fscc.is_some() {
         task::spawn(async move {

src/options.rs

@@ -3,7 +3,7 @@ use super::{utils::generate_certificate, ConnectorOptions, IntifaceCLIErrorEnum,
 use super::frontend::{self, FrontendPBufChannel};
 use argh::FromArgs;
 use buttplug::device::configuration_manager::{
-  set_external_device_config, set_user_device_config, DeviceConfigurationManager,
+  DeviceConfigurationManager,
 };
 use std::fs;
 
@@ -85,6 +85,10 @@ struct IntifaceCLIArguments {
   #[allow(dead_code)]
   #[argh(option)]
   log: Option<String>,
+
+  /// allow raw messages (dangerous, only use for development)
+  #[argh(switch)]
+  allowraw: bool,  
 }
 
 pub fn check_options_and_pipe() -> Option<FrontendPBufChannel> {
@@ -186,8 +190,9 @@ pub fn parse_options() -> Result<Option<ConnectorOptions>, IntifaceCLIErrorEnum>
     );
   }
 
-  connector_info.server_name = args.servername;
-  connector_info.max_ping_time = args.pingtime;
+  connector_info.server_options.name = args.servername;
+  connector_info.server_options.max_ping_time = args.pingtime;
+  connector_info.server_options.allow_raw_messages = args.allowraw;
 
   if args.frontendpipe {
     info!("Intiface CLI Options: Using frontend pipe");
@@ -206,20 +211,31 @@ pub fn parse_options() -> Result<Option<ConnectorOptions>, IntifaceCLIErrorEnum>
       "Intiface CLI Options: External Device Config {}",
       deviceconfig
     );
-    let cfg = fs::read_to_string(deviceconfig).unwrap();
-    set_external_device_config(Some(cfg));
-    // Make an unused DeviceConfigurationManager here, as it'll panic if it's invalid.
-    let _manager = DeviceConfigurationManager::default();
+    match fs::read_to_string(deviceconfig) {
+      Ok(cfg) => connector_info.server_options.device_configuration_json = Some(cfg),
+      Err(err) => panic!("Error opening external device configuration: {:?}", err)
+    };
   }
 
   if let Some(userdeviceconfig) = &args.userdeviceconfig {
     info!(
       "Intiface CLI Options: User Device Config {}",
       userdeviceconfig
     );
-    let cfg = fs::read_to_string(userdeviceconfig).unwrap();
-    set_user_device_config(Some(cfg));
-    let _manager = DeviceConfigurationManager::default();
+    match fs::read_to_string(userdeviceconfig) {
+      Ok(cfg) => connector_info.server_options.user_device_configuration_json = Some(cfg),
+      Err(err) => panic!("Error opening user device configuration: {:?}", err)
+    };
+  }
+
+  // Make sure we can bring up a DeviceConfigurationManager before handing back
+  // to the server to start the listener.
+
+  if let Err(err) = DeviceConfigurationManager::new_with_options(
+    connector_info.server_options.allow_raw_messages, 
+    &connector_info.server_options.device_configuration_json, 
+    &connector_info.server_options.user_device_configuration_json) {
+    panic!("Error in creation of Device Configuration Manager: {:?}", err);
   }
 
   Ok(Some(connector_info))