Lower default Socket::wait timeouts, updated sample

Author: aslze

include/asl/Socket.h

@@ -241,13 +241,13 @@ class ASL_API Socket : public SmartObject
 	Waits until there is incoming data in the socket or it is disconnected for a maximum time, and
 	returns true if some of that happened before timeout
 	*/
-	bool waitInput(double timeout = 60) { return _()->waitInput(timeout); }
+	bool waitInput(double timeout = 2) { return _()->waitInput(timeout); }
 
 	/**
 	Waits until there is incoming data in the socket or it is disconnected for a maximum time, and
 	returns true only if there is data to read (false may mean no data or disconnection)
 	*/
-	bool waitData(double timeout = 60) { return waitInput(timeout) && !disconnected(); }
+	bool waitData(double timeout = 2) { return waitInput(timeout) && !disconnected(); }
 	/**
 	Returns true if there was some communication error in this socket
 	*/

samples/http-websocket/server.cpp

@@ -78,8 +78,8 @@ void Server::serve(HttpRequest& request, HttpResponse& response)
 	{
 		Var data = request.data();
 		printf("HTTP %s\n", *data.string());
-		if (data.has("r")) _r = data["r"];
-		if (data.has("v")) _v = data["v"];
+		data.read("r", _r);
+		data.read("v", _v);
 		response.put(Var("status", "OK"));
 		return;
 	}
@@ -101,24 +101,17 @@ class MyWebSocketServer : public WebSocketServer
 	void serve(WebSocket& ws)
 	{
 		printf("New client: %i\n", clients().length());
-		while (1) {
-			if( ws.wait() )
+		while (!ws.closed() && !_requestStop)
+		{
+			if (!ws.waitData())
+				continue;
+			Var msg = ws.receive(); // receive message and extract radius and speed
+			if (msg.ok())
 			{
-				if (ws.closed())
-					break;
-				Var msg = ws.receive(); // receive message and extract radius and speed
-				if (msg.ok())
-				{
-					printf("WS %s\n", *msg.string());
-					if (msg.has("r"))
-						Server::_r = msg["r"];
-					if (msg.has("v"))
-						Server::_v = msg["v"];
-					ws.send(Var("status", "ok"));
-				}
-			}
-			if (ws.closed()) {
-				break;
+				printf("WS %s\n", *msg.string());
+				msg.read("r", Server::_r);
+				msg.read("v", Server::_v);
+				ws.send(Var("status", "ok"));
 			}
 		}
 		printf("Client out: %i (code %i)\n", clients().length()-1, ws.code());