Send support

Author: BrennanConroy

Diff for: README.md

@@ -1,5 +1,10 @@
 TODO:
 - Support server response
 - Figure out nice send (params in c#)
+- Stream support
+- .On() callbacks
 - Add Protocol layer (but only have json support for now)
-- Move project to library with sample application
+- Move project to library with sample application
+- Headers
+- Logging
+- Tests

Diff for: src/signalrcorelib/HubConnection.cpp

@@ -9,7 +9,7 @@ namespace signalr
 	enum MessageType
 	{
 		Negotiation = 0,
-		Invocation,
+		Invocation = 1,
 		StreamInvocation,
 		StreamItem,
 		Completion,
@@ -28,22 +28,29 @@ namespace signalr
 			switch (messageType.as_integer())
 			{
 			case MessageType::Negotiation:
+				// unused...
 				break;
 			case MessageType::Invocation:
 			{
 				auto method = value[L"target"];
 				auto args = value[L"arguments"];
+				_ASSERT(args.is_array());
 				break;
 			}
 			case MessageType::StreamInvocation:
-				break;
+				// Sent to server only, should not be received by client
+				throw std::runtime_error("Received unexcepted message type 'StreamInvocation'.");
 			case MessageType::StreamItem:
+				// TODO
 				break;
 			case MessageType::Completion:
+				// TODO
 				break;
 			case MessageType::CancelInvocation:
-				break;
+				// Sent to server only, should not be received by client
+				throw std::runtime_error("Received unexcepted message type 'CancelInvocation'.");
 			case MessageType::Ping:
+				// TODO
 				break;
 			}
 		});
@@ -63,16 +70,20 @@ namespace signalr
 		return mTransport->Stop();
 	}
 
-	pplx::task<void> HubConnection::SendCore(const utility::string_t& message)
+	pplx::task<void> HubConnection::Send(const utility::string_t& target, const utility::string_t& arguments)
 	{
-		//_ASSERT(message.is_array());
-		//web::json::value invocation;
-		//invocation[L"type"] = web::json::value::value(1);
-		//invocation[L"target"] = web::json::value::string(target);
-		//invocation[L"arguments"] = message;
+		auto args = web::json::value::parse(arguments);
+		_ASSERT(args.is_array());
 
-		//auto request = web::websockets::client::websocket_outgoing_message();
-		//request.set_utf8_message(utility::conversions::to_utf8string(invocation.serialize()) + "\x1e");
+		web::json::value invocation;
+		invocation[L"type"] = web::json::value::value(MessageType::Invocation);
+		invocation[L"target"] = web::json::value::string(target);
+		invocation[L"arguments"] = args;
+		return SendCore(invocation.serialize() + L"\x1e");
+	}
+
+	pplx::task<void> HubConnection::SendCore(const utility::string_t& message)
+	{
 		return mTransport->Send(message);
 	}
 

Diff for: src/signalrcorelib/HubConnection.h

@@ -12,13 +12,13 @@ namespace signalr
 	class HubConnection
 	{
 	public:
-		HubConnection(const utility::string_t& url, Transport transport);
+		HubConnection(const utility::string_t& url, Transport transport = Transport::WebSockets);
 		pplx::task<void> Start();
 		pplx::task<void> Stop();
 		//On
 		//Stream
 		//Invoke
-		//pplx::task<void> Send(const utility::string_t& method, );
+		pplx::task<void> Send(const utility::string_t& target, const utility::string_t& arguments = L"");
 
 		~HubConnection();
 	private:

Diff for: src/signalrcorelib/Source.cpp

@@ -18,7 +18,7 @@ int main(void)
 		web::json::value args{};
 		args[0] = web::json::value(utility::conversions::to_string_t(msg));
 
-		//hubConnection.Send(L"Send", args);
+		hubConnection.Send(L"Send", args.serialize());
 	}
 
 	hubConnection.Stop().wait();

Diff for: src/signalrcorelib/WebSocketsTransport.cpp

@@ -18,6 +18,10 @@ namespace signalr
 		{
 			uri.set_scheme(L"wss");
 		}
+		else
+		{
+			//???
+		}
 		mUrl = uri.to_string();
 	}