thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 00:37:15 +01:00
Code Releases Activity

Minor changes and bugfixes to WS client.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2021-09-05 12:30:49 +03:00
parent f3d4dab454
commit 05e644b040
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/PocoLib/Net.cpp
View File

@ -56,8 +56,8 @@ void Register_POCO_Net(HSQUIRRELVM vm, Table &)
); );
// -------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------
ConstTable(vm).Enum(_SC("SqWsSendFlags"), Enumeration(vm) ConstTable(vm).Enum(_SC("SqWsSendFlags"), Enumeration(vm)
.Const(_SC("TEXT"), static_cast< SQInteger >(Poco::Net::WebSocket::FRAME_TEXT)) .Const(_SC("Text"), static_cast< SQInteger >(Poco::Net::WebSocket::FRAME_TEXT))
.Const(_SC("BINARY"), static_cast< SQInteger >(Poco::Net::WebSocket::FRAME_BINARY)) .Const(_SC("Binary"), static_cast< SQInteger >(Poco::Net::WebSocket::FRAME_BINARY))
); );
// -------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------
ConstTable(vm).Enum(_SC("SqWsStatusCodes"), Enumeration(vm) ConstTable(vm).Enum(_SC("SqWsStatusCodes"), Enumeration(vm)
@ -76,7 +76,7 @@ void Register_POCO_Net(HSQUIRRELVM vm, Table &)
.Const(_SC("ReservedTlsFailure"), static_cast< SQInteger >(Poco::Net::WebSocket::WS_RESERVED_TLS_FAILURE)) .Const(_SC("ReservedTlsFailure"), static_cast< SQInteger >(Poco::Net::WebSocket::WS_RESERVED_TLS_FAILURE))
); );
// -------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------
ConstTable(vm).Enum(_SC("SqWsSendFlags"), Enumeration(vm) ConstTable(vm).Enum(_SC("SqWsErrorCodes"), Enumeration(vm)
.Const(_SC("NoHandshake"), static_cast< SQInteger >(Poco::Net::WebSocket::WS_ERR_NO_HANDSHAKE)) .Const(_SC("NoHandshake"), static_cast< SQInteger >(Poco::Net::WebSocket::WS_ERR_NO_HANDSHAKE))
.Const(_SC("HandshakeNoVersion"), static_cast< SQInteger >(Poco::Net::WebSocket::WS_ERR_HANDSHAKE_NO_VERSION)) .Const(_SC("HandshakeNoVersion"), static_cast< SQInteger >(Poco::Net::WebSocket::WS_ERR_HANDSHAKE_NO_VERSION))
.Const(_SC("HandshakeUnsupportedVersion"), static_cast< SQInteger >(Poco::Net::WebSocket::WS_ERR_HANDSHAKE_UNSUPPORTED_VERSION)) .Const(_SC("HandshakeUnsupportedVersion"), static_cast< SQInteger >(Poco::Net::WebSocket::WS_ERR_HANDSHAKE_UNSUPPORTED_VERSION))

10
module/PocoLib/Net.hpp
View File

@ -62,7 +62,7 @@ struct WsClient
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Base constructor. * Base constructor.
*/ */
WsClient(StackStrF &host, uint16_t port, StackStrF &uri) WsClient(StackStrF & host, uint16_t port, StackStrF & uri)
: mClient(host.ToStr(), port), : mClient(host.ToStr(), port),
mRequest(Poco::Net::HTTPRequest::HTTP_GET, uri.ToStr(), Poco::Net::HTTPRequest::HTTP_1_1), mResponse(), mRequest(Poco::Net::HTTPRequest::HTTP_GET, uri.ToStr(), Poco::Net::HTTPRequest::HTTP_1_1), mResponse(),
mWebSocket(mClient, mRequest, mResponse), mBuffer(0), mFlags(0), mState(0) mWebSocket(mClient, mRequest, mResponse), mBuffer(0), mFlags(0), mState(0)
@ -79,7 +79,7 @@ struct WsClient
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Sends a Close control frame to the server end of the connection to initiate an orderly shutdown of the connection. * Sends a Close control frame to the server end of the connection to initiate an orderly shutdown of the connection.
*/ */
void ShutdownWith(SQInteger code, StackStrF &msg) { void ShutdownWith(SQInteger code, StackStrF & msg) {
mWebSocket.shutdown(static_cast< uint16_t >(code), msg.ToStr()); mWebSocket.shutdown(static_cast< uint16_t >(code), msg.ToStr());
} }
@ -95,7 +95,7 @@ struct WsClient
* Sends the contents of the given string through the socket as a single frame. * Sends the contents of the given string through the socket as a single frame.
* Returns the number of bytes sent, which may be less than the number of bytes specified. * Returns the number of bytes sent, which may be less than the number of bytes specified.
*/ */
SQInteger SendStringFrame(SQInteger flags, StackStrF &str) { SQInteger SendStringFrame(SQInteger flags, StackStrF & str) {
return mWebSocket.sendFrame(str.mPtr, static_cast< int >(str.mLen), static_cast< int >(flags)); return mWebSocket.sendFrame(str.mPtr, static_cast< int >(str.mLen), static_cast< int >(flags));
} }
@ -136,9 +136,7 @@ struct WsClient
if (mState != 0) if (mState != 0)
{ {
// Create a string with buffer contents // Create a string with buffer contents
LightObj obj(SqTypeIdentity< SqBuffer >{}, SqVM(), LightObj obj(const_cast< const SQChar * >(mBuffer.begin()), static_cast< SQInteger >(mBuffer.sizeBytes()), SqVM());
const_cast< const SQChar * >(mBuffer.begin()),
static_cast< SQInteger >(mBuffer.sizeBytes()));
// Discard buffer contents for next request // Discard buffer contents for next request
mBuffer.resize(0); mBuffer.resize(0);
// Return the string object // Return the string object