sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-09-16 14:43:23 +02:00
parent 2adfce27b0 5f18b3e772
commit ac45f1b454
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
RH-Engine/JSONParser.cs
View File

@@ -36,10 +36,11 @@ namespace RH_Engine
Newtonsoft.Json.Linq.JArray data = jsonData.data;
foreach (dynamic d in data)
{
foreach(PC pc in PCs)
foreach (PC pc in PCs)
{
if (d.clientinfo.host == pc.host && d.clientinfo.user == pc.user)
{
Console.WriteLine("connecting to {0}, on {1} with id {2}", pc.user, pc.host, d.id);
return d.id;
}
}
@@ -48,6 +49,16 @@ namespace RH_Engine
return null;
}
public static string GetTunnelID(string json)
{
dynamic jsonData = JsonConvert.DeserializeObject(json);
if (jsonData.data.status == "ok")
{
return jsonData.data.id;
}
return null;
}
}
}

32
RH-Engine/Program.cs
View File

@@ -65,20 +65,28 @@ namespace RH_Engine
private static void CreateConnection(NetworkStream stream)
{
//WriteTextMessage(stream, "{\r\n\"id\" : \"session/list\"\r\n}");
//string msg = ReadPrefMessage(stream);
//Console.WriteLine(msg);
//string id = JSONParser.GetSessionID(msg, PCs);
//Console.WriteLine(id);
WriteTextMessage(stream, "{\r\n\"id\" : \"session/list\"\r\n}");
string result = ReadPrefMessage(stream);
//Console.WriteLine(result);
foreach (var s in JSONParser.GetUsers(result))
{
Console.WriteLine(s);
}
string id = JSONParser.GetSessionID(ReadPrefMessage(stream), PCs);
string tunnelCreate = "{\"id\" : \"tunnel/create\", \"data\" : {\"session\" : \"" + id + "\"}}";
WriteTextMessage(stream, tunnelCreate);
string tunnelResponse = ReadPrefMessage(stream);
Console.WriteLine(tunnelResponse);
string tunnelID = JSONParser.GetTunnelID(tunnelResponse);
Console.WriteLine("tunnelID is: " + tunnelID);
string sceneReset = "{\"id\" : \"tunnel/send\", \"data\" : {\"dest\" : \"" + tunnelID + "\",\"data\" :{\"id\" : \"scene/reset\",\"data\" : { }}}}}";
//string sceneReset = "{\"id\" : \"scene/reset\"}";
WriteTextMessage(stream, sceneReset);
Console.WriteLine(ReadPrefMessage(stream));
}
}