From 63ea182f94712308b77854c78f63106048b5d74a Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Sat, 26 May 2018 03:00:06 -0700
Subject: [PATCH] Plugin cleanup, and better message distinction

---
 plugin/src/ApiContext.lua | 5 +++++
 plugin/src/HttpError.lua  | 9 ++++++++-
 plugin/src/Session.lua    | 3 ---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugin/src/ApiContext.lua b/plugin/src/ApiContext.lua
index d32a5612..eb61d372 100644
--- a/plugin/src/ApiContext.lua
+++ b/plugin/src/ApiContext.lua
@@ -3,6 +3,7 @@ local Promise = require(script.Parent.Parent.modules.Promise)
 local Config = require(script.Parent.Config)
 local Version = require(script.Parent.Version)
 local Http = require(script.Parent.Http)
+local HttpError = require(script.Parent.HttpError)
 
 local ApiContext = {}
 ApiContext.__index = ApiContext
@@ -104,6 +105,10 @@ function ApiContext:retrieveMessages()
 
 			return self:retrieveMessages()
 		end, function(err)
+			if err.type == HttpError.Error.Timeout then
+				return self:retrieveMessages()
+			end
+
 			self.connected = false
 
 			return Promise.reject(err)
diff --git a/plugin/src/HttpError.lua b/plugin/src/HttpError.lua
index 674721cf..ca624037 100644
--- a/plugin/src/HttpError.lua
+++ b/plugin/src/HttpError.lua
@@ -10,6 +10,9 @@ HttpError.Error = {
 		message = "Rojo plugin couldn't connect to the Rojo server.\n" ..
 			"Make sure the server is running -- use 'Rojo serve' to run it!",
 	},
+	Timeout = {
+		message = "Rojo timed out during a request.",
+	},
 	Unknown = {
 		message = "Rojo encountered an unknown error: {{message}}",
 	},
@@ -44,7 +47,11 @@ function HttpError.fromErrorString(err)
 	end
 
 	if err:find("^curl error") then
-		return HttpError.new(HttpError.Error.ConnectFailed)
+		if err:find("couldn't connect to server") then
+			return HttpError.new(HttpError.Error.ConnectFailed)
+		elseif err:find("timeout was reached") then
+			return HttpError.new(HttpError.Error.Timeout)
+		end
 	end
 
 	return HttpError.new(HttpError.Error.Unknown, err)
diff --git a/plugin/src/Session.lua b/plugin/src/Session.lua
index edfab7b0..d55a9e0e 100644
--- a/plugin/src/Session.lua
+++ b/plugin/src/Session.lua
@@ -43,7 +43,6 @@ function Session.new()
 
 				for id, instance in pairs(instances) do
 					if id ~= "0" then
-						print("parent", created[id], created[tostring(instance.parent)])
 						created[id].Parent = created[tostring(instance.parent)]
 					end
 				end
@@ -57,8 +56,6 @@ function Session.new()
 	end
 
 	api = ApiContext.new(REMOTE_URL, function(message)
-		print("got message", message)
-
 		if message.type == "InstanceChanged" then
 			print("Instance", message.id, "changed!")
 			readAll()