Merge branch 'main' into engineioxide-client

Author: Totodore

Cargo.lock

@@ -208,20 +208,7 @@ impl From<Packet> for String {
         buffer
     }
 }
-<<<<<<< HEAD:crates/engineioxide-core/src/packet.rs
 
-=======
-impl From<Packet> for tokio_tungstenite::tungstenite::Utf8Bytes {
-    fn from(value: Packet) -> Self {
-        String::from(value).into()
-    }
-}
-impl From<Packet> for Bytes {
-    fn from(value: Packet) -> Self {
-        String::from(value).into()
-    }
-}
->>>>>>> origin/main:crates/engineioxide/src/packet.rs
 /// Deserialize a [Packet] from a [String] according to the Engine.IO protocol
 impl TryFrom<Str> for Packet {
     type Error = PacketParseError;

crates/engineioxide-core/src/packet.rs

@@ -114,11 +114,7 @@ pub async fn v4_encoder(
 /// [engine.io v3 protocol](https://github.com/socketio/engine.io-protocol/tree/v3#payload)
 #[cfg(feature = "v3")]
 pub fn v3_bin_packet_encoder(packet: Packet, data: &mut bytes::BytesMut) {
-<<<<<<< HEAD:crates/engineioxide-core/src/payload/encoder.rs
     use crate::payload::BINARY_PACKET_SEPARATOR_V3;
-=======
-    use crate::transport::polling::payload::BINARY_PACKET_SEPARATOR_V3;
->>>>>>> origin/main:crates/engineioxide/src/transport/polling/payload/encoder.rs
     use bytes::BufMut;
 
     let mut itoa = itoa::Buffer::new();
@@ -158,11 +154,7 @@ pub fn v3_bin_packet_encoder(packet: Packet, data: &mut bytes::BytesMut) {
 /// [engine.io v3 protocol](https://github.com/socketio/engine.io-protocol/tree/v3#payload)
 #[cfg(feature = "v3")]
 pub fn v3_string_packet_encoder(packet: Packet, data: &mut bytes::BytesMut) {
-<<<<<<< HEAD:crates/engineioxide-core/src/payload/encoder.rs
     use crate::payload::STRING_PACKET_SEPARATOR_V3;
-=======
-    use crate::transport::polling::payload::STRING_PACKET_SEPARATOR_V3;
->>>>>>> origin/main:crates/engineioxide/src/transport/polling/payload/encoder.rs
     use bytes::BufMut;
     let packet: String = packet.into();
     let packet = format!(

crates/engineioxide-core/src/payload/encoder.rs

@@ -1,3 +1,7 @@
+# engineioxide 0.17.1
+* fix: upgrade process was timing out when the client made accidentally more
+than one polling requests while upgrading (#497).
+
 # engineioxide 0.17
 * MSRV: rust-version is now 1.86 with edition 2024
 

crates/engineioxide/CHANGELOG.md

@@ -1,7 +1,7 @@
 [package]
 name = "engineioxide"
 description = "Engine IO server implementation in rust as a Tower Service."
-version = "0.17.0"
+version = "0.17.1"
 edition.workspace = true
 rust-version.workspace = true
 authors.workspace = true

crates/engineioxide/Cargo.toml

@@ -334,14 +334,8 @@ where
     };
     match Packet::try_from(ws_bytes_to_str(msg))? {
         Packet::PingUpgrade => {
-<<<<<<< HEAD
-            socket.start_upgrade();
-            let pong: String = Packet::PongUpgrade.into();
-=======
             #[cfg(feature = "tracing")]
             tracing::debug!("received first ping upgrade");
-
->>>>>>> origin/main
             // Respond with a PongUpgrade packet
             ws.send(Message::Text(pong.into())).await?;
         }