@@ -6,8 +6,7 @@ import (
 	"os"
 	"time"
 
-	sdk "agones.dev/agones/sdks/go"
-	mcpinger "github.com/Raqbit/mc-pinger"
+	ping "github.com/saulmaldonado/agones-mc-monitor/pkg"
 )
 
 var host string
@@ -29,36 +28,26 @@ func init() {
 }
 
 func main() {
-	// connect to local SDK server
-	client, err := sdk.NewSDK()
+	pinger, err := ping.NewTimed(host, uint16(port), timeout)
 
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	// Ping server until startup
-	_, err = pingUntilSuccessful(retry)
+	err = pingUntilStartup(retry, interval, pinger)
 
 	// Exit in case of unsuccessful startup
 	if err != nil {
 		logger.Println(err)
 		logger.Fatal("Fatal Mincraft server. Exiting...")
 	}
 
-	// Signal that server is ready for players
-	err = client.Ready()
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	logger.Println("Server Ready")
-
 	// Pause before starting next ping cycle
 	time.Sleep(interval)
 
 	// Ping infinitely or until after a series of unsuccessful pings
-	err = pingUntilFatal(retry, client)
+	err = pingUntilFatal(retry, interval, pinger)
 
 	// Exit in case of fatal server
 	if err != nil {
@@ -67,55 +56,48 @@ func main() {
 	}
 }
 
-// Creates a pinger with Context containing timeout
-func ping() (*mcpinger.ServerInfo, error) {
-	pinger := mcpinger.NewTimed(host, uint16(port), timeout)
-	return pinger.Ping()
-}
-
-// Creates pings the server on an interval until the first sucessful ping which then will return the server info response
-// After a series of failed retries an error will be returned indicating a fatal server
-func pingUntilSuccessful(retry uint) (*mcpinger.ServerInfo, error) {
-	info, err := ping()
-
-	for err != nil && retry > 0 {
-		logger.Println(err)
-		logger.Printf("Unsuccessful ping. retrying in %v...", interval)
-		time.Sleep(interval)
-
-		info, err = ping()
-		retry--
-	}
+// Pings server with the specified retries until the server returns a complete response
+// Will also signal the local Agones server with Ready()
+// Returns an error if the pings or singaling local Agones server fails
+func pingUntilStartup(retry uint, interval time.Duration, pinger *ping.AgonesPinger) error {
+	err := retryPing(retry, interval, pinger.ReadyPingWithTimeout)
 
-	// Server will respond with an empty JSON object if its starting up
-	// Pings will continue to happen until the server returns the expected response
-	for info.Players.Max == 0 {
-		logger.Println("Minecraft server starting up...")
-		time.Sleep(interval)
-		info, err = ping()
+	if err != nil {
+		return err
 	}
 
-	return info, err
+	logger.Println("Server ready")
+	return nil
 }
 
 // Pings the server infinitely or the server fails to reposnd after a series of retries
 // Signals to local SDK that server is healthy
-func pingUntilFatal(retry uint, client *sdk.SDK) error {
+func pingUntilFatal(retry uint, interval time.Duration, pinger *ping.AgonesPinger) error {
 	for {
-		_, err := pingUntilSuccessful(retry)
+		err := retryPing(retry, interval, pinger.HealthPingWithTimeout)
 
 		if err != nil {
 			return err
 		}
 
-		// Signal that server is healthy
-		err = client.Health()
+		logger.Printf("Server healthy")
+		time.Sleep(interval)
+	}
+}
 
-		if err != nil {
-			logger.Fatal(err)
-		}
+// Retry wrapper function that will retry the given ping function with the specified attempts and intervals
+// until it dosen't return an error or until all attempts have been made
+func retryPing(attempts uint, interval time.Duration, p func() error) error {
+	err := p()
 
-		logger.Printf("Server healthy")
+	for err != nil && attempts > 0 {
+		logger.Println(err)
+		logger.Printf("Unsuccessful ping. retrying in %v...", interval)
 		time.Sleep(interval)
+
+		err = p()
+		attempts--
 	}
+
+	return err
 }