Firefox now supported, improved UWP JS client support

Firefox would send "Connection: Keep-Alive, Upgrade" for WebSocket, not "Connection: Upgrade", which is valid, albeit strange as keeping alive is unrelated to WebSocket.

Fusion UWP exporter is JS-based, so it's using WebSocket, so server build 33 was already compatible with UWP due to being HTML5-compatbile.
So, just added some extra code to make implementation strings/enum fleshed out, and made "HTML5" references clearly HTML5 or WebSocket in general.

Author: SortaCore

Lacewing/Lacewing.h

@@ -2048,7 +2048,8 @@ struct relayserver
 			Android,
 			iOS,
 			Macintosh,
-			HTML5
+			HTML5,
+			UWP
 			// Edit relayserverinternal::client::getimplementation if you add more lines
 		};
 
@@ -2116,7 +2117,7 @@ struct relayserver
 
 		std::string clientImplStr;
 
-		bool pseudoUDP = true; // Is UDP not supported (e.g. Flash, HTML5) so "faked" by receiver
+		bool pseudoUDP = true; // Is UDP not supported (e.g. HTML5, UWP JS) so "faked" by receiver
 
 		// Got opening null byte, indicating not a HTTP client.
 		bool gotfirstbyte = false;

Lacewing/RelayServer.cc

@@ -761,6 +761,8 @@ const char * relayserver::client::getimplementation() const
 			return "Macintosh";
 		case clientimpl::HTML5:
 			return "HTML5";
+		case clientimpl::UWP:
+			return "UWP";
 		default:
 			return "Unknown [error]";
 	}
@@ -1154,7 +1156,9 @@ void handlerwebserverget(lacewing::webserver webserver, lacewing::webserver_requ
 	relayserverinternal& internal = *(relayserverinternal*)webserver->tag();
 	std::string error;
 
-	if (!strcasecmp(req->header("Connection"), "upgrade"))
+	// According to spec Connection must only *include* Upgrade.
+	// Firefox sends Keep-Alive as well, for some reason.
+	if (strstr(req->header("Connection"), "Upgrade") != NULL)
 	{
 		do {
 			const char* webSocketKey2 = req->header("Sec-WebSocket-Key");
@@ -1205,7 +1209,7 @@ void handlerwebserverget(lacewing::webserver webserver, lacewing::webserver_requ
 		} while (false);
 
 		lacewing::error err = lacewing::error_new();
-		err->add("Failed a HTML5 WebSocket connection, due to %s.\n", error.c_str());
+		err->add("Failed a HTML5/UWP WebSocket connection, due to %s.\n", error.c_str());
 		if (internal.handlererror)
 			internal.handlererror(internal.server, err);
 		lacewing::error_delete(err);
@@ -2528,6 +2532,9 @@ bool relayserverinternal::client_messagehandler(std::shared_ptr<relayserver::cli
 			// First test in client build 99, first release as build 100
 			else if (impl.find("HTML5"sv) != std::string_view::npos)
 				client->clientImpl = relayserver::client::clientimpl::HTML5;
+			// Released in client build 101 - uses HTML5 JS code
+			else if (impl.find("UWP"sv) != std::string_view::npos)
+				client->clientImpl = relayserver::client::clientimpl::UWP;
 			// While supported, Blue Flash never existed, and Relay Flash won't return a implementation response
 			else if (impl.find("Flash"sv) != std::string_view::npos)
 				client->clientImpl = relayserver::client::clientimpl::Flash;
@@ -3070,7 +3077,7 @@ void relayserver::connect_response(
 
 	// Force a connect refusal if not hosting server
 	// TODO: Is this necessary? Client should've been d/c'd on unhost
-	// If it is necessary, the HTML5 server hosting check is borked, client could be on the other  server
+	// If it is necessary, this WebSocket server hosting check is borked, as connecting client could be on the other WebSocket server
 	std::string_view denyReason = passedDenyReason;
 	if (denyReason.empty() && (client->socket->is_websocket() ? !websocket->hosting() && !websocket->hosting_secure() : !hosting()))
 		denyReason = "Server has shut down."sv;

Lacewing/src/stream.c

@@ -383,7 +383,7 @@ size_t lwp_stream_write (lw_stream ctx, const char * buffer, size_t size, int fl
 			queue_back (ctx, buffer + written, size - written);
 		}
 	}
-
+	
 	return size;
 }
 

Lacewing/src/webserver/webserver.c

@@ -123,7 +123,7 @@ size_t lw_webserver_sink_websocket(lw_ws webserver, lwp_ws_httpclient client, co
 		}
 
 		// Packet length is three forms in WebSocket; 8-bit (<126), 16-bit (126), and 64-bit (127).
-		// We don't expect user to send >65kb message via Bluewing, HTML5 or not.
+		// We don't expect user to send >65kb message via Bluewing, WebSocket or not.
 		// It's possible we could read it anyway if it's less than 4GB, but the
 		// Bluewing level ping timeout will make sending big packets dangerous anyway.
 		lw_i32 packetLen = data[1] & 0b01111111;