fixed the https functionality broken from rustls upgrade

packages/cli/src/serve/output.rs

@@ -663,11 +663,19 @@ impl Output {
 
         self.render_feature_list(frame, app_features, state);
 
-        // todo(jon) should we write https ?
-        let address = match state.server.displayed_address() {
-            Some(address) => format!("http://{}", address).blue(),
-            None => "no server address".dark_gray(),
-        };
+        // Render the server address
+        let address = state
+            .server
+            .displayed_address()
+            .map(|addr| {
+                let scheme = if state.krate.config.web.https.enabled.unwrap_or_default() {
+                    "https"
+                } else {
+                    "http"
+                };
+                format!("{}://{}", scheme, addr).blue()
+            })
+            .unwrap_or_else(|| "no server address".dark_gray());
 
         frame.render_widget_ref(
             Paragraph::new(Line::from(vec![

packages/cli/src/serve/proxy.rs

@@ -15,6 +15,7 @@ use hyper_util::{
     client::legacy::{self, connect::HttpConnector},
     rt::TokioExecutor,
 };
+use rustls::crypto::ring;
 
 #[derive(Debug, Clone)]
 struct ProxyClient {
@@ -24,7 +25,10 @@ struct ProxyClient {
 
 impl ProxyClient {
     fn new(url: Uri) -> Self {
-        let _ = rustls::crypto::ring::default_provider().install_default();
+        // Need to initialize the default crypto provider before we start the server
+        // https://github.com/rustls/rustls/issues/1938
+        // The thread which wins will install the provider
+        let _ = ring::default_provider().install_default();
         let https = hyper_rustls::HttpsConnectorBuilder::new()
             .with_native_roots()
             .unwrap()

packages/cli/src/serve/server.rs

@@ -27,6 +27,7 @@ use futures_util::{
     StreamExt,
 };
 use hyper::HeaderMap;
+use rustls::crypto::ring;
 use serde::{Deserialize, Serialize};
 use std::{
     convert::Infallible,
@@ -111,6 +112,13 @@ impl WebServer {
 
         // Set up the router with some shared state that we'll update later to reflect the current state of the build
         let build_status = SharedStatus::new_with_starting_build();
+
+        // Need to initialize the default crypto provider before we start the server
+        // https://github.com/rustls/rustls/issues/1938
+        // This is needed for WSS (dev proxy) / HTTPS (local dev server test)
+        // The thread which wins will install the provider
+        let _ = ring::default_provider().install_default();
+
         let router = build_devserver_router(
             args,
             krate,
@@ -252,7 +260,7 @@ impl WebServer {
                     BuildStage::Failed => self.send_reload_failed().await,
                     BuildStage::Restarting => self.send_reload_start().await,
                     BuildStage::Initializing => {}
-                    BuildStage::InstallingTooling {} => {}
+                    BuildStage::InstallingTooling => {}
                     BuildStage::Compiling {
                         current,
                         total,
@@ -267,7 +275,7 @@ impl WebServer {
                             self.send_build_status().await;
                         }
                     }
-                    BuildStage::OptimizingWasm {} => {}
+                    BuildStage::OptimizingWasm => {}
                     BuildStage::Aborted => {}
                     BuildStage::CopyingAssets { .. } => {}
                     _ => {}