godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64047 from Faless/ws/4.x_no_emws

Browse Source 
[Websocket] Remove dummy JS server implemenation.
This commit is contained in:
Fabio Alessandrelli 2022-08-07 14:57:16 +02:00 committed by GitHub
commit ea0247086b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
modules/websocket/emws_server.cpp
View File

@ -1,92 +0,0 @@
/*************************************************************************/
/* emws_server.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef JAVASCRIPT_ENABLED
#include "emws_server.h"
#include "core/os/os.h"
void EMWSServer::set_extra_headers(const Vector<String> &p_headers) {
}
Error EMWSServer::listen(int p_port, Vector<String> p_protocols, bool gd_mp_api) {
return FAILED;
}
bool EMWSServer::is_listening() const {
return false;
}
void EMWSServer::stop() {
}
bool EMWSServer::has_peer(int p_id) const {
return false;
}
Ref<WebSocketPeer> EMWSServer::get_peer(int p_id) const {
return nullptr;
}
Vector<String> EMWSServer::get_protocols() const {
Vector<String> out;
return out;
}
IPAddress EMWSServer::get_peer_address(int p_peer_id) const {
return IPAddress();
}
int EMWSServer::get_peer_port(int p_peer_id) const {
return 0;
}
void EMWSServer::disconnect_peer(int p_peer_id, int p_code, String p_reason) {
}
void EMWSServer::poll() {
}
int EMWSServer::get_max_packet_size() const {
return 0;
}
Error EMWSServer::set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) {
return OK;
}
EMWSServer::EMWSServer() {
}
EMWSServer::~EMWSServer() {
}
#endif // JAVASCRIPT_ENABLED

64
modules/websocket/emws_server.h
View File

@ -1,64 +0,0 @@
/*************************************************************************/
/* emws_server.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EMWS_SERVER_H
#define EMWS_SERVER_H
#ifdef JAVASCRIPT_ENABLED
#include "core/object/ref_counted.h"
#include "emws_peer.h"
#include "websocket_server.h"
class EMWSServer : public WebSocketServer {
GDCIIMPL(EMWSServer, WebSocketServer);
public:
Error set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) override;
void set_extra_headers(const Vector<String> &p_headers) override;
Error listen(int p_port, Vector<String> p_protocols = Vector<String>(), bool gd_mp_api = false) override;
void stop() override;
bool is_listening() const override;
bool has_peer(int p_id) const override;
Ref<WebSocketPeer> get_peer(int p_id) const override;
IPAddress get_peer_address(int p_peer_id) const override;
int get_peer_port(int p_peer_id) const override;
void disconnect_peer(int p_peer_id, int p_code = 1000, String p_reason = "") override;
int get_max_packet_size() const override;
virtual void poll() override;
virtual Vector<String> get_protocols() const;
EMWSServer();
~EMWSServer();
};
#endif
#endif // EMWS_SERVER_H

5
modules/websocket/register_types.cpp
View File

@ -33,11 +33,13 @@
#include "core/config/project_settings.h"
#include "core/error/error_macros.h"
#include "websocket_client.h"
#include "websocket_server.h"
#ifdef JAVASCRIPT_ENABLED
#include "emscripten.h"
#include "emws_client.h"
#include "emws_peer.h"
#include "emws_server.h"
#else
#include "wsl_client.h"
#include "wsl_server.h"
@ -60,7 +62,6 @@ void initialize_websocket_module(ModuleInitializationLevel p_level) {
#ifdef JAVASCRIPT_ENABLED
EMWSPeer::make_default();
EMWSClient::make_default();
EMWSServer::make_default();
#else
WSLPeer::make_default();
WSLClient::make_default();