Skip to content

Commit 8b0fc4a

Browse files
Remove m2m connections
1 parent 2164c17 commit 8b0fc4a

2 files changed

Lines changed: 0 additions & 38 deletions

File tree

src/cloudflare.rs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -107,41 +107,6 @@ async fn handle_server_stream(
107107
empty_response()
108108
}
109109

110-
// TODO
111-
pub(crate) fn handle_mutiny_to_mutiny(
112-
_req: Request,
113-
_ctx: RouteContext<()>,
114-
) -> worker::Result<Response> {
115-
// For websocket compatibility
116-
let pair = WebSocketPair::new()?;
117-
let server = pair.server;
118-
server.accept()?;
119-
logger::debug("accepted websocket, about to spawn event stream");
120-
wasm_bindgen_futures::spawn_local(async move {
121-
let mut event_stream = server.events().expect("stream error");
122-
logger::debug("spawned event stream, waiting for first message..");
123-
while let Some(event) = event_stream.next().await {
124-
if let Err(e) = event {
125-
logger::error(&format!("error parsing some event: {e}"));
126-
continue;
127-
}
128-
match event.expect("received error in websocket") {
129-
WebsocketEvent::Message(msg) => {
130-
if msg.text().is_none() {
131-
continue;
132-
};
133-
// TODO parse msg when we support m2m here
134-
}
135-
WebsocketEvent::Close(_) => {
136-
logger::debug("closing");
137-
break;
138-
}
139-
}
140-
}
141-
});
142-
Response::from_websocket(pair.client)
143-
}
144-
145110
pub(crate) fn empty_response() -> worker::Result<Response> {
146111
Response::empty()?.with_cors(&cors())
147112
}

src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ async fn main() {
3030

3131
let app = Router::new()
3232
.route("/v1/:ip/:port", get(crate::server::ws_handler))
33-
// TODO m2m
34-
//.route("/v1/mutiny/:identifier", get(mutiny_ws_handler))
3533
.layer(
3634
TraceLayer::new_for_http()
3735
.make_span_with(DefaultMakeSpan::default().include_headers(true)),
@@ -69,7 +67,6 @@ pub async fn main(req: Request, env: Env, _ctx: Context) -> worker::Result<worke
6967
// Environment bindings like KV Stores, Durable Objects, Secrets, and Variables.
7068
router
7169
// TODO this is for mutiny to mutiny, which is being ignored for now
72-
.get("/v1/mutiny/:id", crate::cloudflare::handle_mutiny_to_mutiny)
7370
.get("/v1/:ip/:port", crate::cloudflare::handle_ws_to_tcp)
7471
.options("/*catchall", |_, _| crate::cloudflare::empty_response())
7572
.run(req, env)

0 commit comments

Comments
 (0)