Refine builder pattern

cloudflare · May 5, 2024 · d180768 · d180768
1 parent 5766930
commit d180768
Show file tree

Hide file tree

Showing 3 changed files with 140 additions and 93 deletions.
diff --git a/worker-sandbox/src/counter.rs b/worker-sandbox/src/counter.rs
@@ -34,10 +34,10 @@ impl DurableObject for Counter {
                 .serialize_attachment("hello")
                 .expect("failed to serialize attachment");
 
-            return Ok(Response::empty()
-                .unwrap()
+            return Ok(ResponseBuilder::new()
                 .with_status(101)
-                .with_websocket(Some(pair.client)));
+                .with_websocket(pair.client)
+                .empty());
         }
 
         self.count += 10;

diff --git a/worker/src/lib.rs b/worker/src/lib.rs
@@ -184,7 +184,7 @@ pub use crate::queue::*;
 pub use crate::r2::*;
 pub use crate::request::{FromRequest, Request};
 pub use crate::request_init::*;
-pub use crate::response::{IntoResponse, Response, ResponseBody};
+pub use crate::response::{IntoResponse, Response, ResponseBody, ResponseBuilder};
 pub use crate::router::{RouteContext, RouteParams, Router};
 pub use crate::schedule::*;
 pub use crate::socket::*;