Skip to content

Commit ec756a0

Browse files
author
Nako Sung
committed
unity build fix - websocket
1 parent 140ef89 commit ec756a0

File tree

9 files changed

+72
-70
lines changed

9 files changed

+72
-70
lines changed

‎Plugins/UnrealJS/Source/JavascriptWebSocket/WebSocket.cpp renamed to ‎Plugins/UnrealJS/Source/JavascriptWebSocket/JSWebSocket.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
22
#include "JavascriptWebSocketModule.h"
33

4-
#include "WebSocket.h"
4+
#include "JSWebSocket.h"
55

66
#if PLATFORM_HTML5
77
#include <errno.h>
@@ -51,7 +51,7 @@ static void libwebsocket_debugLogS(int level, const char *line)
5151
}
5252
#endif
5353

54-
FWebSocket::FWebSocket(
54+
FJavascriptWebSocket::FJavascriptWebSocket(
5555
const FInternetAddr& ServerAddress
5656
)
5757
:IsServerSide(false)
@@ -67,7 +67,7 @@ FWebSocket::FWebSocket(
6767
FMemory::Memzero(Protocols, sizeof(libwebsocket_protocols) * 3);
6868

6969
Protocols[0].name = "binary";
70-
Protocols[0].callback = FWebSocket::unreal_networking_client;
70+
Protocols[0].callback = FJavascriptWebSocket::unreal_networking_client;
7171
Protocols[0].per_session_data_size = 0;
7272
Protocols[0].rx_buffer_size = 10 * 1024 * 1024;
7373

@@ -132,7 +132,7 @@ FWebSocket::FWebSocket(
132132
#endif
133133
}
134134

135-
FWebSocket::FWebSocket(WebSocketInternalContext* InContext, WebSocketInternal* InWsi)
135+
FJavascriptWebSocket::FJavascriptWebSocket(WebSocketInternalContext* InContext, WebSocketInternal* InWsi)
136136
: Context(InContext)
137137
, Wsi(InWsi)
138138
, IsServerSide(true)
@@ -141,7 +141,7 @@ FWebSocket::FWebSocket(WebSocketInternalContext* InContext, WebSocketInternal* I
141141
}
142142

143143

144-
bool FWebSocket::Send(uint8* Data, uint32 Size)
144+
bool FJavascriptWebSocket::Send(uint8* Data, uint32 Size)
145145
{
146146
TArray<uint8> Buffer;
147147
// insert size.
@@ -162,12 +162,12 @@ bool FWebSocket::Send(uint8* Data, uint32 Size)
162162
return true;
163163
}
164164

165-
void FWebSocket::SetRecieveCallBack(FWebsocketPacketRecievedCallBack CallBack)
165+
void FJavascriptWebSocket::SetRecieveCallBack(FJavascriptWebSocketPacketRecievedCallBack CallBack)
166166
{
167167
RecievedCallBack = CallBack;
168168
}
169169

170-
FString FWebSocket::RemoteEndPoint()
170+
FString FJavascriptWebSocket::RemoteEndPoint()
171171
{
172172
#if !PLATFORM_HTML5
173173
ANSICHAR Peer_Name[128];
@@ -182,7 +182,7 @@ FString FWebSocket::RemoteEndPoint()
182182
}
183183

184184

185-
FString FWebSocket::LocalEndPoint()
185+
FString FJavascriptWebSocket::LocalEndPoint()
186186
{
187187
#if !PLATFORM_HTML5
188188
return FString(ANSI_TO_TCHAR(libwebsocket_canonical_hostname(Context)));
@@ -194,12 +194,12 @@ FString FWebSocket::LocalEndPoint()
194194

195195
}
196196

197-
void FWebSocket::Tick()
197+
void FJavascriptWebSocket::Tick()
198198
{
199199
HandlePacket();
200200
}
201201

202-
void FWebSocket::HandlePacket()
202+
void FJavascriptWebSocket::HandlePacket()
203203
{
204204
#if !PLATFORM_HTML5
205205
{
@@ -239,7 +239,7 @@ void FWebSocket::HandlePacket()
239239
#endif
240240
}
241241

242-
void FWebSocket::Flush()
242+
void FJavascriptWebSocket::Flush()
243243
{
244244
auto PendingMesssages = OutgoingBuffer.Num();
245245
while (OutgoingBuffer.Num() > 0 && !IsServerSide)
@@ -253,23 +253,23 @@ void FWebSocket::Flush()
253253
HandlePacket();
254254
if (PendingMesssages >= OutgoingBuffer.Num())
255255
{
256-
UE_LOG(LogWebsocket, Warning, TEXT("Unable to flush all of OutgoingBuffer in FWebSocket."));
256+
UE_LOG(LogWebsocket, Warning, TEXT("Unable to flush all of OutgoingBuffer in FJavascriptWebSocket."));
257257
break;
258258
}
259259
};
260260
}
261261

262-
void FWebSocket::SetConnectedCallBack(FWebsocketInfoCallBack CallBack)
262+
void FJavascriptWebSocket::SetConnectedCallBack(FJavascriptWebSocketInfoCallBack CallBack)
263263
{
264264
ConnectedCallBack = CallBack;
265265
}
266266

267-
void FWebSocket::SetErrorCallBack(FWebsocketInfoCallBack CallBack)
267+
void FJavascriptWebSocket::SetErrorCallBack(FJavascriptWebSocketInfoCallBack CallBack)
268268
{
269269
ErrorCallBack = CallBack;
270270
}
271271

272-
void FWebSocket::OnRawRecieve(void* Data, uint32 Size)
272+
void FJavascriptWebSocket::OnRawRecieve(void* Data, uint32 Size)
273273
{
274274
#if !PLATFORM_HTML5
275275
RecievedCallBack.ExecuteIfBound(Data, Size);
@@ -343,7 +343,7 @@ void FWebSocket::OnRawRecieve(void* Data, uint32 Size)
343343

344344
}
345345

346-
void FWebSocket::OnRawWebSocketWritable(WebSocketInternal* wsi)
346+
void FJavascriptWebSocket::OnRawWebSocketWritable(WebSocketInternal* wsi)
347347
{
348348
if (OutgoingBuffer.Num() == 0)
349349
return;
@@ -399,7 +399,7 @@ void FWebSocket::OnRawWebSocketWritable(WebSocketInternal* wsi)
399399

400400
}
401401

402-
FWebSocket::~FWebSocket()
402+
FJavascriptWebSocket::~FJavascriptWebSocket()
403403
{
404404
RecievedCallBack.Unbind();
405405
Flush();
@@ -421,15 +421,15 @@ FWebSocket::~FWebSocket()
421421
}
422422

423423
#if !PLATFORM_HTML5
424-
int FWebSocket::unreal_networking_client(
424+
int FJavascriptWebSocket::unreal_networking_client(
425425
struct libwebsocket_context *Context,
426426
struct libwebsocket *Wsi,
427427
enum libwebsocket_callback_reasons Reason,
428428
void *User,
429429
void *In,
430430
size_t Len)
431431
{
432-
FWebSocket* Socket = (FWebSocket*)libwebsocket_context_user(Context);;
432+
FJavascriptWebSocket* Socket = (FJavascriptWebSocket*)libwebsocket_context_user(Context);;
433433
switch (Reason)
434434
{
435435
case LWS_CALLBACK_CLIENT_ESTABLISHED:

‎Plugins/UnrealJS/Source/JavascriptWebSocket/WebSocket.h renamed to ‎Plugins/UnrealJS/Source/JavascriptWebSocket/JSWebSocket.h

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,28 @@
44
//
55
#pragma once
66

7-
class FWebSocket
7+
DECLARE_DELEGATE(FJavascriptWebSocketInfoCallBack);
8+
9+
class FJavascriptWebSocket
810
{
911

1012
public:
1113

1214
// Initialize as client side socket.
13-
FWebSocket(const FInternetAddr& ServerAddress);
15+
FJavascriptWebSocket(const FInternetAddr& ServerAddress);
1416

1517
// Initialize as server side socket.
16-
FWebSocket(WebSocketInternalContext* InContext, WebSocketInternal* Wsi);
18+
FJavascriptWebSocket(WebSocketInternalContext* InContext, WebSocketInternal* Wsi);
1719

1820
// clean up.
19-
~FWebSocket();
21+
~FJavascriptWebSocket();
2022

2123
/************************************************************************/
2224
/* Set various callbacks for Socket Events */
2325
/************************************************************************/
24-
void SetConnectedCallBack(FWebsocketInfoCallBack CallBack);
25-
void SetErrorCallBack(FWebsocketInfoCallBack CallBack);
26-
void SetRecieveCallBack(FWebsocketPacketRecievedCallBack CallBack);
26+
void SetConnectedCallBack(FJavascriptWebSocketInfoCallBack CallBack);
27+
void SetErrorCallBack(FJavascriptWebSocketInfoCallBack CallBack);
28+
void SetRecieveCallBack(FJavascriptWebSocketPacketRecievedCallBack CallBack);
2729

2830
/** Send raw data to remote end point. */
2931
bool Send(uint8* Data, uint32 Size);
@@ -46,9 +48,9 @@ class FWebSocket
4648
/************************************************************************/
4749
/* Various Socket callbacks */
4850
/************************************************************************/
49-
FWebsocketPacketRecievedCallBack RecievedCallBack;
50-
FWebsocketInfoCallBack ConnectedCallBack;
51-
FWebsocketInfoCallBack ErrorCallBack;
51+
FJavascriptWebSocketPacketRecievedCallBack RecievedCallBack;
52+
FJavascriptWebSocketInfoCallBack ConnectedCallBack;
53+
FJavascriptWebSocketInfoCallBack ErrorCallBack;
5254

5355
/** Recv and Send Buffers, serviced during the Tick */
5456
TArray<uint8> RecievedBuffer;
@@ -72,7 +74,7 @@ class FWebSocket
7274
static int unreal_networking_client(struct libwebsocket_context *, struct libwebsocket *wsi, enum libwebsocket_callback_reasons reason, void *user, void *in, size_t len);
7375
#endif
7476

75-
friend class FWebSocketServer;
77+
friend class FJavascriptWebSocketServer;
7678
int SockFd;
7779
};
7880

‎Plugins/UnrealJS/Source/JavascriptWebSocket/WebSocketServer.cpp renamed to ‎Plugins/UnrealJS/Source/JavascriptWebSocket/JSWebSocketServer.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include "JavascriptWebSocketModule.h"
44

5-
#include "WebSocketServer.h"
6-
#include "WebSocket.h"
5+
#include "JSWebSocketServer.h"
6+
#include "JSWebSocket.h"
77

88
#if PLATFORM_WINDOWS
99
#include "AllowWindowsPlatformTypes.h"
@@ -25,7 +25,7 @@
2525
// a object of this type is associated by libwebsocket to every connected session.
2626
struct PerSessionDataServer
2727
{
28-
FWebSocket *Socket; // each session is actually a socket to a client
28+
FJavascriptWebSocket *Socket; // each session is actually a socket to a client
2929
};
3030

3131

@@ -49,7 +49,7 @@ static int unreal_networking_server(
4949
#endif
5050
#endif
5151

52-
bool FWebSocketServer::Init(uint32 Port, FWebsocketClientConnectedCallBack CallBack)
52+
bool FJavascriptWebSocketServer::Init(uint32 Port, FJavascriptWebSocketClientConnectedCallBack CallBack)
5353
{
5454
#if !PLATFORM_HTML5
5555
// setup log level.
@@ -61,7 +61,7 @@ bool FWebSocketServer::Init(uint32 Port, FWebsocketClientConnectedCallBack CallB
6161
FMemory::Memzero(Protocols, sizeof(libwebsocket_protocols) * 3);
6262

6363
Protocols[0].name = "binary";
64-
Protocols[0].callback = FWebSocket::unreal_networking_server;
64+
Protocols[0].callback = FJavascriptWebSocket::unreal_networking_server;
6565
Protocols[0].per_session_data_size = sizeof(PerSessionDataServer);
6666
Protocols[0].rx_buffer_size = 10 * 1024 * 1024;
6767

@@ -100,7 +100,7 @@ bool FWebSocketServer::Init(uint32 Port, FWebsocketClientConnectedCallBack CallB
100100
return true;
101101
}
102102

103-
bool FWebSocketServer::Tick()
103+
bool FJavascriptWebSocketServer::Tick()
104104
{
105105
#if !PLATFORM_HTML5
106106
{
@@ -111,10 +111,10 @@ bool FWebSocketServer::Tick()
111111
return true;
112112
}
113113

114-
FWebSocketServer::FWebSocketServer()
114+
FJavascriptWebSocketServer::FJavascriptWebSocketServer()
115115
{}
116116

117-
FWebSocketServer::~FWebSocketServer()
117+
FJavascriptWebSocketServer::~FJavascriptWebSocketServer()
118118
{
119119
#if !PLATFORM_HTML5
120120
if (Context)
@@ -129,7 +129,7 @@ FWebSocketServer::~FWebSocketServer()
129129
#endif
130130
}
131131

132-
FString FWebSocketServer::Info()
132+
FString FJavascriptWebSocketServer::Info()
133133
{
134134

135135
#if !PLATFORM_HTML5
@@ -142,7 +142,7 @@ FString FWebSocketServer::Info()
142142

143143
// callback.
144144
#if !PLATFORM_HTML5
145-
int FWebSocket::unreal_networking_server
145+
int FJavascriptWebSocket::unreal_networking_server
146146
(
147147
struct libwebsocket_context *Context,
148148
struct libwebsocket *Wsi,
@@ -153,13 +153,13 @@ int FWebSocket::unreal_networking_server
153153
)
154154
{
155155
PerSessionDataServer* BufferInfo = (PerSessionDataServer*)User;
156-
FWebSocketServer* Server = (FWebSocketServer*)libwebsocket_context_user(Context);
156+
FJavascriptWebSocketServer* Server = (FJavascriptWebSocketServer*)libwebsocket_context_user(Context);
157157

158158
switch (Reason)
159159
{
160160
case LWS_CALLBACK_ESTABLISHED:
161161
{
162-
BufferInfo->Socket = new FWebSocket(Context, Wsi);
162+
BufferInfo->Socket = new FJavascriptWebSocket(Context, Wsi);
163163
Server->ConnectedCallBack.ExecuteIfBound(BufferInfo->Socket);
164164
libwebsocket_set_timeout(Wsi, NO_PENDING_TIMEOUT, 0);
165165
}

‎Plugins/UnrealJS/Source/JavascriptWebSocket/WebSocketServer.h renamed to ‎Plugins/UnrealJS/Source/JavascriptWebSocket/JSWebSocketServer.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
// This uses https://libwebsockets.org/trac/libwebsockets
55
#pragma once
66

7-
class FWebSocketServer
7+
class FJavascriptWebSocketServer
88
{
99
public:
1010

11-
FWebSocketServer();
12-
~FWebSocketServer();
11+
FJavascriptWebSocketServer();
12+
~FJavascriptWebSocketServer();
1313

1414
/** Create a web socket server*/
15-
bool Init(uint32 Port, FWebsocketClientConnectedCallBack);
15+
bool Init(uint32 Port, FJavascriptWebSocketClientConnectedCallBack);
1616

1717
/** Service libwebsocket */
1818
bool Tick();
@@ -23,15 +23,15 @@ class FWebSocketServer
2323
private:
2424

2525
/** Callback for a new websocket connection to the server */
26-
FWebsocketClientConnectedCallBack ConnectedCallBack;
26+
FJavascriptWebSocketClientConnectedCallBack ConnectedCallBack;
2727

2828
/** Internal libwebsocket context */
2929
WebSocketInternalContext* Context;
3030

3131
/** Protocols serviced by this implementation */
3232
WebSocketInternalProtocol* Protocols;
3333

34-
friend class FWebSocket;
34+
friend class FJavascriptWebSocket;
3535
};
3636

3737

‎Plugins/UnrealJS/Source/JavascriptWebSocket/JavascriptWebSocket.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "JavascriptWebSocket.h"
44
#include "JavascriptWebSocketServer.h"
55
#include "JavascriptContext.h"
6-
#include "WebSocket.h"
6+
#include "JSWebSocket.h"
77

88
UJavascriptWebSocket* UJavascriptWebSocket::Connect(const FString& EndpointString)
99
{
@@ -15,28 +15,28 @@ UJavascriptWebSocket* UJavascriptWebSocket::Connect(const FString& EndpointStrin
1515
}
1616

1717
auto addr = Endpoint.ToInternetAddr();
18-
return CreateFrom(new FWebSocket(*addr), GetTransientPackage());
18+
return CreateFrom(new FJavascriptWebSocket(*addr), GetTransientPackage());
1919
}
2020

21-
UJavascriptWebSocket* UJavascriptWebSocket::CreateFrom(FWebSocket* WebSocket, UObject* Outer)
21+
UJavascriptWebSocket* UJavascriptWebSocket::CreateFrom(FJavascriptWebSocket* WebSocket, UObject* Outer)
2222
{
2323
auto instance = NewObject<UJavascriptWebSocket>(Outer);
24-
instance->WebSocket = MakeShareable<FWebSocket>(WebSocket);
24+
instance->WebSocket = MakeShareable<FJavascriptWebSocket>(WebSocket);
2525

2626
{
27-
FWebsocketPacketRecievedCallBack callback;
27+
FJavascriptWebSocketPacketRecievedCallBack callback;
2828
callback.BindUObject(instance, &UJavascriptWebSocket::OnReceivedCallback);
2929
instance->WebSocket->SetRecieveCallBack(callback);
3030
}
3131

3232
{
33-
FWebsocketInfoCallBack callback;
33+
FJavascriptWebSocketInfoCallBack callback;
3434
callback.BindUObject(instance, &UJavascriptWebSocket::OnErrorCallback);
3535
instance->WebSocket->SetErrorCallBack(callback);
3636
}
3737

3838
{
39-
FWebsocketInfoCallBack callback;
39+
FJavascriptWebSocketInfoCallBack callback;
4040
callback.BindUObject(instance, &UJavascriptWebSocket::OnConnectedCallback);
4141
instance->WebSocket->SetConnectedCallBack(callback);
4242
}

0 commit comments

Comments
 (0)