fix(eio): fail properly on connection error

Author: ctrlaltf24

ci/engine-io-polling.js

@@ -5,7 +5,8 @@ const engine = require('engine.io');
 const http = require('http').createServer().listen(4203);
 // the engine.io client runs on port 4203
 const server = engine.attach(http, {
-    allowUpgrades: false
+    allowUpgrades: false,
+    transports: ["polling"]
 });
 
 console.log("Started")

engineio/src/client/socket.rs

@@ -205,7 +205,7 @@ impl SocketBuilder {
                     self.headers
                         .clone()
                         .map(|headers| headers.try_into().unwrap()),
-                );
+                )?;
                 if self.handshake.is_some() {
                     transport.upgrade()?;
                 } else {
@@ -230,7 +230,7 @@ impl SocketBuilder {
                     url,
                     self.tls_config.clone(),
                     self.headers.clone().map(|v| v.try_into().unwrap()),
-                );
+                )?;
                 if self.handshake.is_some() {
                     transport.upgrade()?;
                 } else {
@@ -542,7 +542,8 @@ mod test {
     #[test]
     fn test_connection_ws() -> Result<()> {
         let url = crate::test::engine_io_polling_server()?;
-        assert!(builder(url).build_websocket().is_err());
+        assert!(builder(url.clone()).build_websocket().is_err());
+        assert!(builder(url).build_websocket_with_upgrade().is_err());
 
         let mut url = crate::test::engine_io_server()?;
 

engineio/src/transports/websocket.rs

@@ -20,26 +20,26 @@ pub struct WebsocketTransport {
 
 impl WebsocketTransport {
     /// Creates an instance of `WebsocketTransport`.
-    pub fn new(base_url: Url, headers: Option<Headers>) -> Self {
+    pub fn new(base_url: Url, headers: Option<Headers>) -> Result<Self> {
         let mut url = base_url;
         url.query_pairs_mut().append_pair("transport", "websocket");
         url.set_scheme("ws").unwrap();
-        let mut client_builder = WsClientBuilder::new(url[..].as_ref()).unwrap();
+        let mut client_builder = WsClientBuilder::new(url[..].as_ref())?;
         if let Some(headers) = headers {
             client_builder = client_builder.custom_headers(&headers);
         }
-        let client = client_builder.connect_insecure().unwrap();
+        let client = client_builder.connect_insecure()?;
 
-        client.set_nonblocking(false).unwrap();
+        client.set_nonblocking(false)?;
 
-        let (receiver, sender) = client.split().unwrap();
+        let (receiver, sender) = client.split()?;
 
-        WebsocketTransport {
+        Ok(WebsocketTransport {
             sender: Arc::new(Mutex::new(sender)),
             receiver: Arc::new(Mutex::new(receiver)),
             // SAFTEY: already a URL parsing can't fail
-            base_url: Arc::new(RwLock::new(url::Url::parse(&url.to_string()).unwrap())),
-        }
+            base_url: Arc::new(RwLock::new(url::Url::parse(&url.to_string())?)),
+        })
     }
 
     /// Sends probe packet to ensure connection is valid, then sends upgrade
@@ -136,10 +136,7 @@ mod test {
 
     fn new() -> Result<WebsocketTransport> {
         let url = crate::test::engine_io_server()?.to_string() + "engine.io/?EIO=4";
-        Ok(WebsocketTransport::new(
-            Url::from_str(&url[..]).unwrap(),
-            None,
-        ))
+        WebsocketTransport::new(Url::from_str(&url[..])?, None)
     }
 
     #[test]

engineio/src/transports/websocket_secure.rs

@@ -27,23 +27,27 @@ pub struct WebsocketSecureTransport {
 
 impl WebsocketSecureTransport {
     /// Creates an instance of `WebsocketSecureTransport`.
-    pub fn new(base_url: Url, tls_config: Option<TlsConnector>, headers: Option<Headers>) -> Self {
+    pub fn new(
+        base_url: Url,
+        tls_config: Option<TlsConnector>,
+        headers: Option<Headers>,
+    ) -> Result<Self> {
         let mut url = base_url;
         url.query_pairs_mut().append_pair("transport", "websocket");
         url.set_scheme("wss").unwrap();
-        let mut client_builder = WsClientBuilder::new(url[..].as_ref()).unwrap();
+        let mut client_builder = WsClientBuilder::new(url[..].as_ref())?;
         if let Some(headers) = headers {
             client_builder = client_builder.custom_headers(&headers);
         }
-        let client = client_builder.connect_secure(tls_config).unwrap();
+        let client = client_builder.connect_secure(tls_config)?;
 
-        client.set_nonblocking(false).unwrap();
+        client.set_nonblocking(false)?;
 
-        WebsocketSecureTransport {
+        Ok(WebsocketSecureTransport {
             client: Arc::new(Mutex::new(client)),
             // SAFTEY: already a URL parsing can't fail
-            base_url: Arc::new(RwLock::new(url::Url::parse(&url.to_string()).unwrap())),
-        }
+            base_url: Arc::new(RwLock::new(url::Url::parse(&url.to_string())?)),
+        })
     }
 
     /// Sends probe packet to ensure connection is valid, then sends upgrade
@@ -142,11 +146,11 @@ mod test {
     use std::str::FromStr;
     fn new() -> Result<WebsocketSecureTransport> {
         let url = crate::test::engine_io_server_secure()?.to_string() + "engine.io/?EIO=4";
-        Ok(WebsocketSecureTransport::new(
-            Url::from_str(&url[..]).unwrap(),
+        WebsocketSecureTransport::new(
+            Url::from_str(&url[..])?,
             Some(crate::test::tls_connector()?),
             None,
-        ))
+        )
     }
     #[test]
     fn websocket_secure_transport_base_url() -> Result<()> {