Move environment parsing to Options

Author: daxpedda

src/main.rs

@@ -19,8 +19,10 @@ fn main() -> Result<(), anyhow::Error> {
     let title = std::env::var("CARGO_PKG_NAME").unwrap_or_else(|_| "".to_string());
     let address =
         std::env::var("WASM_SERVER_RUNNER_ADDRESS").unwrap_or_else(|_| "127.0.0.1".to_string());
+    let https =
+        std::env::var("WASM_SERVER_RUNNER_HTTPS").unwrap_or_else(|_| String::from("0")) == "1";
 
-    let options = Options { title, address };
+    let options = Options { title, address, https };
 
     let wasm_file = std::env::args()
         .nth(1)

src/server.rs

@@ -20,6 +20,7 @@ fn generate_version() -> String {
 pub struct Options {
     pub title: String,
     pub address: String,
+    pub https: bool,
 }
 
 pub async fn run_server(options: Options, output: WasmBindgenOutput) -> Result<()> {
@@ -61,7 +62,7 @@ pub async fn run_server(options: Options, output: WasmBindgenOutput) -> Result<(
     }
     let addr: SocketAddr = address_string.parse().expect("Couldn't parse address");
 
-    if std::env::var("WASM_SERVER_RUNNER_HTTPS").unwrap_or_else(|_| String::from("0")) == "1" {
+    if options.https {
         let certificate = rcgen::generate_simple_self_signed([String::from("localhost")])?;
         let config = RustlsConfig::from_der(
             vec![certificate.serialize_der()?],