Display network connection error messages and fix networking on MacOS

jonathanballs · Jan 24, 2020 · 43a94be · 43a94be
1 parent 8d3c598
commit 43a94be
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/source/networking/connection.d b/source/networking/connection.d
@@ -76,10 +76,19 @@ class Connection {
             }
 
             if (amountRead == Socket.ERROR) {
-                if (conn.getErrorText() == "Success") {
-                    amountRead = 0;
-                } else {
-                    throw new Exception("Socket Error: ", conn.getErrorText());
+                version(linux) {
+                    if (conn.getErrorText() == "Success") {
+                        amountRead = 0;
+                    } else {
+                        throw new Exception("Socket Error: ", conn.getErrorText());
+                    }
+                }
+                version(OSX) {
+                    if (conn.getErrorText() == "Undefined error: 0") {
+                        amountRead = 0;
+                    } else {
+                        throw new Exception("Socket Error: ", conn.getErrorText());
+                    }
                 }
             }
             recBuffer ~= cast(string) buffer[0..amountRead];

diff --git a/source/networking/package.d b/source/networking/package.d
@@ -25,21 +25,19 @@ private enum serverPort = 420_69;
 // (p2p, client/server etc).
 
 // TODO list
-// - Exit when window closes - Notifying opponent.
-// - Basically entire game logic
 // - Validate that strings are valid UTF-8
 // - Reconnection.
-// - Could this be cleaner with fibers? The layout is not smooth
+// - Could this be cleaner with fibers? The layout is not very clean and wont scale very well.
 
 // Handles gamestate for a dice roll
 // Document and clean this up please!
 class DiceRoll {
-    bool goFirst;
+    private bool goFirst;
     bool done;
-    Connection conn;
-    ulong mySeed;
-    string oppSeed;
-    string oppSeedHash;
+    private Connection conn;
+    private ulong mySeed;
+    private string oppSeed;
+    private string oppSeedHash;
 
     this(Connection conn, bool goFirst) {
         this.conn = conn;
@@ -244,6 +242,7 @@ class NetworkingThread {
                 }
             }
         } catch (Exception e) {
+            writeln("NETWORK THREAD EXCEPTION");
             writeln(e);
             send(ownerTid, NetworkThreadUnhandledException(e.msg, e.info.to!string));
         }

diff --git a/source/ui/networkwidget.d b/source/ui/networkwidget.d
@@ -37,6 +37,7 @@ class NetworkWidget : Dialog {
 
     Box inetBox;
     HumanSelector inetHuman;
+    Label inetErrorMessage;
     Button inetStartSearchButton;
     Box inetStartSearchBox;
     Label inetStartSearchLabel;
@@ -97,6 +98,11 @@ class NetworkWidget : Dialog {
         });
         inetStartSearchBox.setHalign(GtkAlign.CENTER);
 
+        // In case of any errors we'll put them here
+        inetErrorMessage = new Label("");
+        inetErrorMessage.setMarkup("<span foreground='red'>%s<\\span>");
+        inetBox.packEnd(inetErrorMessage, false, false, 0);
+
         /**
          * LAN
          */
@@ -134,6 +140,9 @@ class NetworkWidget : Dialog {
                     assert(ng.clientPlayer == Player.P2);
                     this.onCreateNewGame.emit(new GameState(opponent, player));
                 }
+            },
+            (NetworkThreadUnhandledException e) {
+                inetErrorMessage.setText(e.message);
             }
         );
         return true;