diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts
index 35d5873f92..073fce48e2 100644
--- a/distribution/openrct2.d.ts
+++ b/distribution/openrct2.d.ts
@@ -1222,7 +1222,7 @@ declare global {
sendMessage(message: string): void;
sendMessage(message: string, players: number[]): void;
- createServer(): SocketServer;
+ createListener(): Listener;
createSocket(): Socket;
}
@@ -1682,18 +1682,18 @@ declare global {
}
/**
- * Represents a server that can listen for incomming connections.
+ * Listens for incomming connections.
* Based on node.js net.Server, see https://nodejs.org/api/net.html for more information.
*/
- interface SocketServer {
+ interface Listener {
readonly listening: boolean;
- listen(port: number): SocketServer;
- close(): SocketServer;
+ listen(port: number): Listener;
+ close(): Listener;
- on(event: 'connection', callback: (socket: Socket) => void): SocketServer;
+ on(event: 'connection', callback: (socket: Socket) => void): Listener;
- off(event: 'connection', callback: (socket: Socket) => void): SocketServer;
+ off(event: 'connection', callback: (socket: Socket) => void): Listener;
}
/**
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index e536ae58ad..0fac581d2b 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -410,7 +410,7 @@
-
+
diff --git a/src/openrct2/scripting/ScNetwork.hpp b/src/openrct2/scripting/ScNetwork.hpp
index 4fd8e19b81..44e6c6977b 100644
--- a/src/openrct2/scripting/ScNetwork.hpp
+++ b/src/openrct2/scripting/ScNetwork.hpp
@@ -18,7 +18,7 @@
# include "../network/NetworkAction.h"
# include "../network/network.h"
# include "Duktape.hpp"
-# include "ScSocketServer.hpp"
+# include "ScSocket.hpp"
namespace OpenRCT2::Scripting
{
@@ -450,16 +450,16 @@ namespace OpenRCT2::Scripting
}
# ifndef DISABLE_NETWORK
- std::shared_ptr createServer()
+ std::shared_ptr createListener()
{
auto& scriptEngine = GetContext()->GetScriptEngine();
auto plugin = scriptEngine.GetExecInfo().GetCurrentPlugin();
- auto socket = std::make_shared(plugin);
+ auto socket = std::make_shared(plugin);
scriptEngine.AddSocket(socket);
return socket;
}
# else
- void createServer()
+ void createListener()
{
duk_error(_context, DUK_ERR_ERROR, "Networking has been disabled.");
}
@@ -497,7 +497,7 @@ namespace OpenRCT2::Scripting
dukglue_register_method(ctx, &ScNetwork::kickPlayer, "kickPlayer");
dukglue_register_method(ctx, &ScNetwork::sendMessage, "sendMessage");
- dukglue_register_method(ctx, &ScNetwork::createServer, "createServer");
+ dukglue_register_method(ctx, &ScNetwork::createListener, "createListener");
dukglue_register_method(ctx, &ScNetwork::createSocket, "createSocket");
}
};
diff --git a/src/openrct2/scripting/ScSocketServer.hpp b/src/openrct2/scripting/ScSocket.hpp
similarity index 95%
rename from src/openrct2/scripting/ScSocketServer.hpp
rename to src/openrct2/scripting/ScSocket.hpp
index b9c87c39aa..684dbb4cdb 100644
--- a/src/openrct2/scripting/ScSocketServer.hpp
+++ b/src/openrct2/scripting/ScSocket.hpp
@@ -355,7 +355,7 @@ namespace OpenRCT2::Scripting
}
};
- class ScSocketServer final : public ScSocketBase
+ class ScListener final : public ScSocketBase
{
private:
static constexpr uint32_t EVENT_NONE = std::numeric_limits::max();
@@ -375,13 +375,13 @@ namespace OpenRCT2::Scripting
return false;
}
- ScSocketServer* close()
+ ScListener* close()
{
CloseSocket();
return this;
}
- ScSocketServer* listen(int32_t port, const DukValue& dukHost)
+ ScListener* listen(int32_t port, const DukValue& dukHost)
{
auto ctx = GetContext()->GetScriptEngine().GetContext();
if (_disposed)
@@ -429,7 +429,7 @@ namespace OpenRCT2::Scripting
return this;
}
- ScSocketServer* on(const std::string& eventType, const DukValue& callback)
+ ScListener* on(const std::string& eventType, const DukValue& callback)
{
auto eventId = GetEventType(eventType);
if (eventId != EVENT_NONE)
@@ -439,7 +439,7 @@ namespace OpenRCT2::Scripting
return this;
}
- ScSocketServer* off(const std::string& eventType, const DukValue& callback)
+ ScListener* off(const std::string& eventType, const DukValue& callback)
{
auto eventId = GetEventType(eventType);
if (eventId != EVENT_NONE)
@@ -457,7 +457,7 @@ namespace OpenRCT2::Scripting
}
public:
- ScSocketServer(const std::shared_ptr& plugin)
+ ScListener(const std::shared_ptr& plugin)
: ScSocketBase(plugin)
{
}
@@ -511,11 +511,11 @@ namespace OpenRCT2::Scripting
static void Register(duk_context* ctx)
{
- dukglue_register_property(ctx, &ScSocketServer::listening_get, nullptr, "listening");
- dukglue_register_method(ctx, &ScSocketServer::close, "close");
- dukglue_register_method(ctx, &ScSocketServer::listen, "listen");
- dukglue_register_method(ctx, &ScSocketServer::on, "on");
- dukglue_register_method(ctx, &ScSocketServer::off, "off");
+ dukglue_register_property(ctx, &ScListener::listening_get, nullptr, "listening");
+ dukglue_register_method(ctx, &ScListener::close, "close");
+ dukglue_register_method(ctx, &ScListener::listen, "listen");
+ dukglue_register_method(ctx, &ScListener::on, "on");
+ dukglue_register_method(ctx, &ScListener::off, "off");
}
};
} // namespace OpenRCT2::Scripting
diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp
index f8b5639232..28c1cd323d 100644
--- a/src/openrct2/scripting/ScriptEngine.cpp
+++ b/src/openrct2/scripting/ScriptEngine.cpp
@@ -33,7 +33,7 @@
# include "ScObject.hpp"
# include "ScPark.hpp"
# include "ScRide.hpp"
-# include "ScSocketServer.hpp"
+# include "ScSocket.hpp"
# include "ScTile.hpp"
# include
@@ -396,7 +396,7 @@ void ScriptEngine::Initialise()
ScGuest::Register(ctx);
# ifndef DISABLE_NETWORK
ScSocket::Register(ctx);
- ScSocketServer::Register(ctx);
+ ScListener::Register(ctx);
# endif
ScStaff::Register(ctx);