Skip to content

Invoke WebSocketTransportBasePlugin connected and disconnected callbacks #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2022
Merged

Invoke WebSocketTransportBasePlugin connected and disconnected callbacks #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions proxy/http/proxy/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,11 @@ def on_client_connection_close(self) -> None:
# Request
'request_method': text_(self.request.method),
'request_path': text_(self.request.path),
'request_bytes': self.request.total_size,
'request_ua': self.request.header(b'user-agent')
'request_bytes': text_(self.request.total_size),
'request_ua': text_(self.request.header(b'user-agent'))
if self.request.has_header(b'user-agent')
else None,
'request_version': self.request.version,
'request_version': text_(self.request.version),
# Response
'response_bytes': self.response.total_size,
'response_code': text_(self.response.code),
Expand Down
19 changes: 11 additions & 8 deletions proxy/http/websocket/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@ class WebSocketTransport(HttpWebServerBasePlugin):

def __init__(self, *args: Any, **kwargs: Any) -> None:
super().__init__(*args, **kwargs)
self.plugins: Dict[str, WebSocketTransportBasePlugin] = {}
self.plugins: List[WebSocketTransportBasePlugin] = []
# Registered methods and handler plugin
self.methods: Dict[str, WebSocketTransportBasePlugin] = {}
if b'WebSocketTransportBasePlugin' in self.flags.plugins:
for klass in self.flags.plugins[b'WebSocketTransportBasePlugin']:
p = klass(self.flags, self.client, self.event_queue)
self.plugins.append(p)
for method in p.methods():
self.plugins[method] = p
self.methods[method] = p

def routes(self) -> List[Tuple[int, str]]:
return [
Expand All @@ -44,8 +47,8 @@ def handle_request(self, request: HttpParser) -> None:
raise NotImplementedError()

def on_websocket_open(self) -> None:
# TODO(abhinavsingh): Add connected callback invocation
logger.info('app ws opened')
for plugin in self.plugins:
plugin.connected()

def on_websocket_message(self, frame: WebsocketFrame) -> None:
try:
Expand All @@ -59,16 +62,16 @@ def on_websocket_message(self, frame: WebsocketFrame) -> None:
method = message['method']
if method == 'ping':
self.reply({'id': message['id'], 'response': 'pong'})
elif method in self.plugins:
self.plugins[method].handle_message(message)
elif method in self.methods:
self.methods[method].handle_message(message)
else:
logger.info(frame.data)
logger.info(frame.opcode)
self.reply({'id': message['id'], 'response': 'not_implemented'})

def on_client_connection_close(self) -> None:
# TODO(abhinavsingh): Add disconnected callback invocation
logger.info('app ws closed')
for plugin in self.plugins:
plugin.disconnected()

def reply(self, data: Dict[str, Any]) -> None:
self.client.queue(
Expand Down