godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Use const ref parameters in the Web modules

Browse Source
This commit is contained in:
Aaron Franke
2025-09-27 10:46:27 -07:00
parent b4472f4670
commit ac2e01684c
19 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/websocket/editor/editor_debugger_server_websocket.h
View File

@@ -47,7 +47,7 @@ private:
public:
static EditorDebuggerServer *create(const String &p_protocol);
void _peer_connected(int p_peer, String p_protocol);
void _peer_connected(int p_peer, const String &p_protocol);
void _peer_disconnected(int p_peer, bool p_was_clean);
virtual void poll() override;

6
modules/websocket/emws_peer.cpp
View File

@@ -60,7 +60,7 @@ void EMWSPeer::_esws_on_close(void *p_obj, int p_code, const char *p_reason, int
peer->ready_state = STATE_CLOSED;
}
Error EMWSPeer::connect_to_url(const String &p_url, Ref<TLSOptions> p_tls_options) {
Error EMWSPeer::connect_to_url(const String &p_url, const Ref<TLSOptions> &p_tls_options) {
ERR_FAIL_COND_V(p_url.is_empty(), ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(p_tls_options.is_valid() && p_tls_options->is_server(), ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(ready_state != STATE_CLOSED && ready_state != STATE_CLOSING, ERR_ALREADY_IN_USE);
@@ -112,7 +112,7 @@ Error EMWSPeer::connect_to_url(const String &p_url, Ref<TLSOptions> p_tls_option
return OK;
}
Error EMWSPeer::accept_stream(Ref<StreamPeer> p_stream) {
Error EMWSPeer::accept_stream(const Ref<StreamPeer> &p_stream) {
WARN_PRINT_ONCE("Acting as WebSocket server is not supported in Web platforms.");
return ERR_UNAVAILABLE;
}
@@ -179,7 +179,7 @@ void EMWSPeer::_clear() {
packet_buffer.clear();
}
void EMWSPeer::close(int p_code, String p_reason) {
void EMWSPeer::close(int p_code, const String &p_reason) {
if (p_code < 0) {
if (peer_sock != -1) {
godot_js_websocket_destroy(peer_sock);

6
modules/websocket/emws_peer.h
View File

@@ -86,9 +86,9 @@ public:
// WebSocketPeer
virtual Error send(const uint8_t *p_buffer, int p_buffer_size, WriteMode p_mode) override;
virtual Error connect_to_url(const String &p_url, Ref<TLSOptions> p_tls_client_options) override;
virtual Error accept_stream(Ref<StreamPeer> p_stream) override;
virtual void close(int p_code = 1000, String p_reason = "") override;
virtual Error connect_to_url(const String &p_url, const Ref<TLSOptions> &p_tls_client_options) override;
virtual Error accept_stream(const Ref<StreamPeer> &p_stream) override;
virtual void close(int p_code = 1000, const String &p_reason = "") override;
virtual void poll() override;
virtual State get_ready_state() const override;

6
modules/websocket/remote_debugger_peer_websocket.cpp
View File

@@ -74,7 +74,7 @@ void RemoteDebuggerPeerWebSocket::poll() {
}
while (ws_peer->get_ready_state() == WebSocketPeer::STATE_OPEN && out_queue.size() > 0) {
Array var = out_queue.front()->get();
const Array var = out_queue.front()->get();
Error err = ws_peer->put_var(var);
ERR_BREAK(err != OK); // Peer buffer full?
out_queue.pop_front();
@@ -92,7 +92,7 @@ bool RemoteDebuggerPeerWebSocket::has_message() {
Array RemoteDebuggerPeerWebSocket::get_message() {
ERR_FAIL_COND_V(in_queue.is_empty(), Array());
Array msg = in_queue.front()->get();
const Array msg = in_queue.front()->get();
in_queue.pop_front();
return msg;
}
@@ -119,7 +119,7 @@ bool RemoteDebuggerPeerWebSocket::can_block() const {
#endif
}
RemoteDebuggerPeerWebSocket::RemoteDebuggerPeerWebSocket(Ref<WebSocketPeer> p_peer) {
RemoteDebuggerPeerWebSocket::RemoteDebuggerPeerWebSocket(const Ref<WebSocketPeer> &p_peer) {
max_queued_messages = (int)GLOBAL_GET("network/limits/debugger/max_queued_messages");
ws_peer = p_peer;
if (ws_peer.is_valid()) {

2
modules/websocket/remote_debugger_peer_websocket.h
View File

@@ -57,5 +57,5 @@ public:
void poll() override;
bool can_block() const override;
RemoteDebuggerPeerWebSocket(Ref<WebSocketPeer> p_peer = Ref<WebSocketPeer>());
RemoteDebuggerPeerWebSocket(const Ref<WebSocketPeer> &p_peer = Ref<WebSocketPeer>());
};

4
modules/websocket/websocket_multiplayer_peer.cpp
View File

@@ -178,7 +178,7 @@ int WebSocketMultiplayerPeer::get_max_packet_size() const {
return get_outbound_buffer_size() - PROTO_SIZE;
}
Error WebSocketMultiplayerPeer::create_server(int p_port, IPAddress p_bind_ip, Ref<TLSOptions> p_options) {
Error WebSocketMultiplayerPeer::create_server(int p_port, IPAddress p_bind_ip, const Ref<TLSOptions> &p_options) {
ERR_FAIL_COND_V(get_connection_status() != CONNECTION_DISCONNECTED, ERR_ALREADY_IN_USE);
ERR_FAIL_COND_V(p_options.is_valid() && !p_options->is_server(), ERR_INVALID_PARAMETER);
_clear();
@@ -194,7 +194,7 @@ Error WebSocketMultiplayerPeer::create_server(int p_port, IPAddress p_bind_ip, R
return OK;
}
Error WebSocketMultiplayerPeer::create_client(const String &p_url, Ref<TLSOptions> p_options) {
Error WebSocketMultiplayerPeer::create_client(const String &p_url, const Ref<TLSOptions> &p_options) {
ERR_FAIL_COND_V(get_connection_status() != CONNECTION_DISCONNECTED, ERR_ALREADY_IN_USE);
ERR_FAIL_COND_V(p_options.is_valid() && p_options->is_server(), ERR_INVALID_PARAMETER);
_clear();

4
modules/websocket/websocket_multiplayer_peer.h
View File

@@ -111,8 +111,8 @@ public:
/* WebSocketPeer */
virtual Ref<WebSocketPeer> get_peer(int p_peer_id) const;
Error create_client(const String &p_url, Ref<TLSOptions> p_options);
Error create_server(int p_port, IPAddress p_bind_ip, Ref<TLSOptions> p_options);
Error create_client(const String &p_url, const Ref<TLSOptions> &p_options);
Error create_server(int p_port, IPAddress p_bind_ip, const Ref<TLSOptions> &p_options);
void set_supported_protocols(const Vector<String> &p_protocols);
Vector<String> get_supported_protocols() const;

6
modules/websocket/websocket_peer.h
View File

@@ -80,11 +80,11 @@ public:
return _create(p_notify_postinitialize);
}
virtual Error connect_to_url(const String &p_url, Ref<TLSOptions> p_options = Ref<TLSOptions>()) = 0;
virtual Error accept_stream(Ref<StreamPeer> p_stream) = 0;
virtual Error connect_to_url(const String &p_url, const Ref<TLSOptions> &p_options = Ref<TLSOptions>()) = 0;
virtual Error accept_stream(const Ref<StreamPeer> &p_stream) = 0;
virtual Error send(const uint8_t *p_buffer, int p_buffer_size, WriteMode p_mode) = 0;
virtual void close(int p_code = 1000, String p_reason = "") = 0;
virtual void close(int p_code = 1000, const String &p_reason = "") = 0;
virtual IPAddress get_connected_host() const = 0;
virtual uint16_t get_connected_port() const = 0;

10
modules/websocket/wsl_peer.cpp
View File

@@ -80,7 +80,7 @@ void WSLPeer::Resolver::stop() {
port = 0;
}
void WSLPeer::Resolver::try_next_candidate(Ref<StreamPeerTCP> &p_tcp) {
void WSLPeer::Resolver::try_next_candidate(const Ref<StreamPeerTCP> &p_tcp) {
// Check if we still need resolving.
if (resolver_id != IP::RESOLVER_INVALID_ID) {
IP::ResolverStatus ip_status = IP::get_singleton()->get_resolve_item_status(resolver_id);
@@ -124,7 +124,7 @@ void WSLPeer::Resolver::try_next_candidate(Ref<StreamPeerTCP> &p_tcp) {
///
/// Server functions
///
Error WSLPeer::accept_stream(Ref<StreamPeer> p_stream) {
Error WSLPeer::accept_stream(const Ref<StreamPeer> &p_stream) {
ERR_FAIL_COND_V(p_stream.is_null(), ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(ready_state != STATE_CLOSED && ready_state != STATE_CLOSING, ERR_ALREADY_IN_USE);
@@ -474,7 +474,7 @@ bool WSLPeer::_verify_server_response() {
return true;
}
Error WSLPeer::connect_to_url(const String &p_url, Ref<TLSOptions> p_options) {
Error WSLPeer::connect_to_url(const String &p_url, const Ref<TLSOptions> &p_options) {
ERR_FAIL_COND_V(p_url.is_empty(), ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(p_options.is_valid() && p_options->is_server(), ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(ready_state != STATE_CLOSED && ready_state != STATE_CLOSING, ERR_ALREADY_IN_USE);
@@ -688,7 +688,7 @@ String WSLPeer::_generate_key() {
return CryptoCore::b64_encode_str(bkey.ptrw(), len);
}
String WSLPeer::_compute_key_response(String p_key) {
String WSLPeer::_compute_key_response(const String &p_key) {
String key = p_key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; // Magic UUID as per RFC
Vector<uint8_t> sha = key.sha1_buffer();
return CryptoCore::b64_encode_str(sha.ptr(), sha.size());
@@ -840,7 +840,7 @@ int WSLPeer::get_current_outbound_buffered_amount() const {
return wslay_event_get_queued_msg_length(wsl_ctx);
}
void WSLPeer::close(int p_code, String p_reason) {
void WSLPeer::close(int p_code, const String &p_reason) {
if (p_code < 0) {
// Force immediate close.
ready_state = STATE_CLOSED;

10
modules/websocket/wsl_peer.h
View File

@@ -59,7 +59,7 @@ private:
static wslay_event_callbacks _wsl_callbacks;
// Helpers
static String _compute_key_response(String p_key);
static String _compute_key_response(const String &p_key);
static String _generate_key();
// Client IP resolver.
@@ -73,7 +73,7 @@ private:
return ip_candidates.size() > 0 || resolver_id != IP::RESOLVER_INVALID_ID;
}
void try_next_candidate(Ref<StreamPeerTCP> &p_tcp);
void try_next_candidate(const Ref<StreamPeerTCP> &p_tcp);
void start(const String &p_host, int p_port);
void stop();
Resolver() {}
@@ -143,9 +143,9 @@ public:
// WebSocketPeer
virtual Error send(const uint8_t *p_buffer, int p_buffer_size, WriteMode p_mode) override;
virtual Error connect_to_url(const String &p_url, Ref<TLSOptions> p_options = Ref<TLSOptions>()) override;
virtual Error accept_stream(Ref<StreamPeer> p_stream) override;
virtual void close(int p_code = 1000, String p_reason = "") override;
virtual Error connect_to_url(const String &p_url, const Ref<TLSOptions> &p_options = Ref<TLSOptions>()) override;
virtual Error accept_stream(const Ref<StreamPeer> &p_stream) override;
virtual void close(int p_code = 1000, const String &p_reason = "") override;
virtual void poll() override;
virtual State get_ready_state() const override { return ready_state; }