Cleanup and wss URL option

tamaynard · Apr 19, 2022 · 3460aaf · 3460aaf
1 parent 50b46d7
commit 3460aaf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Source/SIOJson/Private/SIOJLibrary.cpp b/Source/SIOJson/Private/SIOJLibrary.cpp
@@ -88,7 +88,7 @@ bool USIOJLibrary::StringToJsonValueArray(const FString& JsonString, TArray<USIO
 TMap<USIOJRequestJSON*, FSIOJCallResponse> USIOJLibrary::RequestMap;
 
 
-FString USIOJLibrary::Conv_JsonObjectToString(USIOJsonObject* InObject)
+FString USIOJLibrary::Conv_SIOJsonObjectToString(USIOJsonObject* InObject)
 {
 	if(InObject)
 	{
@@ -155,7 +155,7 @@ USIOJsonValue* USIOJLibrary::Conv_BoolToJsonValue(bool InBool)
 }
 
 
-FString USIOJLibrary::Conv_JsonValueToString(class USIOJsonValue* InValue)
+FString USIOJLibrary::Conv_SIOJsonValueToString(class USIOJsonValue* InValue)
 {
 	if (InValue)
 	{

diff --git a/Source/SIOJson/Public/SIOJLibrary.h b/Source/SIOJson/Public/SIOJLibrary.h
@@ -239,8 +239,8 @@ class SIOJSON_API USIOJLibrary : public UBlueprintFunctionLibrary
 	UFUNCTION(BlueprintPure, meta = (DisplayName = "To JsonValue (Bytes)", CompactNodeTitle = "->", BlueprintAutocast), Category = "Utilities|SocketIO")
 	static USIOJsonValue* Conv_BytesToJsonValue(const TArray<uint8>& InBytes);
 
-	//To JsonValue (String) - doesn't autocast due to get display name
-	UFUNCTION(BlueprintPure, meta = (DisplayName = "To JsonValue (String)", BlueprintAutocast), Category = "Utilities|SocketIO")
+	//To JsonValue (String)
+	UFUNCTION(BlueprintPure, meta = (DisplayName = "To JsonValue (String)", CompactNodeTitle = "->", BlueprintAutocast), Category = "Utilities|SocketIO")
 	static USIOJsonValue* Conv_StringToJsonValue(const FString& InString);
 
 	//To JsonValue (Integer)
@@ -255,9 +255,9 @@ class SIOJSON_API USIOJLibrary : public UBlueprintFunctionLibrary
 	UFUNCTION(BlueprintPure, meta = (DisplayName = "To JsonValue (Bool)", CompactNodeTitle = "->", BlueprintAutocast), Category = "Utilities|SocketIO")
 	static USIOJsonValue* Conv_BoolToJsonValue(bool InBool);
 
-	//To String (JsonValue)
-	UFUNCTION(BlueprintPure, meta = (DisplayName = "To String (JsonValue)", CompactNodeTitle = "->", BlueprintAutocast), Category = "a me first")
-	static FString Conv_JsonValueToString(class USIOJsonValue* InValue);
+	//To String (JsonValue) - doesn't autocast due to get display name
+	UFUNCTION(BlueprintPure, meta = (DisplayName = "To String (JsonValue)", BlueprintAutocast), Category = "Utilities|SocketIO")
+	static FString Conv_SIOJsonValueToString(class USIOJsonValue* InValue);
 
 	//To Integer (JsonValue)
 	UFUNCTION(BlueprintPure, meta = (DisplayName = "To Integer (JsonValue)", CompactNodeTitle = "->", BlueprintAutocast), Category = "Utilities|SocketIO")
@@ -276,8 +276,8 @@ class SIOJSON_API USIOJLibrary : public UBlueprintFunctionLibrary
 	static TArray<uint8> Conv_JsonValueToBytes(class USIOJsonValue* InValue);
 
 	//To String (JsonObject) - doesn't autocast due to get display name
-	UFUNCTION(BlueprintPure, meta = (DisplayName = "To String (JsonObject)", BlueprintAutocast), Category = "Utilities|ASocketIO")
-	static FString Conv_JsonObjectToString(class USIOJsonObject* InObject);
+	UFUNCTION(BlueprintPure, meta = (DisplayName = "To String (JsonObject)", BlueprintAutocast), Category = "Utilities|SocketIO")
+	static FString Conv_SIOJsonObjectToString(class USIOJsonObject* InObject);
 
 	//To Object (JsonValue)
 	UFUNCTION(BlueprintPure, meta = (DisplayName = "To Object (JsonValue)", CompactNodeTitle = "->", BlueprintAutocast), Category = "Utilities|SocketIO")

diff --git a/Source/SocketIOClient/Private/SocketIONative.cpp b/Source/SocketIOClient/Private/SocketIONative.cpp
@@ -604,7 +604,7 @@ void FSocketIONative::RebindCurrentEventMap()
 
 bool FSocketIONative::IsTLSURL(const FString& URL)
 {
-	return URL.StartsWith(TEXT("https://"));
+	return (URL.StartsWith(TEXT("https://") || URL.StartsWith(TEXT("wss://"));
 }
 
 void FSocketIONative::SyncPrivateClientToTLSMode(const FString& URL)