ari-party/rojo
1
0
Fork 0
forked from rojo-rbx/rojo
Code Pull Requests Activity

Improve Rojo sync reliability (#739)

Browse Source 
Uses non-recursive main loop and avoids hanging promises
This commit is contained in:
boatbomber
2023-07-16 14:59:30 -07:00
committed by GitHub
parent dd01a9bef3
commit 8662d2227c
2 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
plugin/src/ServeSession.lua
View File

@@ -299,27 +299,44 @@ function ServeSession:__initialSync(serverInfo)
end
function ServeSession:__mainSyncLoop()
return self.__apiContext:retrieveMessages()
:andThen(function(messages)
Log.trace("Serve session {} retrieved {} messages", tostring(self), #messages)
return Promise.new(function(resolve, reject)
while self.__status == Status.Connected do
local success, result = self.__apiContext:retrieveMessages()
:andThen(function(messages)
if self.__status == Status.Disconnected then
-- In the time it took to retrieve messages, we disconnected
-- so we just resolve immediately without patching anything
return
end
for _, message in ipairs(messages) do
local unappliedPatch = self.__reconciler:applyPatch(message)
Log.trace("Serve session {} retrieved {} messages", tostring(self), #messages)
if not PatchSet.isEmpty(unappliedPatch) then
Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
PatchSet.humanSummary(self.__instanceMap, unappliedPatch))
end
for _, message in messages do
local unappliedPatch = self.__reconciler:applyPatch(message)
if self.__patchAppliedCallback then
pcall(self.__patchAppliedCallback, message, unappliedPatch)
end
if not PatchSet.isEmpty(unappliedPatch) then
Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
PatchSet.humanSummary(self.__instanceMap, unappliedPatch))
end
if self.__patchAppliedCallback then
pcall(self.__patchAppliedCallback, message, unappliedPatch)
end
end
end):await()
if self.__status == Status.Disconnected then
-- If we are no longer connected after applying, we stop silently
-- without checking for errors as they are no longer relevant
break
elseif success == false then
reject(result)
end
end
if self.__status ~= Status.Disconnected then
return self:__mainSyncLoop()
end
end)
-- We are no longer connected, so we resolve the promise
resolve()
end)
end
function ServeSession:__stopInternal(err)