feat: Replace local http transport with launchdarkly-sdk-transport (#118)

Author: keelerm84

.github/actions/build-docs/action.yml

@@ -6,4 +6,4 @@ runs:
   steps:
     - name: Build Documentation
       shell: bash
-      run: cargo doc --no-deps -p eventsource-client
+      run: cargo doc --no-deps --all-features -p eventsource-client

.github/actions/ci/action.yml

@@ -1,6 +1,12 @@
 name: CI Workflow
 description: 'Shared CI workflow.'
 
+inputs:
+  feature-flags:
+    description: 'Cargo feature flags to pass to test and clippy commands'
+    required: false
+    default: ''
+
 runs:
   using: composite
   steps:
@@ -10,15 +16,15 @@ runs:
 
     - name: Run tests
       shell: bash
-      run: cargo test --all-features -p eventsource-client
+      run: cargo test ${{ inputs.feature-flags }} -p eventsource-client
 
     - name: Run slower integration tests
       shell: bash
-      run: cargo test --all-features -p eventsource-client --lib -- --ignored
+      run: cargo test ${{ inputs.feature-flags }} -p eventsource-client --lib -- --ignored
 
     - name: Run clippy checks
       shell: bash
-      run: cargo clippy --all-features -p eventsource-client -- -D warnings
+      run: cargo clippy ${{ inputs.feature-flags }} -p eventsource-client -- -D warnings
 
     - name: Build contract tests
       shell: bash

.github/workflows/ci.yml

@@ -16,6 +16,20 @@ on:
 jobs:
   ci-build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        features:
+          - name: "default"
+            flags: ""
+          - name: "no-features"
+            flags: "--no-default-features"
+          - name: "hyper"
+            flags: "--no-default-features --features hyper"
+          - name: "hyper-rustls"
+            flags: "--no-default-features --features hyper-rustls"
+
+    name: CI (${{ matrix.features.name }})
 
     steps:
       - uses: actions/checkout@v4
@@ -32,4 +46,24 @@ jobs:
           rustup component add rustfmt clippy
 
       - uses: ./.github/actions/ci
+        with:
+          feature-flags: ${{ matrix.features.flags }}
+
+  build-docs:
+    runs-on: ubuntu-latest
+    name: Build Documentation (all features)
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get Rust version
+        id: rust-version
+        run: cat ./.github/variables/rust-versions.env >> $GITHUB_OUTPUT
+
+      - name: Setup rust tooling
+        run: |
+          rustup override set ${{ steps.rust-version.outputs.target }}
+
       - uses: ./.github/actions/build-docs

contract-tests/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 [dependencies]
 futures = { version = "0.3.21" }
 serde = { version = "1.0", features = ["derive"] }
-eventsource-client = { path = "../eventsource-client", features = ["hyper", "hyper-rustls"] }
+eventsource-client = { path = "../eventsource-client", features = ["hyper-rustls"] }
 serde_json = { version = "1.0.39"}
 actix = { version = "0.13.1"}
 actix-web = { version = "4"}
@@ -18,5 +18,7 @@ log = "0.4.6"
 http = "1.0"
 bytes = "1.5"
 
+launchdarkly-sdk-transport = { git = "https://github.com/launchdarkly/rust-sdk-transport.git", branch = "main" }
+
 [[bin]]
 name = "sse-test-api"

contract-tests/src/bin/sse-test-api/stream_entity.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use eventsource_client as es;
-use eventsource_client::HyperTransport;
+use launchdarkly_sdk_transport::HyperTransport;
 
 use crate::{Config, EventType};
 

eventsource-client/Cargo.toml

@@ -20,17 +20,7 @@ tokio = { version = "1.17.0", features = ["time"] }
 rand = "0.8.5"
 base64 = "0.22.1"
 
-#
-# Dependencies for hyper transport
-#
-hyper = { version = "1.0", features = ["client", "http1", "http2"], optional = true }
-hyper-util = { version = "0.1", features = ["client-legacy", "http1", "http2", "tokio"], optional = true }
-http-body-util = { version = "0.1", optional = true }
-hyper-http-proxy = { version = "1.1.0", optional = true }
-hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "native-tokio", "ring", "tls12", "webpki-roots"], optional = true }
-hyper-timeout = { version = "0.5", optional = true }
-tower = { version = "0.4", optional = true }
-no-proxy = { version = "0.3.6", default-features = false }
+launchdarkly-sdk-transport = { git = "https://github.com/launchdarkly/rust-sdk-transport.git", branch = "main" }
 
 [dev-dependencies]
 env_logger = "0.10.0"
@@ -41,7 +31,11 @@ tokio = { version = "1.2.0", features = ["macros", "rt-multi-thread"] }
 test-case = "3.2.1"
 proptest = "1.0.0"
 
+[[example]]
+name = "tail"
+required-features = ["hyper"]
+
 [features]
 default = ["hyper"]
-hyper = ["dep:hyper", "dep:hyper-util", "dep:http-body-util", "dep:hyper-timeout", "dep:tower", "dep:hyper-http-proxy"]
-hyper-rustls = ["hyper", "dep:hyper-rustls"]
+hyper = ["launchdarkly-sdk-transport/hyper"]
+hyper-rustls = ["hyper", "launchdarkly-sdk-transport/hyper-rustls"]

eventsource-client/examples/tail.rs

@@ -16,6 +16,7 @@ use futures::{Stream, TryStreamExt};
 use std::{env, process, time::Duration};
 
 use eventsource_client as es;
+use launchdarkly_sdk_transport::HyperTransport;
 
 #[tokio::main]
 #[allow(clippy::result_large_err)]
@@ -56,7 +57,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 async fn run_with_http(url: &str, auth_header: &str) -> Result<(), Box<dyn std::error::Error>> {
-    let transport = es::HyperTransport::builder()
+    let transport = HyperTransport::builder()
         .connect_timeout(Duration::from_secs(10))
         .read_timeout(Duration::from_secs(30))
         .build_http()?;
@@ -82,7 +83,7 @@ async fn run_with_http(url: &str, auth_header: &str) -> Result<(), Box<dyn std::
 
 #[cfg(feature = "hyper-rustls")]
 async fn run_with_https(url: &str, auth_header: &str) -> Result<(), Box<dyn std::error::Error>> {
-    let transport = es::HyperTransport::builder()
+    let transport = HyperTransport::builder()
         .connect_timeout(Duration::from_secs(10))
         .read_timeout(Duration::from_secs(30))
         .build_https()?;

eventsource-client/src/client.rs

@@ -21,12 +21,12 @@ use tokio::time::Sleep;
 use crate::{
     config::ReconnectOptions,
     response::{ErrorBody, Response},
-    {ByteStream, HttpTransport, ResponseFuture},
 };
 use crate::{
     error::{Error, Result},
     event_parser::ConnectionDetails,
 };
+use launchdarkly_sdk_transport::{ByteStream, HttpTransport, ResponseFuture};
 
 use crate::event_parser::EventParser;
 use crate::event_parser::SSE;
@@ -313,7 +313,7 @@ impl<T: HttpTransport> ReconnectingRequest<T> {
         // Include the request body if set. Most SSE requests use GET and will have None,
         // but some implementations (e.g., using REPORT method) may include a body.
         let request = request_builder
-            .body(self.props.body.clone())
+            .body(self.props.body.clone().map(|b| b.into()))
             .map_err(|e| Error::InvalidParameter(Box::new(e)))?;
 
         Ok(self.transport.request(request))
@@ -573,7 +573,7 @@ fn delay(dur: Duration, description: &str) -> Sleep {
 
 mod private {
     use crate::client::ClientImpl;
-    use crate::HttpTransport;
+    use launchdarkly_sdk_transport::HttpTransport;
 
     pub trait Sealed {}
     impl<T: HttpTransport> Sealed for ClientImpl<T> {}
@@ -618,8 +618,8 @@ mod tests {
     use crate::{
         client::{RequestProps, State},
         ReconnectOptionsBuilder, ReconnectingRequest,
-        {ByteStream, HttpTransport, ResponseFuture, TransportError},
     };
+    use launchdarkly_sdk_transport::{ByteStream, HttpTransport, ResponseFuture, TransportError};
 
     // Mock transport for testing
     #[derive(Clone)]
@@ -634,7 +634,7 @@ mod tests {
     }
 
     impl HttpTransport for MockTransport {
-        fn request(&self, _request: http::Request<Option<String>>) -> ResponseFuture {
+        fn request(&self, _request: http::Request<Option<Bytes>>) -> ResponseFuture {
             if self.fail_request {
                 // Simulate a connection error
                 Box::pin(async {

eventsource-client/src/error.rs

@@ -1,5 +1,5 @@
 use crate::response::{ErrorBody, Response};
-use crate::TransportError;
+use launchdarkly_sdk_transport::TransportError;
 
 /// Error type for invalid response headers encountered in ResponseDetails.
 #[derive(Debug)]

eventsource-client/src/lib.rs

@@ -14,9 +14,8 @@
 //!
 //! # async fn example() -> Result<(), Box<dyn std::error::Error>> {
 //! // You need to implement HttpTransport trait for your HTTP client
-//! // See examples/hyper_transport.rs or examples/reqwest_transport.rs for reference implementations
 //! # struct MyTransport;
-//! # impl eventsource_client::HttpTransport for MyTransport {
+//! # impl launchdarkly_sdk_transport::HttpTransport for MyTransport {
 //! #     fn request(&self, _req: http::Request<Option<String>>) -> eventsource_client::ResponseFuture {
 //! #         unimplemented!()
 //! #     }
@@ -56,17 +55,10 @@ mod error;
 mod event_parser;
 mod response;
 mod retry;
-mod transport;
-
-#[cfg(feature = "hyper")]
-mod transport_hyper;
 
 pub use client::*;
 pub use config::*;
 pub use error::*;
 pub use event_parser::Event;
 pub use event_parser::SSE;
 pub use response::Response;
-pub use transport::*;
-#[cfg(feature = "hyper")]
-pub use transport_hyper::*;