work

1 files changed, 27 insertions, 17 deletions

diff --git a/src/net_test.moon b/src/net_test.moon
index c4989ab..25d79ca 100644
--- a/src/net_test.moon
+++ b/src/net_test.moon
@@ -6,7 +6,6 @@ test_button = ui.button(0,0,100,100,"Test")
 pull_button = ui.button(100,0,100,100,"Pull")
 send_button = ui.button(200,0,100,100,"Send")
 
-net.initalize!
 peer1, peer2, conn = nil, nil, nil
 test_button.on = (e) =>
 	net.register_message("HelloRequest",{
@@ -28,7 +27,7 @@ test_button.on = (e) =>
 		print("Peer 1 received data!")
 	)
 	peer1\on("error",(data) =>
-		print("Peer 1 error:", data)
+		error("Peer 1 error:" .. tostring(data))
 	)
 	peer1\on("connection",(message)=>
 		print("Peer1 connection:", message)
@@ -37,25 +36,36 @@ test_button.on = (e) =>
 		)
 	)
 	peer2 = net.Peer()
-	peer2\on("open", (data) =>
-		print("Peer2 opened",data)
-		conn = peer2\connect("blah-blah3")
-		conn\on("data",(data) =>
-			print("Peer2 data:",data)
+	peer2_startup = (peer) ->
+		peer\on("open", (data) =>
+			print("Peer2 opened",data)
+			conn = peer\connect(peer1.id)
+			conn\on("data",(data) =>
+				print("Peer2 data:",data)
+			)
 		)
-	)
-	peer2\on("connection", (data) =>
-		print("Peer2 connected", data)
-	)
-	peer2\on("error", (data) =>
-		error("Net error: " .. tostring(data))
-	)
-	peer2\on("data", (data) =>
-		print("Peer2 on data",data)
-	)
+		peer\on("connection", (message) =>
+			print("Peer2 connected", message)
+			message.data\on("data",(data)=>
+				print("Peer2 received data:", data)
+			)
+		)
+		peer\on("error", (message) =>
+			print("peer2 error:", message)
+			if message.data.type == "unavailable-id"
+				peer\replace_id!
+				peer2_startup(peer)
+				return
+			error("Peer2 error: " .. tostring(data))
+		)
+		peer\on("data", (data) =>
+			print("Peer2 on data",data)
+		)
+	peer2_startup(peer2)
 
 pull_button.on = (e) =>
 	net.pump!
+	print("Peers:" .. tostring(net.peers!))
 
 send_button.on = (e) =>
 	conn\send("HelloRequest",{