Elijah/CollabVMSharp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Catch WebSocket failure and add connectionfailed event

Browse source 
* Switch registercommand to string[] (idk why it wasnt)
This commit is contained in:
elijahr2411 2023-03-22 21:18:35 -04:00
parent d72094a68b
commit a8254a23b5
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CollabVMSharp/CollabVMClient.cs
View file

@ -39,7 +39,7 @@ public class CollabVMClient {
private TurnUpdateEventArgs _currentturn; private TurnUpdateEventArgs _currentturn;
private VoteUpdateEventArgs _currentvote; private VoteUpdateEventArgs _currentvote;
private WebProxy? _proxy; private WebProxy? _proxy;
private Dictionary<string, Action<string, IEnumerable<string>>> commands; private Dictionary<string, Action<string, string[]>> commands;
// Tasks and related // Tasks and related
private TaskCompletionSource<Node[]> GotNodeList; private TaskCompletionSource<Node[]> GotNodeList;
private TaskCompletionSource<bool> GotConnectionToNode; private TaskCompletionSource<bool> GotConnectionToNode;
@ -63,6 +63,7 @@ public class CollabVMClient {
public event EventHandler<ChatMessage[]> ChatHistory; public event EventHandler<ChatMessage[]> ChatHistory;
public event EventHandler ConnectedToNode; public event EventHandler ConnectedToNode;
public event EventHandler NodeConnectFailed; public event EventHandler NodeConnectFailed;
public event EventHandler<string> ConnectionFailed;
public event EventHandler<RectEventArgs> Rect; public event EventHandler<RectEventArgs> Rect;
public event EventHandler<string> Renamed; public event EventHandler<string> Renamed;
public event EventHandler<UserRenamedEventArgs> UserRenamed; public event EventHandler<UserRenamedEventArgs> UserRenamed;
@ -129,6 +130,7 @@ public class CollabVMClient {
ChatHistory += delegate { }; ChatHistory += delegate { };
ConnectedToNode += delegate { }; ConnectedToNode += delegate { };
NodeConnectFailed += delegate { }; NodeConnectFailed += delegate { };
ConnectionFailed += delegate { };
Rect += delegate { }; Rect += delegate { };
Renamed += delegate { }; Renamed += delegate { };
UserRenamed += delegate { }; UserRenamed += delegate { };
@ -143,8 +145,15 @@ public class CollabVMClient {
/// <summary> /// <summary>
/// Connect to the CollabVM Server /// Connect to the CollabVM Server
/// </summary> /// </summary>
public async Task Connect() { public async Task<bool> Connect() {
try {
await this.socket.ConnectAsync(this.url, CancellationToken.None); await this.socket.ConnectAsync(this.url, CancellationToken.None);
}
catch (WebSocketException e) {
this.ConnectionFailed.Invoke(this, e.Message);
this.Cleanup(false);
return false;
}
this._connected = true; this._connected = true;
if (this.username != null) if (this.username != null)
this.SendMsg(Guacutils.Encode("rename", this.username)); this.SendMsg(Guacutils.Encode("rename", this.username));
@ -154,6 +163,7 @@ public class CollabVMClient {
this.SendMsg(Guacutils.Encode("connect", this.node)); this.SendMsg(Guacutils.Encode("connect", this.node));
this.NOPRecieve.Start(); this.NOPRecieve.Start();
this.WebSocketLoop(); this.WebSocketLoop();
return true;
} }
private async void WebSocketLoop() { private async void WebSocketLoop() {
@ -803,7 +813,7 @@ public class CollabVMClient {
/// </summary> /// </summary>
/// <param name="cmd">The command which triggers the callback. For example, "!ban" would match "!ban guest12345"</param> /// <param name="cmd">The command which triggers the callback. For example, "!ban" would match "!ban guest12345"</param>
/// <param name="callback">Function to be called when a user executes the command. The first parameter is a username and the last is an array of arguments</param> /// <param name="callback">Function to be called when a user executes the command. The first parameter is a username and the last is an array of arguments</param>
public void RegisterCommand(string cmd, Action<string, IEnumerable<string>> callback) { public void RegisterCommand(string cmd, Action<string, string[]> callback) {
this.commands.Add(cmd, callback); this.commands.Add(cmd, callback);
} }
@ -818,7 +828,7 @@ public class CollabVMClient {
return; return;
} }
if (commands.ContainsKey(args[0])) if (commands.ContainsKey(args[0]))
commands[args[0]](username, args.Skip(1)); commands[args[0]](username, args.Skip(1).ToArray());
} }
public Image GetFramebuffer() => framebuffer.CloneAs<Rgba32>(); public Image GetFramebuffer() => framebuffer.CloneAs<Rgba32>();