[Tunnelbroker] refactor initializing session to make it possible to send a response to the client on session creation failure
ClosedPublic
Actions

Authored by kamil on Oct 25 2023, 3:54 AM.

Details

Reviewers

michal
bartek
varun
• jon

Commits

rCOMM2c269eb01013: [Tunnelbroker] refactor initializing session to make it possible to send a…

Summary

This refactor is to make D9595 possible.
The intention is to fix outgoing's ownership issue when session creation fails (send forces outgoing to be mutable).
Doesn't look like a very optimal pattern, but not sure if this can be improved are is there a more graceful way to handle this - if anyone has any suggestions I am happy to change this 😄

Creating separate diff to make it easier for reviewers, actual usage is in D9595.

Depends on D9593

Test Plan

Tunnelbroker tests (most important are test_tunnelbroker_invalid_auth and test_tunnelbroker_valid_auth).

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

kamil created this revision.Oct 25 2023, 3:54 AM

kamil held this revision as a draft.

Herald added a reviewer: • jon. · View Herald TranscriptOct 25 2023, 3:54 AM

Herald added subscribers: will, tomek, ashoat. · View Herald Transcript

kamil added a child revision: D9595: [Tunnelbroker] implement sending response after session creation attempt.Oct 25 2023, 4:03 AM

kamil edited the summary of this revision. (Show Details)Oct 25 2023, 4:04 AM

Harbormaster completed remote builds in B23482: Diff 32390.Oct 25 2023, 4:36 AM

kamil published this revision for review.Oct 25 2023, 5:18 AM

It doesn't look that bad, I don't know if this can be done much better. Perhaps @michal has any ideas?

services/tunnelbroker/src/websockets/mod.rs

240–243 ↗

(On Diff #32390)

you could probably extract this as type alias or even a tuple struct (which could implement some traits later if needed)

pub type ErrorWithStreamHandle<S> = (session::SessionError, SplitSink<WebSocketStream<S>, Message>);

// or
pub struct ErrorWithStreamHandle<S>(session::SessionError, SplitSink<WebSocketStream<S>, Message>);